Module: sip-router
Branch: master
Commit: 03d35c2b93d58c0abb5fd4f47ea010148adb815d
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03d35c2…
Author: Jan Janak <jan(a)iptel.org>
Committer: Jan Janak <jan(a)iptel.org>
Date: Wed Apr 15 17:54:03 2009 +0200
Merge kamailio modules into sip-router master branch
* commit 'origin/kamailio_modules': (3363 commits)
Fix relative paths to tm header files.
Removing kamailio tlsops module.
Removing kamailio version of db_postgres module.
Removing kamailio version of db_mysql module.
Removing kamailio version of db_flatstore module.
Removing kamailio db_berkeley module.
Removing kamailio carrierroute module.
Removing kamailio version of tm module
Switch to sip-router calling convetion of t_request
Define OPENSER_MOD_INTERFACE in Makefile.
Define OPENSER_MOD_INTERFACE in Makefile.
Various db api changes needed after migration to libsrdb1
Define OPENSER_MOD_INTERFACE in Makefile.
Convert hostent2su into proxy2su
Update the number of parameters to mk_shm_proxy to sr version
Include lvalue.h which defines EQ_T in sip-router
Update module to use libkmi
Define OPENSER_MOD_INTERFACE in Makefile.
Enclose a label in #ifdef STATISTICS to avoid compilation warning
Update parse_phostport parameters to the sr version of the function
...
---
Module: sip-router
Branch: master
Commit: 93c2f8aedc4b9fa97af3eb1caa77215a4cbb049e
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93c2f8a…
Author: Jan Janak <jan(a)iptel.org>
Committer: Jan Janak <jan(a)iptel.org>
Date: Wed Apr 15 13:35:47 2009 +0200
Merge commit 'origin/janakj/kcore'
* commit 'origin/janakj/kcore': (32 commits)
Make the parser work with the sr core
Update header field paths, we moved the parser to libkcore
Adding the supported parser from kamailio core
Adding the sst parser from kamailio core
Function to retrieve the first URI from Path headers.
Moving socket related code from snmpstats module into libkcore
Added privacy header parser from kamailio to kcore lib
Use next_sibling_hdr to obtain next header with same type
Kamailio compatiblity: export last_retcode via a global variable
Fix paths to header files in the sr core.
Adding files regexp.[ch] from kamailio core
Fix path to msg_parser.h
Fixing the path to headers in the sip-router core.
Adding P-Preferred-Identity header parser from kamailio core
Fix paths to headers in the sip-router core.
P-Asserted-Identity parser from kamailio core
Update header paths
Adding core_stats.[ch] from kamailio
Copy statistics files from kamailio into libkcore
Adding faked_msg.[ch] from kamailio core
...
---
Hi,
this patch fixes the module loading for the nathelper module. The module
registers the additional processes only (for ping timers) only when
natping_interval > 0. Thus we need to check for this variable in the
child_init(..) function as well.
Cheers,
Henning
diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c
index e9666bf..4118bf2 100644
--- a/modules/nathelper/nathelper.c
+++ b/modules/nathelper/nathelper.c
@@ -1166,7 +1166,7 @@ child_init(int rank)
struct rtpp_set *rtpp_list;
struct rtpp_node *pnode;
- if (rank==PROC_MAIN) {
+ if (rank==PROC_MAIN && natping_interval > 0) {
for( i=0 ; i<natping_processes ; i++ ) {
if(fork_dummy_timer(PROC_TIMER, "TIMER NH", 1 /*socks flag*/,
nh_timer, (void*)(unsigned long)i,
Folks,
I am about to start migrating SER modules and Kamailio modules to the git
repository at git://git.sip-router.org/sip-router. I suppose it will take most
of the day, I will send another announcement when it is done.
Unless you have something very urgent to commit, please wait with commits to
the svn trunk and cvs head. This applies only to cvs head and svn trunk, feel
free to commit to other branches.
If you have something that you need to commit urgently to svn trunk or cvs
head, please do so and let me know by email.
Thanks for your cooperation.
Jan.