sr-dev December 2024

sr-dev@lists.kamailio.org

17 participants
347 discussions

[kamailio/kamailio] ims_isc: bugfix: firstflag incorrect in isc_match_filter (PR #4018)
by Kilian Wöber 14 Dec '24

14 Dec '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The function isc_match_filter uses a local variable "firstflag", to handle the case of an HSS based terminating unregistered service. In that case, the S-CSCF exchanges SAR/SAA with the HSS in order to learn the subscription data and the iFC for an unregistered user or for a PSI. The firstflag is necessary to make a distiction between the FAILURE ROUTE that is used for this case and the FAILURE ROUTE that is used for transaction failure towards the AS. The error is, the firstflag is set for the latter case, too, which leads to a wrong handling of communication errors towards the AS. This PR introduces a new function that looks for the old ISCMARK in the lumps of the stored message and hence can make a distinction between the SAR/SAA case and the AS failure case. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4018 -- Commit Summary -- * ims_isc: bugfix: firstflag incorrect in isc_match_filter -- File Changes -- M src/modules/ims_isc/ims_isc_mod.c (24) M src/modules/ims_isc/mark.c (51) M src/modules/ims_isc/mark.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4018.patch https://github.com/kamailio/kamailio/pull/4018.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4018 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4018(a)github.com>

4 16

git:master:2bd70ed7: ims_isc: bugfix: firstflag incorrect in isc_match_filter
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 2bd70ed7ab8ec4cf59e12be3d561c735d84f2dea URL: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73… Author: Kilian W��ber <Kilian.Woeber(a)kontron.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:53:49+01:00 ims_isc: bugfix: firstflag incorrect in isc_match_filter --- Modified: src/modules/ims_isc/ims_isc_mod.c Modified: src/modules/ims_isc/ims_isc_mod.h Modified: src/modules/ims_isc/isc.c Modified: src/modules/ims_isc/isc.h Modified: src/modules/ims_isc/mark.c Modified: src/modules/ims_isc/mark.h --- Diff: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73… Patch: https://github.com/kamailio/kamailio/commit/2bd70ed7ab8ec4cf59e12be3d561c73…

1 0

[kamailio/kamailio] htable: export table create api functions (PR #4010)
by Stefan Mititelu 14 Dec '24

14 Dec '24

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Looks like htable module already exports API functions, but currently no other module uses them. Added 2 more API functions for table creation (so other modules can be able to create their own hash tables if they want to) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4010 -- Commit Summary -- * htable: export table create api functions -- File Changes -- M src/modules/htable/api.c (10) M src/modules/htable/api.h (4) M src/modules/htable/ht_api.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4010.patch https://github.com/kamailio/kamailio/pull/4010.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4010 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4010(a)github.com>

2 19

git:master:90d1485c: topos_htable: Small update to doc
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 90d1485c62bdfe509ff14b1b05baf0752b1a946e URL: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos_htable: Small update to doc --- Modified: src/modules/topos_htable/doc/topos_htable.xml --- Diff: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… Patch: https://github.com/kamailio/kamailio/commit/90d1485c62bdfe509ff14b1b05baf07… --- diff --git a/src/modules/topos_htable/doc/topos_htable.xml b/src/modules/topos_htable/doc/topos_htable.xml index 66344832065..d42066155a9 100644 --- a/src/modules/topos_htable/doc/topos_htable.xml +++ b/src/modules/topos_htable/doc/topos_htable.xml @@ -10,36 +10,22 @@ <book xmlns:xi="http://www.w3.org/2001/XInclude"> <bookinfo> - <title>TOPOS_REDIS Module</title> + <title>TOPOS_HTABLE Module</title> <productname class="trade">kamailio.org</productname> <authorgroup> - <author> - <firstname>Daniel-Constantin</firstname> - <surname>Mierla</surname> - <email>miconda(a)gmail.com</email> - </author> <editor> - <firstname>Daniel-Constantin</firstname> - <surname>Mierla</surname> - <email>miconda(a)gmail.com</email> - </editor> - <editor> - <firstname>Frederic</firstname> - <surname>Gaisnon</surname> - <email>frederic.gaisnon(a)gmail.com</email> + <firstname>Stefan</firstname> + <surname>Mititelu</surname> + <email>stefan.mititelu(a)net2phone.com</email> </editor> </authorgroup> <copyright> - <year>2017</year> + <year>2024</year> <holder>kamailio.org</holder> </copyright> <copyright> - <year>2017</year> - <holder>flowroute.com</holder> - </copyright> - <copyright> - <year>2021</year> - <holder>MomentTech</holder> + <year>2024</year> + <holder>net2phone.com</holder> </copyright> </bookinfo> <toc></toc>

1 0

git:master:df48b373: topos_htable: Initial commit
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: df48b373c39d631f49cb3632f7547f65b58eda3e URL: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos_htable: Initial commit --- Added: src/modules/topos_htable/Makefile Added: src/modules/topos_htable/doc/Makefile Added: src/modules/topos_htable/doc/topos_htable.xml Added: src/modules/topos_htable/doc/topos_htable_admin.xml Added: src/modules/topos_htable/topos_htable_mod.c Added: src/modules/topos_htable/topos_htable_storage.c Added: src/modules/topos_htable/topos_htable_storage.h Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6… Patch: https://github.com/kamailio/kamailio/commit/df48b373c39d631f49cb3632f7547f6…

1 0

git:master:bd70a78c: topos: Updates for topos_htable module
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: bd70a78ce22ab419a52e8733bc7ee27765d14cac URL: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 topos: Updates for topos_htable module Add htable storage modparam. End storage dialog on negative replies. --- Modified: src/modules/topos/doc/topos_admin.xml Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… Patch: https://github.com/kamailio/kamailio/commit/bd70a78ce22ab419a52e8733bc7ee27… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 4ccc4b7790f..f4fa47556e2 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -99,6 +99,11 @@ <emphasis>redis</emphasis> - Redis Backend </para> </listitem> + <listitem> + <para> + <emphasis>htable</emphasis> - htable module Backend + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 3214bdeb66d..c0db6ec72ec 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -288,6 +288,9 @@ static int mod_init(void) _tpsdbf.close(topos_db_con); topos_db_con = NULL; } + } else if(_tps_storage.len == 6 + && strncmp(_tps_storage.s, "htable", 6) == 0) { + // use htable module api } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len, diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index e0e1c211923..7fff763fe26 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1081,6 +1081,14 @@ int tps_response_received(sip_msg_t *msg) tps_reappend_rr(msg, &btsd, &btsd.x_rr); tps_append_xbranch(msg, &mtsd.x_vbranch1); + if(msg->first_line.u.reply.statuscode > 299 + && (get_cseq(msg)->method_id + & (METHOD_INVITE | METHOD_SUBSCRIBE))) { + LM_DBG("%d reply end dialog storage\n", + msg->first_line.u.reply.statuscode); + tps_storage_end_dialog(msg, &mtsd, &stsd); + } + return 0; error:

1 0

git:master:69db5823: htable: Updates for topos_htable module
by Daniel-Constantin Mierla 14 Dec '24

14 Dec '24

Module: kamailio Branch: master Commit: 69db5823fc9b8ee98c59d591517a1ecef91b16db URL: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… Author: Stefan Mititelu <stefan.mititelu(a)net2phone.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-14T11:52:02+01:00 htable: Updates for topos_htable module Export table create api functions Fix ht_cell_pkg_copy str pointers. Otherwise, pkg cell str pointers will still point to shm memory. Set the pkg cell str pointers similar to how ht_cell_new sets the str pointers. --- Modified: src/modules/htable/api.c Modified: src/modules/htable/api.h Modified: src/modules/htable/ht_api.c --- Diff: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… Patch: https://github.com/kamailio/kamailio/commit/69db5823fc9b8ee98c59d591517a1ec… --- diff --git a/src/modules/htable/api.c b/src/modules/htable/api.c index 57b2b4e75f1..94095d3d5d4 100644 --- a/src/modules/htable/api.c +++ b/src/modules/htable/api.c @@ -147,6 +147,16 @@ int ht_api_count_cells_re(str *hname, str *sre, int mode) return 0; } +int ht_api_table_spec(char *spec) +{ + return ht_table_spec(spec); +} + +int ht_api_init_tables(void) +{ + return ht_init_tables(); +} + /** * */ @@ -156,6 +166,8 @@ int bind_htable(htable_api_t *api) ERR("Invalid parameter value\n"); return -1; } + api->table_spec = ht_api_table_spec; + api->init_tables = ht_api_init_tables; api->set = ht_api_set_cell; api->get_clone = ht_api_get_cell_clone; api->rm = ht_api_del_cell; diff --git a/src/modules/htable/api.h b/src/modules/htable/api.h index 15e5207f1b2..8f67e5ca71a 100644 --- a/src/modules/htable/api.h +++ b/src/modules/htable/api.h @@ -25,6 +25,8 @@ #include "../../core/sr_module.h" #include "../../core/usr_avp.h" +typedef int (*ht_api_table_spec_f)(char *spec); +typedef int (*ht_api_init_tables_f)(void); typedef int (*ht_api_set_cell_f)( str *hname, str *name, int type, int_str *val, int mode); typedef ht_cell_t *(*ht_api_get_cell_clone_f)(str *hname, str *name); @@ -40,6 +42,8 @@ typedef int (*ht_api_count_cells_re_f)(str *hname, str *sre, int mode); typedef struct htable_api { + ht_api_table_spec_f table_spec; + ht_api_init_tables_f init_tables; ht_api_set_cell_f set; ht_api_get_cell_clone_f get_clone; ht_api_del_cell_f rm; diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index ecc49b547d6..8655c2bf443 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -359,6 +359,11 @@ int ht_init_tables(void) ht = _ht_root; while(ht) { + if(ht->entries != NULL) { + ht = ht->next; + continue; + } + LM_DBG("initializing htable [%.*s] with nr. of slots: %d\n", ht->name.len, ht->name.s, ht->htsize); if(ht->name.len + sizeof("htable:expired:") < HT_EVEX_NAME_SIZE) { @@ -860,8 +865,14 @@ ht_cell_t *ht_cell_pkg_copy(ht_t *ht, str *name, ht_cell_t *old) } } cell = (ht_cell_t *)pkg_malloc(it->msize); - if(cell != NULL) + if(cell != NULL) { memcpy(cell, it, it->msize); + + cell->name.s = (char *)cell + sizeof(ht_cell_t); + if(cell->flags & AVP_VAL_STR) { + cell->value.s.s = (char *)cell->name.s + cell->name.len + 1; + } + } ht_slot_unlock(ht, idx); return cell; }

1 0

git:master:fbf2fef1: lwsc: add fixup_free* to exported functions
by Victor Seva 13 Dec '24

13 Dec '24

Module: kamailio Branch: master Commit: fbf2fef1ff0f3289cb4734f66b86f0a4f82f2407 URL: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-13T20:12:07+01:00 lwsc: add fixup_free* to exported functions --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… Patch: https://github.com/kamailio/kamailio/commit/fbf2fef1ff0f3289cb4734f66b86f0a… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index b1645448276..c38779ad712 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -51,6 +51,8 @@ static int w_lwsc_request_proto( static int w_lwsc_notify(sip_msg_t *msg, char *pwsurl, char *pdata); static int w_lwsc_notify_proto( sip_msg_t *msg, char *pwsurl, char *pwsproto, char *pdata); +static int lwsc_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +static int lwsc_pv_parse_name(pv_spec_t *sp, str *in); static int _lwsc_timeout_connect = 0; static int _lwsc_timeout_send = 0; @@ -60,16 +62,17 @@ static str _lwsc_protocol = str_init("kmsg"); static int _lwsc_verbosity = 0; /* clang-format off */ -static cmd_export_t cmds[] = {{"lwsc_request", (cmd_function)w_lwsc_request, 2, - fixup_spve_all, 0, ANY_ROUTE}, +static cmd_export_t cmds[] = { + {"lwsc_request", (cmd_function)w_lwsc_request, 2, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"lwsc_request_proto", (cmd_function)w_lwsc_request_proto, 3, - fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, fixup_spve_all, fixup_free_spve_all, - ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {"lwsc_notify", (cmd_function)w_lwsc_notify, 2, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"lwsc_notify_proto", (cmd_function)w_lwsc_notify_proto, 3, - fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {"bind_lwsc", (cmd_function)bind_lwsc, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0} + {0, 0, 0, 0, 0, 0} }; static param_export_t params[] = { @@ -82,9 +85,6 @@ static param_export_t params[] = { {0, 0, 0} }; -static int lwsc_pv_get(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); -static int lwsc_pv_parse_name(pv_spec_t *sp, str *in); - static pv_export_t mod_pvs[] = { {{"lwsc", sizeof("lwsc") - 1}, PVT_OTHER, lwsc_pv_get, 0, lwsc_pv_parse_name, 0, 0, 0},

1 0

git:master:e4f51d15: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Dec '24

13 Dec '24

Module: kamailio Branch: master Commit: e4f51d15aab7642e62da84877fed464f8461d643 URL: https://github.com/kamailio/kamailio/commit/e4f51d15aab7642e62da84877fed464… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-12-13T20:01:09+01:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/e4f51d15aab7642e62da84877fed464… Patch: https://github.com/kamailio/kamailio/commit/e4f51d15aab7642e62da84877fed464…

1 0

git:master:aae99e8e: dialog: update fields on dlg_set_state() changes
by Daniel-Constantin Mierla 13 Dec '24

13 Dec '24

Module: kamailio Branch: master Commit: aae99e8e6d9cf959719b09360ff0cfc37386d722 URL: https://github.com/kamailio/kamailio/commit/aae99e8e6d9cf959719b09360ff0cfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-13T19:50:44+01:00 dialog: update fields on dlg_set_state() changes --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/aae99e8e6d9cf959719b09360ff0cfc… Patch: https://github.com/kamailio/kamailio/commit/aae99e8e6d9cf959719b09360ff0cfc… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 167e4602b88..0aeff6c02fd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1888,7 +1888,7 @@ int dlg_set_state(sip_msg_t *msg, int istate) str st = STR_NULL; dlg_cell_t *dlg = NULL; unsigned int dir = 0; - int oldstate = 0; + int ostate = 0; if(msg->callid == NULL && ((parse_headers(msg, HDR_CALLID_F, 0) == -1) @@ -1918,16 +1918,24 @@ int dlg_set_state(sip_msg_t *msg, int istate) LM_DBG("dialog not found\n"); return -1; } - oldstate = dlg->state; + ostate = dlg->state; dlg->state = istate; + /* updates for terminated dialogs */ + if(ostate == DLG_STATE_CONFIRMED && istate == DLG_STATE_DELETED) { + /* updating timestamps, flags, dialog stats */ + dlg->init_ts = (unsigned int)(time(0)); + dlg->end_ts = (unsigned int)(time(0)); + } + dlg->dflags |= DLG_FLAG_CHANGED; if(msg->first_line.type == SIP_REQUEST) { - LM_DBG("handling request - oldstate: %d newstate: %d\n", oldstate, + LM_DBG("handling request - oldstate: %d newstate: %d\n", ostate, istate); } else { - LM_DBG("handling response - oldstate: %d newstate: %d\n", oldstate, + LM_DBG("handling response - oldstate: %d newstate: %d\n", ostate, istate); } dlg_release(dlg); + return 0; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024