[sr-dev] git:5.4:17fab5e2: pv_headers: pvh_set_header, remove values to set null when necessary

Module: kamailio Branch: 5.4 Commit: 17fab5e2cf3dad61816dbd76977c72f88a345bdc URL: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Author: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Committer: Victor Seva &lt;linuxmaniac(a)torreviejawireless.org&gt; Date: 2021-07-27T11:33:34+02:00 pv_headers: pvh_set_header, remove values to set null when necessary * fix pvh_set_xavi for SR_XTYPE_NULL (cherry picked from commit af926514ac3e70dff51408baf326b29bce4eecfc) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… Patch: https://github.com/kamailio/kamailio/commit/17fab5e2cf3dad61816dbd76977c72f… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index 96fdc292b0..b8e4f92e61 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -375,7 +375,7 @@ int pvh_set_xavi(struct sip_msg *msg, str *xname, str *name, void *data, LM_DBG("br_xname: %.*s name: %.*s append:%d\n", br_xname.len, br_xname.s, name->len, name->s, append); memset(&xval, 0, sizeof(sr_xval_t)); - if(data == NULL || SR_XTYPE_NULL) { + if(data == NULL || type == SR_XTYPE_NULL) { xval.type = SR_XTYPE_NULL; } else if(type == SR_XTYPE_STR) { xval.type = SR_XTYPE_STR; @@ -618,9 +618,11 @@ int pvh_set_header( if(val == NULL || (val->flags & PV_VAL_NULL)) { if(idxf == PV_IDX_ALL) { - cnt = xavi_rm_by_name(hname, 1, &avi); - LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, - xavi->name.len, xavi->name.s, hname->len, hname->s); + if(hname_cnt > 1) { + cnt = xavi_rm_by_name(hname, 1, &avi); + LM_DBG("removed %d values of %.*s=>%.*s, set $null\n", cnt, + xavi->name.len, xavi->name.s, hname->len, hname->s); + } if(pvh_set_xavi(msg, &xavi_name, hname, NULL, SR_XTYPE_NULL, 0, 0) < 0) goto err;