sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:09fc2d25: modules/ims_regstrar_scscf: remove process id check that could fail on messages processed into shm

by jaybeepee

Module: kamailio Branch: master Commit: 09fc2d25e4fd7bf55e2c055d3664890dbc27a4f0 URL: https://github.com/kamailio/kamailio/commit/09fc2d25e4fd7bf55e2c055d3664890… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-12T16:57:21+02:00 modules/ims_regstrar_scscf: remove process id check that could fail on messages processed into shm --- Modified: modules/ims_registrar_scscf/pvt_message.c --- Diff: https://github.com/kamailio/kamailio/commit/09fc2d25e4fd7bf55e2c055d3664890… Patch: https://github.com/kamailio/kamailio/commit/09fc2d25e4fd7bf55e2c055d3664890… --- diff --git a/modules/ims_registrar_scscf/pvt_message.c b/modules/ims_registrar_scscf/pvt_message.c index 3b8274e..22d54aa 100644 --- a/modules/ims_registrar_scscf/pvt_message.c +++ b/modules/ims_registrar_scscf/pvt_message.c @@ -84,9 +84,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) - && t->uas.request->id != _pv_treq.id) { - + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp)) { /* make a copy */ if (_pv_treq.buf == NULL || _pv_treq.buf_size < t->uas.request->len + 1) { if (_pv_treq.buf != NULL)

7 years, 11 months

git:master:78d01751: modules/ims_regstrar_scscf: corrected logging from ERR to DBG

by jaybeepee

Module: kamailio Branch: master Commit: 78d01751780bb69c339f2f29f2d374a10dc92c70 URL: https://github.com/kamailio/kamailio/commit/78d01751780bb69c339f2f29f2d374a… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-12T16:57:21+02:00 modules/ims_regstrar_scscf: corrected logging from ERR to DBG --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/78d01751780bb69c339f2f29f2d374a… Patch: https://github.com/kamailio/kamailio/commit/78d01751780bb69c339f2f29f2d374a… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index f0ef4a9..e212817 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -617,7 +617,7 @@ static inline int unregister_contact(contact_t* chi, contact_state_t state) { // } if (ul.get_ucontact(&chi->uri, &callid, &path, 0/*cseq*/, &ucontact) != 0) { - LM_ERR("Can't unregister contact that does not exist <%.*s>\n", chi->uri.len, chi->uri.s); + LM_DBG("Can't unregister contact that does not exist <%.*s>\n", chi->uri.len, chi->uri.s); // ul.unlock_udomain(_d, public_identity); goto error; } @@ -930,7 +930,7 @@ int update_contacts(struct sip_msg* msg, udomain_t* _d, } calc_contact_expires(chi, expires_hdr, sos); if (unregister_contact(chi, CONTACT_DELETE_PENDING) != 0) { - LM_ERR("Unable to remove contact <%.*s\n", chi->uri.len, chi->uri.s); + LM_DBG("Unable to remove contact <%.*s\n", chi->uri.len, chi->uri.s); } //add this contact to the successful unregistered in the 200OK so the PCSCF can also see what is de-registered @@ -951,7 +951,7 @@ int update_contacts(struct sip_msg* msg, udomain_t* _d, //now, we get the subscription ul.lock_udomain(_d, public_identity); if (ul.get_impurecord(_d, public_identity, &impu_rec) != 0) { - LM_ERR("Error retrieving impu record on explicit de-reg nothing we can do from here on... aborting..\n"); + LM_DBG("Error retrieving impu record on explicit de-reg nothing we can do from here on... aborting..\n"); ul.unlock_udomain(_d, public_identity); goto error; } @@ -1347,7 +1347,7 @@ int save(struct sip_msg* msg, char* str1, char *route) { //lets update the contacts - we need to know if all were deleted or not for the public identity int res = update_contacts(msg, _d, &public_identity, sar_assignment_type, 0, 0, 0, 0, 0, &contact_header); if (res <= 0) { - LM_ERR("Error processing REGISTER for de-registration\n"); + LM_DBG("Error processing REGISTER for de-registration\n"); free_contact_buf(contact_header); rerrno = R_SAR_FAILED; goto error; @@ -1424,7 +1424,7 @@ int save(struct sip_msg* msg, char* str1, char *route) { create_return_code(CSCF_RETURN_ERROR); - LM_DBG("Suspending SIP TM transaction\n"); + LM_DBG("Suspending SIP TM transaction with index [%d] and label [%d]\n", saved_t->tindex, saved_t->tlabel); if (tmb.t_suspend(msg, &saved_t->tindex, &saved_t->tlabel) != 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_data(saved_t);

7 years, 11 months

git:master:fc12cc57: modules/ims_registrar_scscf: changed WARN log to DBG

by jaybeepee

Module: kamailio Branch: master Commit: fc12cc5714409f2c4c840f873f46ae19751ab996 URL: https://github.com/kamailio/kamailio/commit/fc12cc5714409f2c4c840f873f46ae1… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-12T16:57:20+02:00 modules/ims_registrar_scscf: changed WARN log to DBG --- Modified: modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/fc12cc5714409f2c4c840f873f46ae1… Patch: https://github.com/kamailio/kamailio/commit/fc12cc5714409f2c4c840f873f46ae1… --- diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index ff2db72..b8963c8 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -1697,7 +1697,7 @@ str generate_reginfo_full(udomain_t* _t, str* impu_list, int num_impus, str *exp res = ul.get_impurecord(_t, (&impu_list[i]), &r); if (res != 0) { - LM_WARN("impu disappeared, ignoring it\n"); + LM_DBG("impu disappeared, ignoring it\n"); // if (domain_locked) { ul.unlock_udomain(_t, &impu_list[i]); // }

7 years, 11 months

git:master:abe6bf3c: modules/ims_registrar_scscf: extra error checking before adding call-id to cxdx calls

by jaybeepee

Module: kamailio Branch: master Commit: abe6bf3cf132e8f24d079ead22717e94823a0cbf URL: https://github.com/kamailio/kamailio/commit/abe6bf3cf132e8f24d079ead22717e9… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-12T16:57:20+02:00 modules/ims_registrar_scscf: extra error checking before adding call-id to cxdx calls --- Modified: modules/ims_registrar_scscf/cxdx_sar.c --- Diff: https://github.com/kamailio/kamailio/commit/abe6bf3cf132e8f24d079ead22717e9… Patch: https://github.com/kamailio/kamailio/commit/abe6bf3cf132e8f24d079ead22717e9… --- diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index 7677558..876160f 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -187,6 +187,9 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps rerrno = R_SAR_FAILED; goto error; } + + LM_DBG("callid for found transaction is [%.*s]\n", req->callid->body.len, req->callid->body.s); + cxdx_get_result_code(saa, &rc); cxdx_get_experimental_result_code(saa, &experimental_rc); @@ -336,6 +339,7 @@ int cxdx_send_sar(struct sip_msg *msg, str public_identity, str private_identity AAASession *session = 0; unsigned int hash = 0, label = 0; struct hdr_field *hdr; + str call_id; session = cdpb.AAACreateSession(0); @@ -346,8 +350,14 @@ int cxdx_send_sar(struct sip_msg *msg, str public_identity, str private_identity } if (!sar) goto error1; - if (send_vs_callid_avp) - if (!cxdx_add_call_id(sar, cscf_get_call_id(msg, &hdr))) goto error1; + if (msg && send_vs_callid_avp) { + call_id = cscf_get_call_id(msg, &hdr); + if (call_id.len>0 && call_id.s) { + if (!cxdx_add_call_id(sar, call_id)) + LM_WARN("Failed to add call-id to SAR.... continuing... assuming non-critical\n"); + } + } + if (!cxdx_add_destination_realm(sar, cxdx_dest_realm)) goto error1; if (!cxdx_add_vendor_specific_appid(sar, IMS_vendor_id_3GPP, IMS_Cx, 0 /*IMS_Cx*/)) goto error1;

7 years, 11 months

git:master:c7f78f93: modules: readme files regenerated - sca ...

by Kamailio Dev

Module: kamailio Branch: master Commit: c7f78f9378cbf323e0685ebd1d42d49a8f68b62b URL: https://github.com/kamailio/kamailio/commit/c7f78f9378cbf323e0685ebd1d42d49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-09-12T16:46:26+02:00 modules: readme files regenerated - sca ... --- Modified: modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/c7f78f9378cbf323e0685ebd1d42d49… Patch: https://github.com/kamailio/kamailio/commit/c7f78f9378cbf323e0685ebd1d42d49…

7 years, 11 months

git:master:3c23f347: Merge pull request #774 from linuxmaniac/vseva/2388

by GitHub

Module: kamailio Branch: master Commit: 3c23f347042b17413165683bca990e9555d9c43b URL: https://github.com/kamailio/kamailio/commit/3c23f347042b17413165683bca990e9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-09-12T16:44:40+02:00 Merge pull request #774 from linuxmaniac/vseva/2388 sca: add onhold_bflag module parameter --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca.c Modified: modules/sca/sca.h Modified: modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/3c23f347042b17413165683bca990e9… Patch: https://github.com/kamailio/kamailio/commit/3c23f347042b17413165683bca990e9… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index 85911ce..a4b5210 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -262,6 +262,28 @@ modparam( "sca", "db_update_interval", 120 ) </programlisting> </example> </section> + + <section id="sca.p.onhold_bflag"> + <title><varname>onhold_bflag</varname> (integer)</title> + <para> + <para> + Which branch flag should be used by the module to identify if the call + is on-hold instead of parsing the sdp. + </para> + <para> + <emphasis> + Default value is -1 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>onhold_bflag</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sca", "onhold_bflag", 15) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 7212383..cca8b81 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -125,6 +125,7 @@ int hash_table_size = -1; int call_info_max_expires = 3600; int line_seize_max_expires = 15; int purge_expired_interval = 120; +int onhold_bflag = -1; static param_export_t params[] = { {"outbound_proxy", PARAM_STR, &outbound_proxy}, @@ -136,6 +137,7 @@ static param_export_t params[] = { {"call_info_max_expires", INT_PARAM, &call_info_max_expires}, {"line_seize_max_expires", INT_PARAM, &line_seize_max_expires}, {"purge_expired_interval", INT_PARAM, &purge_expired_interval}, + {"onhold_bflag", INT_PARAM, &onhold_bflag}, {NULL, 0, NULL}, }; @@ -265,6 +267,11 @@ static int sca_set_config(sca_mod *scam) scam->cfg->call_info_max_expires = call_info_max_expires; scam->cfg->line_seize_max_expires = line_seize_max_expires; scam->cfg->purge_expired_interval = purge_expired_interval; + if(onhold_bflag > 31) { + LM_ERR("sca_set_config: onhold_bflag value > 31\n"); + return (-1); + } + scam->cfg->onhold_bflag = onhold_bflag; return (0); } diff --git a/modules/sca/sca.h b/modules/sca/sca.h index 75bb2f0..2c20e76 100644 --- a/modules/sca/sca.h +++ b/modules/sca/sca.h @@ -37,6 +37,7 @@ struct _sca_config { int call_info_max_expires; int line_seize_max_expires; int purge_expired_interval; + int onhold_bflag; }; typedef struct _sca_config sca_config; diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index af31cf5..9b2331e 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA. 02110-1301 USA */ #include "sca_common.h" - +#include "sca.h" #include <assert.h> #include "sca_util.h" - +#include "../../dset.h" #include "../../parser/sdp/sdp.h" int sca_get_msg_method(sip_msg_t *msg) @@ -419,6 +419,10 @@ int sca_call_is_held(sip_msg_t *msg) int is_held = 0; int rc; + if(sca->cfg->onhold_bflag >= 0) { + LM_DBG("sca_call_is_held: skip parse_sdp and use onhold_bflag\n"); + return isbflagset(0, (flag_t)sca->cfg->onhold_bflag); + } rc = parse_sdp(msg); if (rc < 0) { LM_ERR("sca_call_is_held: parse_sdp body failed\n");

7 years, 11 months

git:master:e683b61a: sca: add onhold_bflag module parameter

by Victor Seva

Module: kamailio Branch: master Commit: e683b61a0c0774d1828fca30fa33d90caa2762d6 URL: https://github.com/kamailio/kamailio/commit/e683b61a0c0774d1828fca30fa33d90… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-09-08T19:08:10+02:00 sca: add onhold_bflag module parameter * disable by default (-1) * will skip parsing the sdp for on hold discovery and it will use the value of the bflag Fix #773 --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca.c Modified: modules/sca/sca.h Modified: modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/e683b61a0c0774d1828fca30fa33d90… Patch: https://github.com/kamailio/kamailio/commit/e683b61a0c0774d1828fca30fa33d90… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index 85911ce..a4b5210 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -262,6 +262,28 @@ modparam( "sca", "db_update_interval", 120 ) </programlisting> </example> </section> + + <section id="sca.p.onhold_bflag"> + <title><varname>onhold_bflag</varname> (integer)</title> + <para> + <para> + Which branch flag should be used by the module to identify if the call + is on-hold instead of parsing the sdp. + </para> + <para> + <emphasis> + Default value is -1 (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>onhold_bflag</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sca", "onhold_bflag", 15) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 7212383..cca8b81 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -125,6 +125,7 @@ int hash_table_size = -1; int call_info_max_expires = 3600; int line_seize_max_expires = 15; int purge_expired_interval = 120; +int onhold_bflag = -1; static param_export_t params[] = { {"outbound_proxy", PARAM_STR, &outbound_proxy}, @@ -136,6 +137,7 @@ static param_export_t params[] = { {"call_info_max_expires", INT_PARAM, &call_info_max_expires}, {"line_seize_max_expires", INT_PARAM, &line_seize_max_expires}, {"purge_expired_interval", INT_PARAM, &purge_expired_interval}, + {"onhold_bflag", INT_PARAM, &onhold_bflag}, {NULL, 0, NULL}, }; @@ -265,6 +267,11 @@ static int sca_set_config(sca_mod *scam) scam->cfg->call_info_max_expires = call_info_max_expires; scam->cfg->line_seize_max_expires = line_seize_max_expires; scam->cfg->purge_expired_interval = purge_expired_interval; + if(onhold_bflag > 31) { + LM_ERR("sca_set_config: onhold_bflag value > 31\n"); + return (-1); + } + scam->cfg->onhold_bflag = onhold_bflag; return (0); } diff --git a/modules/sca/sca.h b/modules/sca/sca.h index 75bb2f0..2c20e76 100644 --- a/modules/sca/sca.h +++ b/modules/sca/sca.h @@ -37,6 +37,7 @@ struct _sca_config { int call_info_max_expires; int line_seize_max_expires; int purge_expired_interval; + int onhold_bflag; }; typedef struct _sca_config sca_config; diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index af31cf5..9b2331e 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA. 02110-1301 USA */ #include "sca_common.h" - +#include "sca.h" #include <assert.h> #include "sca_util.h" - +#include "../../dset.h" #include "../../parser/sdp/sdp.h" int sca_get_msg_method(sip_msg_t *msg) @@ -419,6 +419,10 @@ int sca_call_is_held(sip_msg_t *msg) int is_held = 0; int rc; + if(sca->cfg->onhold_bflag >= 0) { + LM_DBG("sca_call_is_held: skip parse_sdp and use onhold_bflag\n"); + return isbflagset(0, (flag_t)sca->cfg->onhold_bflag); + } rc = parse_sdp(msg); if (rc < 0) { LM_ERR("sca_call_is_held: parse_sdp body failed\n");

7 years, 11 months

[kamailio/kamailio] sca: add onhold_bflag module parameter (#774)

by Victor Seva

* disable by default (-1) * will skip parsing the sdp for on hold discovery and it will use the value of the bflag Fix #773 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/774 -- Commit Summary -- * sca: add onhold_bflag module parameter -- File Changes -- M modules/sca/doc/sca_admin.xml (22) M modules/sca/sca.c (7) M modules/sca/sca.h (1) M modules/sca/sca_util.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/774.patch https://github.com/kamailio/kamailio/pull/774.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/774

7 years, 11 months

[kamailio/kamailio] sca: skip on-hold detection by parsing sdp and use bflag (#773)

by Victor Seva

Sipwise hat ON: We have a scenario where we need to force the on-hold detection, so sca has to skip the sdp parsing and behave as previous based on a bflag -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/773

7 years, 11 months

git:master:1a7077f8: modules/ims_usrloc_scscf: don't store contact param with a trailing '; '

by jaybeepee

Module: kamailio Branch: master Commit: 1a7077f8adf540477321a08f1b8d318aa0f00a5e URL: https://github.com/kamailio/kamailio/commit/1a7077f8adf540477321a08f1b8d318… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-12T11:04:58+02:00 modules/ims_usrloc_scscf: don't store contact param with a trailing ';' --- Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/1a7077f8adf540477321a08f1b8d318… Patch: https://github.com/kamailio/kamailio/commit/1a7077f8adf540477321a08f1b8d318… --- diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 4d95f78..418bb7a 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -267,8 +267,10 @@ int db_delete_impurecord(udomain_t* _d, struct impurecord* _r) { } static int MAX_PARAMS_SIZE = 1000; -static str param_name_and_nody = {"%.*s=%.*s;", 1}; +static str param_name_and_body = {"%.*s=%.*s;", 1}; +static str param_name_and_body_last = {"%.*s=%.*s", 1}; static str param_name_no_body = {"%.*s;", 1}; +static str param_name_no_body_last = {"%.*s", 1}; int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { @@ -279,6 +281,7 @@ int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { param_buf.len = 0; param_pad.s = param_padc; param_pad.len = 0; + char* format_name_and_body, *format_name_no_body; db_key_t key[7]; db_val_t val[7]; @@ -287,14 +290,21 @@ int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { tmp = _c->params; while (tmp) { - if(tmp->body.len > 0) { - sprintf(param_pad.s, param_name_and_nody.s, tmp->name.len, tmp->name.s, tmp->body.len, tmp->body.s); - } else { - sprintf(param_pad.s, param_name_no_body.s, tmp->name.len, tmp->name.s); - } - param_pad.len = strlen(param_pad.s); - STR_APPEND(param_buf, param_pad); - tmp = tmp->next; + if (tmp->next == 0) { + format_name_and_body = param_name_and_body_last.s; + format_name_no_body = param_name_no_body_last.s; + } else { + format_name_and_body = param_name_and_body.s; + format_name_no_body = param_name_no_body.s; + } + if (tmp->body.len > 0) { + sprintf(param_pad.s, format_name_and_body, tmp->name.len, tmp->name.s, tmp->body.len, tmp->body.s); + } else { + sprintf(param_pad.s, format_name_no_body, tmp->name.len, tmp->name.s); + } + param_pad.len = strlen(param_pad.s); + STR_APPEND(param_buf, param_pad); + tmp = tmp->next; } LM_DBG("Converted params to string to insert into db: [%.*s]\n", param_buf.len, param_buf.s);

7 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016