[sr-dev] git:master: pv: new variables - $expires(min) and $expires(max)

Module: sip-router Branch: master Commit: c1b51e38f0904217b0a07b8b9aedc51519fe250e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c1b51e3… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: Mon Jul 28 14:24:21 2014 +0200 pv: new variables - $expires(min) and $expires(max) - return the min and max of expires value for sip message - contact headers are checked with higher priority, if no expires parameter there, then Expires header is used - if none is found, $null is returned --- modules/pv/pv.c | 2 + modules/pv/pv_core.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_core.h | 5 ++ 3 files changed, 122 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 3b962f4..8488b67 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -436,6 +436,8 @@ static pv_export_t mod_pvs[] = { 0, pv_parse_sr_version_name, 0, 0, 0}, { {"K", (sizeof("K")-1)}, PVT_OTHER, pv_get_K, 0, pv_parse_K_name, 0, 0, 0 }, + { {"expires", (sizeof("expires")-1)}, PVT_OTHER, pv_get_expires, 0, + pv_parse_expires_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 2d34df5..d41a399 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -44,6 +44,9 @@ #include "../../parser/parse_diversion.h" #include "../../parser/parse_ppi_pai.h" #include "../../parser/digest/digest.h" +#include "../../parser/contact/contact.h" +#include "../../parser/contact/parse_contact.h" +#include "../../parser/parse_expires.h" #include "pv_core.h" #include "pv_svar.h" @@ -2941,3 +2944,115 @@ int pv_get__s(sip_msg_t *msg, pv_param_t *param, } return pv_get_strval(msg, param, res, &sdata); } + +/** + * + */ +int pv_parse_expires_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 3: + if(strncmp(in->s, "min", 3)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "max", 3)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV expires key: %.*s\n", in->len, in->s); + return -1; +} + +/** + * + */ +int pv_get_expires(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + unsigned int exp_min = 0xffffffff; + unsigned int exp_max = 0; + hdr_field_t* hdr; + contact_t* c; + unsigned int eval = 0; + unsigned int ehdr = 0; + unsigned int efound = 0; + + if(param==NULL) + return -1; + + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("failed to parse headers\n"); + return pv_get_null(msg, param, res); + } + + if (msg->expires) { + if(!msg->expires->parsed && (parse_expires(msg->expires) < 0)) { + LM_ERR("failed to parse hdr expires body\n"); + return pv_get_null(msg, param, res); + } + ehdr = ((exp_body_t*)msg->expires->parsed)->val; + } + + if (msg->contact) { + hdr = msg->contact; + while(hdr) { + if (hdr->type == HDR_CONTACT_T) { + if (!hdr->parsed && (parse_contact(hdr) < 0)) { + LM_ERR("failed to parse Contact body\n"); + return pv_get_null(msg, param, res); + } + c = ((contact_body_t*)hdr->parsed)->contacts; + while(c) { + c = c->next; + if(c->expires && c->expires->body.len) { + if (str2int(&c->expires->body, &eval) < 0) { + LM_ERR("failed to parse expires\n"); + return pv_get_null(msg, param, res); + } + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } else if(msg->expires && msg->expires->parsed) { + eval = ehdr; + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } + } + } + hdr = hdr->next; + } + } + + if(efound==0 && msg->expires && msg->expires->parsed) { + eval = ehdr; + efound = 1; + if(eval>exp_max) exp_max = eval; + if(eval<exp_min) exp_min = eval; + } + + if(efound==0) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) + { + case 0: + return pv_get_uintval(msg, param, res, exp_min); + case 1: + return pv_get_uintval(msg, param, res, exp_max); + default: + return pv_get_null(msg, param, res); + } +} diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index 46bde9e..a444ffe 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -320,5 +320,10 @@ int pv_parse__s_name(pv_spec_p sp, str *in); int pv_get__s(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_parse_expires_name(pv_spec_p sp, str *in); + +int pv_get_expires(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif