sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
235 discussions

git:richard.good/diameter_rx_media: Merge branch 'master' into richard.good /diameter_rx_media

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: b1260bbb3a5c67c628234df19d8aec29dfb01a41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b1260bb… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jun 20 11:22:49 2013 +0200 Merge branch 'master' into richard.good/diameter_rx_media ---

11 years, 5 months

git:richard.good/diameter_rx_media: modules/ims_qos: fix memory free warning

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 7ca25d38d0c3605d371b4a53f4fe808fce67c5ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ca25d3… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Jun 20 10:31:30 2013 +0200 modules/ims_qos: fix memory free warning - in rx_aar.c: free_saved_transaction_global_data() check lock exists before deallocating --- modules/ims_qos/rx_aar.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index ad8db69..b9e8e21 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -95,13 +95,13 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps LM_DBG("Received AAR callback\n"); saved_transaction_t* data = (saved_transaction_t*) param; - + LM_DBG("received AAA answer"); if (tmb.t_lookup_ident(&t, data->tindex, data->tlabel) < 0) { LM_ERR("t_continue: transaction not found\n"); goto error; - }else{ + } else { LM_DBG("t_continue: transaction found\n"); } //we have T, lets restore our state (esp. for AVPs) @@ -261,7 +261,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e ul.unlock_udomain(domain_t, &local_data->contact); goto error; } - memset(&ci, 0, sizeof(struct pcontact_info)); + memset(&ci, 0, sizeof (struct pcontact_info)); ci.reg_state = PCONTACT_REG_PENDING_AAR; ci.num_service_routes = 0; ci.num_public_ids = 0; @@ -696,9 +696,10 @@ void free_saved_transaction_global_data(saved_transaction_t* data) { shm_free(data->ttag.s); data->ttag.len = 0; } - - lock_dealloc(data->lock); - lock_destroy(data->lock); + if (data->lock) { + lock_dealloc(data->lock); + lock_destroy(data->lock); + } shm_free(data); }

11 years, 5 months

Re: [sr-dev] Dialog onroute requests.

by Øyvind Kolbu

On 19.06.2013 17:35, Eduardo Lejarreta wrote: > Good evening Øyvind. > > Nice workaround. We'll implement until dialog modules are improved. > > Need help to kamctl ("hot") restart? Depending on which modules you develop > I could give you some ideas. > > Thank you very much and best regards. Hi, we are not developing any modules, but thanks for the offer. -- Øyvind

11 years, 5 months

[tracker] Task closed: modules/dialplan: use pv_cache_get

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#317 - modules/dialplan: use pv_cache_get User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=317 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 5 months

[tracker] Task closed: modules/dialplan: allow xavp vars as parameters

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#318 - modules/dialplan: allow xavp vars as parameters User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=318 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 5 months

[tracker] User took ownership: modules/dialplan: allow xavp vars as parameters

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#318 - modules/dialplan: allow xavp vars as parameters More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=318 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 5 months

git:master: modules/dialplan: allow xavp vars as parameters.

by Victor Seva

Module: sip-router Branch: master Commit: 8f261c5baeb01d5bee0437249b7f6d3d81bee209 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f261c5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Jun 20 08:34:05 2013 +0200 modules/dialplan: allow xavp vars as parameters. --- modules/dialplan/dialplan.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index aff0dec..fa72033 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -164,7 +164,9 @@ static int mod_init(void) attr_pvar_s.len = strlen(attr_pvar_s.s); attr_pvar = pv_cache_get(&attr_pvar_s); if( (attr_pvar==NULL) || - ((attr_pvar->type != PVT_AVP) && (attr_pvar->type!=PVT_SCRIPTVAR))) { + ((attr_pvar->type != PVT_AVP) && + (attr_pvar->type != PVT_XAVP) && + (attr_pvar->type!=PVT_SCRIPTVAR))) { LM_ERR("invalid pvar name\n"); return -1; } @@ -244,7 +246,7 @@ static int dp_get_ivalue(struct sip_msg* msg, dp_param_p dp, int *val) if( pv_get_spec_value( msg, dp->v.sp[0], &value)!=0 || value.flags&(PV_VAL_NULL|PV_VAL_EMPTY) || !(value.flags&PV_VAL_INT)) { - LM_ERR("no AVP or SCRIPTVAR found (error in scripts)\n"); + LM_ERR("no AVP, XAVP or SCRIPTVAR found (error in scripts)\n"); return -1; } *val = value.ri; @@ -260,7 +262,7 @@ static int dp_get_svalue(struct sip_msg * msg, pv_spec_t *spec, str* val) if ( pv_get_spec_value(msg,spec,&value)!=0 || value.flags&PV_VAL_NULL || value.flags&PV_VAL_EMPTY || !(value.flags&PV_VAL_STR)){ - LM_ERR("no AVP or SCRIPTVAR found (error in scripts)\n"); + LM_ERR("no AVP, XAVP or SCRIPTVAR found (error in scripts)\n"); return -1; } @@ -369,20 +371,22 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) #define verify_par_type(_par_no, _spec)\ do{\ if( ((_par_no == 1) \ - && (_spec->type != PVT_AVP) && (_spec->type!=PVT_SCRIPTVAR) )\ + && (_spec->type != PVT_AVP) && (_spec->type != PVT_XAVP) && \ + (_spec->type!=PVT_SCRIPTVAR) )\ ||((_par_no == 2) \ - && (_spec->type != PVT_AVP) && (_spec->type!=PVT_SCRIPTVAR) \ + && (_spec->type != PVT_AVP) && (_spec->type != PVT_XAVP) && \ + (_spec->type!=PVT_SCRIPTVAR) \ && (_spec->type!=PVT_RURI) && (_spec->type!=PVT_RURI_USERNAME))){\ \ - LM_ERR("Unsupported Parameter TYPE\n");\ + LM_ERR("Unsupported Parameter TYPE[%d]\n", _spec->type);\ return E_UNSPEC;\ }\ }while(0); -/* first param: DPID: type: INT, AVP, SVAR +/* first param: DPID: type: INT, AVP, XAVP, SVAR * second param: SRC type: any psedo variable type - * second param: DST type: RURI, RURI_USERNAME, AVP, SVAR, N/A + * second param: DST type: RURI, RURI_USERNAME, AVP, XAVP, SVAR, N/A * default value for the second param: $ru.user/$ru.user */ static int dp_trans_fixup(void ** param, int param_no){ @@ -392,7 +396,7 @@ static int dp_trans_fixup(void ** param, int param_no){ char *p, *s=NULL; str lstr; - if(param_no!=1 && param_no!=2) + if(param_no!=1 && param_no!=2) return 0; p = (char*)*param;

11 years, 5 months

git:master: modules/dialplan: use pv_cache_get function instead of create pv_spec_t

by Victor Seva

Module: sip-router Branch: master Commit: 6b27e0d5519f8e29bc31c553a67367975acfe7ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b27e0d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Thu Jun 20 08:32:47 2013 +0200 modules/dialplan: use pv_cache_get function instead of create pv_spec_t --- modules/dialplan/dialplan.c | 45 +++++++++++++++++++++---------------------- modules/dialplan/dialplan.h | 2 +- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c index 8a3a136..aff0dec 100644 --- a/modules/dialplan/dialplan.c +++ b/modules/dialplan/dialplan.c @@ -160,14 +160,10 @@ static int mod_init(void) attrs_column.len = strlen(attrs_column.s); if(attr_pvar_s.s) { - attr_pvar = (pv_spec_t *)shm_malloc(sizeof(pv_spec_t)); - if(!attr_pvar){ - LM_ERR("out of shm memory\n"); - return -1; - } attr_pvar_s.len = strlen(attr_pvar_s.s); - if( (pv_parse_spec(&attr_pvar_s, attr_pvar)==NULL) || + attr_pvar = pv_cache_get(&attr_pvar_s); + if( (attr_pvar==NULL) || ((attr_pvar->type != PVT_AVP) && (attr_pvar->type!=PVT_SCRIPTVAR))) { LM_ERR("invalid pvar name\n"); return -1; @@ -182,13 +178,15 @@ static int mod_init(void) memset(default_par2, 0, sizeof(dp_param_t)); default_param_s.len = strlen(default_param_s.s); - if (pv_parse_spec( &default_param_s, &default_par2->v.sp[0])==NULL) { + default_par2->v.sp[0] = pv_cache_get(&default_param_s); + if (default_par2->v.sp[0]==NULL) { LM_ERR("input pv is invalid\n"); return -1; } default_param_s.len = strlen(default_param_s.s); - if (pv_parse_spec( &default_param_s, &default_par2->v.sp[1])==NULL) { + default_par2->v.sp[1] = pv_cache_get(&default_param_s); + if (default_par2->v.sp[1]==NULL) { LM_ERR("output pv is invalid\n"); return -1; } @@ -242,9 +240,9 @@ static int dp_get_ivalue(struct sip_msg* msg, dp_param_p dp, int *val) return 0; } - LM_DBG("searching %d\n",dp->v.sp[0].type); + LM_DBG("searching %d\n",dp->v.sp[0]->type); - if( pv_get_spec_value( msg, &dp->v.sp[0], &value)!=0 + if( pv_get_spec_value( msg, dp->v.sp[0], &value)!=0 || value.flags&(PV_VAL_NULL|PV_VAL_EMPTY) || !(value.flags&PV_VAL_INT)) { LM_ERR("no AVP or SCRIPTVAR found (error in scripts)\n"); return -1; @@ -254,13 +252,13 @@ static int dp_get_ivalue(struct sip_msg* msg, dp_param_p dp, int *val) } -static int dp_get_svalue(struct sip_msg * msg, pv_spec_t spec, str* val) +static int dp_get_svalue(struct sip_msg * msg, pv_spec_t *spec, str* val) { pv_value_t value; - LM_DBG("searching %d \n", spec.type); + LM_DBG("searching %d \n", spec->type); - if ( pv_get_spec_value(msg,&spec,&value)!=0 || value.flags&PV_VAL_NULL + if ( pv_get_spec_value(msg,spec,&value)!=0 || value.flags&PV_VAL_NULL || value.flags&PV_VAL_EMPTY || !(value.flags&PV_VAL_STR)){ LM_ERR("no AVP or SCRIPTVAR found (error in scripts)\n"); return -1; @@ -280,7 +278,7 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest, memset(&val, 0, sizeof(pv_value_t)); val.flags = PV_VAL_STR; - no_change = (dest->type == PVT_NONE) || (!repl->s) || (!repl->len); + no_change = (dest==NULL) || (dest->type == PVT_NONE) || (!repl->s) || (!repl->len); if (no_change) goto set_attr_pvar; @@ -358,7 +356,7 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) input.len, input.s, idp->dp_id, output.len, output.s); /*set the output*/ - if (dp_update(msg, &repl_par->v.sp[0], &repl_par->v.sp[1], + if (dp_update(msg, repl_par->v.sp[0], repl_par->v.sp[1], &output, attrs_par) !=0){ LM_ERR("cannot set the output\n"); return -1; @@ -371,10 +369,10 @@ static int dp_translate_f(struct sip_msg* msg, char* str1, char* str2) #define verify_par_type(_par_no, _spec)\ do{\ if( ((_par_no == 1) \ - && ((_spec).type != PVT_AVP) && ((_spec).type!=PVT_SCRIPTVAR) )\ + && (_spec->type != PVT_AVP) && (_spec->type!=PVT_SCRIPTVAR) )\ ||((_par_no == 2) \ - && ((_spec).type != PVT_AVP) && ((_spec).type!=PVT_SCRIPTVAR) \ - && ((_spec).type!=PVT_RURI) && (_spec.type!=PVT_RURI_USERNAME))){\ + && (_spec->type != PVT_AVP) && (_spec->type!=PVT_SCRIPTVAR) \ + && (_spec->type!=PVT_RURI) && (_spec->type!=PVT_RURI_USERNAME))){\ \ LM_ERR("Unsupported Parameter TYPE\n");\ return E_UNSPEC;\ @@ -426,7 +424,8 @@ static int dp_trans_fixup(void ** param, int param_no){ dp_par->v.id = dpid; }else{ lstr.s = p; lstr.len = strlen(p); - if (pv_parse_spec( &lstr, &dp_par->v.sp[0])==NULL) + dp_par->v.sp[0] = pv_cache_get(&lstr); + if (dp_par->v.sp[0]==NULL) goto error; verify_par_type(param_no, dp_par->v.sp[0]); @@ -442,16 +441,16 @@ static int dp_trans_fixup(void ** param, int param_no){ } lstr.s = p; lstr.len = strlen(p); - if(pv_parse_spec( &lstr, &dp_par->v.sp[0])==NULL) + dp_par->v.sp[0] = pv_cache_get(&lstr); + if(dp_par->v.sp[0]==NULL) goto error; if (s != 0) { lstr.s = s; lstr.len = strlen(s); - if (pv_parse_spec( &lstr, &dp_par->v.sp[1] )==NULL) + dp_par->v.sp[1] = pv_cache_get(&lstr); + if (dp_par->v.sp[1]==NULL) goto error; verify_par_type(param_no, dp_par->v.sp[1]); - } else { - dp_par->v.sp[1].type = PVT_NONE; } dp_par->type = DP_VAL_SPEC; diff --git a/modules/dialplan/dialplan.h b/modules/dialplan/dialplan.h index b3396a0..fd3319e 100644 --- a/modules/dialplan/dialplan.h +++ b/modules/dialplan/dialplan.h @@ -83,7 +83,7 @@ typedef struct dp_param{ int type; union { int id; - pv_spec_t sp[2]; + pv_spec_t* sp[2]; } v; }dp_param_t, *dp_param_p;

11 years, 5 months

[tracker] User took ownership: modules/dialplan: use pv_cache_get

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#317 - modules/dialplan: use pv_cache_get More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=317 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 5 months

[tracker] Comment added: modules/dialplan: allow xavp vars as parameters

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#318 - modules/dialplan: allow xavp vars as parameters User who did this - Daniel-Constantin Mierla (miconda) ---------- ok ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=318#comment972 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013