sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:master: Modules_k:pv No warning message for branch(count) if no branches
by Marius Zbihlei 25 Aug '10

25 Aug '10

Module: sip-router Branch: master Commit: 54f04ae93503f1d24763b6b6cb0ceec3045b26d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54f04ae… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 25 14:08:35 2010 +0300 Modules_k:pv No warning message for branch(count) if no branches Patch by Carsten Gross (carsten.gross at 1und1 dot de) --- modules_k/pv/pv_branch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 28b15e8..0831bd5 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -50,7 +50,8 @@ int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, uri.s = get_branch(idx, &uri.len, &lq, &duri, &path, &fl, &fsocket); - if(uri.s == 0) + /* branch(count) doesn't need a valid branch, everything else does */ + if(uri.s == 0 && ( param->pvn.u.isname.name.n != 5/* count*/ )) { LM_ERR("error accessing branch [%d]\n", idx); return pv_get_null(msg, param, res);

1 0

[tracker] Task opened: dialplan reload, out of memory
by sip-router 25 Aug '10

25 Aug '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Kim Jakobsson (kjakobsson) Attached to Project - sip-router Summary - dialplan reload, out of memory Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - - Kamailio 3.0.x from GIT - diaplan moduke with mysql backend - approx 1700 lines of data $ sercmd mi dp_reload Aug 24 15:21:23 core01 /usr/local/sbin/kamailio[6764]: ERROR: db_mysql [km_dbase.c:346]: no memory left Aug 24 15:21:23 core01 /usr/local/sbin/kamailio[6764]: ERROR: dialplan [dp_db.c:218]: failed to fetch Aug 24 15:21:23 core01 /usr/local/sbin/kamailio[6764]: ERROR: dialplan [dialplan.c:450]: failed to reload rules fron database (db load) Is this something that can be adjusted? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=86 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.

2 1

git:master: core: counters can be used before forking
by Andrei Pelinescu-Onciul 24 Aug '10

24 Aug '10

Module: sip-router Branch: master Commit: a5583e0ccff1eda9c38041df9d15a8b21e3ebb0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5583e0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 24 21:14:50 2010 +0200 core: counters can be used before forking Counters can now be incremented (not only registered) before counters_prefork_init(). This enables using them also from mod_init() or the fixup functions (not recommended but needed for "indirect" calls). Fixes crashes when modules call a counter using function from mod_init() or a fixup. E.g.: xlog(s) does a dns lookup from mod_init. If the lookup fails the dns code will try to increment the new dns.failed_dns_request counter. Reported-by: Michal Matyska michal.matyska iptel org --- counters.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++------- counters.h | 5 +++- pt.c | 1 + 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/counters.c b/counters.c index dd8ddf7..56bcd2f 100644 --- a/counters.c +++ b/counters.c @@ -23,6 +23,7 @@ * History: * -------- * 2010-08-06 initial version (andrei) + * 2010-08-24 counters can be used (inc,add) before prefork_init (andrei) */ #include "counters.h" @@ -47,6 +48,11 @@ /* leave space for one flag */ #define MAX_COUNTER_ID 32767 +/* size (number of entries) of the temporary array used for keeping stats + pre-prefork init. Note: if more counters are registered then this size, + the array will be dynamically increased (doubled each time). The value + here is meant only to optimize startup/memory fragmentation. */ +#define PREINIT_CNTS_VALS_SIZE 128 struct counter_record { str group; @@ -85,7 +91,7 @@ static int grp_no; /* number of groups */ counter_array_t* _cnts_vals; int _cnts_row_len; /* number of elements per row */ static int cnts_no; /* number of registered counters */ -static int cnts_max_rows; /* set to process number */ +static int cnts_max_rows; /* set to 0 if not yet fully init */ @@ -101,6 +107,8 @@ int init_counters() goto error; str_hash_init(&grp_hash_table); cnts_no = 1; /* start at 1 (0 used only for invalid counters) */ + cnts_max_rows = 0; /* 0 initially, !=0 after full init + (counters_prefork_init()) */ grp_no = 0; cnt_id2record_size = CNT_ID2RECORD_SIZE; cnt_id2record = pkg_malloc(sizeof(*cnt_id2record) * cnt_id2record_size); @@ -127,7 +135,12 @@ void destroy_counters() struct str_hash_entry* e; struct str_hash_entry* bak; if (_cnts_vals) { - shm_free(_cnts_vals); + if (cnts_max_rows) + /* fully init => it is in shm */ + shm_free(_cnts_vals); + else + /* partially init (before prefork) => pkg */ + pkg_free(_cnts_vals); _cnts_vals = 0; } if (cnts_hash_table.table) { @@ -160,6 +173,7 @@ void destroy_counters() grp_sorted_max_size = 0; cnts_no = 0; _cnts_row_len = 0; + cnts_max_rows = 0; grp_no = 0; } @@ -171,7 +185,9 @@ void destroy_counters() */ int counters_prefork_init(int max_process_no) { + counter_array_t* old; int size, row_size; + counter_handle_t h; /* round cnts_no so that cnts_no * sizeof(counter) it's a CACHELINE_PAD multiple */ /* round-up row_size to a CACHELINE_PAD multiple if needed */ @@ -183,11 +199,20 @@ int counters_prefork_init(int max_process_no) /* get updated cnts_no (row length) */ _cnts_row_len = row_size / sizeof(*_cnts_vals); size = max_process_no * row_size; + /* replace the temporary pre-fork pkg array (with only 1 row) with + the final shm version (with max_process_no rows) */ + old = _cnts_vals; _cnts_vals = shm_malloc(max_process_no * row_size); if (_cnts_vals == 0) return -1; memset(_cnts_vals, 0, max_process_no * row_size); cnts_max_rows = max_process_no; + /* copy prefork values into the newly shm array */ + if (old) { + for (h.id = 0; h.id < cnts_no; h.id++) + counter_pprocess_val(process_no, h) = old[h.id].v; + pkg_free(old); + } return 0; } @@ -286,7 +311,9 @@ static struct counter_record* cnt_hash_add( struct counter_record* cnt_rec; struct grp_record* grp_rec; struct counter_record** p; + counter_array_t* v; int doc_len; + int n; e = 0; if (cnts_no >= MAX_COUNTER_ID) @@ -323,7 +350,31 @@ static struct counter_record* cnt_hash_add( cnt_rec->doc.s[0] = 0; e->key = cnt_rec->name; e->flags = 0; - /* add it a pointer to it in the records array */ + /* check to see if it fits in the prefork tmp. vals array. + This array contains only one "row", is allocated in pkg and + is used only until counters_prefork_init() (after that the + array is replaced with a shm version with all the needed rows). + */ + if (cnt_rec->h.id >= _cnts_row_len || _cnts_vals == 0) { + /* array to small or not yet allocated => reallocate/allocate it + (min size PREINIT_CNTS_VALS_SIZE, max MAX_COUNTER_ID) + */ + n = (cnt_rec->h.id < PREINIT_CNTS_VALS_SIZE) ? + PREINIT_CNTS_VALS_SIZE : + ((2 * (cnt_rec->h.id + (cnt_rec->h.id == 0)) < MAX_COUNTER_ID)? + (2 * (cnt_rec->h.id + (cnt_rec->h.id == 0))) : + MAX_COUNTER_ID + 1); + v = pkg_realloc(_cnts_vals, n * sizeof(*_cnts_vals)); + if (v == 0) + /* realloc/malloc error */ + goto error; + _cnts_vals = v; + /* zero newly allocated memory */ + memset(&_cnts_vals[_cnts_row_len], 0, + (n - _cnts_row_len) * sizeof(*_cnts_vals)); + _cnts_row_len = n; /* record new length */ + } + /* add a pointer to it in the records array */ if (cnt_id2record_size <= cnt_rec->h.id) { /* must increase the array */ p = pkg_realloc(cnt_id2record, @@ -438,7 +489,7 @@ int counter_register( counter_handle_t* handle, const char* group, str n; struct counter_record* cnt_rec; - if (unlikely(_cnts_vals)) { + if (unlikely(cnts_max_rows)) { /* too late */ BUG("late attempt to register counter: %s.%s\n", group, name); goto error; @@ -554,7 +605,7 @@ counter_val_t counter_get_raw_val(counter_handle_t handle) BUG("counters not fully initialized yet\n"); return 0; } - if (unlikely(handle.id >= cnts_no || handle.id < 0)) { + if (unlikely(handle.id >= cnts_no || (short)handle.id < 0)) { BUG("invalid counter id %d (max %d)\n", handle.id, cnts_no - 1); return 0; } @@ -597,7 +648,7 @@ void counter_reset(counter_handle_t handle) { int r; - if (unlikely(_cnts_vals == 0)) { + if (unlikely(_cnts_vals == 0 || cnt_id2record == 0)) { /* not init yet */ BUG("counters not fully initialized yet\n"); return; @@ -622,7 +673,7 @@ void counter_reset(counter_handle_t handle) */ char* counter_get_name(counter_handle_t handle) { - if (unlikely(_cnts_vals == 0)) { + if (unlikely(_cnts_vals == 0 || cnt_id2record == 0)) { /* not init yet */ BUG("counters not fully initialized yet\n"); goto error; @@ -645,7 +696,7 @@ error: */ char* counter_get_group(counter_handle_t handle) { - if (unlikely(_cnts_vals == 0)) { + if (unlikely(_cnts_vals == 0 || cnt_id2record == 0)) { /* not init yet */ BUG("counters not fully initialized yet\n"); goto error; @@ -668,7 +719,7 @@ error: */ char* counter_get_doc(counter_handle_t handle) { - if (unlikely(_cnts_vals == 0)) { + if (unlikely(_cnts_vals == 0 || cnt_id2record == 0)) { /* not init yet */ BUG("counters not fully initialized yet\n"); goto error; diff --git a/counters.h b/counters.h index ca09ab4..6081ae0 100644 --- a/counters.h +++ b/counters.h @@ -109,7 +109,10 @@ char* counter_get_name(counter_handle_t handle); char* counter_get_group(counter_handle_t handle); char* counter_get_doc(counter_handle_t handle); -/** gets the per process value of counter h for process p_no. */ +/** gets the per process value of counter h for process p_no. + * Note that if used before counter_prefork_init() process_no is 0 + * and _cnts_vals will point into a temporary one "row" array. + */ #define counter_pprocess_val(p_no, h) \ _cnts_vals[(p_no) * _cnts_row_len + (h).id].v diff --git a/pt.c b/pt.c index 994f998..68842e6 100644 --- a/pt.c +++ b/pt.c @@ -47,6 +47,7 @@ #if defined PKG_MALLOC || defined SHM_MEM #include "cfg_core.h" #endif +#include "daemonize.h" #include <stdio.h> #include <time.h> /* time(), used to initialize random numbers */

1 0

git:master: core: don't try to fixup to PVE in fixup_var_str*
by Andrei Pelinescu-Onciul 24 Aug '10

24 Aug '10

Module: sip-router Branch: master Commit: a5b499a42d9b0613cc3e99619e744cbe894db3c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5b499a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 24 12:27:08 2010 +0200 core: don't try to fixup to PVE in fixup_var_str* Moved PVE (PV based format string) fixing attempts from fixup_var_str* into new fixup functions: fixup_var_pve_str*. If the argument is a constant string, fixup_var_pve_str*() will try first "fixing" it to a PVAR, then (if it fails) to an AVP, SELECT, PVE and finally normal string. If the PVE fixup returned a "static" PVE, the result will be discarded and a normal string fparam will be created (a little bit faster at runtime). The only difference between fixup_var_str*() and fixup_var_pve_str*() is that fixup_var_str*() will not attempt fixing to PVE (does not support PV style format strings). --- sr_module.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ sr_module.h | 17 +++++++++++-- 2 files changed, 81 insertions(+), 11 deletions(-) diff --git a/sr_module.c b/sr_module.c index c759a17..f975062 100644 --- a/sr_module.c +++ b/sr_module.c @@ -41,11 +41,9 @@ * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ -/*! - * \file - * \brief SIP-router core :: - * \ingroup core - * Module: \ref core +/** module loading, standard fixups. + * @file sr_module.c + * @ingroup core */ #include "sr_module.h" @@ -1299,9 +1297,6 @@ int fixup_var_str_12(void** param, int param_no) if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; - /* FIXME: if not PVE (string only), fix as string! or - make a separate fixup fixup_varpve_... */ - if ((ret = fix_param(FPARAM_PVE, param)) <= 0) return ret; } if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; ERR("Error while fixing parameter, PV, AVP, SELECT, and str conversions" @@ -1324,6 +1319,64 @@ int fixup_var_str_2(void** param, int param_no) } + +/** fixup variable-pve-string. + * The parameter can be a PVAR, AVP, SELECT, PVE (pv based format string) + * or string. + * PVAR, AVP and select and non-static PVEs identifiers will be resolved to + * their values during runtime. + * The parameter value will be converted to fparam structure + * @param param - double pointer to param, as for normal fixup functions. + * @param param_no - parameter number, ignored. + * @return -1 on an error, 0 on success. + */ +int fixup_var_pve_str_12(void** param, int param_no) +{ + int ret; + fparam_t* fp; + if (fixup_get_param_type(param) != STRING_RVE_ST) { + /* if called with a RVE already converted to string => + don't try AVP, PVAR, SELECT or PVE again (to avoid double + deref., e.g.: $foo="$bar"; f($foo) ) */ + if ((ret = fix_param(FPARAM_PVS, param)) <= 0) return ret; + if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; + if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; + if ((ret = fix_param(FPARAM_PVE, param)) <= 0) { + if (ret < 0) + return ret; + /* check if it resolved to a dynamic or "static" PVE. + If the resulting PVE is static (normal string), discard + it and use the normal string fixup (faster at runtime) */ + fp = (fparam_t*)*param; + if (fp->v.pve->spec.getf == 0) + fparam_free_restore(param); /* fallback to STR below */ + else + return ret; /* dynamic PVE => return */ + } + + } + if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; + ERR("Error while fixing parameter, PV, AVP, SELECT, and str conversions" + " failed\n"); + return -1; +} + +/* Same as fixup_var_pve_str_12 but applies to the 1st parameter only */ +int fixup_var_pve_str_1(void** param, int param_no) +{ + if (param_no == 1) return fixup_var_pve_str_12(param, param_no); + else return 0; +} + +/* Same as fixup_var_pve_str_12 but applies to the 2nd parameter only */ +int fixup_var_pve_str_2(void** param, int param_no) +{ + if (param_no == 2) return fixup_var_pve_str_12(param, param_no); + else return 0; +} + + + /* * Fixup variable integer, the parameter can be * AVP, SELECT, or ordinary integer. AVP and select @@ -1654,6 +1707,9 @@ int is_fparam_rve_fixup(fixup_function f) if (f == fixup_var_str_12 || f == fixup_var_str_1 || f == fixup_var_str_2 || + f == fixup_var_pve_str_12 || + f == fixup_var_pve_str_1 || + f == fixup_var_pve_str_2 || f == fixup_var_int_12 || f == fixup_var_int_1 || f == fixup_var_int_2 || @@ -1684,6 +1740,7 @@ free_fixup_function get_fixup_free(fixup_function f) free_fixup_function ret; /* "pure" fparam, all parameters */ if (f == fixup_var_str_12 || + f == fixup_var_pve_str_12 || f == fixup_var_int_12 || f == fixup_int_12 || f == fixup_str_12 || @@ -1692,6 +1749,7 @@ free_fixup_function get_fixup_free(fixup_function f) /* "pure" fparam, 1st parameter */ if (f == fixup_var_str_1 || + f == fixup_var_pve_str_1 || f == fixup_var_int_1 || f == fixup_int_1 || f == fixup_str_1 || @@ -1700,6 +1758,7 @@ free_fixup_function get_fixup_free(fixup_function f) /* "pure" fparam, 2nd parameters */ if (f == fixup_var_str_2 || + f == fixup_var_pve_str_2 || f == fixup_var_int_2 || f == fixup_int_2 || f == fixup_str_2 || diff --git a/sr_module.h b/sr_module.h index 4d32514..fb8be8b 100644 --- a/sr_module.h +++ b/sr_module.h @@ -49,9 +49,8 @@ * 2008-11-26 added fparam_free_contents() and fix_param_types (andrei) */ -/*! - * \file - * \brief modules/plug-in structures declarations +/** modules structures/exports declarations and utilities (fixups a.s.o). + * @file sr_module.h */ @@ -515,6 +514,18 @@ int fixup_var_str_1(void** param, int param_no); /* Same as fixup_var_str_12 but applies to the 2nd parameter only */ int fixup_var_str_2(void** param, int param_no); +/** fixup variable-pve-string. + * The parameter can be a PVAR, AVP, SELECT, PVE (pv based format string) + * or string. + */ +int fixup_var_pve_str_12(void** param, int param_no); + +/* same as fixup_var_pve_str_12 but applies to the 1st parameter only */ +int fixup_var_pve_str_1(void** param, int param_no); + +/* same as fixup_var_pve_str_12 but applies to the 2nd parameter only */ +int fixup_var_pve_str_2(void** param, int param_no); + /* * Fixup variable integer, the parameter can be * AVP, SELECT, or ordinary integer. AVP and select

1 0

git:master: core: fix mod_register & dlflags
by Andrei Pelinescu-Onciul 24 Aug '10

24 Aug '10

Module: sip-router Branch: master Commit: 931bd29d504f01eeab738ee5dad72fe7be858adb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=931bd29… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 24 11:43:36 2010 +0200 core: fix mod_register & dlflags dlflags changes in mod_register() functions were discarded resulting in modules failing to load. --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index 421f1b7..c759a17 100644 --- a/sr_module.c +++ b/sr_module.c @@ -549,7 +549,7 @@ reload: if (((error =(char*)dlerror())==0) && mr) { /* no error call it */ new_dlflags=dlflags; - if (mr(path, &dlflags, 0, 0)!=0) { + if (mr(path, &new_dlflags, 0, 0)!=0) { LOG(L_ERR, "ERROR: load_module: %s: mod_register failed\n", path); goto error1; }

1 0

git:carstenbock/rtpproxy: Added the changes to the RTP-Proxy as a patch, for easier review.
by Carsten Bock 24 Aug '10

24 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: ab5549128fa86197ffdb8ed8773b9b016086b952 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab55491… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Tue Aug 24 11:08:34 2010 +0200 Added the changes to the RTP-Proxy as a patch, for easier review. --- modules_k/rtpproxy/test/rtpproxy.patch | 337 ++++++++++++++++++++++++++++++++ 1 files changed, 337 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ab5…

1 0

git:carstenbock/rtpproxy: - fixed identation
by Carsten Bock 24 Aug '10

24 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy Commit: 262e55278e8b8b0e853f00465c38e3a9d13694f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=262e552… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 19:55:01 2010 +0200 - fixed identation - added modified RTP-Proxy (rtpproxy.tar.gz, based on latest git, needs some cleanup) (please note, that you have to have libcurl-dev and libxmlrpc-client (same as for Kamailio-mi_xmlrpc) installed) - some simple testing files (sample config, command line parameters for pjsua (used for testing) and rtpproxy) --- modules_k/rtpproxy/rtpproxy.c | 2 +- modules_k/rtpproxy/test/exec_pjsua.txt | 3 + modules_k/rtpproxy/test/exec_rtpproxy.txt | 1 + modules_k/rtpproxy/test/kamailio.cfg | 359 +++++++++++++++++++++++++++++ modules_k/rtpproxy/test/rtpproxy.tar.gz | Bin 0 -> 1095581 bytes 5 files changed, 364 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=262…

4 5

git:carstenbock/dialog: - Use only call-id to get the h_id; otherwise dlg_list_dlg and dlg_terminate_dlg would require the from-tag, which is marked as optional in the docs
by Carsten Bock 24 Aug '10

24 Aug '10

Module: sip-router Branch: carstenbock/dialog Commit: da19a78a2bdfb85766bc1cb48fabf38c27732991 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=da19a78… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 19:38:55 2010 +0200 - Use only call-id to get the h_id; otherwise dlg_list_dlg and dlg_terminate_dlg would require the from-tag, which is marked as optional in the docs - dlg_terminate_dlg does request the call-id to terminate a specific call (terminating all calls require a little more development) - match_downstream_dialog does only match by call-id (see first point) --- modules_k/dialog/dialog.c | 4 ++-- modules_k/dialog/dlg_hash.c | 31 +++++++------------------------ modules_k/dialog/dlg_hash.h | 20 +++++++++++++------- modules_k/dialog/doc/dialog_admin.xml | 11 ++--------- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index dbfccb4..677cb41 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -233,7 +233,7 @@ static mi_export_t mi_cmds[] = { { "dlg_list", mi_print_dlgs, 0, 0, 0}, { "dlg_list_ctx", mi_print_dlgs_ctx, 0, 0, 0}, { "dlg_end_dlg", mi_terminate_dlg, 0, 0, 0}, - { "dlg_terminate_dlgs", mi_terminate_dlgs, 0, 0, 0}, + { "dlg_terminate_dlg", mi_terminate_dlgs, 0, 0, 0}, { "profile_get_size", mi_get_profile, 0, 0, 0}, { "profile_list_dlgs", mi_profile_list, 0, 0, 0}, { "dlg_bridge", mi_dlg_bridge, 0, 0, 0}, @@ -1201,7 +1201,7 @@ static void internal_rpc_print_single_dlg(rpc_t *rpc, void *c, int with_context) if (rpc->scan(c, ".S.S", &callid, &from_tag) < 2) return; - h_entry = core_hash( &callid, &from_tag, d_table->size); + h_entry = core_hash( &callid, 0, d_table->size); d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 80f506f..848ee66 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -240,7 +240,7 @@ struct dlg_cell* build_new_dlg( str *callid, str *from_uri, str *to_uri, memset( dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; - dlg->h_entry = core_hash( callid, from_tag->len?from_tag:0, d_table->size); + dlg->h_entry = core_hash( callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n",dlg->h_entry); p = (char*)(dlg+1); @@ -470,7 +470,7 @@ struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir, { struct dlg_cell *dlg; - if ((dlg = internal_get_dlg(core_hash(callid, ftag->len?ftag:0, + if ((dlg = internal_get_dlg(core_hash(callid, 0, d_table->size), callid, ftag, ttag, dir, del)) == 0 && (dlg = internal_get_dlg(core_hash(callid, ttag->len ?ttag:0, d_table->size), callid, ftag, ttag, dir, del)) == 0) { @@ -971,7 +971,7 @@ static inline struct mi_root* process_mi_params(struct mi_root *cmd_tree, return init_mi_tree( 400, MI_SSTR(MI_MISSING_PARM)); } - h_entry = core_hash( callid, from_tag, d_table->size); + h_entry = core_hash( callid, 0, d_table->size); d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); @@ -1084,32 +1084,15 @@ struct mi_root * mi_terminate_dlgs(struct mi_root *cmd_tree, void *param ) if (rpl_tree) /* param error */ return rpl_tree; + if (dlg==NULL) + return init_mi_tree( 400, MI_SSTR(MI_MISSING_PARM)); rpl_tree = init_mi_tree( 200, MI_SSTR(MI_OK)); if (rpl_tree==0) return 0; - - if (dlg==NULL) { - LM_DBG("terminating %i dialogs\n", d_table->size); - - for( i=0 ; i<d_table->size ; i++ ) { - dlg_lock( d_table, &(d_table->entries[i]) ); - - for( dlg=d_table->entries[i].first ; dlg ; dlg=dlg->next ) { - if (dlg_bye_all(dlg, &headers)!=0) - goto error_all; - } - dlg_unlock( d_table, &(d_table->entries[i]) ); - } - } else { - if (dlg_bye_all(dlg, &headers)!=0) - goto error; - } + if (dlg_bye_all(dlg, &headers)!=0) + goto error; return rpl_tree; -error_all: - dlg_unlock( d_table, &(d_table->entries[i]) ); - free_mi_tree(rpl_tree); - return NULL; error: free_mi_tree(rpl_tree); return NULL; diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index aa70d84..b902fc0 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -328,7 +328,7 @@ struct mi_root * mi_print_dlgs(struct mi_root *cmd, void *param ); struct mi_root * mi_print_dlgs_ctx(struct mi_root *cmd, void *param ); /*! - * \brief Terminate all or selected dialogs via the MI interface + * \brief Terminate selected dialogs via the MI interface * \param cmd_tree MI command tree * \param param unused * \return mi node with the dialog information, or NULL on failure @@ -435,13 +435,19 @@ static inline int match_dialog(struct dlg_cell *dlg, str *callid, */ static inline int match_downstream_dialog(struct dlg_cell *dlg, str *callid, str *ftag) { - if(dlg==NULL || callid==NULL || ftag==NULL) - return 0; - if (dlg->callid.len!=callid->len || - dlg->tag[DLG_CALLER_LEG].len!=ftag->len || - strncmp(dlg->callid.s,callid->s,callid->len)!=0 || - strncmp(dlg->tag[DLG_CALLER_LEG].s,ftag->s,ftag->len)!=0) + if(dlg==NULL || callid==NULL) return 0; + if (ftag==NULL) { + if (dlg->callid.len!=callid->len || + strncmp(dlg->callid.s,callid->s,callid->len)!=0) + return 0; + } else { + if (dlg->callid.len!=callid->len || + dlg->tag[DLG_CALLER_LEG].len!=ftag->len || + strncmp(dlg->callid.s,callid->s,callid->len)!=0 || + strncmp(dlg->tag[DLG_CALLER_LEG].s,ftag->s,ftag->len)!=0) + return 0; + } return 1; } diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index 98769f5..bda7e76 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1532,9 +1532,7 @@ if(dlg_get("abcdef", "123", "456")) <section> <title><varname>dlg_terminate_dlgs</varname></title> <para> - Terminates a dialog or of all dialogs (calls). If only - one dialogs is to be terminated, the dialog identifiers are to be passed - as parameter (callid and fromtag). + Terminates a singe dialog, identified by a Call-ID. </para> <para> Name: <emphasis>dlg_terminate_dlgs</emphasis> @@ -1542,8 +1540,7 @@ if(dlg_get("abcdef", "123", "456")) <para>Parameters:</para> <itemizedlist> <listitem><para> - <emphasis>callid</emphasis> (optional) - callid if a single - dialog to be terminated. + <emphasis>callid</emphasis> - callid of the dialog to be terminated. </para></listitem> <listitem><para> <emphasis>from_tag</emphasis> (optional, but cannot be present @@ -1559,10 +1556,6 @@ if(dlg_get("abcdef", "123", "456")) </para> <programlisting format="linespecific"> :dlg_terminate_dlgs:_reply_fifo_file_ - _empty_line_ - </programlisting> - <programlisting format="linespecific"> - :dlg_terminate_dlgs:_reply_fifo_file_ abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 </programlisting>

3 4

git:kamailio_3.0: tls: fix state change while waiting for lock return
by Andrei Pelinescu-Onciul 23 Aug '10

23 Aug '10

Module: sip-router Branch: kamailio_3.0 Commit: 82fe7671c9c65cde0bd53bab615fa37b627fe3c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=82fe767… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 20 12:22:56 2010 +0200 tls: fix state change while waiting for lock return tls_h_fix_read_conn() did not return the right thing if the state changed while waiting for the lock (the fall-through return was error instead of success). Reported-by: Couprie Geoffroy geoffroy couprie atosorigin com (cherry picked from commit 513c21f67f88484dd12dd6adce6d6ddc7fb60c31) --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6d32af6..52b62e3 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -971,7 +971,7 @@ int tls_h_fix_read_conn(struct tcp_connection *c) int ret; struct tls_extra_data* tls_c; - ret = -1; + ret = 1; tls_c = 0; if (unlikely(c->extra_data==0)){ lock_get(&c->write_lock);

1 0

git:sr_3.0: tls: fix state change while waiting for lock return
by Andrei Pelinescu-Onciul 23 Aug '10

23 Aug '10

Module: sip-router Branch: sr_3.0 Commit: 513c21f67f88484dd12dd6adce6d6ddc7fb60c31 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=513c21f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Aug 20 12:22:56 2010 +0200 tls: fix state change while waiting for lock return tls_h_fix_read_conn() did not return the right thing if the state changed while waiting for the lock (the fall-through return was error instead of success). Reported-by: Couprie Geoffroy geoffroy couprie atosorigin com --- modules/tls/tls_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_server.c b/modules/tls/tls_server.c index 6d32af6..52b62e3 100644 --- a/modules/tls/tls_server.c +++ b/modules/tls/tls_server.c @@ -971,7 +971,7 @@ int tls_h_fix_read_conn(struct tcp_connection *c) int ret; struct tls_extra_data* tls_c; - ret = -1; + ret = 1; tls_c = 0; if (unlikely(c->extra_data==0)){ lock_get(&c->write_lock);

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010