sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

CVS:commitlog: sip_router NEWS cfg.lex cfg.y core_cmd.c sctp_options.c sctp_options.h sctp_server.c sctp_server.h
by Andrei Pelinescu-Onciul 29 May '09

29 May '09

andrei 2009/05/29 14:24:59 CEST SER CVS Repository Modified files: . NEWS cfg.lex cfg.y core_cmd.c sctp_options.c sctp_options.h sctp_server.c sctp_server.h Log: sctp: retransmission options - added new config and runtime options for controlling the retransmissions at the sctp protocol level: sctp_srto_initial - initial value of the retr. timeout used in RTO calculations. sctp_srto_max - maximum value of the retr. timeout (RTO). sctp_srto_min - minimum value of the retr. timeout (RTO). - on startup get the OS defaults for the sctp options so that sercmd core.sctp_options always displays the options in use (even if they haven't been "manually"). Revision Changes Path 1.104 +14 -2 sip_router/NEWS http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/NEWS.diff?r1=1.103… 1.121 +10 -1 sip_router/cfg.lex http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.lex.diff?r1=1.… 1.178 +22 -1 sip_router/cfg.y http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg.y.diff?r1=1.17… 1.38 +7 -4 sip_router/core_cmd.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/core_cmd.c.diff?r1… 1.7 +101 -9 sip_router/sctp_options.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.c.dif… 1.4 +5 -1 sip_router/sctp_options.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_options.h.dif… 1.27 +99 -4 sip_router/sctp_server.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.c.diff… 1.6 +3 -3 sip_router/sctp_server.h http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/sctp_server.h.diff…

1 0

git:master: - core: load_module - compatibility with K mod paths
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: b27dfba5097af7e497c0177dd57f476f0b089ab4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b27dfba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 13:08:05 2009 +0300 - core: load_module - compatibility with K mod paths - preservation of SER and Kamailio module loading styles - loadmodule accepts "modname.so" loadpath "searchpath" loadmodule "modpath" - when modpath is modname or modname.so, search module at: - searchpath/modname.so - searchpath/modname/modname.so - if modpath does not start with '/', search module at: - modpath - searchpath/modpath --- sr_module.c | 111 +++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 77 insertions(+), 34 deletions(-) diff --git a/sr_module.c b/sr_module.c index 7986720..e1da688 100644 --- a/sr_module.c +++ b/sr_module.c @@ -260,7 +260,7 @@ int load_module(char* mod_path) unsigned* mod_if_ver; struct sr_module* t; struct stat stat_buf; - char* modname; + str modname; char* mdir; char* nxt_mdir; char* path; @@ -269,71 +269,114 @@ int load_module(char* mod_path) int dlflags; int new_dlflags; int retries; + int path_type; #ifndef RTLD_NOW /* for openbsd */ #define RTLD_NOW DL_LAZY #endif path=mod_path; - if (!strchr(path, '/') && !strchr(path, '.')) { + path_type = 0; + modname.s = path; + modname.len = strlen(mod_path); + if(modname.len>3 && strcmp(modname.s+modname.len-3, ".so")==0) { + path_type = 1; + modname.len -= 3; + } + if (!strchr(path, '/')) + path_type |= 2; + if((path_type&2) || path[0] != '/') { /* module name was given, we try to construct the path */ - modname = path; mdir=mods_dir; /* search path */ do{ nxt_mdir=strchr(mdir, ':'); if (nxt_mdir) mdir_len=(int)(nxt_mdir-mdir); else mdir_len=strlen(mdir); - /* try path <MODS_DIR>/<modname>.so */ - path = (char*)pkg_malloc(mdir_len + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); - if (path==0) goto error; - memcpy(path, mdir, mdir_len); - len = mdir_len; - if (len != 0 && path[len - 1] != '/'){ - path[len]='/'; - len++; - } - path[len]=0; - strcat(path, modname); - strcat(path, ".so"); - - if (stat(path, &stat_buf) == -1) { - DBG("load_module: module file not found <%s>\n", path); - pkg_free(path); - - /* try path <MODS_DIR>/<modname>/<modname>.so */ - path = (char*)pkg_malloc( - mdir_len + 1 /* "/" */ + - strlen(modname) + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); + if(path_type&2) { + /* try path <MODS_DIR>/<modname>.so */ + path = (char*)pkg_malloc(mdir_len + 1 /* "/" */ + + modname.len + 3 /* ".so" */ + 1); if (path==0) goto error; memcpy(path, mdir, mdir_len); len = mdir_len; - if (len != 0 && path[len - 1] != '/') { + if (len != 0 && path[len - 1] != '/'){ path[len]='/'; len++; } path[len]=0; - strcat(path, modname); - strcat(path, "/"); - strcat(path, modname); - strcat(path, ".so"); + strcat(path, modname.s); + if(!(path_type&1)) + strcat(path, ".so"); if (stat(path, &stat_buf) == -1) { DBG("load_module: module file not found <%s>\n", path); pkg_free(path); - path=0; + + /* try path <MODS_DIR>/<modname>/<modname>.so */ + path = (char*)pkg_malloc( + mdir_len + 1 /* "/" */ + + modname.len + 1 /* "/" */ + + modname.len + 3 /* ".so" */ + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/') { + path[len]='/'; + len++; + } + path[len]=0; + strncat(path, modname.s, modname.len); + strcat(path, "/"); + strcat(path, modname.s); + if(!(path_type&1)) + strcat(path, ".so"); + + if (stat(path, &stat_buf) == -1) { + DBG("load_module: module file not found <%s>\n", path); + pkg_free(path); + path=0; + } + } + } else { + /* try mod_path - S compat */ + if(path==mod_path) { + if (stat(path, &stat_buf) == -1) { + DBG("load_module: module file not found <%s>\n", path); + path=0; + } + } + if(path==0) { + /* try path <MODS_DIR>/mod_path - K compat */ + path = (char*)pkg_malloc(mdir_len + 1 /* "/" */ + + strlen(mod_path) + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/'){ + path[len]='/'; + len++; + } + path[len]=0; + strcat(path, mod_path); + + if (stat(path, &stat_buf) == -1) { + DBG("load_module: module file not found <%s>\n", path); + pkg_free(path); + path=0; + } } } mdir=nxt_mdir?nxt_mdir+1:0; }while(path==0 && mdir); if (path==0){ - LOG(L_ERR, "ERROR: load_module: could not find module <%s> in" - " <%s>\n", modname, mods_dir); + LOG(L_ERR, "ERROR: load_module: could not find module <%.*s> in" + " <%s>\n", modname.len, modname.s, mods_dir); goto error; } } + DBG("load_module: trying to load <%s>\n", path); + retries=2; dlflags=RTLD_NOW; reload:

2 3

git:master: core: load_module - updated function docs
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: c9c181f8b5ee63f176fad577bc89314ffd261d8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9c181f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 14:02:20 2009 +0300 core: load_module - updated function docs --- sr_module.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sr_module.c b/sr_module.c index e1da688..81ef9b3 100644 --- a/sr_module.c +++ b/sr_module.c @@ -243,11 +243,14 @@ static inline int version_control(void *handle, char *path) } /** load a sr module. - * tries to load the module specified by path. - * If modname does contain a '/' or a '.' it would be assumed to contain a - * path to the module and it will be used as give. - * else <MODS_DIR>/<modname>.so will be tried and if this fails + * tries to load the module specified by mod_path. + * If mod_path is 'modname' or 'modname.so' then + * <MODS_DIR>/<modname>.so will be tried and if this fails * <MODS_DIR>/<modname>/<modname>.so + * If mod_path contain a '/' it is assumed to be the + * path to the module and tried first. If fails and mod_path is not + * absolute path (not starting with '/') then will try: + * <MODS_DIR>/mod_path * @param modname - path or module name * @return 0 on success , <0 on error */

1 0

tls related compiler warnings
by jh＠tutpro.com 29 May '09

29 May '09

while compiling modules/tls, i get a some warnings: tls_config.c: In function ??parse_ipv6??: tls_config.c:67: warning: implicit declaration of function ??str2ip6?? tls_config.c:67: warning: assignment makes pointer from integer without a cast and tls_init.c:71:10: warning: #warning "openssl zlib compression bug workaround enabled" tls_init.c:89:3: warning: #warning "openssl < 1.0: no TLS extensions or server name support" and tls_server.c: In function ??tls_h_nonblocking_write??: tls_server.c:811: warning: label ??again?? defined but not used how to get rid of them (the last looks easy)? do i have wrong version of openssl dev package? ii libssl-dev 0.9.8g-15+lenny1 SSL development libraries, header files and by the way, why is tls implementation based on openssl instead of gnutls? -- juha

3 4

git:master: core: mpath aliased to loadpath (for K compatibility)
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 8d503e9e3d3758ce0234b28c6d05e49f0e2d91e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d503e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 13:22:44 2009 +0300 core: mpath aliased to loadpath (for K compatibility) - accepts now loadpath="searchpath" (K stype) --- cfg.lex | 2 +- cfg.y | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index afae712..ab30135 100644 --- a/cfg.lex +++ b/cfg.lex @@ -407,7 +407,7 @@ SERVER_ID "server_id" CFG_DESCRIPTION "description"|"descr"|"desc" LOADMODULE loadmodule -LOADPATH loadpath +LOADPATH "loadpath"|"mpath" MODPARAM modparam /* values */ diff --git a/cfg.y b/cfg.y index d8d0e35..4729d03 100644 --- a/cfg.y +++ b/cfg.y @@ -1410,6 +1410,12 @@ module_stm: mods_dir = $2; } | LOADPATH error { yyerror("string expected"); } + | LOADPATH EQUAL STRING { + DBG("loading modules under %s\n", $3); + printf("loading modules under %s\n", $3); + mods_dir = $3; + } + | LOADPATH EQUAL error { yyerror("string expected"); } | MODPARAM LPAREN STRING COMMA STRING COMMA STRING RPAREN { if (set_mod_param_regex($3, $5, PARAM_STRING, $7) != 0) { yyerror("Can't set module parameter");

1 0

git:master: core: load_module - do not free 'path'
by Daniel-Constantin Mierla 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 08605a1c050b0dbc58d683ea8a76bbae364067d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08605a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 29 13:02:34 2009 +0300 core: load_module - do not free 'path' - it is stored by register_module and printed later for modparam --- sr_module.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sr_module.c b/sr_module.c index 8dfcfad..7986720 100644 --- a/sr_module.c +++ b/sr_module.c @@ -405,8 +405,6 @@ reload: } } if (register_module(*mod_if_ver, exp, path, handle)<0) goto error1; - if (path && path!=mod_path) - pkg_free(path); return 0; error1:

1 0

db schema scripts?
by jh＠tutpro.com 29 May '09

29 May '09

i can't find db schema scripts (e.g. for mysql) in sip-router git nor in Makefile an entry to generate them. is this still work to do or have i not looked hard enough? also, what was the conclusion regarding kamctl scripts and their rc files? -- juha

3 2

git:master: core: destroy_rpcs fix: don't try to free unalloc. data
by Andrei Pelinescu-Onciul 29 May '09

29 May '09

Module: sip-router Branch: master Commit: 3ccb9c819ba1c54601eafebed434e550cb39c1dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ccb9c8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 29 11:07:20 2009 +0200 core: destroy_rpcs fix: don't try to free unalloc. data destroy_rpcs() can be called without init_rpcs() being called first (e.g. unknown command line param) => don't blindly free everything, check first if the arrays were allocated. --- rpc_lookup.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpc_lookup.c b/rpc_lookup.c index 606a7ca..c1e1a6d 100644 --- a/rpc_lookup.c +++ b/rpc_lookup.c @@ -67,8 +67,8 @@ void destroy_rpcs() pkg_free(e); } } - pkg_free(rpc_hash_table.table); - pkg_free(rpc_sarray); + if (rpc_hash_table.table) pkg_free(rpc_hash_table.table); + if (rpc_sarray) pkg_free(rpc_sarray); rpc_hash_table.table=0; rpc_hash_table.size=0; rpc_sarray=0;

1 0

Is "ser -c" or "kamailio -c" useful ?
by Iñaki Baz Castillo 29 May '09

29 May '09

Hi, I wonder how useful are -c and -C options (theorically they check the config file). While they detect some obvious errors, they fail to detect errors like: xlog("L_HI_ALL", "What is it?\n"); modparam("wrong_module_name","wrong_param","wrong_value"). So, how much could I trust this utility? Thanks. -- Iñaki Baz Castillo <ibc(a)aliax.net>

5 4

SF.net SVN: openser:[5863] branches/1.5/packaging/debian
by Henning Westerholt 29 May '09

29 May '09

Revision: 5863 http://openser.svn.sourceforge.net/openser/?rev=5863&view=rev Author: henningw Date: 2009-05-29 08:42:53 +0000 (Fri, 29 May 2009) Log Message: ----------- - fix an error in init and postinst, introduced from previous synchronisation Modified Paths: -------------- branches/1.5/packaging/debian/kamailio.init branches/1.5/packaging/debian/kamailio.postinst This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009