Module: kamailio Branch: master Commit: 2b4ec1cf1d30f5520ef68f9e7e653100fa8ce68e URL: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e653100...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2020-10-14T16:13:19+02:00
pv: xavp_slist_explode() stores tockes in xavp fields
- no longer in root xavp list, but a sublist with tokes having name 'v'
---
Modified: src/modules/pv/pv_xavp.c
---
Diff: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e653100... Patch: https://github.com/kamailio/kamailio/commit/2b4ec1cf1d30f5520ef68f9e7e653100...
---
diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 0f7652218d..ae2c6ce048 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -586,8 +586,10 @@ int pv_xavi_print(sip_msg_t* msg, char* s1, char *s2) int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) { str s; + sr_xavp_t *xavp_list=NULL; sr_xavp_t *xavp=NULL; sr_xval_t xval; + str itname = str_init("v"); int i; int j; int sfound; @@ -620,7 +622,22 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } } s.s = slist->s + i + 1; } @@ -637,7 +654,31 @@ int xavp_slist_explode(str *slist, str *sep, str *mode, str *xname) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = s; - xavp = xavp_add_value_after(xname, &xval, xavp); + if(xavp_list == NULL) { + if(xavp_add_value(&itname, &xval, &xavp_list)==NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + return -1; + } + xavp = xavp_list; + } else { + xavp = xavp_add_value_after(&itname, &xval, xavp); + if(xavp == NULL) { + LM_ERR("failed to add item in the list: [%.*s]\n", + s.len, s.s); + xavp_destroy_list(&xavp_list); + return -1; + } + } + } + + /* add main xavp in root list */ + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = xavp_list; + if(xavp_add_value(xname, &xval, NULL)==NULL) { + xavp_destroy_list(&xavp); + return -1; }
return 0;
-
Daniel-Constantin Mierla