- sr-dev - kamailio.org

git:master:cadfec9b: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 13 Sep '23

13 Sep '23

Module: kamailio Branch: master Commit: cadfec9b49404304ee1b2c4f4b49490eaa540bc2 URL: https://github.com/kamailio/kamailio/commit/cadfec9b49404304ee1b2c4f4b49490… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-13T15:47:06+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/cadfec9b49404304ee1b2c4f4b49490… Patch: https://github.com/kamailio/kamailio/commit/cadfec9b49404304ee1b2c4f4b49490…

1 0

git:master:a69c42f8: pv: added function to serialize xavps with quited str values
by Daniel-Constantin Mierla 13 Sep '23

13 Sep '23

Module: kamailio Branch: master Commit: a69c42f830dae5c7b14b03c56c47229f0b85f6c5 URL: https://github.com/kamailio/kamailio/commit/a69c42f830dae5c7b14b03c56c47229… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-13T15:39:30+02:00 pv: added function to serialize xavps with quited str values --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a69c42f830dae5c7b14b03c56c47229… Patch: https://github.com/kamailio/kamailio/commit/a69c42f830dae5c7b14b03c56c47229… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 3a905593dc7..73c309da6e3 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -475,6 +475,8 @@ static int w_xavp_copy_dst(sip_msg_t *msg, char *src_name, char *src_idx, char *dst_name, char *dst_idx); static int w_xavp_params_explode(sip_msg_t *msg, char *pparams, char *pxname); static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname); +static int w_xavp_params_implode_qval( + sip_msg_t *msg, char *pxname, char *pvname); static int w_xavu_params_explode(sip_msg_t *msg, char *pparams, char *pxname); static int w_xavu_params_implode(sip_msg_t *msg, char *pxname, char *pvname); static int w_xavp_slist_explode( @@ -537,6 +539,8 @@ static cmd_export_t cmds[] = { fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"xavp_params_implode", (cmd_function)w_xavp_params_implode, 2, fixup_spve_str, fixup_free_spve_str, ANY_ROUTE}, + {"xavp_params_implode_qval", (cmd_function)w_xavp_params_implode_qval, + 2, fixup_spve_str, fixup_free_spve_str, ANY_ROUTE}, {"xavu_params_explode", (cmd_function)w_xavu_params_explode, 2, fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {"xavu_params_implode", (cmd_function)w_xavu_params_implode, 2, @@ -1119,7 +1123,8 @@ static int ki_xavu_params_explode(sip_msg_t *msg, str *sparams, str *sxname) /** * */ -static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) +static int ki_xavp_params_implode_mode( + sip_msg_t *msg, str *sxname, int mode, str *svname) { pv_spec_t *vspec = NULL; pv_value_t val; @@ -1144,7 +1149,8 @@ static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) } val.rs.s = pv_get_buffer(); - val.rs.len = xavp_serialize_fields(sxname, val.rs.s, pv_get_buffer_size()); + val.rs.len = xavp_serialize_fields_style( + sxname, mode, val.rs.s, pv_get_buffer_size()); if(val.rs.len <= 0) { return -1; } @@ -1158,6 +1164,14 @@ static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) return 1; } +/** + * + */ +static int ki_xavp_params_implode(sip_msg_t *msg, str *sxname, str *svname) +{ + return ki_xavp_params_implode_mode(msg, sxname, 0, svname); +} + /** * */ @@ -1173,6 +1187,30 @@ static int w_xavp_params_implode(sip_msg_t *msg, char *pxname, char *pvname) return ki_xavp_params_implode(msg, &sxname, (str *)pvname); } +/** + * + */ +static int ki_xavp_params_implode_qval(sip_msg_t *msg, str *sxname, str *svname) +{ + return ki_xavp_params_implode_mode(msg, sxname, XAVP_PRINT_QVAL, svname); +} + +/** + * + */ +static int w_xavp_params_implode_qval( + sip_msg_t *msg, char *pxname, char *pvname) +{ + str sxname; + + if(fixup_get_svalue(msg, (gparam_t *)pxname, &sxname) != 0) { + LM_ERR("cannot get the xavp name\n"); + return -1; + } + + return ki_xavp_params_implode_qval(msg, &sxname, (str *)pvname); +} + /** * */ @@ -2864,6 +2902,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_params_implode_qval"), + SR_KEMIP_INT, ki_xavp_params_implode_qval, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavu_params_explode"), SR_KEMIP_INT, ki_xavu_params_explode, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:02a39e53: pv: docs for xavp_params_implode_qval() function
by Daniel-Constantin Mierla 13 Sep '23

13 Sep '23

Module: kamailio Branch: master Commit: 02a39e53b550ee50c61d0b0540282588497ff360 URL: https://github.com/kamailio/kamailio/commit/02a39e53b550ee50c61d0b054028258… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-13T15:43:31+02:00 pv: docs for xavp_params_implode_qval() function --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/02a39e53b550ee50c61d0b054028258… Patch: https://github.com/kamailio/kamailio/commit/02a39e53b550ee50c61d0b054028258… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index d2ef27c10e1..336997a2477 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -421,6 +421,41 @@ $xavp(x[0]=>c) = "d"; $xavp(x[0]=>a) = "b"; xavp_params_implode("x", "$var(out)"); # results in: $var(out) is "a=b;c=d;e=f;" +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_params_implode_qval"> + <title> + <function moreinfo="none">xavp_params_implode_qval(xname, pvname)</function> + </title> + <para> + Serialize the subfields in an XAVP to a parameters string format, + enclosing string values in double quotes. + </para> + <para> + Number values are serialized as unsigned integer string format. + </para> + <para> + The first parameter has to be the name of XAVP (only the string + name, not the in $xavp(name)). The second parameter + is the name of output variable (in full name, like $var(output)). + </para> + <para> + The value is stored as string type. + </para> + <para> + Function can be used from ANY ROUTE. + </para> + <example> + <title><function>xavp_params_implode_qval</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(x=>e) = "f"; +$xavp(x[0]=>c) = 5; +$xavp(x[0]=>a) = "b"; +xavp_params_implode("x", "$var(out)"); +# results in: $var(out) is: a="b";c=5;e="f"; ... </programlisting> </example>

1 0

git:master:2df3ca7d: core: xavp - option to quote string values when serializing
by Daniel-Constantin Mierla 13 Sep '23

13 Sep '23

Module: kamailio Branch: master Commit: 2df3ca7d8fd995650fb937c464b99b457ee7199e URL: https://github.com/kamailio/kamailio/commit/2df3ca7d8fd995650fb937c464b99b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-13T15:25:59+02:00 core: xavp - option to quote string values when serializing --- Modified: src/core/xavp.c Modified: src/core/xavp.h Removed: src/modules/statsd/doc/statsd.txt --- Diff: https://github.com/kamailio/kamailio/commit/2df3ca7d8fd995650fb937c464b99b4… Patch: https://github.com/kamailio/kamailio/commit/2df3ca7d8fd995650fb937c464b99b4… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 551a039ab80..32d1cef8391 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -1121,6 +1121,7 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) int rlen; char *pr = ""; char *sf = ""; + char *qs = ""; ravp = xavp_get(rname, NULL); if(ravp == NULL || ravp->val.type != SR_XTYPE_XAVP) { @@ -1128,13 +1129,16 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) return 0; } - if(mode & 1) { + if(mode & XAVP_PRINT_SCPR) { pr = ";"; sf = ""; } else { pr = ""; sf = ";"; } + if(mode & XAVP_PRINT_QVAL) { + qs = "\""; + } rlen = 0; ostr.s = obuf; @@ -1158,9 +1162,9 @@ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen) 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=%.*s%s", - pr, avp->name.len, avp->name.s, avp->val.v.s.len, - avp->val.v.s.s, sf); + ostr.len = snprintf(ostr.s, olen - rlen, "%s%.*s=%s%.*s%s%s", + pr, avp->name.len, avp->name.s, qs, avp->val.v.s.len, + avp->val.v.s.s, qs, sf); } if(ostr.len <= 0 || ostr.len >= olen - rlen) { LM_ERR("failed to serialize int value (%d/%d\n", ostr.len, diff --git a/src/core/xavp.h b/src/core/xavp.h index 4d5c30d989b..b9131c2d2df 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -114,6 +114,9 @@ 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); + +#define XAVP_PRINT_SCPR 1 /* semicolon prefix */ +#define XAVP_PRINT_QVAL 2 /* quote string param values */ int xavp_serialize_fields_style(str *rname, int mode, char *obuf, int olen); int xavp_set_child_ival(str *rname, str *cname, long ival); diff --git a/src/modules/statsd/doc/statsd.txt b/src/modules/statsd/doc/statsd.txt deleted file mode 100644 index e69de29bb2d..00000000000

1 0

Dialog module issues
by Olle E. Johansson 13 Sep '23

13 Sep '23

Hi Kamailians! Benoît and I have discovered multiple issues we think is related to our use of the Dialog module with DMQ replication. We’ve seen enourmous spikes where SHM memory is quickly consumed to the top limit and Kamailio core dump. We see stuff left in databases that should have been deleted and a few other issues. The crashes worries me most. It could be our signalling pattern or something else that leads to a state where we can’t rely on the the “number of active dialogs” stats. If any other developer recognize this, or has recently dived into the deep inner workings of Dialog I’ll be happy to have a brainstorm. If not, I’m going to have to take a deep breath and try to figure it out… :-) At this point we can’t replicate it. We’re going to try hard doing that so that we can assure that any fixes applied will actually work. Regardless if we have some bad routing, nothing should be able to crash a running Kamailio and eat up memory in an uncontrolled way, so there must be a problem in the code somewhere. I’ll start parsing the logs… Cheers, /O

2 2

Re: [kamailio/kamailio] pdt: added mode parameter to allow ignoring duplicated prefixes (ad7df67)
by vcill 13 Sep '23

13 Sep '23

Hi, I think in the first case you should not return -1 but 0. otherwise these two branches are equal -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86d9d6068e1/127205212(a)github.com>

1 0

client sending message and refresh register normal. But KSR.uac.uac_req_send() from server ERROR
by riffs＠sina.cn 13 Sep '23

13 Sep '23

The client uses the TLS protocol registered and TCP Connection established . There is a problem now, sending message KSR.uac.uac_req_send() from the kamilio server to client failed sometimes,and the error is as follows： “2023-09-04T17:22:01.515763+08:00 (3429) ERROR: tm [../../core/forward.h:292]: msg_send_buffer(): tcp_send failed 2023-09-04T17:22:01.515763+08:00 (3429) ERROR: tm [uac.c:678]: send_prepared_request_impl(): Attempt to send to precreated request failed ”. meantime, the client sending message to Kamalio server succeded, and the register status and tcp connection is normal. After 30s, obtained the $uac_req(evcode) from the event_route[uac:reply] is 408.After this error appears, all the messages sent to this client are 408. " 2023-08-29T03:48:43.738152+08:00 (3349) NOTICE: <script>: ===uac reply received, callid = 0B6ECB534AE24281AED9BBBC56B140A6`yangwang2`1693252093, code is: 408 2023-08-29T03:48:43.738825+08:00 (3349) NOTICE: <script>: ===uac reply received, callid = 0B6ECB534AE24281AED9BBBC56B140A6`yangwang2`1693252093, code is: 408 " But from other information, the TCP connection is normal. Because from Kamailio to querying this user's Location, it has not changed all day. The client sends messages is also normal. That is, the user's registration and sending messages can receive 200 OK. We use netstat commands to view the user's TCP connection information on the client and server, and the connection status is also normal.The status of the corresponding port of the TCP connection is ESTABLISHED. client: netstat -ano | findstr 49957 "172. 17. 47.125:49957 XXX.96.XXX.XXX:5061 ESTABLISHED 10516" server: "tcp 0 0 10.11.xx.xx:5061 xxx.xxx.xxx.xxx:49957 ESTABLISHED 3467/kamailio" This client is normal after logging in, and the problem that occurs after a period of use (maybe some hours), and once it occurs, it fails until the user creates a new connection and logs back in. Not all users will appear. Why is this the case? The socket connection is fine, but uac_req_send () get an ERROR? I found a problem from the log file. Is it caused by duplicate callids pushed to the same user at the same second? Looking forward to your answer, thank you very much Script information that may be required kamailio.cfg ： tm mode # ----- tm params ----- # auto-discard branches from previous serial forking leg modparam("tm", "failure_reply_mode", 3) # default retransmission timeout: 30sec modparam("tm", "fr_timer", 30000) # default invite retransmission timeout after 1xx: 120sec modparam("tm", "fr_inv_timer", 120000) modparam("tm", "auto_inv_100", 1) kamalio.lua uac_req_send() " --uac_req_send 推送给终端 KSR.pv.sets("$uac_req(hdrs)", hdrs) KSR.pv.sets("$uac_req(method)", "MESSAGE") KSR.pv.sets("$uac_req(ruri)", "sip:" .. to .. "@" .. KAM_DOMAIN) KSR.pv.sets("$uac_req(furi)", "sip:" .. from .. "@" .. KAM_DOMAIN) KSR.pv.sets("$uac_req(turi)", "sip:" .. to .. "@" .. KAM_DOMAIN) KSR.pv.seti("$uac_req(evroute)", 1) KSR.pv.sets("$uac_req(body)", content) local ouri = (row.received ~= "" and row.received) or row.contact KSR.pv.sets("$uac_req(ouri)", ouri) local callid = rows[i].clientid .. "`" .. rows[i].username .. "`" .. os.time() KSR.pv.sets("$uac_req(callid)", callid) KSR.uac.uac_req_send()

1 0

[kamailio/kamailio] No warning generated when UDP and no Content-Length header (PR #3359)
by sergey-safarov 12 Sep '23

12 Sep '23

GH # #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #3210 #### Description Added 'always_log_missed_content_length' mode for sanity module. If 'always_log_missed_content_length' is 1 then the SIP message with no 'Content-Length' header will cause warning message in the logs. Otherwise warning message is not generated for cases when SIP message with no 'Content-Length' header is sent over UDP. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3359 -- Commit Summary -- * No warning generated when UDP and no Content-Length header -- File Changes -- M src/modules/sanity/doc/sanity_admin.xml (21) M src/modules/sanity/sanity.c (4) M src/modules/sanity/sanity_mod.c (12) M src/modules/sanity/sanity_mod.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3359.patch https://github.com/kamailio/kamailio/pull/3359.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3359 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3359(a)github.com>

4 9

git:5.7:c51bc6c0: ims_qos: kemi export
by Stefan-Cristian Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: 5.7 Commit: c51bc6c05428e8d66ddd6addcc1c0b4bbf4705f1 URL: https://github.com/kamailio/kamailio/commit/c51bc6c05428e8d66ddd6addcc1c0b4… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-09-12T14:22:31+03:00 ims_qos: kemi export (cherry picked from commit eb23e6b) --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c51bc6c05428e8d66ddd6addcc1c0b4… Patch: https://github.com/kamailio/kamailio/commit/c51bc6c05428e8d66ddd6addcc1c0b4…

1 0

git:5.7:704cc393: ims_dialog: kemi export some functions
by Stefan-Cristian Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: 5.7 Commit: 704cc393dd310c9db6db34214597e3134b40367f URL: https://github.com/kamailio/kamailio/commit/704cc393dd310c9db6db34214597e31… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-09-12T14:23:30+03:00 ims_dialog: kemi export some functions (cherry-picked from commit 3994410) --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/704cc393dd310c9db6db34214597e31… Patch: https://github.com/kamailio/kamailio/commit/704cc393dd310c9db6db34214597e31… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 5da9d058e31..dc614193bff 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -21,6 +21,7 @@ #include "../../modules/tm/tm_load.h" #include "../../core/rpc_lookup.h" #include "../../modules/rr/api.h" +#include "../../core/kemi.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -1044,9 +1045,107 @@ static void rpc_end_all_active_dlg (rpc_t *rpc, void *c) } static rpc_export_t rpc_methods[] = { - {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, - {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, - {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, rpc_end_all_active_dlg_doc, 0}, - {0, 0, 0, 0} + {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, + {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, + {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, + rpc_end_all_active_dlg_doc, 0}, + {0, 0, 0, 0}}; + + +static int ki_is_known_dlg(sip_msg_t *msg) +{ + return is_known_dlg(msg); +} + +static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + + return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); +} + +static int ki_get_profile_size( + sip_msg_t *msg, str *sprofile, str *svalue, str *spv) + +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + pv_spec_t *pvs = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + if(spv == NULL || spv->s == NULL || spv->len <= 0) { + LM_ERR("invalid destination var name\n"); + return -1; + } + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + pvs = pv_cache_get(spv); + if(pvs == NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); + return -1; + } + if(pvs->type != PVT_AVP && pvs->type != PVT_SCRIPTVAR) { + LM_ERR("return must be an AVP or SCRIPT VAR!\n"); + return -1; + } + + return w_get_profile_size3( + msg, (char *)profile, (char *)pvvalue, (char *)pvs); +} + +/* clang-format off */ +static sr_kemi_t sr_kemi_ims_dialog_exports[] = { + { str_init("ims_dialog"), str_init("is_known_dlg"), + SR_KEMIP_INT, ki_is_known_dlg, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("set_dlg_profile"), + SR_KEMIP_INT, ki_set_dlg_profile, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("get_profile_size"), + SR_KEMIP_INT, ki_get_profile_size, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; +/* clang-format on */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ims_dialog_exports); + return 0; +}

1 0

git:5.6:cace9369: ims_qos: kemi export
by Stefan-Cristian Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: 5.6 Commit: cace93692134228eee0b8ebf1d43f0f90d79302a URL: https://github.com/kamailio/kamailio/commit/cace93692134228eee0b8ebf1d43f0f… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-09-12T14:11:19+03:00 ims_qos: kemi export (cherry picked from commit eb23e6b) --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cace93692134228eee0b8ebf1d43f0f… Patch: https://github.com/kamailio/kamailio/commit/cace93692134228eee0b8ebf1d43f0f…

1 0

git:5.6:776d9064: ims_dialog: kemi export some functions
by Stefan-Cristian Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: 5.6 Commit: 776d9064a3e9fa5dbcdbddc5bf0374de09c55fe6 URL: https://github.com/kamailio/kamailio/commit/776d9064a3e9fa5dbcdbddc5bf0374d… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2023-09-12T14:16:51+03:00 ims_dialog: kemi export some functions (cherry-picked from commit 3994410) --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/776d9064a3e9fa5dbcdbddc5bf0374d… Patch: https://github.com/kamailio/kamailio/commit/776d9064a3e9fa5dbcdbddc5bf0374d… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 5ca7bd00762..be06d41bc76 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -21,6 +21,7 @@ #include "../../modules/tm/tm_load.h" #include "../../core/rpc_lookup.h" #include "../../modules/rr/api.h" +#include "../../core/kemi.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -1044,9 +1045,107 @@ static void rpc_end_all_active_dlg (rpc_t *rpc, void *c) } static rpc_export_t rpc_methods[] = { - {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, - {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, - {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, rpc_end_all_active_dlg_doc, 0}, - {0, 0, 0, 0} + {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, + {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, + {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, + rpc_end_all_active_dlg_doc, 0}, + {0, 0, 0, 0}}; + + +static int ki_is_known_dlg(sip_msg_t *msg) +{ + return is_known_dlg(msg); +} + +static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + + return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); +} + +static int ki_get_profile_size( + sip_msg_t *msg, str *sprofile, str *svalue, str *spv) + +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + pv_spec_t *pvs = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + if(spv == NULL || spv->s == NULL || spv->len <= 0) { + LM_ERR("invalid destination var name\n"); + return -1; + } + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + pvs = pv_cache_get(spv); + if(pvs == NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); + return -1; + } + if(pvs->type != PVT_AVP && pvs->type != PVT_SCRIPTVAR) { + LM_ERR("return must be an AVP or SCRIPT VAR!\n"); + return -1; + } + + return w_get_profile_size3( + msg, (char *)profile, (char *)pvvalue, (char *)pvs); +} + +/* clang-format off */ +static sr_kemi_t sr_kemi_ims_dialog_exports[] = { + { str_init("ims_dialog"), str_init("is_known_dlg"), + SR_KEMIP_INT, ki_is_known_dlg, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("set_dlg_profile"), + SR_KEMIP_INT, ki_set_dlg_profile, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("get_profile_size"), + SR_KEMIP_INT, ki_get_profile_size, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; +/* clang-format on */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ims_dialog_exports); + return 0; +}

1 0

git:master:670742de: modules: readme files regenerated - app_lua ... [skip ci]
by Kamailio Dev 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 670742de0f2cef5ad9d478780bbeacec6597ae30 URL: https://github.com/kamailio/kamailio/commit/670742de0f2cef5ad9d478780bbeace… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-12T13:16:26+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/670742de0f2cef5ad9d478780bbeace… Patch: https://github.com/kamailio/kamailio/commit/670742de0f2cef5ad9d478780bbeace… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index c4697435ee0..f8891270e1a 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -149,7 +149,7 @@ Chapter 1. Admin Guide Set the path to the Lua script to be loaded at startup. Then you can use lua_run(function, params) to execute a function from the script at - runtime. + runtime. The script can be in Lua-source or bytecode. Default value is ��null��.

1 0

[kamailio/kamailio] [app_lua] clarify the file scripts can be in source or bytecode (PR #3550)
by Дилян Палаузов 12 Sep '23

12 Sep '23

This is valid both for Lua.org and LuaJIT. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3550 -- Commit Summary -- * [app_lua] clarify the file scripts can be in source or bytecode -- File Changes -- M src/modules/app_lua/doc/app_lua_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3550.patch https://github.com/kamailio/kamailio/pull/3550.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3550 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3550(a)github.com>

2 1

git:master:a8747aa0: [app_lua] clarify the file scripts can be in source or bytecode
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: a8747aa02ff3fbffd7a63bdc1e5c06188472edfa URL: https://github.com/kamailio/kamailio/commit/a8747aa02ff3fbffd7a63bdc1e5c061… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T13:06:53+02:00 [app_lua] clarify the file scripts can be in source or bytecode --- Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a8747aa02ff3fbffd7a63bdc1e5c061… Patch: https://github.com/kamailio/kamailio/commit/a8747aa02ff3fbffd7a63bdc1e5c061… --- diff --git a/src/modules/app_lua/doc/app_lua_admin.xml b/src/modules/app_lua/doc/app_lua_admin.xml index adcb91caeeb..0c2841ea0f7 100644 --- a/src/modules/app_lua/doc/app_lua_admin.xml +++ b/src/modules/app_lua/doc/app_lua_admin.xml @@ -117,7 +117,7 @@ <para> Set the path to the Lua script to be loaded at startup. Then you can use lua_run(function, params) to execute a function from the - script at runtime. + script at runtime. The script can be in Lua-source or bytecode. </para> <para> <emphasis>

1 0

[kamailio/kamailio] core: Format changes (PR #3562)
by Bastian Triller 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3562 -- Commit Summary -- * core: Format changes -- File Changes -- M src/main.c (2630) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3562.patch https://github.com/kamailio/kamailio/pull/3562.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3562 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3562(a)github.com>

2 2

git:master:e927a290: core: Format changes
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e927a290afdae7c91d77ebf40e905a3d03416ac3 URL: https://github.com/kamailio/kamailio/commit/e927a290afdae7c91d77ebf40e905a3… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T13:05:31+02:00 core: Format changes --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/e927a290afdae7c91d77ebf40e905a3… Patch: https://github.com/kamailio/kamailio/commit/e927a290afdae7c91d77ebf40e905a3…

1 0

[kamailio/kamailio] kemi exports (PR #3544)
by Stefan Mititelu 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  some kemi exports for ims_qos and ims_dialog. Currently testing them, will add comment afterwards. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3544 -- Commit Summary -- * ims_qos: kemi export * ims_dialog: kemi export some functions -- File Changes -- M src/modules/ims_dialog/ims_dialog.c (96) M src/modules/ims_qos/ims_qos_mod.c (72) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3544.patch https://github.com/kamailio/kamailio/pull/3544.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3544 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3544(a)github.com>

2 9

git:master:39944102: ims_dialog: kemi export some functions
by Stefan Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 399441029be19f7367a0831f297b81086741a9e2 URL: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-09-12T13:26:05+03:00 ims_dialog: kemi export some functions --- Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… Patch: https://github.com/kamailio/kamailio/commit/399441029be19f7367a0831f297b810… --- diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 439fb6c3ebb..a9fd0aecebf 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -20,6 +20,7 @@ #include "../../modules/tm/tm_load.h" #include "../../core/rpc_lookup.h" #include "../../modules/rr/api.h" +#include "../../core/kemi.h" #include "dlg_hash.h" #include "dlg_timer.h" @@ -1049,3 +1050,102 @@ static rpc_export_t rpc_methods[] = { {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, rpc_end_all_active_dlg_doc, 0}, {0, 0, 0, 0}}; + + +static int ki_is_known_dlg(sip_msg_t *msg) +{ + return is_known_dlg(msg); +} + +static int ki_set_dlg_profile(sip_msg_t *msg, str *sprofile, str *svalue) +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + + return w_set_dlg_profile(msg, (char *)profile, (char *)pvvalue); +} + +static int ki_get_profile_size( + sip_msg_t *msg, str *sprofile, str *svalue, str *spv) + +{ + struct dlg_profile_table *profile = NULL; + pv_elem_t *pvvalue = NULL; + pv_spec_t *pvs = NULL; + + if(sprofile == NULL || sprofile->s == NULL || sprofile->len <= 0) { + LM_ERR("invalid profile identifier\n"); + return -1; + } + if(spv == NULL || spv->s == NULL || spv->len <= 0) { + LM_ERR("invalid destination var name\n"); + return -1; + } + profile = search_dlg_profile(sprofile); + if(profile == NULL) { + LM_CRIT("profile <%.*s> not defined\n", sprofile->len, sprofile->s); + return -1; + } + if(pv_parse_format(svalue, &pvvalue) || pvvalue == NULL) { + LM_ERR("wrong format [%.*s] for value param!\n", svalue->len, + svalue->s); + return -1; + } + pvs = pv_cache_get(spv); + if(pvs == NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); + return -1; + } + if(pvs->type != PVT_AVP && pvs->type != PVT_SCRIPTVAR) { + LM_ERR("return must be an AVP or SCRIPT VAR!\n"); + return -1; + } + + return w_get_profile_size3( + msg, (char *)profile, (char *)pvvalue, (char *)pvs); +} + +/* clang-format off */ +static sr_kemi_t sr_kemi_ims_dialog_exports[] = { + { str_init("ims_dialog"), str_init("is_known_dlg"), + SR_KEMIP_INT, ki_is_known_dlg, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("set_dlg_profile"), + SR_KEMIP_INT, ki_set_dlg_profile, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ims_dialog"), str_init("get_profile_size"), + SR_KEMIP_INT, ki_get_profile_size, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ims_dialog_exports); + return 0; +}

1 0

git:master:eb23e6b6: ims_qos: kemi export
by Stefan Mititelu 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: eb23e6b63b24aa4afdef6d24352eab536c7c7a48 URL: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5… Author: Stefan-Cristian Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)govoip.ro> Date: 2023-09-12T13:26:05+03:00 ims_qos: kemi export --- Modified: src/modules/ims_qos/ims_qos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5… Patch: https://github.com/kamailio/kamailio/commit/eb23e6b63b24aa4afdef6d24352eab5…

1 0

[kamailio/kamailio] statsd: Add labels to metrics. (PR #3529)
by Eloy Coto 12 Sep '23

12 Sep '23

A user reached me to add a way to add the custom labels into the statsd module, so a better way to report metrics to the observability platform. I keep the same old functions and add a new parameter to the statsd modules to both interfaces cfg and kemi. The full documentation can be found here: https://docs.datadoghq.com/developers/dogstatsd/datagram_shell/?tab=metrics So, each function can be used like this: ``` statsd_set("fooo", 1, "inbound"); statsd_gauge("NotFound", "+1", "outbound,carrierFoo"); statsd_gauge("AuthFailed", "+1", "carrier=foo,priority=10"); ``` Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> Tested-by: Alex Antonevych <alex.antonevych(a)replicant.ai>  #### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally I'm waiting until first review on function arguments to create the docs changes. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3529 -- Commit Summary -- * statsd: Add labels to metrics. -- File Changes -- M src/modules/statsd/lib_statsd.c (102) M src/modules/statsd/lib_statsd.h (10) M src/modules/statsd/statsd.c (129) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3529.patch https://github.com/kamailio/kamailio/pull/3529.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3529 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3529(a)github.com>

3 8

git:master:888fc7f4: statsd: adding _labels to kemi exported function with duplicated name
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 888fc7f4cdaf3b179334394a344c6d831b93d25e URL: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:52:20+02:00 statsd: adding _labels to kemi exported function with duplicated name --- Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… Patch: https://github.com/kamailio/kamailio/commit/888fc7f4cdaf3b179334394a344c6d8… --- diff --git a/src/modules/statsd/statsd.c b/src/modules/statsd/statsd.c index ff2f948137d..9724c9244e2 100644 --- a/src/modules/statsd/statsd.c +++ b/src/modules/statsd/statsd.c @@ -337,7 +337,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_gauge"), + { str_init("statsd"), str_init("statsd_labels_gauge"), SR_KEMIP_INT, ki_statsd_gauge_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -347,7 +347,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_histogram"), + { str_init("statsd"), str_init("statsd_labels_histogram"), SR_KEMIP_INT, ki_statsd_histogram_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -362,7 +362,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_stop"), + { str_init("statsd"), str_init("statsd_labels_stop"), SR_KEMIP_INT, ki_statsd_stop_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -372,7 +372,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_incr"), + { str_init("statsd"), str_init("statsd_labels_incr"), SR_KEMIP_INT, ki_statsd_incr_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -382,7 +382,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_decr"), + { str_init("statsd"), str_init("statsd_labels_decr"), SR_KEMIP_INT, ki_statsd_decr_with_labels, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } @@ -392,7 +392,7 @@ static sr_kemi_t sr_kemi_statsd_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("statsd"), str_init("statsd_set"), + { str_init("statsd"), str_init("statsd_labels_set"), SR_KEMIP_INT, ki_statsd_set_with_labels, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:bff7b033: statsd: Add labels to metrics.
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: bff7b033d817c6ed63f3de63dfa7f1b45ead2ff8 URL: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b… Author: Eloy Coto <eloy.coto(a)acalustra.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:41:54+02:00 statsd: Add labels to metrics. A user reached me to add a way to add the custom labels into the statsd module, so a better way to report metrics to the observability platform. I keep the same old functions and add a new parameter to the statsd modules to both interfaces cfg and kemi. The full documentation can be found here: https://docs.datadoghq.com/developers/dogstatsd/datagram_shell/?tab=metrics So, each function can be used like this: ``` statsd_set("fooo", 1, "inbound"); statsd_gauge("NotFound", "+1", "outbound,carrierFoo"); statsd_gauge("AuthFailed", "+1", "carrier:foo,priority:10"); ``` Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> Tested-by: Alex Antonevych <alex.antonevych(a)replicant.ai> Signed-off-by: Eloy Coto <eloy.coto(a)acalustra.com> --- Added: src/modules/statsd/doc/statsd.txt Modified: src/modules/statsd/lib_statsd.c Modified: src/modules/statsd/lib_statsd.h Modified: src/modules/statsd/statsd.c --- Diff: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b… Patch: https://github.com/kamailio/kamailio/commit/bff7b033d817c6ed63f3de63dfa7f1b…

1 0

[kamailio/kamailio] core: Add option for increasing socket send buffer size (PR #3561)
by Bastian Triller 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3561 -- Commit Summary -- * core: Add option for increasing socket send buffer size -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (7) M src/core/globals.h (1) M src/core/udp_server.c (104) M src/core/udp_server.h (1) M src/main.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3561.patch https://github.com/kamailio/kamailio/pull/3561.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3561 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3561(a)github.com>

2 6

git:master:31507501: core: Add option for increasing socket send buffer size
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 31507501b1d35bcf8665f9e6cc70e5fbd0bf38c2 URL: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:34:21+02:00 core: Add option for increasing socket send buffer size --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/udp_server.c Modified: src/core/udp_server.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f… Patch: https://github.com/kamailio/kamailio/commit/31507501b1d35bcf8665f9e6cc70e5f…

1 0

git:master:34cadf6b: modules: readme files regenerated - pdt ... [skip ci]
by Kamailio Dev 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 34cadf6badb5d7db16780e0e59bf46c6fb54fd45 URL: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-12T10:32:15+02:00 modules: readme files regenerated - pdt ... [skip ci] --- Modified: src/modules/pdt/README --- Diff: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… Patch: https://github.com/kamailio/kamailio/commit/34cadf6badb5d7db16780e0e59bf46c… --- diff --git a/src/modules/pdt/README b/src/modules/pdt/README index 569ababf54b..8404139d3f1 100644 --- a/src/modules/pdt/README +++ b/src/modules/pdt/README @@ -39,6 +39,7 @@ Elena-Ramona Modroiu 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 4. Functions @@ -64,8 +65,9 @@ Elena-Ramona Modroiu 1.8. Set fetch_rows parameter 1.9. Set char_list parameter 1.10. Set check_domain parameter - 1.11. prefix2domain usage - 1.12. pd_translate usage + 1.11. Set mode parameter + 1.12. prefix2domain usage + 1.13. pd_translate usage Chapter 1. Admin Guide @@ -88,6 +90,7 @@ Chapter 1. Admin Guide 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 4. Functions @@ -172,6 +175,7 @@ sip:12391001@mydomain.com => sip:91001@alpha.org 3.7. fetch_rows (integer) 3.8. char_list (string) 3.9. check_domain (integer) + 3.10. mode (integer) 3.1. db_url (string) @@ -277,6 +281,18 @@ modparam("pdt", "char_list", "0123456789*+") modparam("pdt", "check_domain", 0) ... +3.10. mode (integer) + + If set to 1, duplicated prefixes are ingnored and starting continues, + if 0, then starting or loading fails. + + Default value is 0. + + Example 1.11. Set mode parameter +... +modparam("pdt", "mode", 1) +... + 4. Functions 4.1. prefix2domain(rewrite_mode, multidomain_mode) @@ -320,7 +336,7 @@ modparam("pdt", "check_domain", 0) This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.11. prefix2domain usage + Example 1.12. prefix2domain usage ... prefix2domain("2", "2"); ... @@ -367,7 +383,7 @@ prefix2domain(); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE or BRANCH_ROUTE. - Example 1.12. pd_translate usage + Example 1.13. pd_translate usage ... pd_translate("$fd", "2"); ...

1 0

[kamailio/kamailio] pdt: make add_to_tree() idempotent (PR #3485)
by vcill 12 Sep '23

12 Sep '23

- the function call will suceed even if the prefix being inserted already exists in the tree   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  PDT module initialization currently fails if you try to insert a prefix multiple times. We use kamailio as a loadbalancer and have had this change out in the field for quite some time now as our database often contains a prefix multiple times (associated with the same domain). Would it make sense to change the behavior in this case ? Thanks, Vladimir. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3485 -- Commit Summary -- * pdt: make add_to_tree() idempotent -- File Changes -- M src/modules/pdt/pdtree.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3485.patch https://github.com/kamailio/kamailio/pull/3485.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3485 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3485(a)github.com>

2 5

git:master:ad7df67c: pdt: added mode parameter to allow ignoring duplicated prefixes
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: ad7df67cfd58713fc0993e2d2365a86d9d6068e1 URL: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:23:55+02:00 pdt: added mode parameter to allow ignoring duplicated prefixes --- Modified: src/modules/pdt/pdt.c Modified: src/modules/pdt/pdtree.c --- Diff: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… Patch: https://github.com/kamailio/kamailio/commit/ad7df67cfd58713fc0993e2d2365a86… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 22d5f663067..ae28aa1a552 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -57,6 +57,7 @@ int pdt_fetch_rows = 1000; /** structures containing prefix-domain pairs */ pdt_tree_t **_ptree = NULL; +int _pdt_mode = 0; /** database connection */ static db1_con_t *db_con = NULL; @@ -118,6 +119,7 @@ static param_export_t params[] = { {"char_list", PARAM_STR, &pdt_char_list}, {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, {"check_domain", INT_PARAM, &pdt_check_domain}, + {"mode", PARAM_INT, &_pdt_mode}, {0, 0, 0} }; diff --git a/src/modules/pdt/pdtree.c b/src/modules/pdt/pdtree.c index 7f83132cd40..b211ca6611d 100644 --- a/src/modules/pdt/pdtree.c +++ b/src/modules/pdt/pdtree.c @@ -35,6 +35,7 @@ //extern str pdt_char_list = {"1234567890*",11}; extern str pdt_char_list; +extern int _pdt_mode; /** * */ @@ -117,9 +118,15 @@ int add_to_tree(pdt_tree_t *pt, str *sp, str *sd) if(itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s != NULL) { - LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, - sd->len, sd->s); - return -1; + if(_pdt_mode & 1) { + LM_DBG("prefix already allocated [%.*s/[%.*s] - ignoring\n", + sp->len, sp->s, sd->len, sd->s); + return -1; + } else { + LM_ERR("prefix already allocated [%.*s/[%.*s]\n", sp->len, sp->s, + sd->len, sd->s); + return -1; + } } itn0[strpos(pdt_char_list.s, sp->s[l]) % PDT_NODE_SIZE].domain.s =

1 0

git:master:11154863: pdt: docs for mode parameter
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 111548639b8cf743d3919048da0ccf971c2340bf URL: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T10:23:55+02:00 pdt: docs for mode parameter - GH #3485 --- Modified: src/modules/pdt/doc/pdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… Patch: https://github.com/kamailio/kamailio/commit/111548639b8cf743d3919048da0ccf9… --- diff --git a/src/modules/pdt/doc/pdt_admin.xml b/src/modules/pdt/doc/pdt_admin.xml index f49f9515798..47aefffcf6e 100644 --- a/src/modules/pdt/doc/pdt_admin.xml +++ b/src/modules/pdt/doc/pdt_admin.xml @@ -299,6 +299,27 @@ modparam("pdt", "char_list", "0123456789*+") ... modparam("pdt", "check_domain", 0) ... +</programlisting> + </example> + </section> + + <section> + <title><varname>mode</varname> (integer)</title> + <para> + If set to 1, duplicated prefixes are ingnored and starting continues, + if 0, then starting or loading fails. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pdt", "mode", 1) +... </programlisting> </example> </section>

1 0

git:master:2a10c158: pkg/kamailio/deb: remove pcre3 dependency [skip ci]
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 2a10c158cbdc6b654aca328b4bdc42e9a88018ba URL: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:54:16+02:00 pkg/kamailio/deb: remove pcre3 dependency [skip ci] --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e… Patch: https://github.com/kamailio/kamailio/commit/2a10c158cbdc6b654aca328b4bdc42e…

1 0

git:master:ef8d7119: pdf: reformat export structures
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: ef8d71197442ffd130a6e80ca147b5feb6c316a4 URL: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:33:17+02:00 pdf: reformat export structures --- Modified: src/modules/pdt/pdt.c --- Diff: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… Patch: https://github.com/kamailio/kamailio/commit/ef8d71197442ffd130a6e80ca147b5f… --- diff --git a/src/modules/pdt/pdt.c b/src/modules/pdt/pdt.c index 252a275917c..22d5f663067 100644 --- a/src/modules/pdt/pdt.c +++ b/src/modules/pdt/pdt.c @@ -95,40 +95,46 @@ static int fixup_translate(void **param, int param_no); static int update_new_uri(struct sip_msg *msg, int plen, str *d, int mode); static int pdt_init_rpc(void); -static cmd_export_t cmds[] = {{"prefix2domain", (cmd_function)w_prefix2domain, - 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, - REQUEST_ROUTE | FAILURE_ROUTE}, - {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, - REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_table", PARAM_STR, &db_table}, - {"sdomain_column", PARAM_STR, &sdomain_column}, - {"prefix_column", PARAM_STR, &prefix_column}, - {"domain_column", PARAM_STR, &domain_column}, - {"prefix", PARAM_STR, &pdt_prefix}, - {"char_list", PARAM_STR, &pdt_char_list}, - {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, - {"check_domain", INT_PARAM, &pdt_check_domain}, {0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"prefix2domain", (cmd_function)w_prefix2domain, + 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_1, 1, fixup_igp_null, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"prefix2domain", (cmd_function)w_prefix2domain_2, 2, fixup_igp_igp, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, + {"pd_translate", (cmd_function)w_pd_translate, 2, fixup_translate, 0, + REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_table", PARAM_STR, &db_table}, + {"sdomain_column", PARAM_STR, &sdomain_column}, + {"prefix_column", PARAM_STR, &prefix_column}, + {"domain_column", PARAM_STR, &domain_column}, + {"prefix", PARAM_STR, &pdt_prefix}, + {"char_list", PARAM_STR, &pdt_char_list}, + {"fetch_rows", INT_PARAM, &pdt_fetch_rows}, + {"check_domain", INT_PARAM, &pdt_check_domain}, + {0, 0, 0} +}; struct module_exports exports = { - "pdt", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd exports */ - params, /* param exports */ - 0, /* RPC method exports */ - 0, /* exported pseudo-variables */ - 0, /* response function */ - mod_init, /* module initialization function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "pdt", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd exports */ + params, /* param exports */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response function */ + mod_init, /* module initialization function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /** * init module function @@ -846,9 +852,13 @@ static void pdt_rpc_list(rpc_t *rpc, void *ctx) } +/* clang-format off */ rpc_export_t pdt_rpc_cmds[] = { - {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, - {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, {0, 0, 0, 0}}; + {"pdt.reload", pdt_rpc_reload, pdt_rpc_reload_doc, 0}, + {"pdt.list", pdt_rpc_list, pdt_rpc_list_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ /**

1 0

[kamailio/kamailio] lcr: pcre2 migration (PR #3545)
by Victor Seva 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2946 #### Description migrate lcr to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3545 -- Commit Summary -- * lcr: pcre2 migration -- File Changes -- M src/modules/lcr/Makefile (12) M src/modules/lcr/hash.c (24) M src/modules/lcr/hash.h (10) M src/modules/lcr/lcr_mod.c (187) M src/modules/lcr/lcr_mod.h (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3545.patch https://github.com/kamailio/kamailio/pull/3545.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3545 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3545(a)github.com>

2 2

git:master:e3e2c41e: lcr: pcre2 migration
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e3e2c41e8c46a13bad18dd40fd9e3540020dd5eb URL: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:12:09+02:00 lcr: pcre2 migration --- Modified: src/modules/lcr/Makefile Modified: src/modules/lcr/hash.c Modified: src/modules/lcr/hash.h Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354… Patch: https://github.com/kamailio/kamailio/commit/e3e2c41e8c46a13bad18dd40fd9e354…

1 0

[kamailio/kamailio] dialplan: pcre2 migration (PR #3543)
by Victor Seva 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [x] Related to issue #2946 #### Description migrate dialplan to pcre2 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3543 -- Commit Summary -- * regex: migration to pcre2 * dialplan: migrate to pcre2 -- File Changes -- M src/modules/dialplan/Makefile (11) M src/modules/dialplan/dialplan.c (5) M src/modules/dialplan/dialplan.h (21) M src/modules/dialplan/dp_db.c (103) M src/modules/dialplan/dp_repl.c (56) M src/modules/regex/Makefile (11) M src/modules/regex/regex_mod.c (240) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3543.patch https://github.com/kamailio/kamailio/pull/3543.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3543 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3543(a)github.com>

2 4

git:master:374227b1: dialplan: migrate to pcre2
by Victor Seva 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 374227b15ff7fbed8660beb93d52da15dcb4ba9e URL: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-12T09:11:51+02:00 dialplan: migrate to pcre2 --- Modified: src/modules/dialplan/Makefile Modified: src/modules/dialplan/dialplan.c Modified: src/modules/dialplan/dialplan.h Modified: src/modules/dialplan/dp_db.c Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1… Patch: https://github.com/kamailio/kamailio/commit/374227b15ff7fbed8660beb93d52da1…

1 0

[kamailio/kamailio] smsops: fixes as per static code analyzer report (PR #3551)
by Supreeth Herle 12 Sep '23

12 Sep '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3551 -- Commit Summary -- * smsops: fixes as per static code analyzer report -- File Changes -- M src/modules/smsops/smsops_impl.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3551.patch https://github.com/kamailio/kamailio/pull/3551.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3551 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3551(a)github.com>

2 3

git:master:5fe367c0: smsops: fixes as per static code analyzer report
by Daniel-Constantin Mierla 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: 5fe367c098123bf2dcbef2d81d1ad7ff940cb092 URL: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-12T09:01:24+02:00 smsops: fixes as per static code analyzer report --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… Patch: https://github.com/kamailio/kamailio/commit/5fe367c098123bf2dcbef2d81d1ad7f… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 10700b37db9..485a814774c 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -605,16 +605,18 @@ int utf8_to_ucs2(char *utf8, int utf8_len, char *ucs2, int buffer_len) } else if((utf8_char & 0xF0) == 0xE0) { // Three-byte UTF-8 character codepoint = ((utf8_char & 0x0F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 2] & 0x3F); + utf8_index += 2; tmp_buff[ucs2_index++] = (uint8_t)(codepoint >> 8); tmp_buff[ucs2_index++] = (uint8_t)(codepoint & 0xFF); } else if((utf8_char & 0xF8) == 0xF0) { // Four-byte UTF-8 character codepoint = ((utf8_char & 0x07) << 18) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 12) - | (((unsigned char)utf8[utf8_index++] & 0x3F) << 6) - | ((unsigned char)utf8[utf8_index++] & 0x3F); + | (((unsigned char)utf8[utf8_index + 1] & 0x3F) << 12) + | (((unsigned char)utf8[utf8_index + 2] & 0x3F) << 6) + | ((unsigned char)utf8[utf8_index + 3] & 0x3F); + utf8_index += 3; // Convert to UCS-2 surrogate pair codepoint -= 0x10000; high_surrogate = 0xD800 | (codepoint >> 10);

1 0

git:master:e0a058b0: misc/ typos (#3559)
by GitHub 12 Sep '23

12 Sep '23

Module: kamailio Branch: master Commit: e0a058b08129e615f51e051401a41cfae6ffaf46 URL: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Author: �� <git-dpa(a)aegee.org> Committer: GitHub <noreply(a)github.com> Date: 2023-09-12T09:00:44+02:00 misc/ typos (#3559) --- Modified: misc/examples/exec/exec_s5b.cfg Modified: misc/examples/ims/icscf/README.md Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/pcscf/README.md Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/sems/sems.conf Modified: misc/examples/ims/scscf/README.md Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/ims/scscf/scscf.cfg.sample Modified: misc/examples/kamailio/acc-mysql.cfg Modified: misc/examples/kamailio/acc.cfg Modified: misc/examples/kamailio/ctd.sh Modified: misc/examples/kamailio/fork.cfg Modified: misc/examples/kamailio/nathelper.cfg Modified: misc/examples/kamailio/replicate.cfg Modified: misc/examples/kamailio/web_im/README Modified: misc/examples/kemi/kamailio-basic-kemi-ruby.rb Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/mixed/acc.cfg Modified: misc/examples/mixed/kamailio-minimal-anycast.cfg Modified: misc/examples/mixed/kamailio-minimal-proxy.cfg Modified: misc/examples/mixed/nathelper.cfg Modified: misc/examples/mixed/onr.cfg Modified: misc/examples/mixed/replicate.cfg Modified: misc/examples/mixed/sip-router.cfg.m4 Modified: misc/examples/mixed/voicemail.cfg Modified: misc/examples/obsoleted/imgw.cfg Modified: misc/examples/obsoleted/secondary.cfg Modified: misc/examples/obsoleted/sms.cfg Modified: misc/examples/obsoleted/smsgw.cfg Modified: misc/examples/obsoleted/test.cfg Modified: misc/examples/obsoleted/tmtest.cfg Modified: misc/examples/pkg/kamailio-basic.cfg Modified: misc/examples/pkg/kamailio-oob.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/examples/presence/full-no-failover.cfg Modified: misc/examples/presence/no-db.cfg Modified: misc/examples/scripts/ctd.sh Modified: misc/examples/scripts/serresponse Modified: misc/examples/scripts/web_im/README Modified: misc/examples/webrtc/kamailio-default-websocket.cfg Modified: misc/scripts/dbtext/ser_dbtext.sh Modified: misc/scripts/mysql/sip-router_mysql.sh Modified: misc/scripts/postgres/ser_postgres.sh Modified: misc/scripts/serconf.sh Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py Modified: misc/tools/pike_top/pike_top.c Modified: misc/tools/profile/launch.sh Modified: misc/tools/sipgrep/sipgrep --- Diff: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf… Patch: https://github.com/kamailio/kamailio/commit/e0a058b08129e615f51e051401a41cf…

1 0

[kamailio/kamailio] misc/ typos (PR #3559)
by Дилян Палаузов 12 Sep '23

12 Sep '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3559 -- Commit Summary -- * misc/ typos -- File Changes -- M misc/examples/exec/exec_s5b.cfg (2) M misc/examples/ims/icscf/README.md (2) M misc/examples/ims/icscf/kamailio.cfg (4) M misc/examples/ims/pcscf/README.md (2) M misc/examples/ims/pcscf/kamailio.cfg (4) M misc/examples/ims/pcscf/pcscf.cfg.sample (2) M misc/examples/ims/pcscf/route/mo.cfg (2) M misc/examples/ims/pcscf/sems/sems.conf (2) M misc/examples/ims/scscf/README.md (2) M misc/examples/ims/scscf/kamailio.cfg (6) M misc/examples/ims/scscf/scscf.cfg.sample (2) M misc/examples/kamailio/acc-mysql.cfg (2) M misc/examples/kamailio/acc.cfg (2) M misc/examples/kamailio/ctd.sh (4) M misc/examples/kamailio/fork.cfg (2) M misc/examples/kamailio/nathelper.cfg (2) M misc/examples/kamailio/replicate.cfg (2) M misc/examples/kamailio/web_im/README (2) M misc/examples/kemi/kamailio-basic-kemi-ruby.rb (4) M misc/examples/kemi/kamailio-basic-kemi.cfg (2) M misc/examples/mixed/acc.cfg (2) M misc/examples/mixed/kamailio-minimal-anycast.cfg (4) M misc/examples/mixed/kamailio-minimal-proxy.cfg (4) M misc/examples/mixed/nathelper.cfg (2) M misc/examples/mixed/onr.cfg (4) M misc/examples/mixed/replicate.cfg (2) M misc/examples/mixed/sip-router.cfg.m4 (14) M misc/examples/mixed/voicemail.cfg (2) M misc/examples/obsoleted/imgw.cfg (4) M misc/examples/obsoleted/secondary.cfg (2) M misc/examples/obsoleted/sms.cfg (2) M misc/examples/obsoleted/smsgw.cfg (2) M misc/examples/obsoleted/test.cfg (2) M misc/examples/obsoleted/tmtest.cfg (4) M misc/examples/pkg/kamailio-basic.cfg (2) M misc/examples/pkg/kamailio-oob.cfg (10) M misc/examples/pkg/sip-router-basic.cfg (2) M misc/examples/pkg/sip-router-oob.cfg (32) M misc/examples/presence/full-no-failover.cfg (6) M misc/examples/presence/no-db.cfg (4) M misc/examples/scripts/ctd.sh (4) M misc/examples/scripts/serresponse (8) M misc/examples/scripts/web_im/README (2) M misc/examples/webrtc/kamailio-default-websocket.cfg (4) M misc/scripts/dbtext/ser_dbtext.sh (2) M misc/scripts/mysql/sip-router_mysql.sh (4) M misc/scripts/postgres/ser_postgres.sh (4) M misc/scripts/serconf.sh (18) M misc/tools/kemi/python_mock/README.md (4) M misc/tools/kemi/python_mock/kemi_mock.py (2) M misc/tools/pike_top/pike_top.c (12) M misc/tools/profile/launch.sh (2) M misc/tools/sipgrep/sipgrep (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3559.patch https://github.com/kamailio/kamailio/pull/3559.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3559 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3559(a)github.com>

3 5

[kamailio/kamailio] Path: incorrect path added after the merger of "use snprintf() instead of sprintf()" branch (Issue #3560)
by Harish S 11 Sep '23

11 Sep '23

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` in $mb from xlog shows path header as Path: <sip:xx.xxx.xx.xx suffix header part is not getting appended creating malformed packet ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.8.0-dev1 (x86_64/linux) 99eb1b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, 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_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, epoll_lt, epoll_et, sigio_rt, select. id: 99eb1b compiled on 10:38:25 Sep 8 2023 with gcc 11.4.0 ``` * **Operating System**:  ``` Ubuntu 22.04 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3560 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3560(a)github.com>

2 4

git:master:d0d6436c: path: fix prepend_path()
by Victor Seva 11 Sep '23

11 Sep '23

Module: kamailio Branch: master Commit: d0d6436cfc46ad1d5be485592decee4efe7bcce0 URL: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-09-11T18:17:14+02:00 path: fix prepend_path() bug introduced at dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… Patch: https://github.com/kamailio/kamailio/commit/d0d6436cfc46ad1d5be485592decee4… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 2431a985553..8fde991260c 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -183,7 +183,7 @@ static int prepend_path( prefix_len = snprintf( prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else - prefix_len = sprintf(prefix, PATH_PREFIX); + prefix_len = snprintf(prefix, prefix_len, PATH_PREFIX); if(parse_headers(_m, HDR_PATH_F, 0) < 0) { LM_ERR("failed to parse message for Path header\n"); @@ -208,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.len, 0); if(!l) goto out2; @@ -223,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp.s - suffix); + dp = path_strzdup(suffix, cp.len); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp.s - suffix, 0); + l = insert_new_lump_before(l, dp, cp.len, 0); if(!l) goto out1; }

1 0

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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev