sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
246 discussions

git:master: dialog: increment cseq in early stage for PRACK and UPDATE
by Daniel-Constantin Mierla 01 Jul '13

01 Jul '13

Module: sip-router Branch: master Commit: 6cf3ab0ca6f38d1d2e60dbc644bb4d2fb563919a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6cf3ab0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 1 15:22:33 2013 +0200 dialog: increment cseq in early stage for PRACK and UPDATE - rework from a patch by Halina Nowak --- modules/dialog/dlg_handlers.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 338dc44..ec55a13 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1249,21 +1249,28 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) } if ( (event==DLG_EVENT_REQ || event==DLG_EVENT_REQACK) - && new_state==DLG_STATE_CONFIRMED) { + && (new_state==DLG_STATE_CONFIRMED || new_state==DLG_STATE_EARLY)) { timeout = get_dlg_timeout(req); if (timeout!=default_timeout) { dlg->lifetime = timeout; } - if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) { - LM_ERR("failed to update dialog lifetime\n"); + if (new_state!=DLG_STATE_EARLY) { + if (update_dlg_timer( &dlg->tl, dlg->lifetime )==-1) { + LM_ERR("failed to update dialog lifetime\n"); + } else { + dlg->dflags |= DLG_FLAG_CHANGED; + } } - if (update_cseqs(dlg, req, dir)!=0) { - LM_ERR("cseqs update failed\n"); - } else { - dlg->dflags |= DLG_FLAG_CHANGED; - if ( dlg_db_mode==DB_MODE_REALTIME ) - update_dialog_dbinfo(dlg); + if(event != DLG_EVENT_REQACK) { + if(update_cseqs(dlg, req, dir)!=0) { + LM_ERR("cseqs update failed\n"); + } else { + dlg->dflags |= DLG_FLAG_CHANGED; + } + } + if(dlg_db_mode==DB_MODE_REALTIME && (dlg->dflags&DLG_FLAG_CHANGED)) { + update_dialog_dbinfo(dlg); } if (old_state==DLG_STATE_CONFIRMED_NA) {

1 0

git:master: dialog: avoid realloc of memory for cseq when setting leg info
by Daniel-Constantin Mierla 01 Jul '13

01 Jul '13

Module: sip-router Branch: master Commit: 71d7dc6bc750406d510e0571e05da3966911cfea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71d7dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 1 14:51:03 2013 +0200 dialog: avoid realloc of memory for cseq when setting leg info - free already allocated structs when needed - has part of a patch by Halina Nowak --- modules/dialog/dlg_hash.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index c669290..bba619a 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -485,8 +485,19 @@ int dlg_set_leg_info(struct dlg_cell *dlg, str* tag, str *rr, str *contact, { char *p; + if(dlg->tag[leg].s) + shm_free(dlg->tag[leg].s); dlg->tag[leg].s = (char*)shm_malloc( tag->len + rr->len + contact->len ); - dlg->cseq[leg].s = (char*)shm_malloc( cseq->len ); + + if(dlg->cseq[leg].s) { + if (dlg->cseq[leg].len < cseq->len) { + shm_free(dlg->cseq[leg].s); + dlg->cseq[leg].s = (char*)shm_malloc(cseq->len); + } + } else { + dlg->cseq[leg].s = (char*)shm_malloc( cseq->len ); + } + if ( dlg->tag[leg].s==NULL || dlg->cseq[leg].s==NULL) { LM_ERR("no more shm mem\n"); if (dlg->tag[leg].s)

1 0

git:master: dialog: fixed callee cseq reference
by Daniel-Constantin Mierla 01 Jul '13

01 Jul '13

Module: sip-router Branch: master Commit: ed6dbb0ca11206049bee9ab515ce071eb70e7b63 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed6dbb0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 1 14:44:45 2013 +0200 dialog: fixed callee cseq reference - part of patch by Halina Nowak --- modules/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index f98f36b..338dc44 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -220,7 +220,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, cseq = (get_cseq(msg))->number; } else { /* use the same as in request */ - cseq = dlg->cseq[DLG_CALLER_LEG]; + cseq = dlg->cseq[DLG_CALLEE_LEG]; } /* extract the contact address */

1 0

git:master: core: Also consider PROTO_WS(S) in forward().
by Victor Seva 01 Jul '13

01 Jul '13

Module: sip-router Branch: master Commit: 1123ed46ee847be83f35aa485a1ef6712566bc09 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1123ed4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Jul 1 13:37:42 2013 +0200 core: Also consider PROTO_WS(S) in forward(). --- action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 406fe0d..d9a7f2c 100644 --- a/action.c +++ b/action.c @@ -423,9 +423,11 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) case PROTO_UDP: #ifdef USE_TCP case PROTO_TCP: + case PROTO_WS: #endif #ifdef USE_TLS case PROTO_TLS: + case PROTO_WSS: #endif #ifdef USE_SCTP case PROTO_SCTP:

1 0

git:master: dialog_ng: include dialog function dlg_get in dialog_ng
by Richard Good 01 Jul '13

01 Jul '13

Module: sip-router Branch: master Commit: 8f6dc39a0fcd9035a2bd5bff01e51fc3fc7671fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f6dc39… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Jul 1 11:47:50 2013 +0200 dialog_ng: include dialog function dlg_get in dialog_ng - In first iteration of dialog_ng module the dialog function dlg_get was not included - This function is now included; it searches and sets current dialog based on Call-ID, From-Tag and To-Tag --- modules/dialog_ng/dialog.c | 70 +++++++++++++++++++++++++++++ modules/dialog_ng/doc/dialog_ng_admin.xml | 46 ++++++++++++++++--- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 4042cbf..bcec0e5 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -69,6 +69,7 @@ pv_spec_t timeout_avp; static int fixup_profile(void** param, int param_no); static int fixup_get_profile2(void** param, int param_no); static int fixup_get_profile3(void** param, int param_no); +static int fixup_dlg_bridge(void** param, int param_no); static int fixup_dlg_terminate(void** param, int param_no); static int w_set_dlg_profile(struct sip_msg*, char*, char*); static int w_unset_dlg_profile(struct sip_msg*, char*, char*); @@ -79,6 +80,7 @@ static int w_dlg_isflagset(struct sip_msg *msg, char *flag, str *s2); static int w_dlg_resetflag(struct sip_msg *msg, char *flag, str *s2); static int w_dlg_setflag(struct sip_msg *msg, char *flag, char *s2); static int w_dlg_terminate(struct sip_msg*, char*, char*); +static int w_dlg_get(struct sip_msg*, char*, char*, char*); static int w_is_known_dlg(struct sip_msg *); static cmd_export_t cmds[] = { @@ -108,6 +110,7 @@ static cmd_export_t cmds[] = { 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE}, {"dlg_terminate", (cmd_function) w_dlg_terminate, 2, fixup_dlg_terminate, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE}, + {"dlg_get", (cmd_function)w_dlg_get, 3, fixup_dlg_bridge, 0, ANY_ROUTE }, {"is_known_dlg", (cmd_function) w_is_known_dlg, 0, NULL, 0, REQUEST_ROUTE | FAILURE_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE}, {"load_dlg", (cmd_function) load_dlg, 0, 0, 0, 0}, @@ -244,6 +247,73 @@ static int fixup_dlg_terminate(void** param, int param_no) { return 0; } +static int fixup_dlg_bridge(void** param, int param_no) +{ + if (param_no>=1 && param_no<=3) { + return fixup_spve_null(param, 1); + } else { + LM_ERR("called with parameter idx %d\n", param_no); + return E_BUG; + } + return 0; +} + +static int w_dlg_get(struct sip_msg *msg, char *ci, char *ft, char *tt) +{ + struct dlg_cell *dlg = NULL; + str sc = {0,0}; + str sf = {0,0}; + str st = {0,0}; + unsigned int dir = 0; + + if(ci==0 || ft==0 || tt==0) + { + LM_ERR("invalid parameters\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)ci, &sc)!=0) + { + LM_ERR("unable to get Call-ID\n"); + return -1; + } + if(sc.s==NULL || sc.len == 0) + { + LM_ERR("invalid Call-ID parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)ft, &sf)!=0) + { + LM_ERR("unable to get From tag\n"); + return -1; + } + if(sf.s==NULL || sf.len == 0) + { + LM_ERR("invalid From tag parameter\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)tt, &st)!=0) + { + LM_ERR("unable to get To Tag\n"); + return -1; + } + if(st.s==NULL || st.len == 0) + { + LM_ERR("invalid To tag parameter\n"); + return -1; + } + + dlg = get_dlg(&sc, &sf, &st, &dir); + if(dlg==NULL) + return -1; + + unref_dlg(dlg, 1); + set_current_dialog(msg, dlg); + _dlg_ctx.dlg = dlg; + _dlg_ctx.dir = dir; + return 1; +} + int load_dlg(struct dlg_binds *dlgb) { dlgb->register_dlgcb = register_dlgcb; diff --git a/modules/dialog_ng/doc/dialog_ng_admin.xml b/modules/dialog_ng/doc/dialog_ng_admin.xml index 2b9047e..c6353e2 100644 --- a/modules/dialog_ng/doc/dialog_ng_admin.xml +++ b/modules/dialog_ng/doc/dialog_ng_admin.xml @@ -839,14 +839,44 @@ dlg_terminate("all", "Insufficient QoS"); </section> <section> - <title> - <function moreinfo="none">dlg_get(callid, ftag, ttag)</function> - </title> - <para> - This function is currently not supported by the dialog_ng module. - To be incorporated in the future. - </para> - </section> + <title> + <function moreinfo="none">dlg_get(callid, ftag, ttag)</function> + </title> + <para> + Search and set current dialog based on Call-ID, From-Tag and To-Tag + parameters. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>callid</emphasis> - SIP call-id. + </para> + </listitem> + <listitem> + <para><emphasis>ftag</emphasis> - SIP From tag. + </para> + </listitem> + <listitem> + <para><emphasis>ttag</emphasis> - SIP To tag. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from BRANCH_ROUTE, + REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE. + </para> + <example> + <title><function>dlg_get</function> usage</title> + <programlisting format="linespecific"> +... +if(dlg_get("abcdef", "123", "456")) +{ + dlg_bye("all"); +} +... +</programlisting> + </example> + </section> <section> <title>

1 0

git:richard.good/diameter_rx_media: modules/ims_qos: execute route block on async reply to AAR
by Richard Good 01 Jul '13

01 Jul '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 927925bf2f388d9b83810875f818ab0519b50d9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=927925b… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jun 25 15:48:12 2013 +0200 modules/ims_qos: execute route block on async reply to AAR - Changed this to make the use of async CDP cleaner - Fixes inconsistencies we are experiencing with async TM and not using route blocks - Note this fix is for AAR replies called from Rx_AAR() and Rx_AAR_register() --- modules/ims_qos/doc/ims_qos_admin.xml | 44 +++++++----- modules/ims_qos/mod.c | 125 +++++++++++++++++++++++---------- modules/ims_qos/rx_aar.h | 11 --- 3 files changed, 115 insertions(+), 65 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=927…

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 July 2013