sr-dev November 2011

sr-dev@lists.kamailio.org

31 participants
341 discussions

git:master: dispatcher(k): use defines for probing modes
by Daniel-Constantin Mierla 02 Nov '11

02 Nov '11

Module: sip-router Branch: master Commit: d665458442aed734bf1831e37ccf666ab2846f25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d665458… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Nov 2 10:35:22 2011 +0100 dispatcher(k): use defines for probing modes - it can be DS_PROBE_NONE (0), DS_PROBE_ALL (1) or DS_PROBE_INACTIVE (2) - when ds_probing_mode is set to 2, keep probing inactive gateways until they become active. Note that the gateway must be set to probing when it goes in trying or inactive state --- modules_k/dispatcher/dispatch.c | 18 ++++++++++++++---- modules_k/dispatcher/dispatch.h | 4 ++++ modules_k/dispatcher/dispatcher.c | 4 ++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 768908c..11c3523 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2016,11 +2016,21 @@ int ds_update_state(sip_msg_t *msg, int group, str *address, int state) /* reset the bits used for states */ idx->dlist[i].flags &= ~(DS_STATES_ALL); + if((state & DS_TRYING_DST) && (old_state & DS_INACTIVE_DST)) + { + /* old state is inactive, new state is trying => keep it inactive + * - it has to go first to active state and then to trying */ + state &= ~ DS_TRYING_DST; + state |= ~ DS_INACTIVE_DST; + } + /* set the new states */ if(state & DS_DISABLED_DST) + { idx->dlist[i].flags |= DS_DISABLED_DST; - else + } else { idx->dlist[i].flags |= state; + } if(state & DS_TRYING_DST) { @@ -2330,7 +2340,7 @@ static void ds_options_callback( struct cell *t, int type, /* Set the according entry back to "Active" */ state = 0; - if (ds_probing_mode==1) + if (ds_probing_mode==DS_PROBE_ALL) state |= DS_PROBING_DST; if (ds_update_state(fmsg, group, &uri, state) != 0) { @@ -2339,7 +2349,7 @@ static void ds_options_callback( struct cell *t, int type, } } else { state = DS_TRYING_DST; - if (ds_probing_mode==1) + if (ds_probing_mode!=DS_PROBE_NONE) state |= DS_PROBING_DST; if (faked_msg_init() < 0) @@ -2388,7 +2398,7 @@ void ds_check_timer(unsigned int ticks, void* param) if((list->dlist[j].flags&DS_DISABLED_DST) != 0) continue; /* If the Flag of the entry has "Probing set, send a probe: */ - if (ds_probing_mode==1 || + if (ds_probing_mode==DS_PROBE_ALL || (list->dlist[j].flags&DS_PROBING_DST) != 0) { LM_DBG("probing set #%d, URI %.*s\n", list->id, diff --git a/modules_k/dispatcher/dispatch.h b/modules_k/dispatcher/dispatch.h index 5b051f0..ea44b27 100644 --- a/modules_k/dispatcher/dispatch.h +++ b/modules_k/dispatcher/dispatch.h @@ -57,6 +57,10 @@ #define ds_skip_dst(flags) ((flags) & (DS_INACTIVE_DST|DS_DISABLED_DST)) +#define DS_PROBE_NONE 0 +#define DS_PROBE_ALL 1 +#define DS_PROBE_INACTIVE 2 + extern str ds_db_url; extern str ds_table_name; extern str ds_set_id_col; diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index edbbade..8206aec 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -109,7 +109,7 @@ int probing_threshhold = 1; /* number of failed requests, before a destination str ds_ping_method = {"OPTIONS",7}; str ds_ping_from = {"sip:dispatcher@localhost", 24}; static int ds_ping_interval = 0; -int ds_probing_mode = 0; +int ds_probing_mode = DS_PROBE_NONE; static str ds_ping_reply_codes_str= {NULL, 0}; static int** ds_ping_reply_codes = NULL; @@ -595,7 +595,7 @@ static int w_ds_mark_dst0(struct sip_msg *msg, char *str1, char *str2) int state; state = DS_INACTIVE_DST; - if (ds_probing_mode==1) + if (ds_probing_mode==DS_PROBE_ALL) state |= DS_PROBING_DST; return ds_mark_dst(msg, state);

1 0

[tracker] Comment added: app_python doesn't work
by sip-router 02 Nov '11

02 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#137 - app_python doesn't work User who did this - Michal Karas (Largon) ---------- Sorry, I should have been more clear. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=137#comment316 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: app_python doesn't work
by sip-router 01 Nov '11

01 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#137 - app_python doesn't work User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=137 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: app_python doesn't work
by sip-router 01 Nov '11

01 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#137 - app_python doesn't work User who did this - Daniel-Constantin Mierla (miconda) ---------- I just applied you patch. Took a while because initially I thought it was duplicate of initial report and forgot about it since I haven't spotted is actually a request to reopen, but a new issue which I didn't find in the list. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=137#comment315 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task reopened: app_python doesn't work
by sip-router 01 Nov '11

01 Nov '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#137 - app_python doesn't work User who did this - Daniel-Constantin Mierla (miconda) More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=137 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:3.1: app_python: fixing clone string for dirname and basename
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: 3.1 Commit: ff5694ff911aa71e76f80b0d0b9dc94b04eb5132 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ff5694f… Author: Michal Karas <largon(a)largon.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 17 11:18:51 2011 +0200 app_python: fixing clone string for dirname and basename - variable tname replaced by dname_src and bname_src, because both dirname() and basename() requires it's argument not to change: "These functions may return pointers to statically allocated memory which may be overwritten by subsequent calls. Alternatively, they may return a pointer to some part of path, so that the string referred to by path should not be modified or freed until the pointer returned by the function is no longer required." - related to FS#137 Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> (cherry picked from commit d05616d81960e6b1647981d8d8b5e0dbe04a3dcb) --- modules/app_python/python_mod.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index c89c928..c178551 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -85,7 +85,7 @@ struct module_exports exports = { static int mod_init(void) { - char *dname, *bname, *tname; + char *dname, *bname, *dname_src, *bname_src; int i; PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs; PyThreadState *mainThreadState; @@ -100,19 +100,19 @@ mod_init(void) child_init_mname.len = strlen(child_init_mname.s); } - tname = as_asciiz(&script_name); - if(tname==NULL) - { - LM_ERR("no more pkg memory\n"); - return -1; - } - dname = dirname(tname); + dname_src = as_asciiz(&script_name); + bname_src = as_asciiz(&script_name); + if(dname_src==NULL || bname_src==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + + dname = dirname(dname_src); if (strlen(dname) == 0) dname = "."; - memcpy(tname, script_name.s, script_name.len); - bname = basename(tname); + bname = basename(bname_src); i = strlen(bname); - pkg_free(tname); if (bname[i - 1] == 'c' || bname[i - 1] == 'o') i -= 1; if (bname[i - 3] == '.' && bname[i - 2] == 'p' && bname[i - 1] == 'y') { @@ -159,6 +159,9 @@ mod_init(void) return -1; } + pkg_free(dname_src); + pkg_free(bname_src); + pFunc = PyObject_GetAttrString(pModule, mod_init_fname.s); Py_DECREF(pModule); /* pFunc is a new reference */

1 0

git:3.2: app_python: fixing clone string for dirname and basename
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: 3.2 Commit: 395b4707025241f8de07a679c04c385a9bfc5937 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=395b470… Author: Michal Karas <largon(a)largon.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 17 11:18:51 2011 +0200 app_python: fixing clone string for dirname and basename - variable tname replaced by dname_src and bname_src, because both dirname() and basename() requires it's argument not to change: "These functions may return pointers to statically allocated memory which may be overwritten by subsequent calls. Alternatively, they may return a pointer to some part of path, so that the string referred to by path should not be modified or freed until the pointer returned by the function is no longer required." - related to FS#137 Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> (cherry picked from commit d05616d81960e6b1647981d8d8b5e0dbe04a3dcb) --- modules/app_python/python_mod.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index c89c928..c178551 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -85,7 +85,7 @@ struct module_exports exports = { static int mod_init(void) { - char *dname, *bname, *tname; + char *dname, *bname, *dname_src, *bname_src; int i; PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs; PyThreadState *mainThreadState; @@ -100,19 +100,19 @@ mod_init(void) child_init_mname.len = strlen(child_init_mname.s); } - tname = as_asciiz(&script_name); - if(tname==NULL) - { - LM_ERR("no more pkg memory\n"); - return -1; - } - dname = dirname(tname); + dname_src = as_asciiz(&script_name); + bname_src = as_asciiz(&script_name); + if(dname_src==NULL || bname_src==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + + dname = dirname(dname_src); if (strlen(dname) == 0) dname = "."; - memcpy(tname, script_name.s, script_name.len); - bname = basename(tname); + bname = basename(bname_src); i = strlen(bname); - pkg_free(tname); if (bname[i - 1] == 'c' || bname[i - 1] == 'o') i -= 1; if (bname[i - 3] == '.' && bname[i - 2] == 'p' && bname[i - 1] == 'y') { @@ -159,6 +159,9 @@ mod_init(void) return -1; } + pkg_free(dname_src); + pkg_free(bname_src); + pFunc = PyObject_GetAttrString(pModule, mod_init_fname.s); Py_DECREF(pModule); /* pFunc is a new reference */

1 0

git:master: app_python: fixing clone string for dirname and basename
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: d05616d81960e6b1647981d8d8b5e0dbe04a3dcb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d05616d… Author: Michal Karas <largon(a)largon.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Oct 17 11:18:51 2011 +0200 app_python: fixing clone string for dirname and basename - variable tname replaced by dname_src and bname_src, because both dirname() and basename() requires it's argument not to change: "These functions may return pointers to statically allocated memory which may be overwritten by subsequent calls. Alternatively, they may return a pointer to some part of path, so that the string referred to by path should not be modified or freed until the pointer returned by the function is no longer required." - related to FS#137 Signed-off-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules/app_python/python_mod.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/app_python/python_mod.c b/modules/app_python/python_mod.c index c89c928..c178551 100644 --- a/modules/app_python/python_mod.c +++ b/modules/app_python/python_mod.c @@ -85,7 +85,7 @@ struct module_exports exports = { static int mod_init(void) { - char *dname, *bname, *tname; + char *dname, *bname, *dname_src, *bname_src; int i; PyObject *sys_path, *pDir, *pModule, *pFunc, *pArgs; PyThreadState *mainThreadState; @@ -100,19 +100,19 @@ mod_init(void) child_init_mname.len = strlen(child_init_mname.s); } - tname = as_asciiz(&script_name); - if(tname==NULL) - { - LM_ERR("no more pkg memory\n"); - return -1; - } - dname = dirname(tname); + dname_src = as_asciiz(&script_name); + bname_src = as_asciiz(&script_name); + if(dname_src==NULL || bname_src==NULL) + { + LM_ERR("no more pkg memory\n"); + return -1; + } + + dname = dirname(dname_src); if (strlen(dname) == 0) dname = "."; - memcpy(tname, script_name.s, script_name.len); - bname = basename(tname); + bname = basename(bname_src); i = strlen(bname); - pkg_free(tname); if (bname[i - 1] == 'c' || bname[i - 1] == 'o') i -= 1; if (bname[i - 3] == '.' && bname[i - 2] == 'p' && bname[i - 1] == 'y') { @@ -159,6 +159,9 @@ mod_init(void) return -1; } + pkg_free(dname_src); + pkg_free(bname_src); + pFunc = PyObject_GetAttrString(pModule, mod_init_fname.s); Py_DECREF(pModule); /* pFunc is a new reference */

1 0

git:master: sdpops: support for codecs with same name and many different ids
by Daniel-Constantin Mierla 01 Nov '11

01 Nov '11

Module: sip-router Branch: master Commit: e4d2b647d1b0e8764b1eb0cfe07d446231af0df8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4d2b64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 1 16:18:34 2011 +0100 sdpops: support for codecs with same name and many different ids - reported by Juha Heinanen --- modules/sdpops/sdpops_data.c | 50 ++++++++++++++++++++++++++--------------- 1 files changed, 32 insertions(+), 18 deletions(-) diff --git a/modules/sdpops/sdpops_data.c b/modules/sdpops/sdpops_data.c index d1d2a56..a360b88 100644 --- a/modules/sdpops/sdpops_data.c +++ b/modules/sdpops/sdpops_data.c @@ -138,17 +138,19 @@ int sdpops_get_ids_by_name(str *name, str *ids) } /** - * get codec ID from a= line based on name + * get codec IDs from a= lines based on name */ -int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cid) +int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cids, int n) { int sdp_session_num; int sdp_stream_num; sdp_session_cell_t *sdp_session; sdp_stream_cell_t *sdp_stream; sdp_payload_attr_t *sdp_payload; + int i; sdp_session_num = 0; + i = 0; for(;;) { sdp_session = get_sdp_session_sdp(sdp, sdp_session_num); @@ -165,8 +167,10 @@ int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cid) && strncasecmp(cname->s, sdp_payload->rtp_enc.s, cname->len)==0) { - *cid = sdp_payload->rtp_payload; - return 0; + if(i==n) + goto notfound; + cids[i] = sdp_payload->rtp_payload; + i++; } sdp_payload=sdp_payload->next; @@ -176,8 +180,15 @@ int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cid) sdp_session_num++; } - cid->s = NULL; - cid->len = 0; + if(i==0) + goto notfound; + if(i<n) + cids[i].s = NULL; + return 0; + +notfound: + cids[0].s = NULL; + cids[0].len = 0; return -1; } @@ -190,8 +201,10 @@ int sdpops_build_ids_list(sdp_info_t *sdp, str *names, str *ids) static char _local_idslist[SDPOPS_MAX_LIST_SIZE]; str tmp; str codec; - str cids; +#define SDPOPS_CIDS_SIZE 8 + str cids[SDPOPS_CIDS_SIZE]; char *p; + int i; tmp = *names; ids->len = 0; @@ -203,33 +216,34 @@ int sdpops_build_ids_list(sdp_info_t *sdp, str *names, str *ids) tmp.len -= (int)(&codec.s[codec.len]-codec.s); tmp.s = codec.s + codec.len; - cids.s = NULL; - if(sdpops_get_ids_by_name(&codec, &cids)==0) { + cids[0].s = NULL; + if(sdpops_get_ids_by_name(&codec, &cids[0])==0) { LM_DBG("codecs list [%.*s] - at name [%.*s] with list ids [%.*s]\n", names->len, names->s, codec.len, codec.s, - cids.len, cids.s); + cids[0].len, cids[0].s); + cids[1].s = NULL; } else { - if(sdpops_sdp_get_ids_by_name(sdp, &codec, &cids)==0) { - LM_DBG("codecs list [%.*s] - at name [%.*s] with sdp id [%.*s]\n", + if(sdpops_sdp_get_ids_by_name(sdp, &codec, cids, SDPOPS_CIDS_SIZE)==0) { + LM_DBG("codecs list [%.*s] - at name [%.*s] with first sdp id [%.*s]\n", names->len, names->s, codec.len, codec.s, - cids.len, cids.s); + cids[0].len, cids[0].s); } } - if(cids.s!=NULL) { - if(ids->len + cids.len>=SDPOPS_MAX_LIST_SIZE) + for(i=0; i<SDPOPS_CIDS_SIZE && cids[i].s!=NULL; i++) { + if(ids->len + cids[i].len>=SDPOPS_MAX_LIST_SIZE) { LM_ERR("the list with codecs ids is too big\n"); ids->len = 0; ids->s = 0; return -1; } - strncpy(p, cids.s, cids.len); - p += cids.len; + strncpy(p, cids[i].s, cids[i].len); + p += cids[i].len; *p = ','; p++; - ids->len += cids.len + 1; + ids->len += cids[i].len + 1; } } if(ids->len>0)

2 2

"sql_buffer_size" causes crash in certain configurations
by Timo Teräs 01 Nov '11

01 Nov '11

Hi, I just upgraded to kam 3.2.0 and my config started crashed. I did some bisecting, until I came to commit 5cd87175faa97161023c37e2cc0f0c06 (core, srdb1, modules/db_*, modules_k/db_*: Added support for configuring SQL buffer size and mediumblob/mediumtext in MySQL) which seems to be the culprit. It seems that this commit broke things that were earlier possible. My existing configuration loads 'permissions' module before the 'db_postgres' module. This used to work perfectly well: the SQL modules were usable after loading without requiring initialization. After this commit, this causes segmentation fault with following backtrace: #0 0xb7fabeaf in memcpy () from /lib/libc.so.0.9.32 #1 0xb7fa5b78 in ?? () from /lib/libc.so.0.9.32 #2 0xb7fa7148 in ?? () from /lib/libc.so.0.9.32 #3 0xb7fa4b16 in vsnprintf () from /lib/libc.so.0.9.32 #4 0xb7fa4862 in snprintf () from /lib/libc.so.0.9.32 #5 0xb5a7a540 in db_do_query (_h=0xb7c4553c, _k=0xbffff614, _op=0x0, _v=0xbffff600, _c=0xbffff618, _n=1, _nc=1, _o=0x0, _r=0xbffff5fc, val2str=0xb56ef1c0 <db_postgres_val2str>, submit_query=0xb56f4a70 <db_postgres_submit_query>, store_result=0xb56f5350 <db_postgres_store_result>) at db_query.c:63 #6 0xb56f6a15 in db_postgres_query (_h=0xb7c4553c, _k=0xbffff614, _op=0x0, _v=0xbffff600, _c=0xbffff618, _n=1, _nc=1, _o=0x0, _r=0xbffff5fc) at km_dbase.c:370 #7 0xb5a7fdc9 in db_table_version (dbf=0xb5930be0, connection=0xb7c4553c, table=0xb59303f0) at db.c:378 #8 0xb5a8044a in db_check_table_version (dbf=0xb5930be0, dbh=0xb7c4553c, table=0xb59303f0, version=4) at db.c:416 #9 0xb591c6fe in init_addresses () at address.c:208 #10 0xb592238d in mod_init () at permissions.c:630 #11 0x001606d6 in init_mod (m=0xb7bc17f0) at sr_module.c:886 #12 0x0016064e in init_mod (m=0xb7bc1dc8) at sr_module.c:883 #13 0x0016064e in init_mod (m=0xb7bc23a8) at sr_module.c:883 #14 0x0016064e in init_mod (m=0xb7bc2a7c) at sr_module.c:883 #15 0x0016064e in init_mod (m=0xb7bc2ef4) at sr_module.c:883 #16 0x0016064e in init_mod (m=0xb7bc3430) at sr_module.c:883 #17 0x0016064e in init_mod (m=0xb7bc37a8) at sr_module.c:883 #18 0x0016064e in init_mod (m=0xb7bc3c2c) at sr_module.c:883 #19 0x0016064e in init_mod (m=0xb7bc3fa4) at sr_module.c:883 #20 0x0016064e in init_mod (m=0xb7bc4da0) at sr_module.c:883 #21 0x00161729 in init_modules () at sr_module.c:913 #22 0x00128957 in main (argc=7, argv=0xbffffd14) at main.c:2412 This is because db_do_query gets called (from permissions module when it checks table version) before the database module was initialized (and thus, db_query_init was not yet called). Now, I'm not sure if the previous behaviour is to be required. But at least we should not crash if the module ordering is not right. Peter, please fix the code to either work as before, or give proper error message and exit (instead of crashing). Thanks, Timo

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2011