[sr-dev] git:master:3693ab0b: avpops: add avp_subst_pv()

Module: kamailio Branch: master Commit: 3693ab0bbb5254e4286e1894884380295e99ad52 URL: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… Author: Kirill Solomko &lt;ksolomko(a)sipwise.com&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2020-01-03T09:44:07+01:00 avpops: add avp_subst_pv() * same functionality as avp_subst() but second parameter will be evaluated before calling subst. --- Modified: src/modules/avpops/avpops.c --- Diff: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… Patch: https://github.com/kamailio/kamailio/commit/3693ab0bbb5254e4286e18948843802… --- diff --git a/src/modules/avpops/avpops.c b/src/modules/avpops/avpops.c index 0805407cff..3d8f949b39 100644 --- a/src/modules/avpops/avpops.c +++ b/src/modules/avpops/avpops.c @@ -67,6 +67,8 @@ static int fixup_pushto_avp(void** param, int param_no); static int fixup_check_avp(void** param, int param_no); static int fixup_op_avp(void** param, int param_no); static int fixup_subst(void** param, int param_no); +static int fixup_subst_pv(void** param, int param_no); +static int fixup_free_subst_pv(void** param, int param_no); static int fixup_is_avp_set(void** param, int param_no); static int w_print_avps(struct sip_msg* msg, char* foo, char *bar); @@ -81,6 +83,7 @@ static int w_pushto_avps(struct sip_msg* msg, char* destination, char *param); static int w_check_avps(struct sip_msg* msg, char* param, char *check); static int w_op_avps(struct sip_msg* msg, char* param, char *op); static int w_subst(struct sip_msg* msg, char* src, char *subst); +static int w_subst_pv(struct sip_msg* msg, char* src, char *param); static int w_is_avp_set(struct sip_msg* msg, char* param, char *foo); /*! \brief @@ -111,6 +114,9 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"avp_subst", (cmd_function)w_subst, 2, fixup_subst, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, + {"avp_subst_pv", (cmd_function)w_subst_pv, 2, fixup_subst_pv, + fixup_free_subst_pv, + REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {"is_avp_set", (cmd_function)w_is_avp_set, 1, fixup_is_avp_set, 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -708,6 +714,16 @@ static int fixup_check_avp(void** param, int param_no) return 0; } +static int fixup_subst_pv(void** param, int param_no) +{ + if(param_no==1) { + return fixup_subst(param, param_no); + } else if (param_no==2) { + return fixup_var_str_2(param, param_no); + } + return 0; +} + static int fixup_subst(void** param, int param_no) { struct subst_expr* se; @@ -841,6 +857,14 @@ static int fixup_subst(void** param, int param_no) return 0; } +static int fixup_free_subst_pv(void** param, int param_no) +{ + if (param_no==2) + fparam_free_restore(param); + + return 0; +} + static int fixup_op_avp(void** param, int param_no) { struct fis_param *ap; @@ -1054,6 +1078,40 @@ static int w_subst(struct sip_msg* msg, char* src, char *subst) return ops_subst(msg, (struct fis_param**)src, (struct subst_expr*)subst); } +static int w_subst_pv(struct sip_msg* msg, char* src, char *param) +{ + str tstr = STR_NULL; + str subst = STR_NULL; + struct subst_expr* se; + fparam_t *fp; + int res; + + fp = (fparam_t*)param; + if(get_str_fparam(&tstr, msg, fp) != 0) + { + LM_ERR("error fetching subst re\n"); + return -1; + } + + LM_DBG("preparing to evaluate: [%.*s]\n", tstr.len, tstr.s); + if(pv_eval_str(msg, &subst, &tstr)<0){ + subst.s = tstr.s; + subst.len = tstr.len; + } + + LM_DBG("preparing %s\n", subst.s); + se = subst_parser(&subst); + if(se==0) + { + LM_ERR("bad subst re %s\n", subst.s); + return E_BAD_RE; + } + + res = ops_subst(msg, (struct fis_param**)src, se); + subst_expr_free(se); + return res; +} + static int w_is_avp_set(struct sip_msg* msg, char* param, char *op) { return ops_is_avp_set(msg, (struct fis_param*)param);