sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
299 discussions

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

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023