sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:tmp/ims_charging: ims_charging: Fixed minor typos in ims_charging-documentation
by Carsten Bock 30 Sep '13

30 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: ad7fb226901ca6ebc6119df0994054ba51100951 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ad7fb22… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:16:20 2013 +0200 ims_charging: Fixed minor typos in ims_charging-documentation --- modules/ims_charging/doc/ims_charging_admin.xml | 883 +++++++++++------------ 1 files changed, 421 insertions(+), 462 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ad7…

1 0

git:tmp/ims_charging: ims_charging: Documentation updates.
by Carsten Bock 30 Sep '13

30 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: b9c8f31cfba447326869c32c87cb728c04ec0e28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b9c8f31… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 12:58:56 2013 +0200 ims_charging: Documentation updates. --- modules/ims_charging/doc/images/charging1.png | Bin 0 -> 8503 bytes modules/ims_charging/doc/images/charging2.png | Bin 0 -> 80472 bytes modules/ims_charging/doc/ims_charging_admin.xml | 542 ++++++++++++++++++++++- 3 files changed, 522 insertions(+), 20 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b9c…

1 0

git:tmp/ims_charging: ims_charging: updated documentation
by Carlos Ruiz Diaz 30 Sep '13

30 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: 792fc3cbc1a1181a482659ea5743681f1a52b911 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=792fc3c… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Mon Sep 30 15:57:23 2013 -0400 ims_charging: updated documentation --- modules/ims_charging/README | 466 ++++++++++++----------- modules/ims_charging/doc/ims_charging_admin.xml | 62 +++- modules/ims_charging/mod.c | 2 +- 3 files changed, 309 insertions(+), 221 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=792…

1 0

git:tmp/ims_charging: ims_charging: added some stats
by Carlos Ruiz Diaz 30 Sep '13

30 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: ef073a82f81af6e51dff19dcadfe4a8cb760c07d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef073a8… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Mon Sep 30 14:40:54 2013 -0400 ims_charging: added some stats - billed_secs - ccr_avg_response_time - ccr_responses_time - failed_final_ccrs - failed_initial_ccrs - failed_interim_ccr - final_ccrs - initial_ccrs - interim_ccrs - killed_calls - successful_final_ccrs - successful_initial_ccrs - successful_interim_ccr --- modules/ims_charging/dialog.c | 4 +- modules/ims_charging/ims_ro.c | 40 ++++++++++++++-------------- modules/ims_charging/mod.c | 56 +++++++++++++++++++++++++++++++------- modules/ims_charging/ro_timer.c | 5 +++ modules/ims_charging/stats.c | 45 +++++++++++++++++++++++++++++++ modules/ims_charging/stats.h | 28 +++++++++++++++++++ 6 files changed, 145 insertions(+), 33 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ef0…

1 0

git:master: app_perl: use local buffer to print dynamic string in pv_sprintf()
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 1c3e761fbd087ee578ce305d89f6b8ee4e9ab79d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c3e761… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 16:49:26 2013 +0200 app_perl: use local buffer to print dynamic string in pv_sprintf() - avoid pkg malloc for temporary need - fix leak in case of fmt parse error, discovered on a report by Dragos Oancea --- modules/app_perl/kamailioxs.xs | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/modules/app_perl/kamailioxs.xs b/modules/app_perl/kamailioxs.xs index 4947ab6..823c4fc 100644 --- a/modules/app_perl/kamailioxs.xs +++ b/modules/app_perl/kamailioxs.xs @@ -362,15 +362,11 @@ static inline int rewrite_ruri(struct sip_msg* _m, char* _s) */ char *pv_sprintf(struct sip_msg *m, char *fmt) { int buf_size = 4096; + char out[4096]; pv_elem_t *model; str s; - char *out = (char *)pkg_malloc(buf_size); char *ret = NULL; - if (!out) { - LM_ERR("pv_sprintf: Memory exhausted!\n"); - return NULL; - } s.s = fmt; s.len = strlen(s.s); if(pv_parse_format(&s, &model) < 0) { @@ -386,7 +382,6 @@ char *pv_sprintf(struct sip_msg *m, char *fmt) { } pv_elem_free_all(model); - pkg_free(out); return ret; }

1 0

git:master: registrar: simplified getting value for max_contacts xavp
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 0696e668d75be14922980dbc9f67aa91eaf688fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0696e66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 15:54:44 2013 +0200 registrar: simplified getting value for max_contacts xavp --- modules/registrar/save.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index de6610e..cbc28c4 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -417,7 +417,6 @@ error: int reg_get_crt_max_contacts(void) { int n; - sr_xavp_t *ravp=NULL; sr_xavp_t *vavp=NULL; str vname = {"max_contacts", 12}; @@ -425,23 +424,15 @@ int reg_get_crt_max_contacts(void) if(reg_xavp_cfg.s!=NULL) { - ravp = xavp_get(&reg_xavp_cfg, NULL); - if(ravp!=NULL && ravp->val.type==SR_XTYPE_XAVP) + vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &vname); + if(vavp!=NULL) { - vavp = xavp_get(&vname, ravp->val.v.xavp); - if(vavp!=NULL && vavp->val.type==SR_XTYPE_INT) - { - n = vavp->val.v.i; - LM_ERR("using max contacts value from xavp: %d\n", n); - } else { - ravp = NULL; - } - } else { - ravp = NULL; + n = vavp->val.v.i; + LM_DBG("using max contacts value from xavp: %d\n", n); } } - if(ravp==NULL) + if(vavp==NULL) { n = cfg_get(registrar, registrar_cfg, max_contacts); }

1 0

git:master: registrar: option to take the socket from an xavp
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 308f2920df586065e0bf8ef02d7c77b1c94a4836 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=308f292… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 15:49:10 2013 +0200 registrar: option to take the socket from an xavp - child named "socket" of xavp named by xavp_cfg parameter --- modules/registrar/save.c | 55 +++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index fc4a60a..de6610e 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -134,37 +134,50 @@ static inline int star(sip_msg_t *_m, udomain_t* _d, str* _a, str *_h) /*! \brief */ -static struct socket_info *get_sock_hdr(struct sip_msg *msg) +static struct socket_info *get_sock_val(struct sip_msg *msg) { struct socket_info *sock; struct hdr_field *hf; + str xsockname = str_init("socket"); + sr_xavp_t *vavp = NULL; str socks; str hosts; int port; int proto; char c; - if (parse_headers( msg, HDR_EOH_F, 0) == -1) { - LM_ERR("failed to parse message\n"); - return 0; - } + if(sock_hdr_name.len>0) { + if (parse_headers( msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse message\n"); + return 0; + } - for (hf=msg->headers; hf; hf=hf->next) { - if (cmp_hdrname_str(&hf->name, &sock_hdr_name)==0) - break; - } + for (hf=msg->headers; hf; hf=hf->next) { + if (cmp_hdrname_str(&hf->name, &sock_hdr_name)==0) + break; + } - /* hdr found? */ - if (hf==0) - return 0; + /* hdr found? */ + if (hf==0) + return 0; - trim_len( socks.len, socks.s, hf->body ); - if (socks.len==0) - return 0; + trim_len( socks.len, socks.s, hf->body ); + if (socks.len==0) + return 0; - /*FIXME: This is a hack */ - c = socks.s[socks.len]; - socks.s[socks.len] = '\0'; + /*FIXME: This is a hack */ + c = socks.s[socks.len]; + socks.s[socks.len] = '\0'; + } else { + /* xavp */ + if(reg_xavp_cfg.s!=NULL) + { + vavp = xavp_get_child_with_sval(&reg_xavp_cfg, &xsockname); + if(vavp==NULL || vavp->val.v.s.len<=0) + return 0; + } + socks = vavp->val.v.s; + } if (parse_phostport( socks.s, &hosts.s, &hosts.len, &port, &proto)!=0) { socks.s[socks.len] = c; @@ -172,7 +185,9 @@ static struct socket_info *get_sock_hdr(struct sip_msg *msg) socks.len, socks.s); return 0; } - socks.s[socks.len] = c; + if(sock_hdr_name.len>0) { + socks.s[socks.len] = c; + } sock = grep_sock_info(&hosts,(unsigned short)port,(unsigned short)proto); if (sock==0) { LM_ERR("non-local socket <%.*s>\n", socks.len, socks.s); @@ -256,7 +271,7 @@ static inline ucontact_info_t* pack_ci( struct sip_msg* _m, contact_t* _c, unsig /* set received socket */ if (_m->flags&sock_flag) { - ci.sock = get_sock_hdr(_m); + ci.sock = get_sock_val(_m); if (ci.sock==0) ci.sock = _m->rcv.bind_address; } else {

1 0

git:master: core: helper functions to get xavp child nodes
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Module: sip-router Branch: master Commit: 89bd52a84d5e0d75572caff61346d0c3750c868a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89bd52a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Sep 30 15:47:30 2013 +0200 core: helper functions to get xavp child nodes - one function to get the $xavp(rootname=>childname) in code - wrappers for child node, child node with int value and child node with str value --- xavp.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ xavp.h | 4 ++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/xavp.c b/xavp.c index ceb405d..5f51731 100644 --- a/xavp.c +++ b/xavp.c @@ -787,4 +787,53 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list) } return NULL; } + +/** + * return child node of an xavp + * - $xavp(rname=>cname) + */ +sr_xavp_t* xavp_get_child(str *rname, str *cname) +{ + sr_xavp_t *ravp=NULL; + + ravp = xavp_get(rname, NULL); + if(ravp==NULL || ravp->val.type!=SR_XTYPE_XAVP) + return NULL; + + return xavp_get(cname, ravp->val.v.xavp); +} + + +/** + * return child node of an xavp if it has int value + * - $xavp(rname=>cname) + */ +sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname) +{ + sr_xavp_t *vavp=NULL; + + vavp = xavp_get_child(rname, cname); + + if(vavp==NULL || vavp->val.type!=SR_XTYPE_INT) + return NULL; + + return vavp; +} + + +/** + * return child node of an xavp if it has string value + * - $xavp(rname=>cname) + */ +sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname) +{ + sr_xavp_t *vavp=NULL; + + vavp = xavp_get_child(rname, cname); + + if(vavp==NULL || vavp->val.type!=SR_XTYPE_STR) + return NULL; + + return vavp; +} #endif diff --git a/xavp.h b/xavp.h index 7d5d517..8332069 100644 --- a/xavp.h +++ b/xavp.h @@ -104,6 +104,10 @@ sr_xavp_t *xavp_extract(str *name, sr_xavp_t **list); void xavp_print_list(sr_xavp_t **head); sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold); + +sr_xavp_t* xavp_get_child(str *rname, str *cname); +sr_xavp_t* xavp_get_child_with_ival(str *rname, str *cname); +sr_xavp_t* xavp_get_child_with_sval(str *rname, str *cname); #endif #endif

1 0

next irc devel meeting - proposed for Sep 12, 2013
by Daniel-Constantin Mierla 30 Sep '13

30 Sep '13

Hello, I'm considering to have a new IRC devel meeting to plan a bit the development for the near future (among them, nail down goals and dates for next major release). The proposed date is next week on Thursday, at 14:00UTC, on #kamailio channel from irc.freenode.net. I create a wiki page for it at: - https://www.kamailio.org/wiki/devel/irc-meetings/2013b First thing to decide is the date and time, if it is something convenient for many people. If not, propose other dates and we will chose the one when most of the people are available. Also, feel free to add to agenda. For now I just created a basic list, I will add more myself as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Trainings - Berlin, Oct 21-24; Miami, Nov 11-13, 2013 - more details about Kamailio trainings at http://www.asipto.com -

3 8

git:tmp/ims_charging: Regenerated README after documentation update
by Carsten Bock 30 Sep '13

30 Sep '13

Module: sip-router Branch: tmp/ims_charging Commit: e266b01116513a4fcea5df1c761ef1981e17f8f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e266b01… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Mon Sep 30 13:30:41 2013 +0200 Regenerated README after documentation update --- modules/ims_charging/README | 246 +++++++++++++++++++++--------------------- 1 files changed, 123 insertions(+), 123 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e26…

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