sr-dev December 2015

sr-dev@lists.kamailio.org

30 participants
230 discussions

git:master:27026291: uac: increase the buffer for within dialog rr param
by Daniel-Constantin Mierla 03 Dec '15

03 Dec '15

Module: kamailio Branch: master Commit: 2702629194351069827564243e1cff7e4b0513d9 URL: https://github.com/kamailio/kamailio/commit/2702629194351069827564243e1cff7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-03T09:20:24+01:00 uac: increase the buffer for within dialog rr param - following the previous commit --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/2702629194351069827564243e1cff7… Patch: https://github.com/kamailio/kamailio/commit/2702629194351069827564243e1cff7… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 6d1d1f7..f0bd471 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -541,7 +541,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check goto failed; } - add_to_rr.s = pkg_malloc(2+rr_param->len+param_val.len); + add_to_rr.s = pkg_malloc(3+rr_param->len+param_val.len); if ( add_to_rr.s==0 ) { add_to_rr.len = 0; LM_ERR("no more pkg mem\n"); @@ -550,7 +550,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check add_to_rr.len = sprintf(add_to_rr.s, ";%.*s=%.*s", rr_param->len,rr_param->s,param_val.len,param_val.s); if ( uac_rrb.add_rr_param(msg, &add_to_rr)!=0 ) { - LM_ERR("add_RR_param failed\n"); + LM_ERR("add rr param failed\n"); goto failed; } pkg_free(add_to_rr.s);

1 0

git:master:18644f93: modules/dialog: Error in last commit. goto invalid destination
by Kristian HÃ¸gh 03 Dec '15

03 Dec '15

Module: kamailio Branch: master Commit: 18644f93e100a2e4ec545ad5e42aa84d90283f75 URL: https://github.com/kamailio/kamailio/commit/18644f93e100a2e4ec545ad5e42aa84… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Committer: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2015-12-01T16:44:22+01:00 modules/dialog: Error in last commit. goto invalid destination --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/18644f93e100a2e4ec545ad5e42aa84… Patch: https://github.com/kamailio/kamailio/commit/18644f93e100a2e4ec545ad5e42aa84… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index b14fcfd..0cd97ec 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1400,7 +1400,7 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) run_dlg_callbacks( DLGCB_REQ_WITHIN, dlg, req, NULL, dir, 0); if (add_dlg_rr_param( req, dlg->h_entry, dlg->h_id)<0 ) { LM_ERR("failed to add RR param\n"); - goto error; + goto done; } if ( (event!=DLG_EVENT_REQACK) &&

1 0

git:master:3bcdf3ae: Merge pull request #425 from khoegh/master
by Daniel-Constantin Mierla 03 Dec '15

03 Dec '15

Module: kamailio Branch: master Commit: 3bcdf3aec099fd88ec43fd11af3254cf4431e070 URL: https://github.com/kamailio/kamailio/commit/3bcdf3aec099fd88ec43fd11af3254c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-03T09:16:08+01:00 Merge pull request #425 from khoegh/master Add RR parameter on sequential requests --- Modified: modules/dialog/dlg_handlers.c Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/3bcdf3aec099fd88ec43fd11af3254c… Patch: https://github.com/kamailio/kamailio/commit/3bcdf3aec099fd88ec43fd11af3254c… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 617502e..0cd97ec 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1398,6 +1398,10 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) /* within dialog request */ run_dlg_callbacks( DLGCB_REQ_WITHIN, dlg, req, NULL, dir, 0); + if (add_dlg_rr_param( req, dlg->h_entry, dlg->h_id)<0 ) { + LM_ERR("failed to add RR param\n"); + goto done; + } if ( (event!=DLG_EVENT_REQACK) && (dlg->cbs.types)&DLGCB_RESPONSE_WITHIN ) { diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 354b2f9..6d1d1f7 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -512,6 +512,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check { struct lump* l; str param_val; + str add_to_rr = {0, 0}; struct to_body* old_body; str old_uri; str new_uri; @@ -540,6 +541,20 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check goto failed; } + add_to_rr.s = pkg_malloc(2+rr_param->len+param_val.len); + if ( add_to_rr.s==0 ) { + add_to_rr.len = 0; + LM_ERR("no more pkg mem\n"); + goto failed; + } + add_to_rr.len = sprintf(add_to_rr.s, ";%.*s=%.*s", rr_param->len,rr_param->s,param_val.len,param_val.s); + + if ( uac_rrb.add_rr_param(msg, &add_to_rr)!=0 ) { + LM_ERR("add_RR_param failed\n"); + goto failed; + } + pkg_free(add_to_rr.s); + /* dencrypt parameter ;) */ if (uac_passwd.len) for( i=0 ; i<new_uri.len ; i++) @@ -635,6 +650,8 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check failed1: pkg_free(new_uri.s); failed: + if(add_to_rr.s) + pkg_free(add_to_rr.s); return -1; }

1 0

git:master:f6a5a285: modules/uac: Add RR parameter on sequential requests when using uac_replace_from/to
by Kristian HÃ¸gh 03 Dec '15

03 Dec '15

Module: kamailio Branch: master Commit: f6a5a28532ff410d03d10e86d43d38a785d0fab2 URL: https://github.com/kamailio/kamailio/commit/f6a5a28532ff410d03d10e86d43d38a… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Committer: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2015-12-01T15:24:16+01:00 modules/uac: Add RR parameter on sequential requests when using uac_replace_from/to --- Modified: modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/f6a5a28532ff410d03d10e86d43d38a… Patch: https://github.com/kamailio/kamailio/commit/f6a5a28532ff410d03d10e86d43d38a… --- diff --git a/modules/uac/replace.c b/modules/uac/replace.c index 354b2f9..6d1d1f7 100644 --- a/modules/uac/replace.c +++ b/modules/uac/replace.c @@ -512,6 +512,7 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check { struct lump* l; str param_val; + str add_to_rr = {0, 0}; struct to_body* old_body; str old_uri; str new_uri; @@ -540,6 +541,20 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check goto failed; } + add_to_rr.s = pkg_malloc(2+rr_param->len+param_val.len); + if ( add_to_rr.s==0 ) { + add_to_rr.len = 0; + LM_ERR("no more pkg mem\n"); + goto failed; + } + add_to_rr.len = sprintf(add_to_rr.s, ";%.*s=%.*s", rr_param->len,rr_param->s,param_val.len,param_val.s); + + if ( uac_rrb.add_rr_param(msg, &add_to_rr)!=0 ) { + LM_ERR("add_RR_param failed\n"); + goto failed; + } + pkg_free(add_to_rr.s); + /* dencrypt parameter ;) */ if (uac_passwd.len) for( i=0 ; i<new_uri.len ; i++) @@ -635,6 +650,8 @@ int restore_uri( struct sip_msg *msg, str *rr_param, str* restore_avp, int check failed1: pkg_free(new_uri.s); failed: + if(add_to_rr.s) + pkg_free(add_to_rr.s); return -1; }

1 0

git:master:de4ad807: modules/dialog: Add RR parameter on sequential requests
by Kristian HÃ¸gh 03 Dec '15

03 Dec '15

Module: kamailio Branch: master Commit: de4ad807334c2b74cafec733a0029e3e2ef4996c URL: https://github.com/kamailio/kamailio/commit/de4ad807334c2b74cafec733a0029e3… Author: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Committer: Kristian HÃ¸gh <kfh(a)uni-tel.dk> Date: 2015-12-01T15:22:54+01:00 modules/dialog: Add RR parameter on sequential requests --- Modified: modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/de4ad807334c2b74cafec733a0029e3… Patch: https://github.com/kamailio/kamailio/commit/de4ad807334c2b74cafec733a0029e3… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 617502e..b14fcfd 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -1398,6 +1398,10 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) /* within dialog request */ run_dlg_callbacks( DLGCB_REQ_WITHIN, dlg, req, NULL, dir, 0); + if (add_dlg_rr_param( req, dlg->h_entry, dlg->h_id)<0 ) { + LM_ERR("failed to add RR param\n"); + goto error; + } if ( (event!=DLG_EVENT_REQACK) && (dlg->cbs.types)&DLGCB_RESPONSE_WITHIN ) {

1 0

[kamailio] Add RR parameter on sequential requests (#425)
by khoegh 03 Dec '15

03 Dec '15

The 2 commits restores vsf=, vst= and did= RR parameters on in-dialog requests You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/425 -- Commit Summary -- * modules/dialog: Add RR parameter on sequential requests * modules/uac: Add RR parameter on sequential requests when using uac_replace_from/to -- File Changes -- M modules/dialog/dlg_handlers.c (4) M modules/uac/replace.c (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/425.patch https://github.com/kamailio/kamailio/pull/425.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/425

2 2

[kamailio] Kamailio : warning message - WARNING: pike [pike_funcs.c:274]: refresh_node(): PIKE - UNBLOCKing node 0x7ff1a89c30b0 (#426)
by BY-SYSTEMS SPRL 03 Dec '15

03 Dec '15

Dear, This morning I got some errors and warnings with the Kamailio. /usr/sbin/kamailio[3037]: WARNING: pike [pike_funcs.c:274]: refresh_node(): PIKE - UNBLOCKing node 0x7ff1a89c30b0 Is someone can decript for me which is this warning? Best Regards, Youssef --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/426

2 2

[kamailio] Kamailio - error message - ERROR: <script>: NATMANAGE coie (#427)
by BY-SYSTEMS SPRL 03 Dec '15

03 Dec '15

Dear, This morning I got some errors and warnings with the Kamailio. /usr/sbin/kamailio[3024]: ERROR: <script>: NATMANAGE M=INVITE OU=<null> RURI=<null> RD=<null> F=sip:sme01@91.151.60.81 T=sip:codec5@91.151.60.81 NH=<null> IP=10.80.89.5 ID=ydEOk0BD1449045968(a)192.168.1.116 /usr/sbin/kamailio[3024]: ERROR: <script>: NATMANAGE coie Is someone can decript for me which is this warning? Best Regards, Youssef --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/427

2 2

git:master:3272ff6a: dispatcher: extended log message when hash size parameter is not set
by Daniel-Constantin Mierla 02 Dec '15

02 Dec '15

Module: kamailio Branch: master Commit: 3272ff6a427ce5bb60d767ed61c8cadd13759de1 URL: https://github.com/kamailio/kamailio/commit/3272ff6a427ce5bb60d767ed61c8cad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-12-02T23:11:25+01:00 dispatcher: extended log message when hash size parameter is not set --- Modified: modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/3272ff6a427ce5bb60d767ed61c8cad… Patch: https://github.com/kamailio/kamailio/commit/3272ff6a427ce5bb60d767ed61c8cad… --- diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c index f6a6cc3..376e768 100644 --- a/modules/dispatcher/dispatcher.c +++ b/modules/dispatcher/dispatcher.c @@ -514,7 +514,7 @@ static int mod_init(void) register_timer(ds_ht_timer, NULL, ds_hash_check_interval); } else { LM_ERR("call load dispatching DSTID_AVP set but no size" - " for hash table\n"); + " for hash table (see ds_hash_size parameter)\n"); return -1; } }

1 0

git:master:3a345d8f: modules/ims_charging: unref dlg after ref-counting lookup
by jaybeepee 02 Dec '15

02 Dec '15

Module: kamailio Branch: master Commit: 3a345d8f3b0612c9bee4b29396f17a36472f215f URL: https://github.com/kamailio/kamailio/commit/3a345d8f3b0612c9bee4b29396f17a3… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-12-02T15:17:05+02:00 modules/ims_charging: unref dlg after ref-counting lookup --- Modified: modules/ims_charging/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3a345d8f3b0612c9bee4b29396f17a3… Patch: https://github.com/kamailio/kamailio/commit/3a345d8f3b0612c9bee4b29396f17a3… --- diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index 9dae820..e769a52 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -345,11 +345,13 @@ static int w_ro_set_session_id_avp(struct sip_msg *msg, char *str1, char *str2) ro_session= lookup_ro_session(dlg->h_entry, &dlg->callid, 0, 0); if(!ro_session) { LM_ERR("Unable to find Ro charging data\n"); + dlgb.release_dlg(dlg); return RO_RETURN_ERROR; } //set avp response with session id res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); + dlgb.release_dlg(dlg); return res; }

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 December 2015