sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
162 discussions

[kamailio/kamailio] pua and pua_dialoginfo improvements (PR #3955)

by Victor Seva

#### 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) - [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 #### Description We are seeing a lot of error messages like: > ERROR: <null> pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) After some investigation I come up with a couple of fixes: * pua: improve the query to support caller|callee with same pres_id (same dialog) * pua_dialoginfo: support uuid to generate pres_id to improve randomness You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3955 -- Commit Summary -- * pua: get_record_puadb() add pres_uri to the query * pua_dialoginfo: use_uuid parameter * pua_dialoginfo: document use_uuid parameter -- File Changes -- M src/modules/pua/pua_db.c (18) M src/modules/pua/pua_db.h (5) M src/modules/pua/send_publish.c (5) M src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml (11) M src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml (25) M src/modules/pua_dialoginfo/pua_dialoginfo.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3955.patch https://github.com/kamailio/kamailio/pull/3955.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3955 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3955(a)github.com>

3 months

git:master:c06ed186: pua_dialoginfo: document use_uuid parameter

by Victor Seva

Module: kamailio Branch: master Commit: c06ed1864f37e5574345601489427a8623d24e34 URL: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: document use_uuid parameter --- Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… Patch: https://github.com/kamailio/kamailio/commit/c06ed1864f37e5574345601489427a8… --- diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index 17ae58a27fa..d1eda128f23 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -50,6 +50,11 @@ <surname>Gaisnon</surname> <email>frederic.gaisnon(a)gmail.com</email> </editor> + <editor> + <firstname>Victor</firstname> + <surname>Seva</surname> + <email>vseva(a)sipwise.com</email> + </editor> </authorgroup> <copyright> <year>2006</year> @@ -63,6 +68,10 @@ <year>2021</year> <holder>MomentTech</holder> </copyright> + <copyright> + <year>2024</year> + <holder>Sipwise</holder> + </copyright> </bookinfo> <toc></toc> @@ -70,5 +79,3 @@ </book> - - diff --git a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index cad923058ac..6093c3516b6 100644 --- a/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/src/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -211,6 +211,11 @@ <emphasis>pua</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>uuid</emphasis> if <varname>use_uuid</varname> is enabled. + </para> + </listitem> </itemizedlist> </para> </section> @@ -233,6 +238,25 @@ <section> <title>Parameters</title> + <section id="pua_dialoginfo.p.use_uuid"> + <title><varname>use_uuid</varname> (int)</title> + <para> + If this parameter is set, the pres_id will be generated using libuuid via uuid module. + uuid module has to be loaded before pua_dialoginfo in this case. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>use_uuid</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "use_uuid", 1) +... +</programlisting> + </example> + </section> + <section id="pua_dialoginfo.p.include_callid"> <title><varname>include_callid</varname> (int)</title> <para>

3 months

git:master:6ba2fba3: pua_dialoginfo: use_uuid parameter

by Victor Seva

Module: kamailio Branch: master Commit: 6ba2fba382704b0c693a1ca5745db6203c12f2a0 URL: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua_dialoginfo: use_uuid parameter generate pres_id using libuuid via uuid module --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… Patch: https://github.com/kamailio/kamailio/commit/6ba2fba382704b0c693a1ca5745db62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index d1782380b07..35757128ff7 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -51,6 +51,7 @@ MODULE_VERSION /* Default module parameter values */ +#define DEF_USE_UUID 0 #define DEF_INCLUDE_CALLID 1 #define DEF_INCLUDE_LOCALREMOTE 1 #define DEF_INCLUDE_TAGS 1 @@ -91,6 +92,7 @@ static str callee_entity_when_publish_disabled = {0, 0}; /* pubruri_callee */ static str local_identity_dlg_var = STR_NULL; /* Module parameter variables */ +int use_uuid = DEF_USE_UUID; int include_callid = DEF_INCLUDE_CALLID; int include_localremote = DEF_INCLUDE_LOCALREMOTE; int include_tags = DEF_INCLUDE_TAGS; @@ -123,6 +125,7 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { + {"use_uuid", INT_PARAM, &use_uuid}, {"include_callid", INT_PARAM, &include_callid}, {"include_localremote", INT_PARAM, &include_localremote}, {"include_tags", INT_PARAM, &include_tags}, @@ -733,8 +736,16 @@ struct dlginfo_cell *get_dialog_data(struct dlg_cell *dlg, int type, int len; // generate new random uuid - if(sruid_next_safe(&_puadi_sruid) < 0) { - return NULL; + if(use_uuid) { + _puadi_sruid.uid.len = SRUID_SIZE; + if(sruid_uuid_generate(_puadi_sruid.uid.s, &_puadi_sruid.uid.len) < 0) { + LM_ERR("uuid not generated\n"); + return NULL; + } + } else { + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } } LM_DBG("uuid generated: '%.*s'\n", _puadi_sruid.uid.len, _puadi_sruid.uid.s);

3 months

git:master:bbb86944: pua: get_record_puadb() add pres_uri to the query

by Victor Seva

Module: kamailio Branch: master Commit: bbb869441feb141d6732926973a6a95224d70a17 URL: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:12:58+02:00 pua: get_record_puadb() add pres_uri to the query if pres_uri is present, added to the query to avoid this kind of errors: > pua [pua_db.c:895]: get_record_puadb(): Too many rows found (2) Since there's always in our case two records with the same pres_id (callee|caller): | 27 | sip:testgroup1010@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67760.9.0 | | 29 | sip:testuser1003@invite-group-parallel.scenarios-pbx.test | DIALOG_PUBLISH.padi-66c6f28a-108ad-4 | 32 | 1724318050 | 1724338210 | 1024 | a.1724314250.67757.8.0 | --- Modified: src/modules/pua/pua_db.c Modified: src/modules/pua/pua_db.h Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… Patch: https://github.com/kamailio/kamailio/commit/bbb869441feb141d6732926973a6a95… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index f66c3b210f7..67f02736836 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -2,6 +2,7 @@ * pua db - presence user agent database support * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -790,17 +791,26 @@ int insert_record_puadb(ua_pres_t *pres) /******************************************************************************/ -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **dbres) +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **dbres) { - db_key_t q_cols[2]; - db_val_t q_vals[2], *values; + db_key_t q_cols[3]; + db_val_t q_vals[3], *values; db_row_t *rows; db1_res_t *res; int n_query_cols = 0, nr_rows; db_query_f query_fn = pua_dbf.query_lock ? pua_dbf.query_lock : pua_dbf.query; + if(pres_uri != NULL) { + q_cols[n_query_cols] = &str_pres_uri_col; + q_vals[n_query_cols].type = DB1_STR; + q_vals[n_query_cols].nul = 0; + q_vals[n_query_cols].val.str_val.s = pres_uri->s; + q_vals[n_query_cols].val.str_val.len = pres_uri->len; + n_query_cols++; + } + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; diff --git a/src/modules/pua/pua_db.h b/src/modules/pua/pua_db.h index 788d1656207..cd448b0467d 100644 --- a/src/modules/pua/pua_db.h +++ b/src/modules/pua/pua_db.h @@ -2,6 +2,7 @@ * pua_db headers - presence user agent db headers * * Copyright (C) 2011 Crocodile RCS Ltd + * Copyright (C) 2024 Victor Seva (Sipwise) * * This file is part of Kamailio, a free SIP server. * @@ -58,8 +59,8 @@ int update_dialog_puadb(ua_pres_t *pres, int expires, str *contact); list_entry_t *get_subs_list_puadb(str *did); int insert_record_puadb(ua_pres_t *pres); -ua_pres_t *get_record_puadb( - str pres_id, str *etag, ua_pres_t *result, db1_res_t **res); +ua_pres_t *get_record_puadb(str *pres_uri, str pres_id, str *etag, + ua_pres_t *result, db1_res_t **res); int delete_record_puadb(ua_pres_t *pres); int update_record_puadb(ua_pres_t *pres, int expires, str *contact); int update_version_puadb(ua_pres_t *pres); diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index 53644265633..4a06870f7a5 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -309,7 +309,7 @@ void publ_cback_func(struct cell *t, int type, struct tmcb_params *ps) if(pua_dbf.affected_rows != NULL || dbmode != PUA_DB_ONLY) { if(find_and_update_record(hentity, hash_code, lexpire, &etag) > 0) goto done; - } else if((db_presentity = get_record_puadb( + } else if((db_presentity = get_record_puadb(hentity->pres_uri, hentity->id, &hentity->etag, &dbpres, &res)) != NULL) { update_record_puadb(hentity, lexpire, &etag); @@ -468,7 +468,8 @@ int send_publish(publ_info_t *publ) dbpres.pres_uri = &pres_uri; dbpres.watcher_uri = &watcher_uri; dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); + presentity = get_record_puadb( + publ->pres_uri, publ->id, publ->etag, &dbpres, &res); } else { ua_pres_t pres;

3 months

git:master:30d9ef64: pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci]

by Victor Seva

Module: kamailio Branch: master Commit: 30d9ef64d7162d53290c1f18d0b89a33010084a1 URL: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T10:02:33+02:00 pkg/kamailio/deb: add Ubuntu 24.04 (Noble Numbat) support [skip ci] --- Added: pkg/kamailio/deb/debian/backports/noble Added: pkg/kamailio/deb/noble/changelog Added: pkg/kamailio/deb/noble/compat Added: pkg/kamailio/deb/noble/control Added: pkg/kamailio/deb/noble/copyright Added: pkg/kamailio/deb/noble/kamailio-autheph-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-berkeley-bin.dirs Added: pkg/kamailio/deb/noble/kamailio-dnssec-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-outbound-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-tls-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio-websocket-modules.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.README.Debian Added: pkg/kamailio/deb/noble/kamailio.default Added: pkg/kamailio/deb/noble/kamailio.examples Added: pkg/kamailio/deb/noble/kamailio.init Added: pkg/kamailio/deb/noble/kamailio.lintian-overrides Added: pkg/kamailio/deb/noble/kamailio.postinst Added: pkg/kamailio/deb/noble/kamailio.service Added: pkg/kamailio/deb/noble/kamailio@.service Added: pkg/kamailio/deb/noble/rules Added: pkg/kamailio/deb/noble/source.lintian-overrides Added: pkg/kamailio/deb/noble/source/format Added: pkg/kamailio/deb/noble/watch --- Diff: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3… Patch: https://github.com/kamailio/kamailio/commit/30d9ef64d7162d53290c1f18d0b89a3…

3 months

git:master:2581d7aa: modules: readme files regenerated - sca ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2581d7aa2fd9c14c76b75274ea42fb94a87c4684 URL: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-27T09:46:09+02:00 modules: readme files regenerated - sca ... [skip ci] --- Modified: src/modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9… Patch: https://github.com/kamailio/kamailio/commit/2581d7aa2fd9c14c76b75274ea42fb9…

3 months

[kamailio/kamailio] sca: add support custom [to|from]_uri (PR #3930)

by Victor Seva

#### 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 #### Description This is the first step to merge the functionality that is already used in Sipwise kamailio flavor * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3930 -- Commit Summary -- * sca: add support custom [to|from]_uri -- File Changes -- M src/modules/sca/doc/sca.xml (58) M src/modules/sca/doc/sca_admin.xml (52) M src/modules/sca/sca.c (115) M src/modules/sca/sca.h (5) M src/modules/sca/sca_call_info.c (190) M src/modules/sca/sca_subscribe.c (96) M src/modules/sca/sca_subscribe.h (5) M src/modules/sca/sca_util.c (184) M src/modules/sca/sca_util.h (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3930.patch https://github.com/kamailio/kamailio/pull/3930.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3930 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3930(a)github.com>

3 months

git:master:c9a9fcd4: sca: add support custom [to|from]_uri

by Victor Seva

Module: kamailio Branch: master Commit: c9a9fcd4429de8c7da7cb3ab9cebe077edea91bf URL: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:37:56+02:00 sca: add support custom [to|from]_uri * module parameters [from|to]_uri_avp to store * sca_handle_subscribe() support [from|to_uri] parameters Add the possibility of define what is the URI value for To and/or From instead of the values from the SIP message --- Modified: src/modules/sca/doc/sca.xml Modified: src/modules/sca/doc/sca_admin.xml Modified: src/modules/sca/sca.c Modified: src/modules/sca/sca.h Modified: src/modules/sca/sca_call_info.c Modified: src/modules/sca/sca_subscribe.c Modified: src/modules/sca/sca_subscribe.h Modified: src/modules/sca/sca_util.c Modified: src/modules/sca/sca_util.h --- Diff: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07… Patch: https://github.com/kamailio/kamailio/commit/c9a9fcd4429de8c7da7cb3ab9cebe07…

3 months

[kamailio/kamailio] fix(pua_reginfo): free pkg memory after getting the XML attribute (PR #3953)

by Andrew Pogrebennyk

fix(pua_reginfo): free pkg memory after getting the XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs.   #### 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/3953 -- Commit Summary -- * fix(pua_reginfo): free pkg memory after getting the content of each XML attribute -- File Changes -- M src/modules/pua_reginfo/notify.c (86) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3953.patch https://github.com/kamailio/kamailio/pull/3953.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3953 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3953(a)github.com>

3 months

git:master:ed6730aa: pua_reginfo: free pkg memory after getting the content of each XML attribute

by Victor Seva

Module: kamailio Branch: master Commit: ed6730aa64e0e7c1580584d6f808e76a665e5882 URL: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Author: Andrii Pogrebennyk <andrii(a)ng-voice.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-08-27T09:35:47+02:00 pua_reginfo: free pkg memory after getting the content of each XML attribute - free the memory from the state XML attribute that was returned and immediately used in another function call without freeing leaving one small mem leak; - add comments but keep the dead code regarding parsed but unused attrs. --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76… Patch: https://github.com/kamailio/kamailio/commit/ed6730aa64e0e7c1580584d6f808e76…

3 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024