sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
276 discussions

git:5.6:ad753f46: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 14 Sep '22

14 Sep '22

Module: kamailio Branch: 5.6 Commit: ad753f4657bc72a79fd61b56276de5ae87b3c574 URL: https://github.com/kamailio/kamailio/commit/ad753f4657bc72a79fd61b56276de5a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-09-14T20:16:27+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/posops/README Modified: src/modules/ratelimit/README Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/ad753f4657bc72a79fd61b56276de5a… Patch: https://github.com/kamailio/kamailio/commit/ad753f4657bc72a79fd61b56276de5a… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 7c31188ac77..1ea4e6f98d0 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -529,6 +529,11 @@ Note information given will not be stored in the CDR as they cannot be accessed by the end of the call when the CDR is logged. + The dialog module needs to be engaged on the dialogs that should be + accounted, that they will be tracked by the server. This is usally done + by calling the function dlg_manage() or setting the dlg_flag. Refer to + the documentation of the dialog module for more information. + Sometimes, dialogs expire because the UA has a problem and a final message is never transmitted. You can toggle on/off the generation of CDR-based logging in such cases with only the dlg_vars showing by using @@ -1129,7 +1134,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) 6.34. cdr_facility (integer) Log facility to which CDR messages are issued to syslog. This allows to - easily seperate CDR-specific logging from the other log messages. + easily separate CDR-specific logging from the other log messages. Default value is LOG_DAEMON. diff --git a/src/modules/posops/README b/src/modules/posops/README index 035f807acb8..e7583adc588 100644 --- a/src/modules/posops/README +++ b/src/modules/posops/README @@ -214,6 +214,9 @@ pos_insert("100", "10"); Set the char at position index to first character in val. + Important: it changes the character directly in the SIP message buffer, + the update being immediately visible. + The idx can be an integer value or a variable holding an integer. If the value is negative, the position is counted from the end of the buffer. diff --git a/src/modules/ratelimit/README b/src/modules/ratelimit/README index ecd6fce79a1..4862e717f73 100644 --- a/src/modules/ratelimit/README +++ b/src/modules/ratelimit/README @@ -514,5 +514,5 @@ modparam("ratelimit", "pipe", "4:NETWORK:10000") The pipes and queues are stored as static vectors, so no more than MAX_PIPES/MAX_QUEUES can be added without recompilation. - * MAX_PIPES - 16 - * MAX_QUEUES - 10 + * MAX_PIPES - 32 + * MAX_QUEUES - 32 diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index d180968e95d..a15bc8c62de 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -1113,10 +1113,15 @@ modparam("usrloc", "version_table", 0) Note: the internal keepalive is for the moment implemented only for contact records stored in memory. - Note: it is recommeder to set 'timer_procs' parameter in order to have + Note: it is recommended to set 'timer_procs' parameter in order to have dedicated timer processes for usrloc module and off-load the keepalive sending process from the core timers. + Note: Keepalives will be sent to the IP and port using the transport + defined in the âreceivedâ column. If not set, then keepalives will + be sent to the AOR using UDP as a default transport. If available, the + TCP connection will be re-used for WS, TCP and TLS. + Default value is “0 (keepalive disabled)”. Example 1.50. ka_mode parameter usage

1 0

git: new commits in branch 5.6
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

- URL: https://github.com/kamailio/kamailio/commit/98342927e3493a8af6b859ab1cd1877… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-14T18:54:05+02:00 ratelimit: fix docs to actual values in the code for queue and pipe limits (cherry picked from commit cae9d78a6c8d33f6c4ec780901a55c27260c2000) - URL: https://github.com/kamailio/kamailio/commit/e8d797cb26e2b16dff3afd7ecb54beb… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-14T18:55:47+02:00 acc: add some explanation that dialogs need to be tracked for CDR accounting (cherry picked from commit 3ec40d792df5bcee838eee3e5e0e89a2ebdcc453) - URL: https://github.com/kamailio/kamailio/commit/8aceadf62fde1b1faf414e5d47c4210… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:58:47+02:00 core/cfg: cast pointer to long to silent compiler warning - GH #3208 (cherry picked from commit 26785f866eeadc6944af83ae1a57e8ff100f60f5) - URL: https://github.com/kamailio/kamailio/commit/a5cbf0bade8ab0b04d1f8e9288b239d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:00:15+02:00 msrp: proper cmap insert when last item has greater citemid - condition for last item was processed first, resulting in improper order of items, GH #3215 (cherry picked from commit 1e4bf1dd7fbfc9d51f0e56e98472a42de781cdbd) - URL: https://github.com/kamailio/kamailio/commit/5bcb685d19b55b3b2046345e195e5de… Author: Shane Mitchell <sm(a)opencluster.com.au> Date: 2022-09-14T19:02:39+02:00 dialog: dont reset dlg_db_mode in POSTCHILDINIT for DB_MODE_SHUTDOWN (cherry picked from commit 8fb25f7cb6fa73dc37fe11df9b921c32009bd107) - URL: https://github.com/kamailio/kamailio/commit/506e20e6aae21d862f6d643a2c87c74… Author: Andy Brezinsky <andy.brezinsky(a)mitel.com> Date: 2022-09-14T19:03:09+02:00 usrloc: re-use TCP connections for keepalive - Fixes GH #3178. Sets TCP connection id for keepalive based on the value in the database If unset, tcpconn_id will remain 0 and keepalives will work the same as they do today - Update documentation to clarify when it will use received vs AOR for keepalive (cherry picked from commit 06f933ad17aac3a3f0f81cf0e0ab04f38cf60993) - URL: https://github.com/kamailio/kamailio/commit/9d473f92d3ff534535e6170b8895569… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:04:06+02:00 usrloc: increased the size for keys2 array in ul_ka_db_records() - consequence of 06f933ad17aac3a3f0f81cf0e0ab04f38cf60993 (cherry picked from commit b5ae633242e5e34b1f6dc8f025e68872b47b461c) - URL: https://github.com/kamailio/kamailio/commit/5ffbbaa6c956a74665859a709bd6c79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:05:12+02:00 registrar: print number of contacts and max limit in logs and formatting updates (cherry picked from commit a88f805236ef0549ce8a8079142b202d569bf3f1) - URL: https://github.com/kamailio/kamailio/commit/94101dfc2df05f471fdb7ea1e6190f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:05:26+02:00 registrar: use macro to init str value and more debug messages (cherry picked from commit 5f229a799b251e82431b4642e9bd8aa76c405d13) - URL: https://github.com/kamailio/kamailio/commit/addd16c13a0a6ab5cb460850141073d… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-14T19:05:58+02:00 utils: small whitespace fix for Makefile (cherry picked from commit 3cb1f8eaec344433fd94011ec28da464c5626c2a) - URL: https://github.com/kamailio/kamailio/commit/4bdd89b4709553e2dde2fb2356ba47d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:06:19+02:00 pv: detect known headers provided with variable for $hfl(...) and $hflc(...) - GH #3194 (cherry picked from commit fb13cf364870895dec94fa1ddf6a1afd3c099715) - URL: https://github.com/kamailio/kamailio/commit/33e1638b92c073f58b27232e7985a5f… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-14T19:06:40+02:00 etc/kamailio.cfg: corrected a typo ("endabled"), GH #3223 (cherry picked from commit b46afeca6c515f5baf1812ca821321117df6478b) - URL: https://github.com/kamailio/kamailio/commit/e44c6716b5d640c489561062ea02545… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:06:54+02:00 pv: parse header name given with variable to $hdr() and $hdrc() (cherry picked from commit a10da3a8802fd02bab9e8c655aa845d121370fd4) - URL: https://github.com/kamailio/kamailio/commit/902807e5de185cb6d6463ff617bf4c2… Author: korayvt <koray.vatansever(a)gmail.com> Date: 2022-09-14T19:07:29+02:00 core: added parser mode check (cherry picked from commit 4598f0a0df90ad81e192be55a89fbd5cca52a40e) - URL: https://github.com/kamailio/kamailio/commit/272060e1079d9edbc819d396dafb203… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:07:48+02:00 usrloc: adde random and pid to call-id for keepalive requests - GH #3225 (cherry picked from commit 721daf5ca55a8fb366cff2821e249bfff64d8f87) - URL: https://github.com/kamailio/kamailio/commit/60a62d6f7df233d61d4ccecc39504e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:04+02:00 acc: duplicate dlg var values used in extra2strar_dlg_only() - avoid buffer index overlapping and be coherent with extra2strar() (cherry picked from commit 54905e6b02e36e72bb74a92c77b273cf57822f18) - URL: https://github.com/kamailio/kamailio/commit/948f066718e102a7d592ef647754ba0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:22+02:00 dialog: updated to get the int value for cseq update operations (cherry picked from commit a070f5c132a68111fade7212db6a2bc738e03193) - URL: https://github.com/kamailio/kamailio/commit/363a6267c4c50b6e321e59961dedc4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:30+02:00 dialog: safer version for getting dlg variable value - clone to ensure that reference is not becoming invalid over the time (cherry picked from commit aded00bbfe75771cef8d0ee9ae8401772f7644a9) - URL: https://github.com/kamailio/kamailio/commit/38cbf04afa2c02fa2f15bb1528d6b7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:37+02:00 dialog: fetch directly the int value for dlg variable used in dlg_cseq_update() (cherry picked from commit 8cb948cc07e2d577cdd14efdfe38f3e9bbf11d79) - URL: https://github.com/kamailio/kamailio/commit/e1deb704bc1df02e4dbdc85d7728acc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:48+02:00 pua_dialoginfo: clone dlg var values (cherry picked from commit 1553a6c0efb2cec0b5962bba13bc0095211ee75d) - URL: https://github.com/kamailio/kamailio/commit/89fa86703adfdf6e30dc43c191d7327… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:09:59+02:00 siptrace: use socket name for hep mirroring - GH #3174 (cherry picked from commit 30c628732092108e8d73856a5c9ec60b16d5ef99) - URL: https://github.com/kamailio/kamailio/commit/2427f1951a1c63a8c047710d49ef067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:10:20+02:00 dialog: wrapper function to set a dlg var with unsigned integer parameter - use it to set cseq diff value (cherry picked from commit b7dc2ac6d66839b38ba8d6f36e9f28bc0a2d1425) - URL: https://github.com/kamailio/kamailio/commit/644938a6be5f841634f2e1443e5f123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:10:29+02:00 dialog: remove strlen() checks when setting a variable - assumed key->s and val->s are 0-terminated, which may not be the case (cherry picked from commit 2cebd46f8f2dc3f87c9cfd2054976e347aa75ace) - URL: https://github.com/kamailio/kamailio/commit/d8c8922ff4dd47a47773e5391e4ce49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:10:44+02:00 core: kemi - duplicate module name when registering the api exports (cherry picked from commit 43f764cae870b15a96b8ca88f1eb195d4ceb8455) - URL: https://github.com/kamailio/kamailio/commit/b0636ff4aaa3f5c21389ca6b99a90be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:11:20+02:00 core: use unsigned printing for version defines (cherry picked from commit 3e94dd4bd3901d503c7be655d761f1d70453a451) - URL: https://github.com/kamailio/kamailio/commit/5edc2cd0f0308099be410f7f34c0c25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:11:46+02:00 posops: docs - updated pos_set_char() section - note that the change is done directly inside the sip message buffer (cherry picked from commit c3771966fa8470db91d04323a1e9c837a16a22cf)

1 0

[kamailio/kamailio] dialplan: Fix typos (PR #3237)
by Bastian Triller 14 Sep '22

14 Sep '22

Fix typos in kemi exports   #### 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/3237 -- Commit Summary -- * dialplan: Fix typos -- File Changes -- M src/modules/dialplan/dialplan.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3237.patch https://github.com/kamailio/kamailio/pull/3237.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3237 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3237(a)github.com>

2 1

git:master:2e8bfcef: dialplan: Fix typos
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: 2e8bfcef4f3f90214df0c1fe4d40d359265f060a URL: https://github.com/kamailio/kamailio/commit/2e8bfcef4f3f90214df0c1fe4d40d35… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T19:34:03+02:00 dialplan: Fix typos Fix typos in kemi exports --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/2e8bfcef4f3f90214df0c1fe4d40d35… Patch: https://github.com/kamailio/kamailio/commit/2e8bfcef4f3f90214df0c1fe4d40d35… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 0df83bbee6..c260d3f315 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -850,12 +850,12 @@ static sr_kemi_t sr_kemi_dialplan_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("dialplan"), str_init("dp_transalte"), + { str_init("dialplan"), str_init("dp_translate"), SR_KEMIP_INT, ki_dp_translate_1_args, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("dialplan"), str_init("dp_transalte"), + { str_init("dialplan"), str_init("dp_translate"), SR_KEMIP_INT, ki_dp_translate_3_args, { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:f68cbc16: core: ppcfg - skip ending quite for exported defined values to snexpr
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: f68cbc16b7ac29cce143f7b77114eaef37312ab6 URL: https://github.com/kamailio/kamailio/commit/f68cbc16b7ac29cce143f7b77114eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:31:59+02:00 core: ppcfg - skip ending quite for exported defined values to snexpr --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/f68cbc16b7ac29cce143f7b77114eae… Patch: https://github.com/kamailio/kamailio/commit/f68cbc16b7ac29cce143f7b77114eae… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 895855df38..fc570faecd 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -393,7 +393,7 @@ static struct snexpr* pp_snexpr_defval(char *vname) if(pd->value.len>=2 && (pd->value.s[0]=='"' || pd->value.s[0]=='\'') && pd->value.s[0]==pd->value.s[pd->value.len-1]) { /* strip enclosing quotes for string value */ - return snexpr_convert_stzl(pd->value.s+1, pd->value.len-1, SNE_OP_CONSTSTZ); + return snexpr_convert_stzl(pd->value.s+1, pd->value.len-2, SNE_OP_CONSTSTZ); } else { return snexpr_convert_stzl(pd->value.s, pd->value.len, SNE_OP_CONSTSTZ); }

1 0

git:master:bb494b5d: core: ppcfg - debug messagee with result of snexpr evaluation
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: bb494b5d2dc4690c7389a3000ff8fda4ce3aeaa8 URL: https://github.com/kamailio/kamailio/commit/bb494b5d2dc4690c7389a3000ff8fda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:31:59+02:00 core: ppcfg - debug messagee with result of snexpr evaluation --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/bb494b5d2dc4690c7389a3000ff8fda… Patch: https://github.com/kamailio/kamailio/commit/bb494b5d2dc4690c7389a3000ff8fda… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 49f16aaa6f..895855df38 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -434,6 +434,7 @@ void pp_ifexp_eval(char *exval, int exlen) } if(result->type == SNE_OP_CONSTNUM) { + LM_DBG("expression number result: %g\n", result->param.num.nval); if(result->param.num.nval) { b = 1; } else { @@ -441,8 +442,11 @@ void pp_ifexp_eval(char *exval, int exlen) } } else if(result->type == SNE_OP_CONSTSTZ) { if(result->param.stz.sval==NULL || strlen(result->param.stz.sval)==0) { + LM_DBG("expression string result: <%s>\n", + (result->param.stz.sval)?"empty":"null"); b = 0; } else { + LM_DBG("expression string result: [%s]\n", result->param.stz.sval); b = 1; } }

1 0

git:master:0406cba7: core: ppcfg - remove enclosing quotes when exporting defined value to snexpr
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: 0406cba7db628a757572968269fd5d2f4426472e URL: https://github.com/kamailio/kamailio/commit/0406cba7db628a757572968269fd5d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:31:59+02:00 core: ppcfg - remove enclosing quotes when exporting defined value to snexpr --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/0406cba7db628a757572968269fd5d2… Patch: https://github.com/kamailio/kamailio/commit/0406cba7db628a757572968269fd5d2… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 2af5347cea..49f16aaa6f 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -390,13 +390,18 @@ static struct snexpr* pp_snexpr_defval(char *vname) if(pd->value.s != NULL) { LM_DBG("define id [%s] at index [%d] found with value - return [%.*s]\n", vname, idx, pd->value.len, pd->value.s); - return snexpr_convert_stzl(pd->value.s, pd->value.len, SNE_OP_CONSTSTZ); + if(pd->value.len>=2 && (pd->value.s[0]=='"' || pd->value.s[0]=='\'') + && pd->value.s[0]==pd->value.s[pd->value.len-1]) { + /* strip enclosing quotes for string value */ + return snexpr_convert_stzl(pd->value.s+1, pd->value.len-1, SNE_OP_CONSTSTZ); + } else { + return snexpr_convert_stzl(pd->value.s, pd->value.len, SNE_OP_CONSTSTZ); + } } else { LM_DBG("define id [%s] at index [%d] found without value - return 1\n", vname, idx); return snexpr_convert_num(1, SNE_OP_CONSTNUM); } - } void pp_ifexp_eval(char *exval, int exlen)

1 0

git:master:2f67daa9: dialplan: export dp_translate to kemi
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: 2f67daa9ce945cb57b8429101569203d4b891d1c URL: https://github.com/kamailio/kamailio/commit/2f67daa9ce945cb57b8429101569203… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:11:50+02:00 dialplan: export dp_translate to kemi --- Modified: src/modules/dialplan/dialplan.c --- Diff: https://github.com/kamailio/kamailio/commit/2f67daa9ce945cb57b8429101569203… Patch: https://github.com/kamailio/kamailio/commit/2f67daa9ce945cb57b8429101569203… --- diff --git a/src/modules/dialplan/dialplan.c b/src/modules/dialplan/dialplan.c index 7770679a453..0df83bbee68 100644 --- a/src/modules/dialplan/dialplan.c +++ b/src/modules/dialplan/dialplan.c @@ -75,6 +75,10 @@ static int dp_reload_f(struct sip_msg* msg); static int w_dp_replace(sip_msg_t* msg, char* pid, char* psrc, char* pdst); static int w_dp_match(sip_msg_t* msg, char* pid, char* psrc); +static int ki_dp_translate(sip_msg_t* msg, int id, str *input, str *output); +static int ki_dp_translate_1_args(sip_msg_t* msg, int id); +static int ki_dp_translate_3_args(sip_msg_t* msg, int id, str *input, str *output); + int dp_replace_fixup(void** param, int param_no); int dp_replace_fixup_free(void** param, int param_no); @@ -846,11 +850,97 @@ static sr_kemi_t sr_kemi_dialplan_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialplan"), str_init("dp_transalte"), + SR_KEMIP_INT, ki_dp_translate_1_args, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("dialplan"), str_init("dp_transalte"), + SR_KEMIP_INT, ki_dp_translate_3_args, + { SR_KEMIP_INT, 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 */ +static int ki_dp_translate(sip_msg_t* msg, int id, str *input_spv, str *output_spv) { + str input, output; + dpl_id_p idp; + str attrs, *outattrs; + pv_spec_t *pvs_i = NULL, *pvs_o = NULL; + + if (!msg) + return -1; + + if (input_spv == NULL || input_spv->s == NULL || input_spv->len <= 0 || + output_spv == NULL || output_spv->s == NULL || output_spv->len <= 0) { + LM_ERR("invalid destination var name for input or output\n"); + return -1; + } + + if (input_spv == NULL && output_spv == NULL) { + pvs_i = pv_cache_get(&default_param_s); + pvs_o = pv_cache_get(&default_param_s); + } else { + pvs_i = pv_cache_get(input_spv); + pvs_o = pv_cache_get(output_spv); + } + + if (pvs_i == NULL || pvs_o == NULL) { + LM_ERR("cannot get pv spec for input or output\n"); + return -1; + } + + if ((pvs_i->type!=PVT_AVP && pvs_i->type!=PVT_XAVP && pvs_i->type!=PVT_SCRIPTVAR && + pvs_i->type!=PVT_RURI && pvs_i->type!=PVT_RURI_USERNAME) || + (pvs_o->type!=PVT_AVP && pvs_o->type!=PVT_XAVP && pvs_o->type!=PVT_SCRIPTVAR && + pvs_o->type!=PVT_RURI && pvs_o->type!=PVT_RURI_USERNAME)) { + LM_ERR("type of pv error\n"); + return -1; + } + + if ((idp = select_dpid(id)) ==0 ){ + LM_DBG("no information available for dpid %i\n", id); + return -2; + } + + /* get the input */ + if (dp_get_svalue(msg, pvs_i, &input)!=0){ + LM_ERR("invalid param 2\n"); + return -1; + } + + LM_DBG("input is %.*s\n", input.len, input.s); + + outattrs = (!attr_pvar)?NULL:&attrs; + if (dp_translate_helper(msg, &input, &output, idp, outattrs)!=0) { + LM_DBG("could not translate %.*s " + "with dpid %i\n", input.len, input.s, idp->dp_id); + return -1; + } + LM_DBG("input %.*s with dpid %i => output %.*s\n", + input.len, input.s, idp->dp_id, output.len, output.s); + + /* set the output */ + if (dp_update(msg, pvs_o, &output, outattrs) !=0){ + LM_ERR("cannot set the output\n"); + return -1; + } + + return 1; + +} + +static int ki_dp_translate_1_args(sip_msg_t* msg, int id) { + return ki_dp_translate(msg, id, NULL, NULL); +} + +static int ki_dp_translate_3_args(sip_msg_t* msg, int id, str *input, str *output) { + return ki_dp_translate(msg, id, input, output); +} + /** * */

1 0

git:master:a33b41ba: siputils: export is_gruu() to kemi
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: a33b41ba804bc944b0e1c4ecf17fdc3ca68d4da0 URL: https://github.com/kamailio/kamailio/commit/a33b41ba804bc944b0e1c4ecf17fdc3… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:11:50+02:00 siputils: export is_gruu() to kemi --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/a33b41ba804bc944b0e1c4ecf17fdc3… Patch: https://github.com/kamailio/kamailio/commit/a33b41ba804bc944b0e1c4ecf17fdc3… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index e7c5e3dcfca..88ed33050b6 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -118,6 +118,7 @@ static int fixup_get_uri_param(void** param, int param_no); static int free_fixup_get_uri_param(void** param, int param_no); static int fixup_option(void** param, int param_no); +static int ki_is_gruu(sip_msg_t *msg); char *contact_flds_separator = DEFAULT_SEPARATOR; @@ -726,11 +727,20 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_gruu"), + SR_KEMIP_INT, ki_is_gruu, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; /* clang-format on */ +static int ki_is_gruu(sip_msg_t *msg) { + return w_is_gruu(msg, NULL, NULL); +} + /** * */

1 0

git:master:678d93a7: ratelimit: export functions to kemi
by Daniel-Constantin Mierla 14 Sep '22

14 Sep '22

Module: kamailio Branch: master Commit: 678d93a742ba294bbe571c975814e01fdd795371 URL: https://github.com/kamailio/kamailio/commit/678d93a742ba294bbe571c975814e01… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-14T18:11:50+02:00 ratelimit: export functions to kemi --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/678d93a742ba294bbe571c975814e01… Patch: https://github.com/kamailio/kamailio/commit/678d93a742ba294bbe571c975814e01… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index efecfaa779c..4973694321c 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -42,6 +42,7 @@ #include "../../core/data_lump_rpl.h" #include "../../core/counters.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "rl_statistics.h" @@ -199,6 +200,8 @@ static int w_rl_check_forced(struct sip_msg*, char *, char *); static int w_rl_check_forced_pipe(struct sip_msg*, char *, char *); static int add_queue_params(modparam_t, void *); static int add_pipe_params(modparam_t, void *); +static int ki_rl_check(struct sip_msg *msg); +static int ki_rl_check_pipe(struct sip_msg *msg, int pipe); /* RESERVED for future use static int set_load_source(modparam_t, void *); */ @@ -1323,3 +1326,33 @@ static rpc_export_t rpc_methods[] = { {0, 0, 0, 0} }; +static sr_kemi_t sr_kemi_ratelimit_exports[] = { + { str_init("ratelimit"), str_init("rl_check"), + SR_KEMIP_INT, ki_rl_check, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("ratelimit"), str_init("rl_check_pipe"), + SR_KEMIP_INT, ki_rl_check_pipe, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } + +}; + +static int ki_rl_check(struct sip_msg *msg) { + return rl_check(msg, -1); +} + +static int ki_rl_check_pipe(struct sip_msg *msg, int pipe) { + + LM_DBG("trying kemi pipe %d\n", pipe); + return rl_check(msg, pipe); +} + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_ratelimit_exports); + return 0; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022