sr-dev September 2017

sr-dev@lists.kamailio.org

26 participants
271 discussions

git:master:99ea089c: sl: exported sl_forward_reply() to kemi framework
by Daniel-Constantin Mierla 07 Sep '17

07 Sep '17

Module: kamailio Branch: master Commit: 99ea089cb410c18e26bf29feb6ed14bf404988ff URL: https://github.com/kamailio/kamailio/commit/99ea089cb410c18e26bf29feb6ed14b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-07T15:26:22+02:00 sl: exported sl_forward_reply() to kemi framework --- Modified: src/modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/99ea089cb410c18e26bf29feb6ed14b… Patch: https://github.com/kamailio/kamailio/commit/99ea089cb410c18e26bf29feb6ed14b… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index 9c6cf3c144..ab50db3649 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -367,7 +367,7 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) LM_ERR("invalid SIP message type\n"); return -1; } - if(code!=NULL) { + if(code!=NULL && code->len>0) { if(code->len!=3) { LM_ERR("invalid reply code value %.*s\n", code->len, code->s); return -1; @@ -382,16 +382,12 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) return -1; } } - if(reason!=NULL && reason->len<=0) { - LM_ERR("invalid reply reason value\n"); - return -1; - } /* backup old values */ oldscode[0] = msg->first_line.u.reply.status.s[0]; oldscode[1] = msg->first_line.u.reply.status.s[1]; oldscode[2] = msg->first_line.u.reply.status.s[2]; oldncode = msg->first_line.u.reply.statuscode; - if(code!=NULL) { + if(code!=NULL && code->len>0) { /* update status code directly in msg buffer */ msg->first_line.u.reply.statuscode = (code->s[0]-'0')*100 + (code->s[1]-'0')*10 + code->s[2]-'0'; @@ -400,7 +396,7 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) msg->first_line.u.reply.status.s[2] = code->s[2]; } - if(reason!=NULL) { + if(reason!=NULL && reason->len>0) { ldel = del_lump(msg, msg->first_line.u.reply.reason.s - msg->buf, msg->first_line.u.reply.reason.len, @@ -419,7 +415,7 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) memcpy(rbuf, reason->s, reason->len); ladd = insert_new_lump_after(ldel, rbuf, reason->len, 0); if (ladd==0) { - LOG(L_ERR, "failed to add reason lump: %.*s\n", + LM_ERR("failed to add reason lump: %.*s\n", reason->len, reason->s); pkg_free(rbuf); ret = -1; @@ -428,14 +424,14 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) } ret = forward_reply_nocb(msg); restore: - if(reason!=NULL) { + if(reason!=NULL && reason->len>0) { if(ldel!=NULL) { remove_lump(msg, ldel); /* ladd is liked in the 'after' list inside ldel, * destroyed together, no need for its own remove operation */ } } - if(code!=NULL) { + if(code!=NULL && code->len>0) { msg->first_line.u.reply.statuscode = oldncode; msg->first_line.u.reply.status.s[0] = oldscode[0]; msg->first_line.u.reply.status.s[1] = oldscode[1]; @@ -521,6 +517,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("sl_forward_reply"), + SR_KEMIP_INT, w_sl_forward_reply, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:c4bd6709: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 06 Sep '17

06 Sep '17

Module: kamailio Branch: master Commit: c4bd6709cf3abb1fb0685fc89641d85c6752eb34 URL: https://github.com/kamailio/kamailio/commit/c4bd6709cf3abb1fb0685fc89641d85… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-06T20:46:22+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/c4bd6709cf3abb1fb0685fc89641d85… Patch: https://github.com/kamailio/kamailio/commit/c4bd6709cf3abb1fb0685fc89641d85… --- diff --git a/src/modules/lcr/README b/src/modules/lcr/README index 3ac0c7a185..aca7e6d6a2 100644 --- a/src/modules/lcr/README +++ b/src/modules/lcr/README @@ -571,8 +571,8 @@ modparam("lcr", "lcr_rule_table", "rules") 3.17. prefix_column (string) - Name of the column holding prefix of Request-URI user part and prefix - of gateway. + Name of the column in lcr_rule and lcr_gw tables holding prefix of + Request-URI user part and prefix of gateway, respectively. Default value is “prefix”.

1 0

git:master:b0f941e1: modules/lcr: improved description of prefix_column param
by Juha Heinanen 06 Sep '17

06 Sep '17

Module: kamailio Branch: master Commit: b0f941e1ef9a013472ea42bade3c8ecae9111768 URL: https://github.com/kamailio/kamailio/commit/b0f941e1ef9a013472ea42bade3c8ec… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2017-09-06T21:34:56+03:00 modules/lcr: improved description of prefix_column param --- Modified: src/modules/lcr/doc/lcr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0f941e1ef9a013472ea42bade3c8ec… Patch: https://github.com/kamailio/kamailio/commit/b0f941e1ef9a013472ea42bade3c8ec… --- diff --git a/src/modules/lcr/doc/lcr_admin.xml b/src/modules/lcr/doc/lcr_admin.xml index 8c4552d1ba..5d1d92c99a 100644 --- a/src/modules/lcr/doc/lcr_admin.xml +++ b/src/modules/lcr/doc/lcr_admin.xml @@ -519,8 +519,8 @@ modparam("lcr", "lcr_rule_table", "rules") <section> <title><varname>prefix_column</varname> (string)</title> <para> - Name of the column holding prefix of Request-URI user - part and prefix of gateway. + Name of the column in lcr_rule and lcr_gw tables holding prefix + of Request-URI user part and prefix of gateway, respectively. </para> <para> <emphasis>

1 0

git:master:b672d8ef: tm: reset T_ASYNC_CONTINUE once t_continue() callback is executed
by Daniel-Constantin Mierla 06 Sep '17

06 Sep '17

Module: kamailio Branch: master Commit: b672d8ef63715cf816390a05ce7a441377c3e468 URL: https://github.com/kamailio/kamailio/commit/b672d8ef63715cf816390a05ce7a441… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-06T11:13:16+02:00 tm: reset T_ASYNC_CONTINUE once t_continue() callback is executed - by having it still set, the reply field was not reset, causing to free an invalid pointer when transaction was destroyed, reported by Vitaliy Aleksandrov - set reply of suspended request branch to FAKED_REPLY on continue, the code was already set to 500 - make it coherent with the local replied transactions - reset cloned reply under lock for suspended reply branch and free it later via backup pointer - safer if someone risks to access the suspended reply branch (should happen now, just future proof) --- Modified: src/modules/tm/t_suspend.c --- Diff: https://github.com/kamailio/kamailio/commit/b672d8ef63715cf816390a05ce7a441… Patch: https://github.com/kamailio/kamailio/commit/b672d8ef63715cf816390a05ce7a441…

1 0

git:5.0:d5f89eb4: tm: more info in some log messages
by Daniel-Constantin Mierla 06 Sep '17

06 Sep '17

Module: kamailio Branch: 5.0 Commit: d5f89eb46c6d463d162dab0af1a7b56af513549c URL: https://github.com/kamailio/kamailio/commit/d5f89eb46c6d463d162dab0af1a7b56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-06T09:15:14+02:00 tm: more info in some log messages (cherry picked from commit 8599f6fca16367a3e2a0dd4a638c667459482cd5) --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/d5f89eb46c6d463d162dab0af1a7b56… Patch: https://github.com/kamailio/kamailio/commit/d5f89eb46c6d463d162dab0af1a7b56… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 265633ca69..474ad63cbe 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -930,7 +930,7 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch ) *p_branch =(int) branch_id; REF_UNSAFE( T ); UNLOCK_HASH(hash_index); - LM_DBG("reply matched (T=%p)!\n",T); + LM_DBG("reply (%p) matched an active transaction (T=%p)!\n", p_msg, T); if(likely(!(p_msg->msg_flags&FL_TM_RPL_MATCHED))) { /* if this is a 200 for INVITE, we will wish to store to-tags to be * able to distinguish retransmissions later and not to call @@ -997,8 +997,8 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) ret=0; /* is T still up-to-date ? */ - LM_DBG("msg id=%d global id=%d T start=%p\n", - p_msg->id,global_msg_id,T); + LM_DBG("msg (%p) id=%d global id=%d T start=%p\n", + p_msg,p_msg->id,global_msg_id,T); if ( p_msg->id != global_msg_id || T==T_UNDEFINED ) { global_msg_id = p_msg->id; @@ -1063,17 +1063,17 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) if ( T && T!=T_UNDEFINED && T->flags & (T_IN_AGONY)) { LM_WARN("transaction %p scheduled for deletion " "and called from t_check_msg (flags=%x) (but it might be ok)" - "\n", T, T->flags); + " (msg %p)\n", T, T->flags, p_msg); } #endif - LM_DBG("msg id=%d global id=%d T end=%p\n", - p_msg->id,global_msg_id,T); + LM_DBG("msg (%p) id=%d global id=%d T end=%p\n", + p_msg,p_msg->id,global_msg_id,T); } else { /* ( p_msg->id == global_msg_id && T!=T_UNDEFINED ) */ if (T){ - LM_DBG("T already found!\n"); + LM_DBG("T (%p) already found for msg (%p)!\n", T, p_msg); ret=1; }else{ - LM_DBG("T previously sought and not found\n"); + LM_DBG("T previously sought and not found for msg (%p)\n", p_msg); ret=-1; } if (likely(param_branch))

1 0

git:master:8599f6fc: tm: more info in some log messages
by Daniel-Constantin Mierla 06 Sep '17

06 Sep '17

Module: kamailio Branch: master Commit: 8599f6fca16367a3e2a0dd4a638c667459482cd5 URL: https://github.com/kamailio/kamailio/commit/8599f6fca16367a3e2a0dd4a638c667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-06T09:09:13+02:00 tm: more info in some log messages --- Modified: src/modules/tm/t_lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/8599f6fca16367a3e2a0dd4a638c667… Patch: https://github.com/kamailio/kamailio/commit/8599f6fca16367a3e2a0dd4a638c667… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 94787f1965..1fff011dee 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -930,7 +930,7 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch ) *p_branch =(int) branch_id; REF_UNSAFE( T ); UNLOCK_HASH(hash_index); - LM_DBG("reply matched (T=%p)!\n",T); + LM_DBG("reply (%p) matched an active transaction (T=%p)!\n", p_msg, T); if(likely(!(p_msg->msg_flags&FL_TM_RPL_MATCHED))) { /* if this is a 200 for INVITE, we will wish to store to-tags to be * able to distinguish retransmissions later and not to call @@ -997,8 +997,8 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) ret=0; /* is T still up-to-date ? */ - LM_DBG("msg id=%d global id=%d T start=%p\n", - p_msg->id,global_msg_id,T); + LM_DBG("msg (%p) id=%d global id=%d T start=%p\n", + p_msg,p_msg->id,global_msg_id,T); if ( p_msg->id != global_msg_id || T==T_UNDEFINED ) { global_msg_id = p_msg->id; @@ -1063,17 +1063,17 @@ int t_check_msg( struct sip_msg* p_msg , int *param_branch ) if ( T && T!=T_UNDEFINED && T->flags & (T_IN_AGONY)) { LM_WARN("transaction %p scheduled for deletion " "and called from t_check_msg (flags=%x) (but it might be ok)" - "\n", T, T->flags); + " (msg %p)\n", T, T->flags, p_msg); } #endif - LM_DBG("msg id=%d global id=%d T end=%p\n", - p_msg->id,global_msg_id,T); + LM_DBG("msg (%p) id=%d global id=%d T end=%p\n", + p_msg,p_msg->id,global_msg_id,T); } else { /* ( p_msg->id == global_msg_id && T!=T_UNDEFINED ) */ if (T){ - LM_DBG("T already found!\n"); + LM_DBG("T (%p) already found for msg (%p)!\n", T, p_msg); ret=1; }else{ - LM_DBG("T previously sought and not found\n"); + LM_DBG("T previously sought and not found for msg (%p)\n", p_msg); ret=-1; } if (likely(param_branch))

1 0

git:master:e90184ed: modules: readme files regenerated - p_usrloc ... [skip ci]
by Kamailio Dev 05 Sep '17

05 Sep '17

Module: kamailio Branch: master Commit: e90184ede69a1c162da640d2df0d44198c2059bf URL: https://github.com/kamailio/kamailio/commit/e90184ede69a1c162da640d2df0d441… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-05T13:31:18+02:00 modules: readme files regenerated - p_usrloc ... [skip ci] --- Modified: src/modules/p_usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/e90184ede69a1c162da640d2df0d441… Patch: https://github.com/kamailio/kamailio/commit/e90184ede69a1c162da640d2df0d441… --- diff --git a/src/modules/p_usrloc/README b/src/modules/p_usrloc/README index 6d3af78ff6..0b8356e4f7 100644 --- a/src/modules/p_usrloc/README +++ b/src/modules/p_usrloc/README @@ -427,6 +427,9 @@ modparam("p_usrloc", "risk_group_column", "rg") Default value is “3600”. + Can be set at runtime, e.g.: + $ kamcmd cfg.set_now_int p_usrloc expire_time 7200 + Example 1.12. Set expire_time parameter ... modparam("p_usrloc", "expire_time", "3600") @@ -438,6 +441,9 @@ modparam("p_usrloc", "expire_time", "3600") Default value is “50”. + Can be set at runtime, e.g.: + $ kamcmd cfg.set_now_int p_usrloc db_err_threshold 20 + Example 1.13. Set db_err_threshold parameter ... modparam("p_usrloc", "db_err_threshold", "50") @@ -452,6 +458,9 @@ modparam("p_usrloc", "db_err_threshold", "50") Default value is “1”. + Can be set at runtime, e.g.: + $ kamcmd cfg.set_now_int p_usrloc failover_level 2 + Example 1.14. Set failover_level parameter ... modparam("p_usrloc", "failover_level", "1") @@ -592,6 +601,9 @@ modparam("p_usrloc", "default_db_type", "cluster") Default value is “1”. + Can be set at runtime, e.g.: + $ kamcmd cfg.set_now_int p_usrloc db_ops_ruid 1 + Example 1.24. Set db_ops_ruid parameter ... modparam("p_usrloc", "db_ops_ruid", 0) @@ -605,6 +617,9 @@ modparam("p_usrloc", "db_ops_ruid", 0) Default value is “0”. + Can be set at runtime, e.g.: + $ kamcmd cfg.set_now_int p_usrloc db_update_as_insert 1 + Example 1.25. Set db_update_as_insert parameter ... modparam("usrloc", "db_update_as_insert", 1)

1 0

git:master:fda5be33: p_usrloc: add config framework support for certain parameters
by Lucian Balaceanu 05 Sep '17

05 Sep '17

Module: kamailio Branch: master Commit: fda5be331d24342beb5b50e7171b4a3be9c5b4fc URL: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-09-05T14:21:40+03:00 p_usrloc: add config framework support for certain parameters The following params are now configurable via kamcmd cfg: expire_time, db_err_threshold, failover_level, db_ops_ruid, db_update_as_insert --- Added: src/modules/p_usrloc/config.c Added: src/modules/p_usrloc/config.h Modified: src/modules/p_usrloc/doc/p_usrloc_admin.xml Modified: src/modules/p_usrloc/p_usrloc_mod.c Modified: src/modules/p_usrloc/p_usrloc_mod.h Modified: src/modules/p_usrloc/ucontact.c Modified: src/modules/p_usrloc/ul_db.c Modified: src/modules/p_usrloc/ul_db_failover.c Modified: src/modules/p_usrloc/ul_db_handle.c Modified: src/modules/p_usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3… Patch: https://github.com/kamailio/kamailio/commit/fda5be331d24342beb5b50e7171b4a3…

1 0

git:master:30329454: modules: readme files regenerated - presence_xml ... [skip ci]
by Kamailio Dev 05 Sep '17

05 Sep '17

Module: kamailio Branch: master Commit: 303294547399610a4eedcd382631e7d442fd76ad URL: https://github.com/kamailio/kamailio/commit/303294547399610a4eedcd382631e7d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-09-05T08:01:33+02:00 modules: readme files regenerated - presence_xml ... [skip ci] --- Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/303294547399610a4eedcd382631e7d… Patch: https://github.com/kamailio/kamailio/commit/303294547399610a4eedcd382631e7d… --- diff --git a/src/modules/presence_xml/README b/src/modules/presence_xml/README index 4b26628d6a..045edce2d9 100644 --- a/src/modules/presence_xml/README +++ b/src/modules/presence_xml/README @@ -119,8 +119,8 @@ Chapter 1. Admin Guide * presence. * sl. * xcap_client. - Only compulsory if not using an integrated xcap server (if - 'integrated_xcap_server' parameter is not set). + Needed only when not using the integrated xcap server (if + 'integrated_xcap_server' parameter is set to 0). 2.2. External Libraries or Applications @@ -223,15 +223,15 @@ modparam("presence_xml", "force_active", 1) This parameter is a flag for the type of XCAP servers used. If the XCAP server is integrated with Kamailio presence_xml module and access the same database tables directly, like the embedded XCAP server - implemented in xcap_server module, the parameter should be set to a - positive value. Apart from updating in xcap table, if the integrated - server is not running on the same Kamailio instance, it must send an - RPC command presence.refreshWatchers [pres_uri] [event] when a user - modifies a rules document, to instruct the presence_xml module to - update states from the database and, if needed, send NOTIFY updates. - - Otherwise, it uses xcap_client module to fetch documents from the XCAP - servers with HTTP requests. + implemented in xcap_server module, the parameter has to be set to 1. + Apart from updating in xcap table, if the integrated server is not + running on the same Kamailio instance, it must send an RPC command + presence.refreshWatchers [pres_uri] [event] when a user modifies a + rules document, to instruct the presence_xml module to update states + from the database and, if needed, send NOTIFY updates. + + Otherwise (if set to 0) it uses xcap_client module to fetch documents + from the XCAP servers with HTTP requests. Default value is “0”.

1 0

git:master:6fbaac0d: presence_xml: small adjustments, added section ids
by Daniel-Constantin Mierla 05 Sep '17

05 Sep '17

Module: kamailio Branch: master Commit: 6fbaac0d9383da5fe30ea9d2e9671ab3dffd9694 URL: https://github.com/kamailio/kamailio/commit/6fbaac0d9383da5fe30ea9d2e9671ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-09-05T07:55:09+02:00 presence_xml: small adjustments, added section ids --- Modified: src/modules/presence_xml/doc/presence_xml_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6fbaac0d9383da5fe30ea9d2e9671ab… Patch: https://github.com/kamailio/kamailio/commit/6fbaac0d9383da5fe30ea9d2e9671ab…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2017