[sr-dev] git:master: registrar: simplified getting value for max_contacts xavp

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); }