sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: sms(s): merge changes from sms(k) ( log file refactorings and one security fix)

by Henning Westerholt

Module: sip-router Branch: master Commit: 8f52d67376b8a4e31e90894723c3ffa126bb0b80 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f52d67… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Aug 13 17:58:42 2010 +0200 sms(s): merge changes from sms(k) (log file refactorings and one security fix) --- modules_s/sms/libsms_getsms.c | 51 ++++++++---------- modules_s/sms/libsms_modem.c | 69 ++++++++++-------------- modules_s/sms/libsms_putsms.c | 9 ++-- modules_s/sms/sms.c | 98 +++++++++++++++-------------------- modules_s/sms/sms_funcs.c | 114 +++++++++++++++++++---------------------- modules_s/sms/sms_report.c | 39 +++++++-------- modules_s/sms/sms_report.h | 8 ++-- 7 files changed, 172 insertions(+), 216 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=8f5…

13 years, 10 months

git:andrei/cancel_reason: tm: option to compile without reason support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: bf5d1d6f1df303019ccf44f3674c13463d11ec05 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf5d1d6… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 17:20:26 2010 +0200 tm: option to compile without reason support If compiled with -DNO_CANCEL_REASON_SUPPORT, the reason header support will not be enabled. --- modules/tm/h_table.c | 2 ++ modules/tm/h_table.h | 2 ++ modules/tm/t_cancel.c | 22 +++++++++++++++++----- modules/tm/t_cancel.h | 5 ++++- modules/tm/t_fwd.c | 18 ++++++++++++++++-- modules/tm/t_msgbuilder.c | 33 ++++++++++++++++++++++++++++----- modules/tm/t_msgbuilder.h | 15 +++++++++++---- modules/tm/t_reply.c | 22 ++++++++++++++++++++-- modules/tm/t_reply.h | 24 ++++++++++++++++++++++-- modules/tm/timer.c | 4 ++++ 10 files changed, 126 insertions(+), 21 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bf5…

13 years, 10 months

git:andrei/cancel_reason: tm: docs: reason header modparams and script function

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: 963b5beb686c6b3a6250cee9ad0a068f0d40c340 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=963b5be… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 12:30:26 2010 +0200 tm: docs: reason header modparams and script function - docs for: local_cancel_reason = 0|1 e2e_cancel_reason = 0|1 t_set_no_e2e_cancel_reason(0|1) - regenerated README --- NEWS | 17 +++ modules/tm/README | 235 ++++++++++++++++++++++++++++-------------- modules/tm/doc/functions.xml | 81 ++++++++++---- modules/tm/doc/params.xml | 68 ++++++++++++- modules/tm/doc/tm.xml | 9 ++- 5 files changed, 306 insertions(+), 104 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=963…

13 years, 10 months

git:master: modules/db_mysql Added statistics (via counter framework) for mysql driver error

by Marius Zbihlei

Module: sip-router Branch: master Commit: 7ca3941c12b8a78d58642241c3dab9621ff0f2e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ca3941… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Aug 12 18:11:16 2010 +0300 modules/db_mysql Added statistics (via counter framework) for mysql driver error These errors are caused by lost connectivity to the server. --- modules/db_mysql/km_dbase.c | 5 +++++ modules/db_mysql/km_my_con.c | 4 +++- modules/db_mysql/mysql_mod.c | 10 ++++++++++ modules/db_mysql/mysql_mod.h | 11 +++++++++++ 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 49ab55a..b73e73a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -81,6 +81,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) if ((t - CON_TIMESTAMP(_h)) > my_ping_interval) { if (mysql_ping(CON_CONNECTION(_h))) { LM_WARN("driver error on ping: %s\n", mysql_error(CON_CONNECTION(_h))); + counter_inc(mysql_cnts_h.driver_err); } } /* @@ -115,6 +116,10 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) } } LM_ERR("driver error on query: %s\n", mysql_error(CON_CONNECTION(_h))); + /* Bad queries don't count */ + if(code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { + counter_inc(mysql_cnts_h.driver_err); + } return -2; } diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index 953c574..ce20be2 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -34,7 +34,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" - +#include "mysql_mod.h" /*! \brief * Create a new connection structure, @@ -107,6 +107,8 @@ struct my_con* db_mysql_new_connection(const struct db_id* id) id->database, id->port, 0, 0)) { #endif LM_ERR("driver error: %s\n", mysql_error(ptr->con)); + /* increase error counter */ + counter_inc(mysql_cnts_h.driver_err); mysql_close(ptr->con); goto err; } diff --git a/modules/db_mysql/mysql_mod.c b/modules/db_mysql/mysql_mod.c index e0ebe7f..014e396 100644 --- a/modules/db_mysql/mysql_mod.c +++ b/modules/db_mysql/mysql_mod.c @@ -57,6 +57,12 @@ unsigned int my_retries = 1; /* Number of retries when command fails */ unsigned long my_client_ver = 0; +struct mysql_counters_h mysql_cnts_h; +counter_def_t mysql_cnt_defs[] = { + {&mysql_cnts_h.driver_err, "Mysql driver erros", 0, 0, 0, + "incremented each time a Mysql error happened because the server/connection has failed."}, + {0, 0, 0, 0, 0, 0 } +}; #define DEFAULT_MY_SEND_TO 2 /* in seconds */ #define DEFAULT_MY_RECV_TO 4 /* in seconds */ @@ -145,8 +151,12 @@ static int mysql_mod_init(void) " compiled against %ld)\n", MYSQL_VERSION_ID); } #endif + if (counter_register_array("mysql", mysql_cnt_defs) < 0) + goto error; return kam_mysql_mod_init(); +error: + return -1; } /** @} */ diff --git a/modules/db_mysql/mysql_mod.h b/modules/db_mysql/mysql_mod.h index 3a6f470..0d98334 100644 --- a/modules/db_mysql/mysql_mod.h +++ b/modules/db_mysql/mysql_mod.h @@ -36,10 +36,21 @@ #ifndef _MYSQL_MOD_H #define _MYSQL_MOD_H +#include "../../counters.h" + +/* counter struct +*/ +struct mysql_counters_h { + counter_handle_t driver_err; +}; +/* defined in km_dbase.c */ +extern struct mysql_counters_h mysql_cnts_h; + /** @defgroup mysql MySQL db driver * @ingroup DB_API */ /** @{ */ + extern int my_ping_interval; extern unsigned int my_connect_to; extern unsigned int my_send_to;

13 years, 10 months

git:master: modules/db_mysql: Improved handling of driver error counter

by Marius Zbihlei

Module: sip-router Branch: master Commit: b02aeb0fa769984dd40ca2221a8fc9aaf0088dc8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b02aeb0… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Aug 13 14:39:49 2010 +0300 modules/db_mysql: Improved handling of driver error counter --- modules/db_mysql/km_dbase.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index b73e73a..081d646 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -104,7 +104,8 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) * Thus the 3 in the loop count. Increasing the loop count over this * value shouldn't be needed, but it doesn't hurt either, since the loop * will most of the time stop at the second or sometimes at the third - * iteration. + * iteration. In the case of CR_SERVER_GONE_ERROR and CR_SERVER_LOST the + * driver error counter is increased */ for (i=0; i < (db_mysql_auto_reconnect ? 3 : 1); i++) { if (mysql_real_query(CON_CONNECTION(_h), _s->s, _s->len) == 0) { @@ -114,12 +115,9 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) if (code != CR_SERVER_GONE_ERROR && code != CR_SERVER_LOST) { break; } - } - LM_ERR("driver error on query: %s\n", mysql_error(CON_CONNECTION(_h))); - /* Bad queries don't count */ - if(code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { counter_inc(mysql_cnts_h.driver_err); } + LM_ERR("driver error on query: %s\n", mysql_error(CON_CONNECTION(_h))); return -2; } @@ -157,6 +155,7 @@ void db_mysql_close(db1_con_t* _h) */ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) { + int code; if ((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); return -1; @@ -176,6 +175,10 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) goto done; } else { LM_ERR("driver error: %s\n", mysql_error(CON_CONNECTION(_h))); + code = mysql_errno(CON_CONNECTION(_h)); + if (code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { + counter_inc(mysql_cnts_h.driver_err); + } db_free_result(*_r); *_r = 0; return -3; @@ -274,7 +277,7 @@ int db_mysql_query(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _op, */ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) { - int rows, i; + int rows, i, code; if (!_h || !_r || nrows < 0) { LM_ERR("Invalid parameter value\n"); @@ -304,6 +307,10 @@ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) return 0; } else { LM_ERR("driver error: %s\n", mysql_error(CON_CONNECTION(_h))); + code = mysql_errno(CON_CONNECTION(_h)); + if (code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { + counter_inc(mysql_cnts_h.driver_err); + } db_free_result(*_r); *_r = 0; return -3;

13 years, 10 months

Re: [sr-dev] git:andrei/rve_f_params: NEWS: notes about expressions in function parameters

by Klaus Darilion

forgot to cc the list... Am 11.08.2010 20:11, schrieb Andrei Pelinescu-Onciul: > On Aug 11, 2010 at 18:39, Klaus Darilion<klaus.mailinglists(a)pernau.at> wrote: >> >> >> Am 11.08.2010 17:19, schrieb Andrei Pelinescu-Onciul: >>> On Aug 11, 2010 at 17:13, Klaus Darilion<klaus.mailinglists(a)pernau.at> wrote: >>>> Hi Andrei! >>>> >>>> Am 11.08.2010 16:18, schrieb Andrei Pelinescu-Onciul: >>>>> + - all the module functions can now be called with any constant expression >>>>> + as parameters. E.g.: f("7 *" +" 6 = " + 7 * 6); >>>> >>>> What is the result of this example? >>> >>> f("7 * 6 = 42") >> >> >> ... + 7 * 6) >> ^ ^ >> | | >> A B >> >> IMO it is very confusing (if not even wrong) that A is a string >> concat and B is a arithmetic operation. What happens with: >> >> ... + 7 + 6) ? > > f("7 + 6 = 76") :-) > > but > > f("7 +" +" 6 = " + (7 + 6)) is f("7 + 6 = 13"), as expected. > > I agree it's confusing, but when I wanted to add a separate operator for > string concat (e.g. '.') lots of people opposed it on the grounds that > it will be too difficult for a script writer to use 2 different operators > (or something similar). > Now we have auto-conversion everywhere... > > Maybe we can revisit this and the option of declaring only typed > variable for a future release. I can't remember if I was for or against a dedicated concat parameter, but now I think a dedicated parameter would be good. '.' might be confusing as well once we support float numbers. Is it possible to analyze how sr evaluates the term? regards klaus

13 years, 10 months

Makefile bug fixes and Dragonfly BSD port

by Vincent Stemen

Hi. I have ported kamailio to Dragonfly BSD and fixed a couple of bugs in the build system in the process. I have 4 patches to the Makefiles which I created for kamailio-3.0.1, but have verified will apply to the current master branch. Two are bug fixes and the other 2 are to get it to compile and run on Dragonfly. I have attached all 4 patches to this email. There are comments in the top of each of the patches about what they do. All patches can be applied from the root of the source tree. It turns out that kamailio is not going to serve our needs at this time, so I don't have much more time to put into it. However, I am in hopes that the developers will utilize the patches for Dragonfly as well. I would like to see kamailio natively support Dragonfly BSD for the benefit of both communities and in case we ever need it ourselves in the future, since our environment is all Dragonfly BSD based. The patches primarily just make kamailio treat Dragonfly the same as FreeBSD. kamailio-3.0.1 compiled, installed, and ran successfully with these patches. However, after applying them to todays master branch from the git repository, make was successful, but "make install" errored with install -m 755 msilo.so /u1/falcon/ports/kamailio-20100724/package/kamailio-20100724/kamailio-20100724/usr/pkg/lib/ser/modules_s CC (gcc) [M nathelper.so] nathelper.o CC (gcc) [M nathelper.so] natping.o CC (gcc) [M nathelper.so] nhelpr_funcs.o CC (gcc) [M nathelper.so] rtpproxy_stream.o rtpproxy_stream.c: In function 'rtpproxy_stream': rtpproxy_stream.c:61: error: array type has incomplete element type rtpproxy_stream.c:61: warning: unused variable 'v' rtpproxy_stream.c: In function 'rtpproxy_stop_stream': rtpproxy_stream.c:151: error: array type has incomplete element type rtpproxy_stream.c:151: warning: unused variable 'v' gmake[1]: *** [rtpproxy_stream.o] Error 1 gmake: *** [install-modules_s] Error 1 I don't know if it is Dragonfly related or if it is just a temporary bug introduced in the current master branch. Additional notes: To successfully compile on Dragonfly BSD after applying the patches to kamailio-3.0.1 these are the commands I used. # export CFLAGS=-D__FreeBSD__ # gmake prefix=/usr/pkg # gmake prefix=/usr/pkg install Regards, Vince

13 years, 10 months

git:master: core: DragonFly kqueue support enabled

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c07c2b5e599a2b97fc21d04731f1f9d409859d43 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c07c2b5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 13 11:45:39 2010 +0200 core: DragonFly kqueue support enabled - fixed kqueue support check for DragonFly (seems to be always supported since it was forked from FreeBSD 4.8). - in dragonfly case define both __OS_freebsd and __OS_dragonfly so that we can make some exceptions for dragonfly (e.g. no >= 4.1 version check at runtime before enabling kqueue). - assume SCTP in 2.6 is at least on par with SCTP in FreeBSD 7.1. --- Makefile.defs | 27 +++++++++++++++------------ io_wait.c | 10 ++++++++-- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 440179c..73edb4b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -626,18 +626,20 @@ $(info target architecture <$(ARCH)>, host architecture <$(HOST_ARCH)>) # adds support for Application Server interface # Sometimes is needes correct non-quoted $OS. HACK: gcc translates known OS to number ('linux'), so there is added underscore -# Tell it that dragonflybsd is equivalent to compiling for freebsd. -# This will cause __OS_freebsd to be defined below. ifeq ($(OS), dragonfly) - EQUIV_OS := freebsd + # Tell it that dragonflybsd is equivalent to compiling for freebsd, but + # define also __OS_dragonfly (for fine-tunning like kqueue support). + os_defs := -D__OS_freebsd -D__OS_dragonfly + EQUIV_OS = freebsd else - EQUIV_OS := $(OS) + os_defs := -D__OS_$(OS) + EQUIV_OS = $(OS) endif C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ - -D__CPU_$(ARCH) -D__OS_$(EQUIV_OS) \ + -D__CPU_$(ARCH) $(os_defs) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ -DPKG_MALLOC \ @@ -1820,11 +1822,9 @@ ifeq ($(OS), dragonfly) else LIBS= #dlopen is in libc endif - # check for ver >= 4.1 - ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue) - ifeq ($(NO_KQUEUE),) - C_DEFS+=-DHAVE_KQUEUE - endif + # dragonfly was forked from freebsd 4.8 => all version have kqueue + ifeq ($(NO_KQUEUE),) + C_DEFS+=-DHAVE_KQUEUE endif ifeq ($(NO_SELECT),) C_DEFS+=-DHAVE_SELECT @@ -1840,8 +1840,11 @@ ifeq ($(OS), dragonfly) $(info "sctp development files not installed -- sctp disabled") override SCTP := endif - ifeq ($(shell [ $(OSREL_N) -lt 7000 ] && echo sctp), sctp) -$(info "old freebsd version (>= 7.0 needed) -- sctp disabled") + # FIXME: don't know what's the status of SCTP on dragonfly + # (we suppose the 2.6 version is >= the version in + # in freebsd 7.0) + ifeq ($(shell [ $(OSREL_N) -lt 2006 ] && echo sctp), sctp) +$(info "old dragonfly version (>= 2.6 needed) -- sctp disabled") override SCTP := endif diff --git a/io_wait.c b/io_wait.c index 0c73402..62cdee9 100644 --- a/io_wait.c +++ b/io_wait.c @@ -340,10 +340,13 @@ char* check_poll_method(enum poll_types poll_method) #ifndef HAVE_KQUEUE ret="kqueue not supported, try re-compiling with -DHAVE_KQUEUE"; #else - /* only in FreeBSD 4.1, NETBSD 2.0, OpenBSD 2.9, Darwin */ + /* only in FreeBSD 4.1, NETBSD 2.0, OpenBSD 2.9, Darwin, DragonFly */ #ifdef __OS_freebsd + /* all DragonFly versions have kqueque */ + #ifndef __OS_dragonfly if (_os_ver<0x0401) /* if ver < 4.1 */ ret="kqueue not supported on FreeBSD < 4.1"; + #endif /* __OS_dragonfly */ #elif defined (__OS_netbsd) if (_os_ver<0x020000) /* if ver < 2.0 */ ret="kqueue not supported on NetBSD < 2.0"; @@ -388,9 +391,12 @@ enum poll_types choose_poll_method() #endif #ifdef HAVE_KQUEUE if (poll_method==0) - /* only in FreeBSD 4.1, NETBSD 2.0, OpenBSD 2.9, Darwin */ + /* only in FreeBSD 4.1, NETBSD 2.0, OpenBSD 2.9, Darwin, DragonFly */ #ifdef __OS_freebsd + /* all DragonFly versions have kqueque */ + #ifndef __OS_dragonfly if (_os_ver>=0x0401) /* if ver >= 4.1 */ + #endif /**__OS_dragonfly #elif defined (__OS_netbsd) if (_os_ver>=0x020000) /* if ver >= 2.0 */ #elif defined (__OS_openbsd)

13 years, 10 months

git:master: core:dns_cache When dns_cache is disabled, increment dns error counter on failure

by Marius Zbihlei

Module: sip-router Branch: master Commit: 7ae55b615e4e35ce47d886b6a9ae6db9865fe1f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ae55b6… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Aug 13 11:35:51 2010 +0300 core:dns_cache When dns_cache is disabled, increment dns error counter on failure This affects dns_resolvehost() and resolvehost() when dns_cache is disabled --- dns_cache.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dns_cache.c b/dns_cache.c index 7d52c2c..182e61f 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -2598,9 +2598,14 @@ error: struct hostent* dns_resolvehost(char* name) { str host; - + struct hostent* ret; if ((cfg_get(core, core_cfg, use_dns_cache)==0) || (dns_hash==0)){ /* not init yet */ - return _resolvehost(name); + ret = _resolvehost(name); + if(unlikely(!ret)){ + /* increment dns error counter */ + counter_inc(dns_cnts_h.failed_dns_req); + } + return ret; } host.s=name; host.len=strlen(name);

13 years, 10 months

git:master: test/unit: Cleaned up cfg for unit tests

by Marius Zbihlei

Module: sip-router Branch: master Commit: 2f6491383eb4d9a93e61516a42cc3f2f123e9ede URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f64913… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Aug 13 11:21:51 2010 +0300 test/unit: Cleaned up cfg for unit tests As modules migrate from modules_k/ to modules/ using relative path in loadmodule statement becomes difficult, so both modules/ and modules_k/ path are searched. --- test/unit/12.cfg | 2 +- test/unit/13.cfg | 6 +++--- test/unit/14.cfg | 4 ++-- test/unit/19.cfg | 8 ++++---- test/unit/2.cfg | 2 +- test/unit/20.cfg | 8 ++++---- test/unit/21.cfg | 4 ++-- test/unit/25.cfg | 6 +++--- test/unit/26.cfg | 6 +++--- test/unit/28.cfg | 6 +++--- test/unit/30.cfg | 2 +- test/unit/33.cfg | 2 +- test/unit/34.cfg | 4 ++-- test/unit/40.cfg | 6 +++--- test/unit/41.cfg | 8 ++++---- 15 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/unit/12.cfg b/test/unit/12.cfg index 1fcc96d..2738ad5 100644 --- a/test/unit/12.cfg +++ b/test/unit/12.cfg @@ -1,6 +1,6 @@ log_stderror=yes listen=127.0.0.1 -loadpath "../../modules_k/" +loadpath "../../modules/:../../modules_k/" loadmodule "../../modules/db_mysql/db_mysql.so" loadmodule "../../modules/tm/tm.so" loadmodule "sl" diff --git a/test/unit/13.cfg b/test/unit/13.cfg index dc8394d..bcc49df 100644 --- a/test/unit/13.cfg +++ b/test/unit/13.cfg @@ -1,10 +1,10 @@ debug=2 -loadpath "../../modules_k" +loadpath "../../modules/:../../modules_k/" loadmodule "sl" -loadmodule "../../modules/tm/tm.so" +loadmodule "tm" loadmodule "xlog" loadmodule "maxfwd" -loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "carrierroute" loadmodule "pv" loadmodule "tmx" loadmodule "mi_fifo" diff --git a/test/unit/14.cfg b/test/unit/14.cfg index dde83a0..f99e4b8 100644 --- a/test/unit/14.cfg +++ b/test/unit/14.cfg @@ -1,8 +1,8 @@ -loadpath "../../modules_k" +loadpath "../../modules/:../../modules_k/" loadmodule "sl" loadmodule "xlog" loadmodule "maxfwd" -loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "carrierroute" loadmodule "pv" loadmodule "mi_fifo" diff --git a/test/unit/19.cfg b/test/unit/19.cfg index 6f3ad8b..f66e591 100644 --- a/test/unit/19.cfg +++ b/test/unit/19.cfg @@ -10,10 +10,10 @@ dns=no rev_dns=no #-----------------------Loading Modules------------------------------------- -mpath="../../modules_k/" -loadmodule "../../modules/tm/tm.so" -loadmodule "../../modules/db_mysql/db_mysql.so" -loadmodule "usrloc/usrloc.so" +loadpath "../../modules/:../../modules_k/" +loadmodule "tm" +loadmodule "db_mysql" +loadmodule "usrloc" loadmodule "registrar/registrar.so" loadmodule "sl/sl.so" loadmodule "maxfwd/maxfwd.so" diff --git a/test/unit/2.cfg b/test/unit/2.cfg index ebddb44..113754a 100644 --- a/test/unit/2.cfg +++ b/test/unit/2.cfg @@ -1,5 +1,5 @@ debug=2 -loadpath "../../modules_k" +loadpath "../../modules/:../../modules_k/" loadmodule "../../modules/tm/tm.so" loadmodule "tmx" loadmodule "acc" diff --git a/test/unit/20.cfg b/test/unit/20.cfg index 7405967..be5a9b0 100644 --- a/test/unit/20.cfg +++ b/test/unit/20.cfg @@ -10,11 +10,11 @@ dns=yes rev_dns=no #-----------------------Loading Modiules------------------------------------- -mpath="../../modules_k/" -loadmodule "../../modules/tm/tm.so" -loadmodule "../../modules/db_mysql/db_mysql.so" +loadpath "../../modules_k/:../../modules/" +loadmodule "tm" +loadmodule "db_mysql" loadmodule "usrloc/usrloc.so" -loadmodule "registrar/registrar.so" +loadmodule "registrar" loadmodule "sl/sl.so" loadmodule "maxfwd/maxfwd.so" loadmodule "acc/acc.so" diff --git a/test/unit/21.cfg b/test/unit/21.cfg index 9eba1d9..ce943c6 100644 --- a/test/unit/21.cfg +++ b/test/unit/21.cfg @@ -22,10 +22,10 @@ rev_dns=no # ------------------ module loading ---------------------------------- #set module path -mpath="../../modules_k/" +loadpath "../../modules_k/:../../modules/" # Uncomment this if you want to use SQL database -loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "db_mysql/db_mysql.so" loadmodule "sl/sl.so" loadmodule "rr/rr.so" diff --git a/test/unit/25.cfg b/test/unit/25.cfg index 6c68a43..636910e 100644 --- a/test/unit/25.cfg +++ b/test/unit/25.cfg @@ -2,13 +2,13 @@ debug=0 listen=127.0.0.1 port=5059 -mpath="../../modules_k/" -loadmodule "../../modules/tm/tm.so" +loadpath "../../modules_k/:../../modules/" +loadmodule "tm/tm.so" loadmodule "sl/sl.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "xlog/xlog.so" -loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "db_mysql/db_mysql.so" loadmodule "pv/pv.so" loadmodule "userblacklist/userblacklist.so" loadmodule "maxfwd/maxfwd.so" diff --git a/test/unit/26.cfg b/test/unit/26.cfg index 0953b60..52d8da9 100644 --- a/test/unit/26.cfg +++ b/test/unit/26.cfg @@ -1,15 +1,15 @@ debug=3 memdbg=6 memlog=6 -loadpath "../../modules_k" +loadpath "../../modules/:../../modules_k/" loadmodule "sl" -loadmodule "../../modules/tm/tm.so" +loadmodule "tm" loadmodule "tmx" loadmodule "xlog" loadmodule "maxfwd" loadmodule "pv" loadmodule "kex" -loadmodule "../../modules/carrierroute/carrierroute.so" +loadmodule "carrierroute" loadmodule "mi_fifo" modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") diff --git a/test/unit/28.cfg b/test/unit/28.cfg index 1325705..531446e 100644 --- a/test/unit/28.cfg +++ b/test/unit/28.cfg @@ -1,9 +1,9 @@ debug=3 -mpath="../../modules_k/" +loadpath "../../modules_k/:../../modules/" loadmodule "sl.so" -loadmodule "../../modules/tm/tm.so" -loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "tm/tm.so" +loadmodule "db_mysql/db_mysql.so" loadmodule "cpl-c/cpl-c.so" loadmodule "mi_fifo/mi_fifo.so" loadmodule "textops/textops.so" diff --git a/test/unit/30.cfg b/test/unit/30.cfg index 7215b8e..c2f006b 100644 --- a/test/unit/30.cfg +++ b/test/unit/30.cfg @@ -1,5 +1,5 @@ debug=2 -loadpath "../../modules_k" +loadpath "../../modules/:../../modules_k/" loadmodule "sl" loadmodule "../../modules/tm/tm.so" loadmodule "xlog" diff --git a/test/unit/33.cfg b/test/unit/33.cfg index c498a66..671aba3 100644 --- a/test/unit/33.cfg +++ b/test/unit/33.cfg @@ -1,6 +1,6 @@ debug=3 memlog=2 -mpath="../../modules_k/" +loadpath "../../modules_k/:../../modules/" loadmodule "cfgutils.so" loadmodule "pv.so" loadmodule "xlog.so" diff --git a/test/unit/34.cfg b/test/unit/34.cfg index eff5e72..6f158a5 100644 --- a/test/unit/34.cfg +++ b/test/unit/34.cfg @@ -1,5 +1,5 @@ -mpath="../../modules_k" -loadmodule "../../modules/tm/tm.so" +loadpath "../../modules_k:../../modules" +loadmodule "tm/tm.so" loadmodule "sl.so" loadmodule "usrloc.so" loadmodule "presence.so" diff --git a/test/unit/40.cfg b/test/unit/40.cfg index f9f5c6c..994629a 100644 --- a/test/unit/40.cfg +++ b/test/unit/40.cfg @@ -1,9 +1,9 @@ -mpath="../../modules_k" +loadpath "../../modules_k:../../modules/" -loadmodule "../../modules/tm/tm.so" +loadmodule "tm/tm.so" loadmodule "sl/sl.so" -loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "pike/pike.so" diff --git a/test/unit/41.cfg b/test/unit/41.cfg index 0ca4422..d8f865f 100644 --- a/test/unit/41.cfg +++ b/test/unit/41.cfg @@ -1,15 +1,15 @@ #memlog=1 debug=1 children=1 -mpath="../../modules_k" +loadpath "../../modules_k:../../modules/" -loadmodule "../../modules/tm/tm.so" +loadmodule "tm/tm.so" loadmodule "sl/sl.so" -loadmodule "../../modules/db_mysql/db_mysql.so" +loadmodule "db_mysql/db_mysql.so" loadmodule "usrloc/usrloc.so" loadmodule "registrar/registrar.so" loadmodule "pv/pv.so" -loadmodule "../../modules/avpops/avpops.so" +loadmodule "avpops/avpops.so" loadmodule "mi_fifo/mi_fifo.so" loadmodule "xlog/xlog.so"

13 years, 10 months

← Newer
1
...
19
20
21
22
23
24
25
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010