- sr-dev - kamailio.org

git:master:d3acf9cc: core: parser - handle comma inside quoted params of via
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: d3acf9cc56f0ee73bee3c7cf1210c052d79a4c46 URL: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:25:47+02:00 core: parser - handle comma inside quoted params of via --- Modified: src/core/parser/parse_via.c Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… Patch: https://github.com/kamailio/kamailio/commit/d3acf9cc56f0ee73bee3c7cf1210c05… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index a978d1aaf2e..c604f55aa2e 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -1162,10 +1162,18 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end, case ',': switch(state) { case P_VALUE: + if(param->flags & VIA_PARAM_F_QUOTED) { + /* inside a quoted value */ + break; + } param->value.len = tmp - param->value.s; state = F_VIA; goto endofvalue; case P_STRING: + if(param->flags & VIA_PARAM_F_QUOTED) { + /* inside a quoted value */ + break; + } case F_LF: case F_CR: case F_CRLF: @@ -1217,6 +1225,7 @@ static /*inline*/ char *parse_via_param(char *const p, const char *const end, case F_VALUE: state = P_STRING; param->value.s = tmp + 1; + param->flags |= VIA_PARAM_F_QUOTED; break; case P_STRING: state = L_PARAM; diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index bd0a4ffbb14..d3de9737b68 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -53,9 +53,12 @@ enum }; +#define VIA_PARAM_F_QUOTED (1) + typedef struct via_param { int type; /* Type of the parameter */ + unsigned int flags; /* Flags for the parameter */ str name; /* Name of the parameter */ str value; /* Value of the parameter */ char *start; /* Pointer to param start, just after ';',

1 0

git:master:7000c33a: core: parser - internal msg flags typedefed to unsigned long long
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

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(

1 0

git:master:9f9d5df5: core: action - updated cast for internal message flags
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

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:

1 0

git:master:49912924: uac: updated the type for internal msg flags
by Daniel-Constantin Mierla 09 Sep '23

09 Sep '23

Module: kamailio Branch: master Commit: 499129246e948ec765f5f74d1b15a55a5bb43eb0 URL: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-09T15:58:35+02:00 uac: updated the type for internal msg flags --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… Patch: https://github.com/kamailio/kamailio/commit/499129246e948ec765f5f74d1b15a55… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c77167ae0d8..f13a661ca95 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -248,7 +248,7 @@ int replace_uri(struct sip_msg *msg, str *display, str *uri, char *p; str param; str buf; - unsigned int uac_flag; + msg_flags_t uac_flag; int i; int_str avp_value; struct dlg_cell *dlg = 0; @@ -558,7 +558,7 @@ int restore_uri( char *p; int i; int_str avp_value; - int flag; + msg_flags_t flag; int bsize; /* we should process only sequential request, but since we are looking

1 0

git:master:99eb1bd2: core: debug message about adding xavp params to via
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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);

1 0

git:master:82b0f273: core: parser - set via->params.len when body is finished
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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;

1 0

git:master:cf959e29: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 07 Sep '23

07 Sep '23

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…

1 0

git:master:1e5d1e35: core: xavp - helper function to set style when serializing
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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);

1 0

git:master:a7e63e43: core: better style for serializing via reply xavp params
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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

1 0

git:master:d5fa60a9: corex: docs - added missing end of section
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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>

1 0

git:master:1832880c: core: add via reply xavp params for generation when using another reply
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

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();

1 0

git:master:c92a73f8: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 07 Sep '23

07 Sep '23

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

1 0

git:master:1880737b: cores: new function via_reply_add_xavp_params()
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 1880737b9251a14eb7395f5968b955475848780d URL: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:09:35+02:00 cores: new function via_reply_add_xavp_params() - enable adding parameters to top via of replies from xavp fields --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Patch: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 24eba482489..d65f49dd8cf 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -70,6 +70,7 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2); +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); @@ -156,6 +157,8 @@ static cmd_export_t cmds[] = {{"forward_reply", (cmd_function)w_forward_reply, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE}, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, @@ -1114,6 +1117,33 @@ static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *s2) return ki_via_use_xavp_fields(msg, fval); } +/** + * + */ +static int ki_via_reply_add_xavp_params(sip_msg_t *msg, int fval) +{ + if(msg == NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_ADD_XAVP_VIA_REPLY_PARAMS; + } else { + msg->msg_flags &= ~(FL_ADD_XAVP_VIA_REPLY_PARAMS); + } + return 1; +} + +/** + * + */ +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_t *)pflags, &fval) != 0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_reply_add_xavp_params(msg, fval); +} /** * @@ -1317,6 +1347,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("via_reply_add_xavp_params"), + SR_KEMIP_INT, ki_via_reply_add_xavp_params, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("corex"), str_init("has_ruri_user"), SR_KEMIP_INT, ki_has_ruri_user, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:faa0bdcc: corex: docs for via_reply_add_xavp_params(flags) function
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: faa0bdcc5d87d40cac8a279c524fbe724c1f7f1d URL: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:38:51+02:00 corex: docs for via_reply_add_xavp_params(flags) function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Patch: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0346c2bc3fd..b0babf26886 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -854,6 +854,41 @@ request_route { </programlisting> </example> </section> + <section id="corex.f.via_reply_add_xavp_params"> + <title><function moreinfo="none">via_reply_add_xavp_params(flags)</function></title> + <para> + Control if fields of the xavp with the name specified by + xavp_via_reply_params global parameter are added or not to the top Via + of replies. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - add xavp parameters; 0 - do not + add xavp parameters. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_reply_add_xavp_params</function> usage</title> + <programlisting format="linespecific"> +... +xavp_via_reply_params="xviarpl" +... +request_route { + ... + $xavp(xviarpl=>srvid) = "1"; + $xavp(xviarpl[0]=>myval) = "xyz"; + via_reply_add_xavp_params("1"); + ... +} +... +</programlisting> + </example> <section id="corex.f.is_faked_msg"> <title> <function moreinfo="none">is_faked_msg()</function>

1 0

git:master:3ed56db3: pv: proper name id for oc field of via variables
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 3ed56db363ace8162abdfda6e5bc0cbd51a73c70 URL: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:39:38+02:00 pv: proper name id for oc field of via variables --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Patch: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index a491d10d643..dc611de7f1a 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4490,7 +4490,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) break; case 2: if(strncmp(in->s, "oc", 2) == 0) - sp->pvp.pvn.u.isname.name.n = 0; + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

1 0

git:master:cf0e802b: core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: cf0e802bbf62ec4a19f26c786c07e7436ba07f0a URL: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:04:16+02:00 core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Patch: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index b33317da0cb..187385f2491 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -118,6 +118,8 @@ typedef enum request_method #define FL_ROUTE_ADDR (1 << 25) /*!< request has Route address for next hop */ #define FL_USE_OTCPID \ (1 << 26) /*!< request to be routed using outbound tcp con id */ +#define FL_ADD_XAVP_VIA_REPLY_PARAMS \ + (1 << 27) /*!< add xavp fields to first (previous sip node) via params */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:439eae7a: core: ability to add paramters to top via of generated sip replies
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: 439eae7aa2154a25a0d9143345e526e22162b24f URL: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:08:20+02:00 core: ability to add paramters to top via of generated sip replies - parameters and values are taken from xavp specified by xavp_via_reply_params --- Modified: src/core/globals.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Patch: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… --- diff --git a/src/core/globals.h b/src/core/globals.h index da693a06bae..a11f8521a3b 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -218,6 +218,7 @@ extern int ksr_all_errors; extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; +extern str _ksr_xavp_via_reply_params; extern int ksr_sip_parser_mode; extern int ksr_cfg_print_mode; extern int ksr_return_mode; diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index fcc6f133439..c5c4172c045 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -114,6 +114,7 @@ extern int version_len; str _ksr_xavp_via_params = STR_NULL; str _ksr_xavp_via_fields = STR_NULL; +str _ksr_xavp_via_reply_params = STR_NULL; int ksr_local_rport = 0; /** per process fixup function for global_req_flags. @@ -2415,6 +2416,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, char *totags; int httpreq; char *pvia; + str xparams = STR_NULL; body = 0; buf = 0; @@ -2456,6 +2458,17 @@ 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 */ + 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()); + if(xparams.len > 0) { + len += xparams.len; /* ending ';' included */ + } + } + /* first line */ len += msg->first_line.u.request.version.len + 1 /*space*/ + 3 /*code*/ + 1 /*space*/ + text->len @@ -2588,6 +2601,10 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, append_str_trans(p, hdr->name.s, (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, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:master:d394724e: core: config parser extended with xavp_via_reply_params parameter
by Daniel-Constantin Mierla 07 Sep '23

07 Sep '23

Module: kamailio Branch: master Commit: d394724ee79e168786abb9ac94ef1e965f169a7c URL: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:02:42+02:00 core: config parser extended with xavp_via_reply_params parameter - allows to specify xavp name that is going to hold parameters to be added to the top via of replies --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Patch: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e0500769bb5..6ec71fcf6d1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -304,6 +304,7 @@ LOGENGINETYPE log_engine_type LOGENGINEDATA log_engine_data XAVPVIAPARAMS xavp_via_params XAVPVIAFIELDS xavp_via_fields +XAVPVIAREPLYPARAMS xavp_via_reply_params LISTEN listen ADVERTISE advertise|ADVERTISE VIRTUAL virtual @@ -753,6 +754,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGENGINEDATA} { yylval.strval=yytext; return LOGENGINEDATA; } <INITIAL>{XAVPVIAPARAMS} { yylval.strval=yytext; return XAVPVIAPARAMS; } <INITIAL>{XAVPVIAFIELDS} { yylval.strval=yytext; return XAVPVIAFIELDS; } +<INITIAL>{XAVPVIAREPLYPARAMS} { yylval.strval=yytext; return XAVPVIAREPLYPARAMS; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{VIRTUAL} { count(); yylval.strval=yytext; return VIRTUAL; } diff --git a/src/core/cfg.y b/src/core/cfg.y index eef8e6acd28..19d0ee6949e 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -328,6 +328,7 @@ extern char *default_routename; %token LOGENGINEDATA %token XAVPVIAPARAMS %token XAVPVIAFIELDS +%token XAVPVIAREPLYPARAMS %token LISTEN %token ADVERTISE %token VIRTUAL @@ -890,6 +891,10 @@ assign_stm: _ksr_xavp_via_fields.len=strlen($3); } | XAVPVIAFIELDS EQUAL error { yyerror("string value expected"); } + | XAVPVIAREPLYPARAMS EQUAL STRING { _ksr_xavp_via_reply_params.s=$3; + _ksr_xavp_via_reply_params.len=strlen($3); + } + | XAVPVIAREPLYPARAMS EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; }

1 0

[kamailio/kamailio] Function `sdp_mangle_ip("IP/MASK","IP")` Malfunction (Issue #3554)
by teamwcp 06 Sep '23

06 Sep '23

I have been trying to replace the SDP connection IP with some other IP using module `mangler` (`Kamailio v5.7.0`). But It seem like its malfunctioning ``` if ($rs == 200) { xlog("L_INFO", "200 $rm Detected"); sdp_mangle_ip("192.168.0.132/24","8.8.8.8"); } ``` and results I received are like this below ``` v=0 o=- 107808851201429815 2 IN IP4 192.168.0.132 s=- t=0 0 m=audio 24794 RTP/AVP 0 8 101 c=IN IP4 192.168.0.1328.8.8.8 a=mid:audio a=sendrecv a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:822878909 cname:0ZfUBhl8cMeHaeVl a=nortpproxy:yes ``` I first ask the same question in mailing list `sr-users(a)lists.kamailio.org` but after waiting for some time (>24hrs) i cant see my question on on forum, that why I open a ticket here. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3554 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3554(a)github.com>

2 2

[kamailio/kamailio] sdp_remove_transport() corrupts SDP payload in conjunction with NAT-traversal rewriting using rtpproxy (Issue #3555)
by Nathan Whitehorn 06 Sep '23

06 Sep '23

### Description I have some buggy devices that get upset by SRTP payloads in SDP that are marked inactive. As a hack, I was attempting to delete them when going to certain endpoints that are known to be problematic: ``` if (is_method("INVITE")) sdp_remove_transport("RTP/SAVP"); ``` ### Troubleshooting Per below, there is some garbage that looks like a port number inserted before `m=audio` that seems to have come from rtpproxy rewriting for NAT traversal. Removing the NAT traversal rewrite logic entirely fixes the problem, but also makes NAT traversal not happen. Changing the order of `sdp_remove_transport()` with respect to `rtpproxy_manage()` does not change anything. #### Reproduction This was seen with a Grandstream DP752 phone talking to SEMS, but applying the code snippet above and getting a packet trace will be enough. The original SDP had the RTP/SAVP transport first, followed by an RTP/AVP one. For the problem to occur, NAT SDP rewriting has to occur using rtpproxy. #### Debugging Data Here is the payload after sfp_remove_transport() removed the RTP/SAVP section: ``` v=0 o=15176190619 8000 8000 IN IP4 X.X.X.X s=SIP Call c=IN IP4 X.X.X.X t=0 0 46108m=audio 55082 RTP/AVP 125 9 0 8 2 18 97 101 a=sendrecv a=rtpmap:125 opus/48000/2 a=fmtp:125 maxplaybackrate=16000 a=ptime:20 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:2 G726-32/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=rtpmap:97 iLBC/8000 a=fmtp:97 mode=20 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16,32-36,54 a=nortpproxy:yes ``` There is a garbage 46108 (I think what would have been the port number for SAVP data) at the beginning of the m=audio line. It seems that the rewrite by rtpproxy is still inserting this port number even though the transport in question has been removed. #### Log Messages None relevant. #### SIP Traffic (See above) ### Possible Solutions None. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ kamailio -v version: kamailio 5.6.2 (x86_64/freebsd) 54a9c1 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, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 54a9c1 compiled on 10:44:33 Jul 20 2023 with cc FreeBSD clang version 13.0.0 (git@github.com:llvm/llvm-project.git llvmorg-13.0.0-0-gd7b669b3a303) ``` * **Operating System**: FreeBSD 13.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3555 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3555(a)github.com>

2 2

git:master:629a5451: pv: via-related variables can retun oc parameters
by Daniel-Constantin Mierla 06 Sep '23

06 Sep '23

Module: kamailio Branch: master Commit: 629a5451d3924fff5c9b4e06c37bd498fc6b58db URL: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T15:05:06+02:00 pv: via-related variables can retun oc parameters - overload control - rfc7339 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Patch: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b81f37bc9a5..a491d10d643 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 2: + if(strncmp(in->s, "oc", 2) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "host", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4501,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "rport", 5) == 0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; @@ -4509,6 +4517,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "params", 6) == 0) sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "ocalgo", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4524,7 +4534,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; - + case 10: + if(strncmp(in->s, "ocvalidity", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; } @@ -4544,6 +4559,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) int pv_get_via_attr( sip_msg_t *msg, via_body_t *vb, pv_param_t *param, pv_value_t *res) { + via_oc_t ocv; + if(vb == NULL) { LM_DBG("null via header\n"); return pv_get_null(msg, param, res); @@ -4587,6 +4604,34 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->params); } break; + case 9: /* oc */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.oc == 1) { + return pv_get_sintval(msg, param, res, 1); + } else { + return pv_get_sintval(msg, param, res, 2); + } + break; + case 10: /* oc-algo */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.algo.s != NULL && ocv.algo.len > 0) { + return pv_get_strval(msg, param, res, &ocv.algo); + } + return pv_get_null(msg, param, res); + case 11: /* oc-validity */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, ocv.validity); + case 12: /* oc-seq */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, (unsigned long)ocv.seq); default: return pv_get_null(msg, param, res);

1 0

git:master:062dbc7c: dispatcher: added pactive and pinactive for $dsg(key)
by Daniel-Constantin Mierla 06 Sep '23

06 Sep '23

Module: kamailio Branch: master Commit: 062dbc7c7f74ebe705eff711e994c3eec5956e03 URL: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T13:00:12+02:00 dispatcher: added pactive and pinactive for $dsg(key) - return percent of active/inactive route in the group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… Patch: https://github.com/kamailio/kamailio/commit/062dbc7c7f74ebe705eff711e994c3e… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e9676b0aae7..741fbe7fab7 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1424,6 +1424,10 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, active); case 2: /* inactive */ return pv_get_sintval(msg, param, res, inactive); + case 3: /* pactive */ + return pv_get_sintval(msg, param, res, (int)((active*100)/count)); + case 4: /* pinactive */ + return pv_get_sintval(msg, param, res, (int)((inactive*100)/count)); default: return pv_get_null(msg, param, res); } @@ -1450,12 +1454,24 @@ static int pv_parse_dsg(pv_spec_p sp, str *in) else goto error; break; + case 7: + if(strncmp(in->s, "pactive", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 3; + else + goto error; + break; case 8: if(strncmp(in->s, "inactive", 8) == 0) sp->pvp.pvn.u.isname.name.n = 2; else goto error; break; + case 9: + if(strncmp(in->s, "pinactive", 9) == 0) + sp->pvp.pvn.u.isname.name.n = 4; + else + goto error; + break; default: goto error; }

1 0

git:master:d07eb9e5: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: d07eb9e54a075716c6bc96b123c3bbb885466da8 URL: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-05T12:46:34+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… Patch: https://github.com/kamailio/kamailio/commit/d07eb9e54a075716c6bc96b123c3bbb… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 307217bf070..79fc82ec175 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -121,6 +121,7 @@ Federico Cabiddu 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -208,8 +209,10 @@ Federico Cabiddu 1.55. ds_is_from_list usage 1.56. ds_is_active usage 1.57. ds_load_unset usage - 1.58. dispatcher list file - 1.59. Kamailio config script - sample dispatcher usage + 1.58. ds_reload usage + 1.59. ds_dsg_fetch() usage + 1.60. dispatcher list file + 1.61. Kamailio config script - sample dispatcher usage Chapter 1. Admin Guide @@ -285,6 +288,7 @@ Chapter 1. Admin Guide 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 5. RPC Commands @@ -1110,6 +1114,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.13. ds_load_update() 4.14. ds_load_unset() 4.15. ds_reload() + 4.16. ds_dsg_fetch(setid) 4.1. ds_select_dst(set, alg[, limit]) @@ -1597,6 +1602,26 @@ onreply_route { This function can be used from ANY_ROUTE. + Example 1.58. ds_reload usage +... + ds_reload(); +... + +4.16. ds_dsg_fetch(setid) + + Sets the destination group id to setid for fetching $dsg(key) + attributes. + + Parameters: setid - integer or variable holding the set id value + + This function can be used from ANY_ROUTE. + + Example 1.59. ds_dsg_fetch() usage +... + ds_dsg_fetch("1"); + xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); +... + 5. RPC Commands 5.1. dispatcher.set_state @@ -1875,7 +1900,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) For database, each element of a line resides in a different column. Next is a dispatcher.list file example: - Example 1.58. dispatcher list file + Example 1.60. dispatcher list file ... # # dispatcher destination sets (groups) @@ -1900,7 +1925,7 @@ r,opt) Next listing shows a sample config for using the dispatcher module. - Example 1.59. Kamailio config script - sample dispatcher usage + Example 1.61. Kamailio config script - sample dispatcher usage ... #!KAMAILIO #

1 0

git:master:b6979b50: modules: readme files regenerated - tm ... [skip ci]
by The Root 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: b6979b503ffe65314526a8a2824f50b3f46b7a22 URL: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-09-05T12:46:08+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… Patch: https://github.com/kamailio/kamailio/commit/b6979b503ffe65314526a8a2824f50b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 0b44b81813c..19f4a9a3781 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -1864,11 +1864,12 @@ modparam("tm", "failover_reply_codes", "code=403;code=488;class=5") 4.1. t_relay([host, port]) - Relay a message statefully either to the destination indicated in the - current URI (if called without any parameters) or to the specified host - and port. In the later case (host and port specified) the protocol used - is the same protocol on which the message was received. It creates a - transaction. + Relay a SIP request statefully either to the destination indicated in + the current URI (if called without any parameters) or to the specified + host and port. In the later case (host and port specified) the protocol + used is the same protocol on which the message was received. It creates + the SIP transaction, if none was created before (e.g., with + t_newtran()). t_relay() is the stateful version for forward() while t_relay(host, port) is similar to forward(host, port).

1 0

git:master:0e640014: dispatcher: docs - example for ds_reload()
by Daniel-Constantin Mierla 05 Sep '23

05 Sep '23

Module: kamailio Branch: master Commit: 0e640014019fff58d665e8c3f2d37b7c8d0cfd21 URL: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-05T12:34:41+02:00 dispatcher: docs - example for ds_reload() --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… Patch: https://github.com/kamailio/kamailio/commit/0e640014019fff58d665e8c3f2d37b7… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 46148b03e4b..011c9af827e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1970,6 +1970,14 @@ onreply_route { <para> This function can be used from ANY_ROUTE. </para> + <example> + <title><function>ds_reload</function> usage</title> + <programlisting format="linespecific"> +... + ds_reload(); +... +</programlisting> + </example> </section> </section>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev