sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
294 discussions

git:master:9f9d5df5: core: action - updated cast for internal message flags

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9f9d5df5f5cb5503b685cb1ab3ab7162726d58e5 URL: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T07:34:29+02:00 core: action - updated cast for internal message flags --- Modified: src/core/action.c --- Diff: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… Patch: https://github.com/kamailio/kamailio/commit/9f9d5df5f5cb5503b685cb1ab3ab716… --- diff --git a/src/core/action.c b/src/core/action.c index 4a29a73b06e..bd75eacec33 100644 --- a/src/core/action.c +++ b/src/core/action.c @@ -1413,7 +1413,7 @@ int do_action(struct run_act_ctx *h, struct action *a, struct sip_msg *msg) ret = 1; /* continue processing */ break; case UDP_MTU_TRY_PROTO_T: - msg->msg_flags |= (unsigned int)a->val[0].u.number & FL_MTU_FB_MASK; + msg->msg_flags |= (msg_flags_t)a->val[0].u.number & FL_MTU_FB_MASK; ret = 1; /* continue processing */ break; case SET_ADV_ADDR_T:

8 months, 3 weeks

git:master:7000c33a: core: parser - internal msg flags typedefed to unsigned long long

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7000c33ab5d4dc71a3471eb46c1972a3f17b5ceb URL: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T07:30:03+02:00 core: parser - internal msg flags typedefed to unsigned long long - type msg_flags_t - unsigned int size flags were filled --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… Patch: https://github.com/kamailio/kamailio/commit/7000c33ab5d4dc71a3471eb46c1972a… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index fdc4a844350..5d2e799d69d 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -63,7 +63,7 @@ /* number of via's encountered */ int via_cnt; /* global request flags */ -unsigned int global_req_flags = 0; +msg_flags_t global_req_flags = 0; int ksr_sip_parser_mode = KSR_SIP_PARSER_MODE_STRICT; diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 187385f2491..67650523451 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -234,6 +234,8 @@ enum _uri_flags }; /* bit fields */ typedef enum _uri_flags uri_flags; +typedef unsigned long long msg_flags_t; + /*! \brief The SIP uri object */ struct sip_uri { @@ -423,7 +425,7 @@ typedef struct sip_msg unsigned int hash_index; /*!< index to TM hash table; stored in core to avoid unnecessary calculations */ - unsigned int msg_flags; /*!< internal flags used by core */ + msg_flags_t msg_flags; /*!< internal flags used by core */ flag_t flags; /*!< config flags */ flag_t xflags[KSR_XFLAGS_SIZE]; /*!< config extended flags */ str set_global_address; @@ -459,7 +461,7 @@ extern int via_cnt; * a flag value is checked, e.g.: * if ((msg->msg_flags|global_req_flags) & FL_XXX) ... */ -extern unsigned int global_req_flags; +extern msg_flags_t global_req_flags; int parse_msg(

8 months, 3 weeks

[kamailio/kamailio] clean_sa(): Error sending delete SAs command via netlink socket: Invalid argument (#2707)

by openspring

### Description  #### Log Messages  ``` 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type5, i/count 0/1: type 1(1)/ data 0x7f8583620ef0 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 0/3: type 22(16)/ data 0x7f8583621ad8 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 1/3: type 8(8)/ data 0x7f8583620fd8 0(117561) DEBUG: <core> [core/route_struct.c:128]: mk_action(): ACTION type16, i/count 2/3: type 0(0)/ data 0x7f8500000000 0(117561) DEBUG: <core> [core/route.c:129]: route_add(): mapping routing block (0xb914c0)[MT_indialog_reply] to 6 ERROR: bad config file (1 errors) 0(117561) DEBUG: <core> [core/sr_module.c:765]: destroy_modules(): starting modules destroy phase 0(117561) DEBUG: debugger [debugger_api.c:1267]: dbg_destroy_mod_levels(): Destroyed _dbg_mod_table, size 32 0(117561) ERROR: ims_ipsec_pcscf [ipsec.c:567]: clean_sa(): Error sending delete SAs command via netlink socket: Invalid argument 0(117561) WARNING: ims_ipsec_pcscf [cmd.c:998]: ipsec_cleanall(): Error cleaning IPSec Security associations during startup. 0(117561) ERROR: ims_ipsec_pcscf [ipsec.c:609]: clean_policy(): Error sending delete policies command via netlink socket: Invalid argument 0(117561) WARNING: ims_ipsec_pcscf [cmd.c:1002]: ipsec_cleanall(): Error cleaning IPSec Policies during startup. 0(117561) ERROR: ims_ipsec_pcscf [ims_ipsec_pcscf_mod.c:309]: mod_destroy(): Error destroying spi generator 0(117561) ERROR: ims_ipsec_pcscf [ims_ipsec_pcscf_mod.c:313]: mod_destroy(): Error destroying port generator 0(117561) DEBUG: tm [t_funcs.c:84]: tm_shutdown(): start 0(117561) DEBUG: tm [t_funcs.c:87]: tm_shutdown(): emptying hash table 0(117561) DEBUG: tm [t_funcs.c:89]: tm_shutdown(): removing semaphores 0(117561) DEBUG: tm [t_funcs.c:91]: tm_shutdown(): destroying tmcb lists 0(117561) DEBUG: tm [t_funcs.c:94]: tm_shutdown(): done 0(117561) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(117561) DEBUG: <core> [core/mem/shm.c:289]: shm_destroy_manager(): destroying memory manager: q_malloc 0(117561) DEBUG: <core> [core/mem/q_malloc.c:1185]: qm_shm_lock_destroy(): destroying the shared memory lock 0(117561) DEBUG: <core> [core/mem/pkg.c:98]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.4 (x86_64/linux) 8d6c2b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 8d6c2b compiled on 22:26:30 Apr 11 2021 with gcc 4.8.5 ``` * **Operating System**:  ``` NAME="CentOS Linux" VERSION="7 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="7" PRETTY_NAME="CentOS Linux 7 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:7" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-7" CENTOS_MANTISBT_PROJECT_VERSION="7" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="7" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2707

8 months, 3 weeks

git:master:99eb1bd2: core: debug message about adding xavp params to via

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99eb1bd2046fa9501bd9ba599c4eae16b0259373 URL: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T14:33:52+02:00 core: debug message about adding xavp params to via --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… Patch: https://github.com/kamailio/kamailio/commit/99eb1bd2046fa9501bd9ba599c4eae1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0140fc1d98a..f3e2ce6c28b 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2348,6 +2348,7 @@ char *generate_res_buf_from_sip_res( xparams.len = xavp_serialize_fields_style(&_ksr_xavp_via_reply_params, 1, xparams.s, pv_get_buffer_size()); if(xparams.len > 0) { + LM_DBG("adding via reply xavp params\n"); anchor = anchor_lump(msg, msg->via2->params.s + msg->via2->params.len - msg->buf, 0, 0);

8 months, 3 weeks

git:master:82b0f273: core: parser - set via->params.len when body is finished

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 82b0f273e1cf65051b6c50301c5073dce56c1149 URL: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T14:16:49+02:00 core: parser - set via->params.len when body is finished --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… Patch: https://github.com/kamailio/kamailio/commit/82b0f273e1cf65051b6c50301c5073d… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 921911f1d17..a978d1aaf2e 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2692,6 +2692,17 @@ char *parse_via( goto error; } } + if(vb->params.s != NULL && vb->params.len == 0 && vb->last_param != NULL) { + if(vb->last_param->name.len > 0) { + if(vb->last_param->value.len > 0) { + vb->params.len = vb->last_param->value.s + vb->last_param->value.len + - vb->params.s; + } else { + vb->params.len = vb->last_param->name.s + vb->last_param->name.len + - vb->params.s; + } + } + } return tmp; nextvia: DBG("parsing via: next via\n"); @@ -2706,6 +2717,18 @@ char *parse_via( goto error; } } + if(vb->params.s != NULL && vb->params.len == 0 && vb->last_param != NULL) { + if(vb->last_param->name.len > 0) { + if(vb->last_param->value.len > 0) { + vb->params.len = vb->last_param->value.s + vb->last_param->value.len + - vb->params.s; + } else { + vb->params.len = vb->last_param->name.s + vb->last_param->name.len + - vb->params.s; + } + } + } + vb->next = pkg_malloc(sizeof(struct via_body)); if(vb->next == 0) { PKG_MEM_ERROR;

8 months, 3 weeks

git:master:cf959e29: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cf959e29ed71caa75b789d73fb8d5132cbc4e08a URL: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-07T08:47:15+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513… Patch: https://github.com/kamailio/kamailio/commit/cf959e29ed71caa75b789d73fb8d513…

8 months, 3 weeks

git:master:d5fa60a9: corex: docs - added missing end of section

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5fa60a96702a5a6f3ee562fa439ac2f23bc2247 URL: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:41:08+02:00 corex: docs - added missing end of section --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… Patch: https://github.com/kamailio/kamailio/commit/d5fa60a96702a5a6f3ee562fa439ac2… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index b0babf26886..6b60cbbf445 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -889,6 +889,7 @@ request_route { ... </programlisting> </example> + </section> <section id="corex.f.is_faked_msg"> <title> <function moreinfo="none">is_faked_msg()</function>

8 months, 3 weeks

git:master:a7e63e43: core: better style for serializing via reply xavp params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7e63e43cc63781c53bd3fc44e55f0530e1754d6 URL: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)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/a7e63e43cc63781c53bd3fc44e55f05… Patch: https://github.com/kamailio/kamailio/commit/a7e63e43cc63781c53bd3fc44e55f05… --- 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

8 months, 3 weeks

git:master:1e5d1e35: core: xavp - helper function to set style when serializing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e5d1e35fbebd25d3d4b81839e40dfbea841f7d2 URL: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:39:41+02:00 core: xavp - helper function to set style when serializing --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… Patch: https://github.com/kamailio/kamailio/commit/1e5d1e35fbebd25d3d4b81839e40dfb… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 9a0e4ad600a..551a039ab80 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1105,19 +1105,22 @@ int xavp_set_child_sval(str *rname, str *cname, str *sval) } /** - * serialize the values in subfields of an xavp in name=value; format + * serialize the values in subfields of an xavp in name=value format styles * - rname - name of the root list xavp + * - mode - 0 - style is 'name=value;', 1 - style is ';name=value' * - obuf - buffer were to write the output * - olen - the size of obuf * return: 0 - not found; -1 - error; >0 - length of output */ -int xavp_serialize_fields(str *rname, char *obuf, int olen) +int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) { sr_xavp_t *ravp = NULL; sr_xavp_t *avp = NULL; str ostr; int rlen; + char *pr = ""; + char *sf = ""; ravp = xavp_get(rname, NULL); if(ravp == NULL || ravp->val.type != SR_XTYPE_XAVP) { @@ -1125,6 +1128,14 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) return 0; } + if(mode & 1) { + pr = ";"; + sf = ""; + } else { + pr = ""; + sf = ";"; + } + rlen = 0; ostr.s = obuf; avp = ravp->val.v.xavp; @@ -1132,9 +1143,9 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) switch(avp->val.type) { case SR_XTYPE_LONG: LM_DBG(" XAVP long int value: %ld\n", avp->val.v.l); - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%lu;", - avp->name.len, avp->name.s, - (unsigned long)avp->val.v.l); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%lu%s", + pr, avp->name.len, avp->name.s, + (unsigned long)avp->val.v.l, sf); if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, olen - rlen); @@ -1144,12 +1155,12 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) case SR_XTYPE_STR: LM_DBG(" XAVP str value: %s\n", avp->val.v.s.s); if(avp->val.v.s.len == 0) { - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s;", - avp->name.len, avp->name.s); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s%s", + pr, avp->name.len, avp->name.s, sf); } else { - ostr.len = snprintf(ostr.s, olen - rlen, "%.*s=%.*s;", - avp->name.len, avp->name.s, avp->val.v.s.len, - avp->val.v.s.s); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%.*s%s", + pr, avp->name.len, avp->name.s, avp->val.v.s.len, + avp->val.v.s.s, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, @@ -1170,6 +1181,19 @@ int xavp_serialize_fields(str *rname, char *obuf, int olen) return rlen; } +/** + * serialize the values in subfields of an xavp in 'name=value;' format + * - rname - name of the root list xavp + * - obuf - buffer were to write the output + * - olen - the size of obuf + * return: 0 - not found; -1 - error; >0 - length of output + */ + +int xavp_serialize_fields(str *rname, char *obuf, int olen) +{ + return xavp_serialize_fields_style(rname, 0, obuf, olen); +} + /** * */ diff --git a/src/core/xavp.h b/src/core/xavp.h index c1aa7d8c651..4d5c30d989b 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -114,6 +114,7 @@ sr_xavp_t *xavp_get_child(str *rname, str *cname); sr_xavp_t *xavp_get_child_with_ival(str *rname, str *cname); sr_xavp_t *xavp_get_child_with_sval(str *rname, str *cname); int xavp_serialize_fields(str *rname, char *obuf, int olen); +int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen); int xavp_set_child_ival(str *rname, str *cname, long ival); int xavp_set_child_sval(str *rname, str *cname, str *sval);

8 months, 3 weeks

git:master:1832880c: core: add via reply xavp params for generation when using another reply

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1832880c4d8e2e0c5b5444542d414b13bbab47ca URL: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T08:39:41+02:00 core: add via reply xavp params for generation when using another reply --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… Patch: https://github.com/kamailio/kamailio/commit/1832880c4d8e2e0c5b5444542d414b1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index c5c4172c045..42f445983f1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2320,6 +2320,8 @@ char *generate_res_buf_from_sip_res( unsigned offset, s_offset, via_offset; char *buf; unsigned int len; + str xparams; + sr_lump_t *anchor; buf = msg->buf; len = msg->len; @@ -2339,6 +2341,23 @@ char *generate_res_buf_from_sip_res( } } + /* test and add xavp via reply params */ + 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()); + if(xparams.len > 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) { + LM_ERR("unable to add via reply xavp params\n"); + } + } + } + } + /* Calculate message body difference and adjust * Content-Length */ @@ -2458,7 +2477,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, len -= msg->via1->rport->size + 1; /* include ';' */ } - /* test and add xavpvia params */ + /* test and add xavp via reply params */ if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) && _ksr_xavp_via_reply_params.len > 0) { xparams.s = pv_get_buffer();

8 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023