sr-dev June 2024

sr-dev@lists.kamailio.org

14 participants
228 discussions

git:master:9eb117ab: dispatcher: print oc rate and time in rpc list full
by Daniel-Constantin Mierla 11 Jun '24

11 Jun '24

Module: kamailio Branch: master Commit: 9eb117abe34abbaa1ff228df3d81506b46933e53 URL: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-11T10:57:31+02:00 dispatcher: print oc rate and time in rpc list full --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… Patch: https://github.com/kamailio/kamailio/commit/9eb117abe34abbaa1ff228df3d81506… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index c7ea8380543..4726992a559 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1881,7 +1881,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSS", "BODY", + if(rpc->struct_add(wh, "SSdddSSSujj", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1899,7 +1899,11 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data) + : &data, + "OCRATE", node->dlist[j].attrs.ocrate, "OCTIME_SEC", + (unsigned long)node->dlist[j].octime.tv_sec, + "OCTIME_USEC", + (unsigned long)node->dlist[j].octime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

[kamailio/kamailio] pike: fix documentation for reqs_density_per_unit (PR #3806)
by tsearle 11 Jun '24

11 Jun '24

#### 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/3806 -- Commit Summary -- * pike: fix documentation for reqs_density_per_unit -- File Changes -- M src/modules/pike/doc/pike_admin.xml (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3806.patch https://github.com/kamailio/kamailio/pull/3806.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3806 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3806(a)github.com>

5 7

git:master:dd30f8b9: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: dd30f8b905a80f85891df72a1f865c9ad1508c9a URL: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-10T13:16:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… Patch: https://github.com/kamailio/kamailio/commit/dd30f8b905a80f85891df72a1f865c9… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index c095bc201be..1e99229575a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -122,7 +122,7 @@ Federico Cabiddu 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 5. RPC Commands @@ -212,7 +212,7 @@ Federico Cabiddu 1.57. ds_load_unset usage 1.58. ds_reload usage 1.59. ds_dsg_fetch() usage - 1.60. ds_oc_set_rate() usage + 1.60. ds_oc_set_attrs() usage 1.61. dispatcher list file 1.62. Kamailio config script - sample dispatcher usage @@ -291,7 +291,7 @@ Chapter 1. Admin Guide 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 5. RPC Commands @@ -1118,7 +1118,7 @@ modparam("dispatcher", "ds_interval_mode", 7200) 4.14. ds_load_unset() 4.15. ds_reload() 4.16. ds_dsg_fetch(setid) - 4.17. ds_oc_set_rate(setid, uri, val) + 4.17. ds_oc_set_attrs(setid, uri, rval, tval) 4.1. ds_select_dst(set, alg[, limit]) @@ -1636,22 +1636,26 @@ onreply_route { xinfo("set id: 1 - all: $dsg(count); active: $dsg(active)\n"); ... -4.17. ds_oc_set_rate(setid, uri, val) +4.17. ds_oc_set_attrs(setid, uri, rval, tval) - Sets the overload control rate for the destination (setid, uri). + Sets the overload control rate and time internval limit for the + destination (setid, uri). Description of parameters: * setid - the set (group) id. The parameter can be an integer or a variable holding an integer value. * uri - the URI of the destination. - * val - the value of the overload control rate (from 1 to 100) - how + * rval - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections. + * tval - time interval limit to apply the overload control rate (in + milliseconds). If the value is 0 or negative, then the default + value 500 is used. This function can be used from ANY_ROUTE. - Example 1.60. ds_oc_set_rate() usage + Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); ... 5. RPC Commands

1 0

git:master:851a839b: dispatcher: compare time interval validity for oveload control
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 851a839b50296669523947e1a0d73f1b602f0819 URL: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T13:09:26+02:00 dispatcher: compare time interval validity for oveload control --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… Patch: https://github.com/kamailio/kamailio/commit/851a839b50296669523947e1a0d73f1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index c7722acb32e..6e13987a4da 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -498,18 +498,26 @@ int ds_oc_set_attrs(sip_msg_t *msg, int setid, str *duri, int irval, int itval) */ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) { - int ret = 0; + struct timeval tnow; if(alg != DS_ALG_OVERLOAD) { return 0; } + gettimeofday(&tnow, NULL); + + if(timercmp(&dsg->dlist[n].octime, &tnow, <)) { + /* over the time interval validity - use it */ + return 0; + } if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { - ret = 0; + /* use it */ + return 0; } dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; - return ret; + /* skip it */ + return 1; } /**

1 0

git:master:244fc84a: dispatcher: docs for ds_oc_set_attrs(...)
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 244fc84a971d3381e731dab558c19d96e0922f5f URL: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:49:42+02:00 dispatcher: docs for ds_oc_set_attrs(...) --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… Patch: https://github.com/kamailio/kamailio/commit/244fc84a971d3381e731dab558c19d9… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index e0e8d1beed8..62e212f8744 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2014,12 +2014,13 @@ onreply_route { </programlisting> </example> </section> - <section id="dispatcher.f.ds_oc_set_rate"> + <section id="dispatcher.f.ds_oc_set_attrs"> <title> - <function moreinfo="none">ds_oc_set_rate(setid, uri, val)</function> + <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval)</function> </title> <para> - Sets the overload control rate for the destination (setid, uri). + Sets the overload control rate and time internval limit + for the destination (setid, uri). </para> <para>Description of parameters:</para> <itemizedlist> @@ -2032,9 +2033,14 @@ onreply_route { <para><emphasis>uri</emphasis> - the URI of the destination.</para> </listitem> <listitem> - <para><emphasis>val</emphasis> - the value of the overload control + <para><emphasis>rval</emphasis> - the value of the overload control rate (from 1 to 100) - how many times to skip using this destination in 100 selections.</para> + </listitem> + <listitem> + <para><emphasis>tval</emphasis> - time interval limit to apply the + overload control rate (in milliseconds). If the value is 0 or + negative, then the default value 500 is used.</para> </listitem> </itemizedlist> @@ -2042,10 +2048,10 @@ onreply_route { This function can be used from ANY_ROUTE. </para> <example> - <title><function>ds_oc_set_rate()</function> usage</title> + <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_rate("1", "sip:127.0.0.1:5080", "30"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000"); ... </programlisting> </example>

1 0

git:master:0f8b5349: dispatcher: replaced ds_oc_set_rate() with ds_oc_set_attrs()
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 0f8b5349e2e98333d9e3b578144bb5402d8443e0 URL: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:41:30+02:00 dispatcher: replaced ds_oc_set_rate() with ds_oc_set_attrs() - used now to set both oc rate and time limit --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54… Patch: https://github.com/kamailio/kamailio/commit/0f8b5349e2e98333d9e3b578144bb54…

1 0

git:master:818cced9: core: helper fixup for functions with int-str-int-int parameters
by Daniel-Constantin Mierla 10 Jun '24

10 Jun '24

Module: kamailio Branch: master Commit: 818cced90cdbb524acbc423c79fc6c2b696da77c URL: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-10T12:22:58+02:00 core: helper fixup for functions with int-str-int-int parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… Patch: https://github.com/kamailio/kamailio/commit/818cced90cdbb524acbc423c79fc6c2… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ec4e016ed88..fa7e2c4b47a 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -1061,3 +1061,37 @@ int fixup_free_isi(void **param, int param_no) return E_UNSPEC; } } + +/** + * + */ +int fixup_isii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + return fixup_igp_null(param, 1); + case 2: + return fixup_spve_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_isii(void **param, int param_no) +{ + switch(param_no) { + case 1: + case 3: + case 4: + return fixup_free_igp_null(param, 1); + case 2: + return fixup_free_spve_null(param, 1); + default: + return E_UNSPEC; + } +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index aafb3a4cbff..76c57bc9bf6 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -187,4 +187,7 @@ int fixup_free_ssii(void **param, int param_no); int fixup_isi(void **param, int param_no); int fixup_free_isi(void **param, int param_no); +int fixup_isii(void **param, int param_no); +int fixup_free_isii(void **param, int param_no); + #endif

1 0

git:5.8:955c6e02: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Jun '24

08 Jun '24

Module: kamailio Branch: 5.8 Commit: 955c6e02ed0e31a4c7f148518bf44edb12c37a07 URL: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-08T20:31:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… Patch: https://github.com/kamailio/kamailio/commit/955c6e02ed0e31a4c7f148518bf44ed… --- diff --git a/src/modules/ims_ipsec_pcscf/README b/src/modules/ims_ipsec_pcscf/README index bce99b791da..3d831eb2c47 100644 --- a/src/modules/ims_ipsec_pcscf/README +++ b/src/modules/ims_ipsec_pcscf/README @@ -361,7 +361,7 @@ ipsec_destroy("location"); recv_host - received host to match the record. recv_port - received port to match the record. - The last three parameters have to be string valies and can contain + The last three parameters have to be string values and can contain variables. Example 1.14. ipsec_destroy_by_contact()

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 08 Jun '24

08 Jun '24

- URL: https://github.com/kamailio/kamailio/commit/f9bd2c5a4341913ac3e887e0324a19d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:28:02+02:00 tcpops: reformat exported structures (cherry picked from commit 9b087fd618ab6c5cbd6a29c352b09c7198f1b594) - URL: https://github.com/kamailio/kamailio/commit/5c4f687d0ed06d6c7a5696917982b1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:28:19+02:00 sipcapture: use local static buffers for ip address and port - GH #3835 (cherry picked from commit d1f377ff23f491bfd5162cb7bf510759440dd8e5) - URL: https://github.com/kamailio/kamailio/commit/d53843c75da9115a9c3cb6b1b909fd3… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2024-06-08T12:28:32+02:00 db_mysql: fixed build on CentOS 7 (cherry picked from commit 767b3faee3af450d6482b919c81431ea6d707807) - URL: https://github.com/kamailio/kamailio/commit/deb11ee814e1591698d120a113630aa… Author: Rick Barenthin <rick(a)ng-voice.com> Date: 2024-06-08T12:29:15+02:00 usrloc: delete location_attrs in db_only mode on delete_urecord When calling delete_urecord in DB_ONLY mode the location_attrs are not deleted. This fix makes sure to delete location_attrs when calling db_delete_urecord is called. (cherry picked from commit 6b8f6d3b5d563d91234b8d4b7e155b7e74b9d313) - URL: https://github.com/kamailio/kamailio/commit/9a7e3e54f1c52ee69c68b1165de1158… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:01+02:00 htable: error on not finding htable in pv set (cherry picked from commit 82cfea317fd8d02a6c94347bc1be18c8a06e580f) - URL: https://github.com/kamailio/kamailio/commit/7087ce6aa496de9b6015e5054d8fd70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:14+02:00 htable: error on not finding htable in pv get (cherry picked from commit 24b27214231166366cceb88fcb3724298cc53b32) - URL: https://github.com/kamailio/kamailio/commit/f4eea76a15b220b15337b60a77f7978… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:30:26+02:00 rtpengine: Fix extra process in pkg.stats When DTMF events socket is not configured, pkg.stats RPC method returns an empty entry. { entry: 13 pid: 0 rank: -128 used: 0 free: 0 real_used: 0 total_size: 67108864 total_frags: 0 desc: } Fixes: 26f6e57c8f ("Register a new worker process for dtmf event listener") (cherry picked from commit e67f6048f4883d446df2d88fe7a7d7f2ff6daf8c) - URL: https://github.com/kamailio/kamailio/commit/833b93563f43fa95e4bfdd175b14467… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:35+02:00 siputils: free head of params list for get_uri_param() - GH #3857 (cherry picked from commit d72a3fbc903da02ae3b26f3aae2ea228c9f8b255) - URL: https://github.com/kamailio/kamailio/commit/ebc8acef7617a69dcc06b163c47e88a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:30:46+02:00 siputils: free head of params list for get_uri_param() - GH #3857 (cherry picked from commit 8363208fff7c101a2779ff64783e5b7dbf8ffd7c) - URL: https://github.com/kamailio/kamailio/commit/5c9c13080be2b15252492dca388777d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-08T12:31:20+02:00 regex: fix pcre2 migration instead of reserving an array in pkg_mem and later copy the pointers to shm_mem just use shm_mem in the first place. fixes #3812 (cherry picked from commit d89333748662c0e7c72e3579d41fd14ef05c0fee) - URL: https://github.com/kamailio/kamailio/commit/614b5601170578c2d0eb79e7e5c64e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:31+02:00 geoip2: init MMDB_s global pointer and check on destroy (cherry picked from commit 8ba4ee4e00798ca015adc48542d0e4de8ed9daad) - URL: https://github.com/kamailio/kamailio/commit/2cc901e8be63791432a49f87d434eeb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:39+02:00 geoip2: do not close global MMDB_s on destroy - GH #3861 (cherry picked from commit e066613cac308d1129baebc47d7c245b36eba4b0) - URL: https://github.com/kamailio/kamailio/commit/ae3be6af4ea8d50c29fe8e523c95482… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:31:50+02:00 geoip2: rename global lock variable (cherry picked from commit 4bd619d3517f129362de3ce50eed2620d5002b42) - URL: https://github.com/kamailio/kamailio/commit/45f2e2670a3eac768b97b58eeec228b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:00+02:00 geoip2: keep global structure per process - parsing db file allocates private memory - reworked reload to rely on a global counter - GH #3861 (cherry picked from commit baccbe0298f9fa46db285505bc4386f997de5a47) - URL: https://github.com/kamailio/kamailio/commit/c27094b8288b7a949fbfc766eb9223c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:08+02:00 geoip2: clang format module file (cherry picked from commit 293193c55caaf5d0c39dc456babe92f574b58b3b) - URL: https://github.com/kamailio/kamailio/commit/54f9adb03ebbacf35eb0785dc46b55c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:32:16+02:00 geoip2: Reload database before accessing it Re-add reloading of database. GH #3861 Fixes: 293193c55c ("geoip2: clang format module file") (cherry picked from commit 51dcab019a42e5b1f3b81247ca71ffcaf46180de) - URL: https://github.com/kamailio/kamailio/commit/eb4a8e326b10d0c3e922cc524d8f46d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:32:55+02:00 iims_registrar_scscf: include header for common c functions - GH #3855 (cherry picked from commit b508ef253cf996a5efd8bf13ded0c804f3557ada) - URL: https://github.com/kamailio/kamailio/commit/5999529be9ac2187dad465518bea3de… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:33:18+02:00 core/resolve: Check dns_cache_init and choose appropriate functions (cherry picked from commit 06d583e356351ae9d8a559c9f5de3e57fb128a38) - URL: https://github.com/kamailio/kamailio/commit/eb4ec6f9305e334d9749e1fd56ad195… Author: codenot <codenot(a)msn.com> Date: 2024-06-08T12:33:34+02:00 nathelper: fixed handle_ruri_alias_mode(1) cannot proper handle multi alias (cherry picked from commit 8e0b2e4b6450fa50bd573fa013dc888aaaccd2bf) - URL: https://github.com/kamailio/kamailio/commit/e8dc8506dbc4d8964e02c3be175d7f1… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:33:43+02:00 nathelper: remove magic constant (cherry picked from commit 3d187336f22e30800acefd28e4d0f98e0f677a49) - URL: https://github.com/kamailio/kamailio/commit/5571ea0ff8877a8a19b3fb76030af19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-08T12:34:06+02:00 dmq_usrloc: reformat exported structures (cherry picked from commit e94812149c6f2867a5b23f1218a9af139590bf51) - URL: https://github.com/kamailio/kamailio/commit/ed0cdf3a3c85a8d05aacec8917fe35a… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2024-06-08T12:35:18+02:00 ims_ipsec_pcscf: Fix typo (cherry picked from commit 16e1b38fcc1593ad09eb03d86cd056ab8ff7f7f7) - URL: https://github.com/kamailio/kamailio/commit/8ef8db05dbc3a4cf5246354ce31dff1… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-06-08T12:35:24+02:00 pua_dialoginfo: Fix ruri length (cherry picked from commit 2c7c2d215ec9277fa706053579a38f058f15ae85)

1 0

[kamailio/kamailio] pua_dialoginfo fails to publish the caller when not using avps (Issue #3838)
by michelpelletier07 08 Jun '24

08 Jun '24

### Description What I did: I enabled the pua_dialoginfo module to publish changes for both the caller and the callee. What I expected: PUBLISH to be generated for the caller and the callee What actually happened: PUBLISH is only generated for the callee. ### Troubleshooting I troubleshooted the issue by adding LM_ERR messages at various point in the pua_dialoginfo.c #### Reproduction Add a db-url as modparam to pua Do not add any modparam to pua_dialoginfo. Then make a phone call while making sure dialog.dlg_manage() is called to track the call. #### Debugging Data Not applicable #### Log Messages pua_dialoginfo [dialog_publish.c:303]: dialog_publish(): failed to parse the PUBLISH R-URI ### Possible Solutions I tracked the issue to line 840 of pua_dialoginfo.c (see enclosed patch file), where dlginfo->pubruris_caller->s.s is set to the value of dlginfo->from_uri but dlginfo->pubruris_caller->s.len is not set to anything (left at zero). So I added a line to set the len value to the len value of dlginfo->from_uri.len See patch below: ``` diff -ru a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c 2024-05-02 11:14:34.150097771 -0600 +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c 2024-05-02 11:09:30.855960974 -0600 @@ -838,6 +838,8 @@ } memset(dlginfo->pubruris_caller, 0, sizeof(struct str_list)); dlginfo->pubruris_caller->s.s = shm_str2char_dup(&dlginfo->from_uri); + dlginfo->pubruris_caller->s.len = dlginfo->from_uri.len; + if(!dlginfo->pubruris_caller->s.s) { free_dlginfo_cell(dlginfo); return NULL; ``` ### Additional Information version: kamailio 5.8.1 (x86_64/linux) 384843 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_SEND_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: 384843 compiled on 13:45:08 May 2 2024 with gcc 10.2.1 * **Operating System**: Linux yto11-stg-smf-vtr1.vcn.ms 5.10.0-27-amd64 #1 SMP Debian 5.10.205-2 (2023-12-31) x86_64 GNU/Linux -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3838 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3838(a)github.com>

3 4

← Newer
1
...
14
15
16
17
18
19
20
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2024