sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

git:4.2:c39e896e: dialog: proper handling cseq increment when cseq header is before via

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: c39e896e144c33a9f7f10a99029b9a63aff85530 URL: https://github.com/kamailio/kamailio/commit/c39e896e144c33a9f7f10a99029b9a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:07:18+01:00 dialog: proper handling cseq increment when cseq header is before via - reported by Fernando Aquilino (cherry picked from commit 8c3a12f6aca7c6492ee440da469834997ea89eee) --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/c39e896e144c33a9f7f10a99029b9a6… Patch: https://github.com/kamailio/kamailio/commit/c39e896e144c33a9f7f10a99029b9a6… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 994975d..ad1713c 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -277,31 +277,60 @@ int dlg_cseq_msg_sent(void *data) /* new cseq value */ dlg->iflags |= DLG_IFLAG_CSEQ_DIFF; - /* copy first part till after via branch */ - tbuf_len = via->branch->value.s + via->branch->value.len - msg.buf; - memcpy(tbuf, msg.buf, tbuf_len); - /* complete via branch */ - tbuf[tbuf_len++] = '.'; - tbuf[tbuf_len++] = 'c'; - tbuf[tbuf_len++] = 's'; - memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s, get_cseq(&msg)->number.len); - tbuf_len += get_cseq(&msg)->number.len; - /* copy till beginning of cseq number */ - memcpy(tbuf+tbuf_len, via->branch->value.s + via->branch->value.len, - get_cseq(&msg)->number.s - via->branch->value.s - - via->branch->value.len); - tbuf_len += get_cseq(&msg)->number.s - via->branch->value.s + + if(via->branch->value.s<get_cseq(&msg)->number.s) { + /* Via is before CSeq */ + /* copy first part till after via branch */ + tbuf_len = via->branch->value.s + via->branch->value.len - msg.buf; + memcpy(tbuf, msg.buf, tbuf_len); + /* complete via branch */ + tbuf[tbuf_len++] = '.'; + tbuf[tbuf_len++] = 'c'; + tbuf[tbuf_len++] = 's'; + memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s, get_cseq(&msg)->number.len); + tbuf_len += get_cseq(&msg)->number.len; + /* copy till beginning of cseq number */ + memcpy(tbuf+tbuf_len, via->branch->value.s + via->branch->value.len, + get_cseq(&msg)->number.s - via->branch->value.s + - via->branch->value.len); + tbuf_len += get_cseq(&msg)->number.s - via->branch->value.s - via->branch->value.len; - /* add new value */ - memcpy(tbuf+tbuf_len, nval.s, nval.len); - tbuf_len += nval.len; - /* copy from after cseq number to the end of sip message */ - memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s+get_cseq(&msg)->number.len, - msg.buf + msg.len - get_cseq(&msg)->number.s - - get_cseq(&msg)->number.len); - tbuf_len += msg.buf+msg.len - get_cseq(&msg)->number.s + /* add new value */ + memcpy(tbuf+tbuf_len, nval.s, nval.len); + tbuf_len += nval.len; + /* copy from after cseq number to the end of sip message */ + memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s+get_cseq(&msg)->number.len, + msg.buf + msg.len - get_cseq(&msg)->number.s + - get_cseq(&msg)->number.len); + tbuf_len += msg.buf+msg.len - get_cseq(&msg)->number.s - get_cseq(&msg)->number.len; - + } else { + /* CSeq is before Via */ + /* copy till beginning of cseq number */ + tbuf_len = get_cseq(&msg)->number.s - msg.buf; + memcpy(tbuf, msg.buf, tbuf_len); + /* add new value */ + memcpy(tbuf+tbuf_len, nval.s, nval.len); + tbuf_len += nval.len; + /* copy from after cseq number to the after via branch */ + memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s+get_cseq(&msg)->number.len, + via->branch->value.s + via->branch->value.len + - get_cseq(&msg)->number.s - get_cseq(&msg)->number.len); + tbuf_len += via->branch->value.s + via->branch->value.len + - get_cseq(&msg)->number.s - get_cseq(&msg)->number.len; + /* complete via branch */ + tbuf[tbuf_len++] = '.'; + tbuf[tbuf_len++] = 'c'; + tbuf[tbuf_len++] = 's'; + memcpy(tbuf+tbuf_len, get_cseq(&msg)->number.s, get_cseq(&msg)->number.len); + tbuf_len += get_cseq(&msg)->number.len; + /* copy from after via to the end of sip message */ + memcpy(tbuf+tbuf_len, via->branch->value.s + via->branch->value.len, + msg.buf + msg.len - via->branch->value.s + - via->branch->value.len); + tbuf_len += msg.buf+msg.len - via->branch->value.s + - via->branch->value.len; + } /* replace old msg content */ obuf->s = pkg_malloc((tbuf_len+1)*sizeof(char)); if(obuf->s==NULL) {

9 years, 9 months

git:4.2:da06d9a4: sca: more error handling during initialization of the module

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: da06d9a4912f71b3e9f7af3d29a1543a4884efa9 URL: https://github.com/kamailio/kamailio/commit/da06d9a4912f71b3e9f7af3d29a1543… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:07:32+01:00 sca: more error handling during initialization of the module - fix crash when the module doesn't initialize and calls destroy function during shutdonw at startup - reported by Olle E. Johansson, GH#57 (cherry picked from commit df2a45541c5e37907374c5e7595de1f30ea84f98) --- Modified: modules/sca/sca.c --- Diff: https://github.com/kamailio/kamailio/commit/da06d9a4912f71b3e9f7af3d29a1543… Patch: https://github.com/kamailio/kamailio/commit/da06d9a4912f71b3e9f7af3d29a1543… --- diff --git a/modules/sca/sca.c b/modules/sca/sca.c index e739e18..920024b 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -210,6 +210,7 @@ sca_set_config( sca_mod *scam ) LM_ERR( "Failed to shm_malloc module configuration" ); return( -1 ); } + memset(scam->cfg, 0, sizeof( sca_config )); if ( outbound_proxy.s ) { scam->cfg->outbound_proxy = &outbound_proxy; @@ -293,23 +294,23 @@ sca_mod_init( void ) if ( rpc_register_array( sca_rpc ) != 0 ) { LM_ERR( "Failed to register RPC commands" ); - return( -1 ); + goto error; } if ( sca_bind_srdb1( sca, &dbf ) != 0 ) { LM_ERR( "Failed to initialize required DB API" ); - return( -1 ); + goto error; } if ( load_tm_api( &tmb ) != 0 ) { LM_ERR( "Failed to initialize required tm API" ); - return( -1 ); + goto error; } sca->tm_api = &tmb; if ( sca_bind_sl( sca, &slb ) != 0 ) { LM_ERR( "Failed to initialize required sl API" ); - return( -1 ); + goto error; } if ( sca_hash_table_create( &sca->subscriptions,

9 years, 9 months

git:4.2:0d47a5cf: sca: initialize sca variable to catch destroy on shutdown at startup

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 0d47a5cfc723be2b8ef2baeb439d5df05b5c580c URL: https://github.com/kamailio/kamailio/commit/0d47a5cfc723be2b8ef2baeb439d5df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:07:04+01:00 sca: initialize sca variable to catch destroy on shutdown at startup - reported by GH#35 (cherry picked from commit 010977f5febcf923a31d545bd631fbee11dd426c) --- Modified: modules/sca/sca.c --- Diff: https://github.com/kamailio/kamailio/commit/0d47a5cfc723be2b8ef2baeb439d5df… Patch: https://github.com/kamailio/kamailio/commit/0d47a5cfc723be2b8ef2baeb439d5df… --- diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 743ec96..e739e18 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -40,7 +40,7 @@ MODULE_VERSION /* MODULE OBJECT */ -sca_mod *sca; +sca_mod *sca = NULL; /* EXTERNAL API */ @@ -363,10 +363,15 @@ sca_mod_init( void ) void sca_mod_destroy( void ) { + if(sca==0) + return; + /* write back to the DB to retain most current subscription info */ if ( sca_subscription_db_update() != 0 ) { - LM_ERR( "sca_mod_destroy: failed to save current subscriptions " - "in DB %.*s", STR_FMT( sca->cfg->db_url )); + if(sca && sca->cfg && sca->cfg->db_url) { + LM_ERR( "sca_mod_destroy: failed to save current subscriptions " + "in DB %.*s", STR_FMT( sca->cfg->db_url )); + } } sca_db_disconnect();

9 years, 9 months

git:4.2:23e8ab71: userblacklist: init variables for safer destroy at startup

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 23e8ab71c7c6a3baf8858e02391e67f2e8c30c97 URL: https://github.com/kamailio/kamailio/commit/23e8ab71c7c6a3baf8858e02391e67f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:06:49+01:00 userblacklist: init variables for safer destroy at startup - reported by GH#42 (cherry picked from commit c28551cd245f5e8ab9fc5d5c29f657cc06ad81e2) --- Modified: modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/23e8ab71c7c6a3baf8858e02391e67f… Patch: https://github.com/kamailio/kamailio/commit/23e8ab71c7c6a3baf8858e02391e67f… --- diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c index 5e13a04..73bcd0c 100644 --- a/modules/userblacklist/userblacklist.c +++ b/modules/userblacklist/userblacklist.c @@ -169,7 +169,7 @@ struct source_list_t { static gen_lock_t *lock = NULL; static struct source_list_t *sources = NULL; -static struct dtrie_node_t *dtrie_root; +static struct dtrie_node_t *dtrie_root = NULL; static int check_user_blacklist_fixup(void** param, int param_no) @@ -627,7 +627,7 @@ static int init_source_list(void) SHM_MEM_ERROR; return -1; } - sources->head = NULL; + memset(sources, 0, sizeof(struct source_list_t)); return 0; }

9 years, 9 months

git:4.2:008b03ae: evapi: Listening socket will be bound with SO_REUSEADDR option so that rebinding does not have to wait for TIME_WAIT connections to clear.

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 008b03ae8361ca06da9042b479c10e760391da72 URL: https://github.com/kamailio/kamailio/commit/008b03ae8361ca06da9042b479c10e7… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:05:01+01:00 evapi: Listening socket will be bound with SO_REUSEADDR option so that rebinding does not have to wait for TIME_WAIT connections to clear. (cherry picked from commit cd1a59f223e2806ca4c16ab4a8dc1e0ff2b219d1) --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/008b03ae8361ca06da9042b479c10e7… Patch: https://github.com/kamailio/kamailio/commit/008b03ae8361ca06da9042b479c10e7… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 6ee7e3d..1ba1c0b 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -434,6 +434,7 @@ int evapi_run_dispatcher(char *laddr, int lport) struct hostent *h = NULL; struct ev_io io_server; struct ev_io io_notify; + int yes_true = 1; LM_DBG("starting dispatcher processing\n"); @@ -469,6 +470,18 @@ int evapi_run_dispatcher(char *laddr, int lport) evapi_srv_addr.sin_port = htons((short)lport); evapi_srv_addr.sin_addr = *(struct in_addr*)h->h_addr; + /* Set SO_REUSEADDR option on listening socket so that we don't + * have to wait for connections in TIME_WAIT to go away before + * re-binding. + */ + + if(setsockopt(evapi_srv_sock, SOL_SOCKET, SO_REUSEADDR, + &yes_true, sizeof(int)) < 0) { + LM_ERR("cannot set SO_REUSEADDR option on descriptor\n"); + close(evapi_srv_sock); + return -1; + } + if (bind(evapi_srv_sock, (struct sockaddr*)&evapi_srv_addr, sizeof(evapi_srv_addr)) < 0) { LM_ERR("cannot bind to local address and port [%s:%d]\n", laddr, lport);

9 years, 9 months

git:4.2:e2db6086: sipcapture Add some missing \n in log messages

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: e2db60867748eac2e6585ef9d865b12c1e8ddfe2 URL: https://github.com/kamailio/kamailio/commit/e2db60867748eac2e6585ef9d865b12… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:04:19+01:00 sipcapture Add some missing \n in log messages (cherry picked from commit 5bafc03222bf6fcc59dbcf8aec30def9cdb24581) --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/e2db60867748eac2e6585ef9d865b12… Patch: https://github.com/kamailio/kamailio/commit/e2db60867748eac2e6585ef9d865b12… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 42df2c3..070482c 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -794,16 +794,16 @@ static int mod_init(void) { } if ((insert_retries <0) || ( insert_retries > 500)) { - LM_ERR("insert_retries should be a value between 0 and 500"); + LM_ERR("insert_retries should be a value between 0 and 500\n"); return -1; } if (( 0 == insert_retries) && (insert_retry_timeout != 0)){ - LM_ERR("insert_retry_timeout has no meaning when insert_retries is not set"); + LM_ERR("insert_retry_timeout has no meaning when insert_retries is not set\n"); } if ((insert_retry_timeout <0) || ( insert_retry_timeout > 300)) { - LM_ERR("insert_retry_timeout should be a value between 0 and 300"); + LM_ERR("insert_retry_timeout should be a value between 0 and 300\n"); return -1; } @@ -964,7 +964,7 @@ static int child_init(int rank) while (c){ if (!c->db_url.s || !c->db_url.len ){ - LM_ERR("DB URL not set for capture mode:[%.*s]", c->name.len, c->name.s); + LM_ERR("DB URL not set for capture mode:[%.*s]\n", c->name.len, c->name.s); return -1; } c->db_con = c->db_funcs.init(&c->db_url);

9 years, 9 months

git:4.2:a244189e: added bool to print error once

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: a244189eeb454e7c1de85022002d69bf38482f43 URL: https://github.com/kamailio/kamailio/commit/a244189eeb454e7c1de85022002d69b… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-04T18:03:50+01:00 added bool to print error once (cherry picked from commit c8363905755e5d120251eed95c5fa1be45e8f216) --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/a244189eeb454e7c1de85022002d69b… Patch: https://github.com/kamailio/kamailio/commit/a244189eeb454e7c1de85022002d69b… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index c1ff51c..a14fcd9 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -37,7 +37,7 @@ #include "sipcapture.h" - +static int show_error = 0; static int count = 0; struct hep_timehdr* heptime; @@ -58,7 +58,10 @@ int hep_msg_received(void *data) struct receive_info *ri; if(!hep_capture_on) { - LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n"); + if(show_error == 0) { + LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n"); + show_error = 1; + } return -1; }

9 years, 9 months

Section ID for pseudovariables

by Olle E. Johansson

Hi! While discussing the $RANDOM variable I noticed that it was missing from the cookbook and will add it. Victor noted in IRC that we did not have a section ID identifier for pseudovariables - to generate the README. I added "v" on the wiki for this. Daniel - is this ok? I guess it's you managing the scripts... http://www.kamailio.org/wiki/devel/module-docbook-readme?&#section_ids /O

9 years, 9 months

git:master:7225ab2c: Merge pull request #68 from linuxmaniac/vseva/corex_doc

by Olle E. Johansson

Module: kamailio Branch: master Commit: 7225ab2c9a3f5524eabdbd729f2fd9c3fafbc56a URL: https://github.com/kamailio/kamailio/commit/7225ab2c9a3f5524eabdbd729f2fd9c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-02-04T16:38:25+01:00 Merge pull request #68 from linuxmaniac/vseva/corex_doc Corex: fix documentation of min_msg_len Code and docs did not agree on the name. --- Modified: modules/corex/README Modified: modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7225ab2c9a3f5524eabdbd729f2fd9c… Patch: https://github.com/kamailio/kamailio/commit/7225ab2c9a3f5524eabdbd729f2fd9c…

9 years, 9 months

[kamailio] corex: Modify parameter name (#65)

by Olle E. Johansson

Reported by klaus.lists(a)inode.at please correct typos in the "COREX" module documentation (verified in current devel module´s documentation), chapter 1.3 ff: modparam("corex", "min_msg_len", 32) The modparam "min_msg_len" (= http://kamailio.org/docs/modules/devel/modules/corex.html#idm14680) is always named "msg_min_len" in the README file and online documentation. Only the exemplary kamailio.cfg excerpt is using the right name of this module parameter. Please use the right parameters name "min_msg_len" in the whole document. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/65

9 years, 9 months

← Newer
1
...
27
28
29
30
31
32
33
34
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2015