sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
299 discussions

git:master:ea2babf7: pv: allow via oc param names with dashes
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: ea2babf79d8b66cbfdccdae51ddf806964b16138 URL: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T16:25:08+02:00 pv: allow via oc param names with dashes --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… Patch: https://github.com/kamailio/kamailio/commit/ea2babf79d8b66cbfdccdae51ddf806… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index dc611de7f1a..4fa8e4677aa 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4519,12 +4519,16 @@ int pv_parse_via_name(pv_spec_p sp, str *in) 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 if(strncmp(in->s, "oc-seq", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; case 7: if(strncmp(in->s, "protoid", 7) == 0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "oc-algo", 7) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4540,6 +4544,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 11: + if(strncmp(in->s, "oc-validity", 11) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; }

1 0

git:master:06b1a35c: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: 06b1a35c727155974eb3c10971eaac2606b430ea URL: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-11T14:46:24+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… Patch: https://github.com/kamailio/kamailio/commit/06b1a35c727155974eb3c10971eaac2… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index fa73e19ea32..3979dfdf185 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -104,6 +104,7 @@ Ovidiu Sas 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 2. Developer Guide @@ -175,6 +176,7 @@ Ovidiu Sas 1.60. get_body_part_raw usage 1.61. remove_body_part usage 1.62. _regex_substring usage + 1.63. via_param_rm usage Chapter 1. Admin Guide @@ -252,6 +254,7 @@ Chapter 1. Admin Guide 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 1. Overview @@ -355,6 +358,7 @@ From: medabeda 4.59. get_body_part_raw(content_type, opv) 4.60. remove_body_part(content_type) 4.61. regex_substring(itext, regexp, mindex, mcount, dpv) + 4.62. via_param_rm(name, idx) 4.1. search(re) @@ -1621,6 +1625,25 @@ msg_apply_changes(); ---- ... +4.62. via_param_rm(name, idx) + + Remove parameter matching by name from Via body at the specified index. + The index starts from 0 (first Via body). Negative index counts from + the end of the list for Via header bodies (-1 is the last Via body). + + Meaning of the parameters is as follows: + * name - name of the parameter + * idx - index of the Via body. + + The parameters can also be variables. + + This function can be used from ANY_ROUTE. + + Example 1.63. via_param_rm usage +... +via_param_rm("p1", "0"); +... + Chapter 2. Developer Guide Table of Contents

1 0

git:master:fb2be385: textops: docs for via_param_rm(...)
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: fb2be3855c5971d312bad52ffc3c4cb99aeb63d8 URL: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:32:58+02:00 textops: docs for via_param_rm(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… Patch: https://github.com/kamailio/kamailio/commit/fb2be3855c5971d312bad52ffc3c4cb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4af7a8bb805..9c121e51c70 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -2303,5 +2303,40 @@ msg_apply_changes(); </example> </section> + <section id="textops.f.via_param_rm"> + <title> + <function moreinfo="none">via_param_rm(name, idx)</function> + </title> + <para> + Remove parameter matching by name from Via body at the specified index. + The index starts from 0 (first Via body). Negative index counts from the + end of the list for Via header bodies (-1 is the last Via body). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>name</emphasis> - name of the parameter + </para> + </listitem> + <listitem> + <para><emphasis>idx</emphasis> - index of the Via body. + </para> + </listitem> + </itemizedlist> + <para>The parameters can also be variables.</para> + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title><function>via_param_rm</function> usage</title> + <programlisting format="linespecific"> +... +via_param_rm("p1", "0"); +... +</programlisting> + </example> + </section> + </section> </chapter>

1 0

git:master:9fb28d50: textops: new function via_param_rm("name", idx)
by Daniel-Constantin Mierla 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: 9fb28d509274a659b221b0360f45d4fefafdb041 URL: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-11T14:26:30+02:00 textops: new function via_param_rm("name", idx) - remove paramter of a via body at a specific index --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… Patch: https://github.com/kamailio/kamailio/commit/9fb28d509274a659b221b0360f45d4f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 8fc0e5a7be7..b1999fed43c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -169,6 +169,8 @@ static int fixup_search_hf(void **param, int param_no); static int fixup_subst_hf(void **param, int param_no); static int fixup_regex_substring(void **param, int param_no); +static int w_via_param_rm(sip_msg_t *msg, char *pname, char *pidx); + static int mod_init(void); static tr_export_t mod_trans[] = {{{"re", sizeof("re") - 1}, /* regexp class */ @@ -287,6 +289,8 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"append_time_to_request", (cmd_function)append_time_request_f, 0, 0, 0, ANY_ROUTE}, + {"via_param_rm", (cmd_function)w_via_param_rm, 2, fixup_spve_igp, + fixup_free_spve_igp, ANY_ROUTE}, {"set_body_multipart", (cmd_function)set_multibody_0, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, @@ -4870,6 +4874,118 @@ static int fixup_subst_hf(void **param, int param_no) return 0; } +/** + * + */ +static int ki_via_param_rm(sip_msg_t *msg, str *name, int idx) +{ + via_body_t *vb; + hdr_field_t *hf = NULL; + int n = 0; + int ret = 0; + via_param_t *vp; + sr_lump_t *l; + char *p; + + if(parse_headers(msg, HDR_EOH_F, 0) < 0) { + LM_DBG("failed to parse sip headers\n"); + return -1; + } + if(msg->h_via1 == NULL) { + LM_WARN("no Via header\n"); + return -1; + } + + if(idx < 0) { + n = 1; + /* count Via header bodies */ + for(hf = msg->h_via1; hf != NULL; hf = hf->next) { + if(hf->type == HDR_VIA_T) { + for(vb = (via_body_t *)hf->parsed; vb != NULL; vb = vb->next) { + n++; + } + } + } + + idx = -idx; + if(idx > n) { + LM_DBG("index out of range\n"); + return -1; + } + idx = n - idx; + } + n = 0; + for(hf = msg->h_via1; hf != NULL; hf = hf->next) { + if(hf->type == HDR_VIA_T) { + for(vb = (via_body_t *)hf->parsed; vb != NULL; vb = vb->next) { + if(n == idx) { + for(vp = vb->param_lst; vp != NULL; vp = vp->next) { + if(vp->name.len == name->len + && strncasecmp(vp->name.s, name->s, name->len) + == 0) { + p = vp->name.s - 1; + while(p >= vb->host.s + vb->host.len && *p != ';') { + p--; + } + if(*p != ';') { + LM_ERR("missing start of via parameters\n"); + return -1; + } + if(vp->value.len > 0) { + if(vp->flags & VIA_PARAM_F_QUOTED) { + l = del_lump(msg, p - msg->buf, + vp->value.s + vp->value.len - p + 1, + 0); + } else { + l = del_lump(msg, p - msg->buf, + vp->value.s + vp->value.len - p, 0); + } + } else { + l = del_lump(msg, p - msg->buf, + vp->name.s + vp->name.len - p, 0); + } + if(l == 0) { + LM_ERR("no memory for delete operation\n"); + return -1; + } + if(ret < 0) { + ret = 1; + } else { + ret++; + } + } + } + if(ret > 0) { + return ret; + } + } + n++; + } + } + } + return ret; +} + +/** + * + */ +static int w_via_param_rm(sip_msg_t *msg, char *pname, char *pidx) +{ + str name = STR_NULL; + int idx = 0; + + if(fixup_get_svalue(msg, (gparam_t *)pname, &name) != 0) { + LM_ERR("cannot get name parameter\n"); + return -2; + } + if(fixup_get_ivalue(msg, (gparam_t *)pidx, &idx) != 0) { + LM_ERR("cannot get name parameter\n"); + return -2; + } + + return ki_via_param_rm(msg, &name, idx); +} + /** * */

1 0

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: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: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: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: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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023