sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
211 discussions

git:master: modules/dialog: added parameter and dialog property to disable timeout reset
by Daniel-Constantin Mierla 08 Jan '14

08 Jan '14

Module: sip-router Branch: master Commit: c70823c0454561dda63eb1e95f66bd96605474db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70823c… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 10:43:00 2014 +0100 modules/dialog: added parameter and dialog property to disable timeout reset --- modules/dialog/dialog.c | 14 ++++++++++++++ modules/dialog/dlg_handlers.c | 7 +++++-- modules/dialog/dlg_hash.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 8d7be33..4072981 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -123,6 +123,7 @@ int active_dlgs_cnt = 0; int early_dlgs_cnt = 0; int detect_spirals = 1; int dlg_send_bye = 0; +int timeout_noreset = 0; stat_var *active_dlgs = 0; stat_var *processed_dlgs = 0; stat_var *expired_dlgs = 0; @@ -281,6 +282,7 @@ static param_export_t mod_params[]={ { "xavp_cfg", STR_PARAM, &dlg_xavp_cfg.s }, { "ka_timer", INT_PARAM, &dlg_ka_timer }, { "ka_interval", INT_PARAM, &dlg_ka_interval }, + { "timeout_noreset", INT_PARAM, &timeout_noreset }, { 0,0,0 } }; @@ -577,6 +579,11 @@ static int mod_init(void) return -1; } + if (timeout_noreset != 0 && timeout_noreset != 1) { + LM_ERR("invalid value %d for timeout_noreset param!!\n",timeout_noreset); + return -1; + } + /* if statistics are disabled, prevent their registration to core */ if (dlg_enable_stats==0) exports.stats = 0; @@ -1193,6 +1200,13 @@ static int w_dlg_set_property(struct sip_msg *msg, char *prop, char *s2) d->iflags |= DLG_IFLAG_KA_DST; dlg_release(d); } + } else if(val.len==15 && strncmp(val.s, "timeout-noreset", 15)==0) { + dctx->iflags |= DLG_IFLAG_TIMER_NORESET; + d = dlg_get_by_iuid(&dctx->iuid); + if(d!=NULL) { + d->iflags |= DLG_IFLAG_TIMER_NORESET; + dlg_release(d); + } } else { LM_ERR("unknown property value [%.*s]\n", val.len, val.s); return -1; diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 9393d7f..058131b 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -82,6 +82,7 @@ static int default_timeout; /*!< default dialog timeout */ static int seq_match_mode; /*!< dlg_match mode */ static int shutdown_done = 0; /*!< 1 when destroy_dlg_handlers was called */ extern int detect_spirals; +extern int timeout_noreset; extern int initial_cbs_inscript; extern int dlg_send_bye; extern int dlg_event_rt[DLG_EVENTRT_MAX]; @@ -1085,7 +1086,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg_cell_t *dlg; dlg_iuid_t *iuid; str val, callid, ftag, ttag; - int h_entry, h_id, new_state, old_state, unref, event, timeout; + int h_entry, h_id, new_state, old_state, unref, event, timeout, reset; unsigned int dir; int ret = 0; @@ -1258,7 +1259,9 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) if (timeout!=default_timeout) { dlg->lifetime = timeout; } - if (new_state!=DLG_STATE_EARLY) { + reset = !((dlg->iflags & DLG_IFLAG_TIMER_NORESET) || timeout_noreset) + + if ((new_state!=DLG_STATE_EARLY) && (old_state!=DLG_STATE_CONFIRMED || reset)) { if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) { LM_ERR("failed to update dialog lifetime\n"); } else { diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index 4bfc911..6994256 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -85,6 +85,7 @@ #define DLG_IFLAG_TIMEOUTBYE (1<<0) /*!< send bye on time-out */ #define DLG_IFLAG_KA_SRC (1<<1) /*!< send keep alive to src */ #define DLG_IFLAG_KA_DST (1<<2) /*!< send keep alive to dst */ +#define DLG_IFLAG_TIMER_NORESET (1<<3) /*!< don't reset dialog timers on in-dialog messages reception */ #define DLG_CALLER_LEG 0 /*!< attribute that belongs to a caller leg */ #define DLG_CALLEE_LEG 1 /*!< attribute that belongs to a callee leg */

1 0

git:master: uac_redirect: fixed typo in comments
by Daniel-Constantin Mierla 08 Jan '14

08 Jan '14

Module: sip-router Branch: master Commit: 80d55e19f18a93cc15f7f4eadb2828210bf15970 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80d55e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 18:09:18 2014 +0100 uac_redirect: fixed typo in comments --- modules/uac_redirect/rd_funcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/uac_redirect/rd_funcs.c b/modules/uac_redirect/rd_funcs.c index aa8dbd0..f85d84d 100644 --- a/modules/uac_redirect/rd_funcs.c +++ b/modules/uac_redirect/rd_funcs.c @@ -223,7 +223,7 @@ static int shmcontact2dset(struct sip_msg *req, struct sip_msg *sh_rpl, /* contact header is not parsed */ if ( sh_rpl->msg_flags&FL_SHM_CLONE ) { /* duplicate the reply into private memory to be able - * to parse it and after words to free the parsed mems */ + * to parse it and afterwards to free the parsed mems */ memcpy( &dup_rpl, sh_rpl, sizeof(struct sip_msg) ); dup = 2; /* ok -> force the parsing of contact header */

1 0

git:master: modules/dialog: docs updated for timeout_noreset parameter and timeout-noreset property
by Daniel-Constantin Mierla 08 Jan '14

08 Jan '14

Module: sip-router Branch: master Commit: 97c3a6ad01700f2c2d03e163df65c5aba097165c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97c3a6a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 8 12:17:49 2014 +0100 modules/dialog: docs updated for timeout_noreset parameter and timeout-noreset property --- modules/dialog/doc/dialog_admin.xml | 42 ++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 3 deletions(-) diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index f0d1626..7b96101 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -1235,6 +1235,28 @@ modparam("dialog", "ka_interval", 300) </example> </section> + <section> + <title><varname>timeout_noreset</varname> (int)</title> + <para> + If set to 1, the dialog timeout won't be reset each + time a sequential request is processed. + It is an alternative to dlg_set_property("timeout-noreset") for all dialogs. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timeout_noreset</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "timeout_noreset", 1) +... +</programlisting> + </example> + </section> + </section> @@ -1802,8 +1824,17 @@ dlg_set_timeout_by_profile("users", "abc123", "3"); <itemizedlist> <listitem> <para><emphasis>attr</emphasis> - name of property. It can be: - 'ka-src' - send keep alive OPTION requests to caller; - 'ka-dst' - send keep alive OPTION requests to callee. + <itemizedlist> + <listitem> + 'ka-src' - send keep alive OPTION requests to caller + </listitem> + <listitem> + 'ka-dst' - send keep alive OPTION requests to callee + </listitem> + <listitem> + 'timeout-noreset' - don't reset timeout on in-dialog messages reception + </listitem> + </itemizedlist> </para> </listitem> </itemizedlist> @@ -1813,7 +1844,11 @@ dlg_set_timeout_by_profile("users", "abc123", "3"); within dialog, with the scope of detecting if the destination is still in the call. If the keep alive request results in a local timeout or '481 Call Leg/Transaction Does Not Exist', then the - dialog is ended from the server. + dialog is ended from the server. + </para> + <para> + If 'timeout-noreset' is set, dialog timeout won't be reset upon reception + of in-dialog messages (default behavior). </para> <para> This function can be used from ANY_ROUTE. @@ -1824,6 +1859,7 @@ dlg_set_timeout_by_profile("users", "abc123", "3"); ... dlg_set_property("ka-src"); dlg_set_property("ka-dst"); +dlg_set_property("timeout-noreset"); ... </programlisting> </example>

1 0

git:4.0: usrloc: add user_col to the update contact query with instance
by Victor Seva 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.0 Commit: 7031c26ddb5b3bb32b1a44a9133e8f3c0893e567 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7031c26… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jan 7 13:59:37 2014 +0100 usrloc: add user_col to the update contact query with instance (cherry picked from commit b393656c1113eb3630470389f142c53fbc085a90) (cherry picked from commit 2dd36bbae6f05ea0c980e58f247ac7e4f737f6a6) Conflicts: modules/usrloc/ucontact.c --- modules/usrloc/ucontact.c | 47 +++++++++++++++++++++++++++++++------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index fcd3005..eeee451 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -1022,8 +1022,8 @@ int db_update_ucontact_instance(ucontact_t* _c) { str auser; str adomain; - db_key_t keys1[2]; - db_val_t vals1[2]; + db_key_t keys1[4]; + db_val_t vals1[4]; int n1; db_key_t keys2[13]; @@ -1041,6 +1041,13 @@ int db_update_ucontact_instance(ucontact_t* _c) } n1 = 0; + keys1[n1] = &user_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = *_c->aor; + LM_DBG("aor:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); + n1++; + keys1[n1] = &instance_col; vals1[n1].type = DB1_STR; vals1[n1].nul = 0; @@ -1150,6 +1157,29 @@ int db_update_ucontact_instance(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); n2++; + auser = *_c->aor; + if (use_domain) { + keys1[n1] = &domain_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + adomain.s = memchr(_c->aor->s, '@', _c->aor->len); + if (adomain.s==0) { + vals1[0].val.str_val.len = 0; + vals1[n1].val.str_val = *_c->aor; + auser.len = 0; + adomain = *_c->aor; + } else { + vals1[0].val.str_val.len = adomain.s - _c->aor->s; + vals1[n1].val.str_val.s = adomain.s + 1; + vals1[n1].val.str_val.len = _c->aor->s + _c->aor->len - adomain.s - 1; + auser.len = adomain.s - _c->aor->s; + adomain.s++; + adomain.len = _c->aor->s + + _c->aor->len - adomain.s; + } + n1++; + } + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; @@ -1171,18 +1201,7 @@ int db_update_ucontact_instance(ucontact_t* _c) } /* delete old db attrs and add the current list */ - auser = *_c->aor; - if (use_domain) { - adomain.s = memchr(_c->aor->s, '@', _c->aor->len); - if (adomain.s==0) { - auser.len = 0; - adomain = *_c->aor; - } else { - auser.len = adomain.s - _c->aor->s; - adomain.s++; - adomain.len = _c->aor->s + _c->aor->len - adomain.s; - } - + if (use_domain) { uldb_delete_attrs(_c->domain, &auser, &adomain, &_c->ruid); uldb_insert_attrs(_c->domain, &auser,

1 0

git:3.3: modules_k/usrloc: add missing callid field to the update query at db_update_ucontact_instance function
by Victor Seva 08 Jan '14

08 Jan '14

Module: sip-router Branch: 3.3 Commit: 1011b1a626bd69ecb0aa1a8804aa401d8c933bcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1011b1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed Jan 8 14:39:28 2014 +0100 modules_k/usrloc: add missing callid field to the update query at db_update_ucontact_instance function --- modules_k/usrloc/ucontact.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index c2462a7..ae0a08c 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -756,8 +756,8 @@ int db_update_ucontact_instance(ucontact_t* _c) db_key_t keys1[4]; db_val_t vals1[4]; - db_key_t keys2[13]; - db_val_t vals2[13]; + db_key_t keys2[14]; + db_val_t vals2[14]; int nr_cols2; @@ -784,8 +784,9 @@ int db_update_ucontact_instance(ucontact_t* _c) keys2[8] = &sock_col; keys2[9] = &methods_col; keys2[10] = &last_mod_col; - keys2[11] = &ruid_col; - keys2[12] = &contact_col; + keys2[11] = &callid_col; + keys2[12] = &ruid_col; + keys2[13] = &contact_col; vals1[0].type = DB1_STR; vals1[0].nul = 0; @@ -859,7 +860,11 @@ int db_update_ucontact_instance(ucontact_t* _c) vals2[10].nul = 0; vals2[10].val.time_val = _c->last_modified; - nr_cols2 = 11; + vals2[11].type = DB1_STR; + vals2[11].nul = 0; + vals2[11].val.str_val = _c->callid; + + nr_cols2 = 12; if(_c->ruid.len>0) { vals2[nr_cols2].type = DB1_STR;

1 0

git:4.1: usrloc: add user_col to the update contact query with instance
by Victor Seva 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.1 Commit: 2dd36bbae6f05ea0c980e58f247ac7e4f737f6a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2dd36bb… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Tue Jan 7 13:59:37 2014 +0100 usrloc: add user_col to the update contact query with instance (cherry picked from commit b393656c1113eb3630470389f142c53fbc085a90) --- modules/usrloc/ucontact.c | 48 ++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 4877c7f..b18ce98 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -1051,8 +1051,8 @@ int db_update_ucontact_instance(ucontact_t* _c) { str auser; str adomain; - db_key_t keys1[2]; - db_val_t vals1[2]; + db_key_t keys1[4]; + db_val_t vals1[4]; int n1; db_key_t keys2[13]; @@ -1070,6 +1070,13 @@ int db_update_ucontact_instance(ucontact_t* _c) } n1 = 0; + keys1[n1] = &user_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = *_c->aor; + LM_DBG("aor:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); + n1++; + keys1[n1] = &instance_col; vals1[n1].type = DB1_STR; vals1[n1].nul = 0; @@ -1181,6 +1188,29 @@ int db_update_ucontact_instance(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals2[n2].val.str_val.len, vals2[n2].val.str_val.s); n2++; + auser = *_c->aor; + if (use_domain) { + keys1[n1] = &domain_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + adomain.s = memchr(_c->aor->s, '@', _c->aor->len); + if (adomain.s==0) { + vals1[0].val.str_val.len = 0; + vals1[n1].val.str_val = *_c->aor; + auser.len = 0; + adomain = *_c->aor; + } else { + vals1[0].val.str_val.len = adomain.s - _c->aor->s; + vals1[n1].val.str_val.s = adomain.s + 1; + vals1[n1].val.str_val.len = _c->aor->s + _c->aor->len - adomain.s - 1; + auser.len = adomain.s - _c->aor->s; + adomain.s++; + adomain.len = _c->aor->s + + _c->aor->len - adomain.s; + } + n1++; + } + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { LM_ERR("sql use_table failed\n"); return -1; @@ -1204,19 +1234,7 @@ int db_update_ucontact_instance(ucontact_t* _c) /* delete old db attrs and add the current list */ if (ul_xavp_contact_name.s) { - auser = *_c->aor; - if (use_domain) { - adomain.s = memchr(_c->aor->s, '@', _c->aor->len); - if (adomain.s==0) { - auser.len = 0; - adomain = *_c->aor; - } else { - auser.len = adomain.s - _c->aor->s; - adomain.s++; - adomain.len = _c->aor->s + - _c->aor->len - adomain.s; - } - + if (use_domain) { uldb_delete_attrs(_c->domain, &auser, &adomain, &_c->ruid); uldb_insert_attrs(_c->domain, &auser,

2 2

git:4.1: lib/ims: Replaced custom getter for P-Asserted-Identity with the Parser from Core
by Hugh Waite 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.1 Commit: e53117a038961b912ebb95c8a07468f87c161db2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e53117a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Dec 11 13:47:57 2013 +0100 lib/ims: Replaced custom getter for P-Asserted-Identity with the Parser from Core (cherry picked from commit af1734cea213b2a07c9d725fff158cd4899725d1) --- lib/ims/ims_getters.c | 45 +++++++-------------------------------------- 1 files changed, 7 insertions(+), 38 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 8fce196..a41cd31 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -56,6 +56,7 @@ #include "../../parser/parse_from.h" #include "../../parser/parse_content.h" #include "ims_getters.h" +#include "../../parser/parse_ppi_pai.h" /** @@ -389,45 +390,13 @@ str s_asserted_identity={"P-Asserted-Identity",19}; */ str cscf_get_asserted_identity(struct sip_msg *msg) { - name_addr_t id; - struct hdr_field *h; - rr_t *r; - memset(&id,0,sizeof(name_addr_t)); - if (!msg) return id.uri; - if (parse_headers(msg, HDR_EOH_F, 0)<0) { - return id.uri; - } - h = msg->headers; - while(h) - { - if (h->name.len == s_asserted_identity.len && - strncasecmp(h->name.s,s_asserted_identity.s,s_asserted_identity.len)==0) - { - if (parse_rr(h)<0){ - //This might be an old client - LM_CRIT("WARN:cscf_get_asserted_identity: P-Asserted-Identity header must contain a Nameaddr!!! Fix the client!\n"); - id.name.s = h->body.s; - id.name.len = 0; - id.len = h->body.len; - id.uri = h->body; - while(id.uri.len && (id.uri.s[0]==' ' || id.uri.s[0]=='\t' || id.uri.s[0]=='<')){ - id.uri.s = id.uri.s+1; - id.uri.len --; - } - while(id.uri.len && (id.uri.s[id.uri.len-1]==' ' || id.uri.s[id.uri.len-1]=='\t' || id.uri.s[id.uri.len-1]=='>')){ - id.uri.len--; - } - return id.uri; - } - r = (rr_t*) h->parsed; - id = r->nameaddr; - free_rr(&r); - h->parsed=r; - return id.uri; - } - h = h->next; + str uri = {0,0}; + if (!msg) return uri; + if((parse_pai_header(msg) == 0) && (msg->pai) && (msg->pai->parsed)) { + to_body_t *pai = get_pai(msg)->id; + return pai->uri; } - return id.uri; + return uri; } static str phone_context_s={";phone-context=",15};

1 0

git:4.1: ims_registrar_pcscf: Bugfix: Properly handle the case, when we do not have a Asserted Identity
by Hugh Waite 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.1 Commit: 723bf45840b02e70bcb1c7f9c11a2e64e4f303db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=723bf45… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Dec 9 20:07:12 2013 +0100 ims_registrar_pcscf: Bugfix: Properly handle the case, when we do not have a Asserted Identity (cherry picked from commit 6b0bcff43c0b3c22f399211aeb7e9279f7c35814) --- modules/ims_registrar_pcscf/reg_mod.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/ims_registrar_pcscf/reg_mod.c b/modules/ims_registrar_pcscf/reg_mod.c index d844832..b2ffe8e 100644 --- a/modules/ims_registrar_pcscf/reg_mod.c +++ b/modules/ims_registrar_pcscf/reg_mod.c @@ -394,12 +394,13 @@ static int w_assert_identity(struct sip_msg* _m, char* _d, char* _preferred_uri) } /* - * Returns the current RTP-Statistics from the RTP-Proxy + * Get the asserted Identity for the current user */ static int pv_get_asserted_identity_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { - str * ret_val = get_asserted_identity(msg); - return pv_get_strval(msg, param, res, ret_val); + str * ret_val = get_asserted_identity(msg); + if (ret_val != NULL) return pv_get_strval(msg, param, res, ret_val); + else return -1; }

1 0

git:4.1: Improved Free at cscf_get_service_route(), caused a reproducable crash
by Hugh Waite 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.1 Commit: bf0a544d135b029ad381746b380bb6f71c52aee7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf0a544… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Mon Dec 9 23:00:08 2013 +0100 Improved Free at cscf_get_service_route(), caused a reproducable crash (cherry picked from commit caa9954d3c017ce741245d8f2b338158caf2270f) --- lib/ims/ims_getters.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ims/ims_getters.c b/lib/ims/ims_getters.c index 05450f1..8fce196 100644 --- a/lib/ims/ims_getters.c +++ b/lib/ims/ims_getters.c @@ -1361,14 +1361,16 @@ str* cscf_get_service_route(struct sip_msg *msg, int *size, int is_shm) { h = h->next; } if (is_shm) { - while (h) + h = msg->headers; + while (h) { if (h->name.len == 13 && strncasecmp(h->name.s, "Service-Route", 13) == 0) { h->parsed = 0; r = (rr_t*) h->parsed; free_rr(&r); } - h = h->next; + h = h->next; + } } return x;

1 0

git:4.1: ims_registrar_scscf: fix crash caused by an uninitialized AVP
by Hugh Waite 08 Jan '14

08 Jan '14

Module: sip-router Branch: 4.1 Commit: d6480f98aef45b8c569ef9edf90c6cf1604cc2f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6480f9… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Wed Dec 18 15:28:39 2013 -0300 ims_registrar_scscf: fix crash caused by an uninitialized AVP (cherry picked from commit 52d727dc249a88b31348b008045cc6071ab215a7) --- modules/ims_registrar_scscf/cxdx_sar.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index 7ff976b..122edc4 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -141,6 +141,13 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *saa, long elaps goto error_no_send; } + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); + set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); + set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); + get_act_time(); if (is_timeout) { @@ -253,12 +260,6 @@ done: if (data->sar_assignment_type != AVP_IMS_SAR_UNREGISTERED_USER) reg_send_reply_transactional(t->uas.request, data->contact_header, t); LM_DBG("DBG:SAR Async CDP callback: ... Done resuming transaction\n"); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to); - set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from); - set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to); create_return_code(result); @@ -278,6 +279,8 @@ done: error: if (data->sar_assignment_type != AVP_IMS_SAR_UNREGISTERED_USER) reg_send_reply_transactional(t->uas.request, data->contact_header, t); + + create_return_code(-2); error_no_send: //if we don't have the transaction then we can't send a transaction response update_stat(rejected_registrations, 1);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014