Module: kamailio Branch: master Commit: a7e63e43cc63781c53bd3fc44e55f0530e1754d6 URL: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f053...
Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@gmail.com Date: 2023-09-07T08:39:41+02:00
core: better style for serializing via reply xavp params
---
Modified: src/core/msg_translator.c
---
Diff: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f053... Patch: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f053...
---
diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 42f445983f1..0140fc1d98a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2345,13 +2345,15 @@ char *generate_res_buf_from_sip_res( if(msg && msg->via2 && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); - xparams.len = xavp_serialize_fields( - &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, + 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { - anchor = anchor_lump(msg, msg->via2->params.s - + msg->via2->params.len - msg->buf, 0, 0); + anchor = anchor_lump(msg, + msg->via2->params.s + msg->via2->params.len - msg->buf, 0, + 0); if(anchor != NULL) { - if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) == 0) { + if(insert_new_lump_after(anchor, xparams.s, xparams.len, 0) + == 0) { LM_ERR("unable to add via reply xavp params\n"); } } @@ -2481,10 +2483,10 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer(); - xparams.len = xavp_serialize_fields( - &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, + 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { - len += xparams.len; /* ending ';' included */ + len += xparams.len; /* starting ';' included */ } }
@@ -2621,8 +2623,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } if(xparams.len > 0) { - append_str(p, ";", 1); - append_str(p, xparams.s, xparams.len - 1); + append_str(p, xparams.s, xparams.len); } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia