sr-dev

sr-dev@lists.kamailio.org

4 participants
45459 discussions

git:master:c44a3499: ratelimit: use core str comparison functions
by Victor Seva 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: c44a349964081d397ab9efa3504737bf369f8cf5 URL: https://github.com/kamailio/kamailio/commit/c44a349964081d397ab9efa3504737b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-22T16:45:35+02:00 ratelimit: use core str comparison functions --- Modified: src/modules/ratelimit/ratelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/c44a349964081d397ab9efa3504737b… Patch: https://github.com/kamailio/kamailio/commit/c44a349964081d397ab9efa3504737b… --- diff --git a/src/modules/ratelimit/ratelimit.c b/src/modules/ratelimit/ratelimit.c index 5cac92464db..295102bd08e 100644 --- a/src/modules/ratelimit/ratelimit.c +++ b/src/modules/ratelimit/ratelimit.c @@ -60,9 +60,6 @@ MODULE_VERSION #define RXL(m, str, i) (int)((m)[i].rm_eo - (m)[i].rm_so) #define RXS(m, str, i) (str) + (m)[i].rm_so -static inline int str_cmp(const str *a, const str *b); -static inline int str_i_cmp(const str *a, const str *b); - typedef struct str_map { str str; @@ -256,7 +253,7 @@ struct module_exports exports = { static int str_map_str(const str_map_t *map, const str *key, int *ret) { for(; map->str.s; map++) - if(!str_cmp(&map->str, key)) { + if(!str_strcmp(&map->str, key)) { *ret = map->id; return 0; } @@ -704,16 +701,6 @@ static void destroy(void) } -static inline int str_cmp(const str *a, const str *b) -{ - return !(a->len == b->len && !strncmp(a->s, b->s, a->len)); -} - -static inline int str_i_cmp(const str *a, const str *b) -{ - return !(a->len == b->len && !strncasecmp(a->s, b->s, a->len)); -} - str queue_other = str_init("*"); /** @@ -727,10 +714,10 @@ static int find_queue(struct sip_msg *msg, str *method, int *queue) *queue = -1; for(i = 0; i < *nqueues; i++) - if(!str_i_cmp(queues[i].method, method)) { + if(!str_strcasecmp(queues[i].method, method)) { *queue = i; return 0; - } else if(!str_i_cmp(queues[i].method, &queue_other)) { + } else if(!str_strcasecmp(queues[i].method, &queue_other)) { *queue = i; }

1 0

git:master:ef9fa6fb: rtpengine: use core str comparison functions and macros
by Victor Seva 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: ef9fa6fb34859890afef70fc3803de360979e213 URL: https://github.com/kamailio/kamailio/commit/ef9fa6fb34859890afef70fc3803de3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-22T16:45:34+02:00 rtpengine: use core str comparison functions and macros --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/ef9fa6fb34859890afef70fc3803de3… Patch: https://github.com/kamailio/kamailio/commit/ef9fa6fb34859890afef70fc3803de3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index e31feb3ceeb..e04bb5e9fb3 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -859,11 +859,6 @@ static int bind_force_send_ip(int sock_idx) return 0; } -static inline int str_cmp(const str *a, const str *b) -{ - return !(a->len == b->len && !strncmp(a->s, b->s, a->len)); -} - static inline int str_eq(const str *p, const char *q) { int l = strlen(q); @@ -963,7 +958,7 @@ struct rtpp_node *get_rtpp_node(struct rtpp_set *rtpp_list, str *url) lock_get(rtpp_list->rset_lock); rtpp_node = rtpp_list->rn_first; while(rtpp_node) { - if(str_cmp(&rtpp_node->rn_url, url) == 0) { + if(str_strcmp(&rtpp_node->rn_url, url) == 0) { lock_release(rtpp_list->rset_lock); return rtpp_node; } @@ -4247,7 +4242,7 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, if(!bencode_dictionary_get_str(tag_dict, "label", &check)) continue; LM_DBG("rtpengine: XXX got label %.*s\n", check.len, check.s); - if(str_cmp(&check, &label)) + if(str_strcmp(&check, &label)) continue; LM_DBG("rtpengine: XXX label match\n"); medias = @@ -5800,4 +5795,4 @@ static int bind_rtpengine(rtpengine_api_t *api) api->rtpengine_delete = ki_rtpengine_delete; return 0; -} \ No newline at end of file +} diff --git a/src/modules/rtpengine/rtpengine_hash.c b/src/modules/rtpengine/rtpengine_hash.c index de6dbc9d5ed..2c7f8f2f0ba 100644 --- a/src/modules/rtpengine/rtpengine_hash.c +++ b/src/modules/rtpengine/rtpengine_hash.c @@ -11,24 +11,6 @@ static void rtpengine_hash_table_free_row_lock(gen_lock_t *row_lock); static struct rtpengine_hash_table *rtpengine_hash_table; -/* from sipwise rtpengine */ -static int str_cmp_str(const str a, const str b) -{ - if(a.len < b.len) - return -1; - if(a.len > b.len) - return 1; - if(a.len == 0 && b.len == 0) - return 0; - return memcmp(a.s, b.s, a.len); -} - -/* from sipwise rtpengine */ -static int str_equal(str a, str b) -{ - return (str_cmp_str(a, b) == 0); -} - /* from sipwise rtpengine */ static unsigned int str_hash(str s) { @@ -254,8 +236,8 @@ int rtpengine_hash_table_insert( while(entry) { // if found, don't add new entry - if(str_equal(entry->callid, new_entry->callid) - && str_equal(entry->viabranch, new_entry->viabranch)) { + if(STR_EQ(entry->callid, new_entry->callid) + && STR_EQ(entry->viabranch, new_entry->viabranch)) { // unlock lock_release(rtpengine_hash_table->row_locks[hash_index]); LM_NOTICE("callid=%.*s, viabranch=%.*s already in hashtable, " @@ -324,9 +306,9 @@ int rtpengine_hash_table_remove( while(entry) { // if callid found, delete entry - if((str_equal(entry->callid, callid) - && str_equal(entry->viabranch, viabranch)) - || (str_equal(entry->callid, callid) && viabranch.len == 0 + if((STR_EQ(entry->callid, callid) + && STR_EQ(entry->viabranch, viabranch)) + || (STR_EQ(entry->callid, callid) && viabranch.len == 0 && op == OP_DELETE)) { // set pointers; exclude entry last_entry->next = entry->next; @@ -407,9 +389,9 @@ struct rtpp_node *rtpengine_hash_table_lookup( while(entry) { // if callid found, return entry - if((str_equal(entry->callid, callid) - && str_equal(entry->viabranch, viabranch)) - || (str_equal(entry->callid, callid) && viabranch.len == 0 + if((STR_EQ(entry->callid, callid) + && STR_EQ(entry->viabranch, viabranch)) + || (STR_EQ(entry->callid, callid) && viabranch.len == 0 && op == OP_DELETE)) { node = entry->node;

1 0

[kamailio/kamailio] rtpengine: use core STR_EQ macro (PR #4004)
by Victor Seva 22 Oct '24

22 Oct '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 #### Description don't reinvent the wheel and just use core macro You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4004 -- Commit Summary -- * rtpengine: use core STR_EQ macro -- File Changes -- M src/modules/rtpengine/rtpengine.c (11) M src/modules/rtpengine/rtpengine_hash.c (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4004.patch https://github.com/kamailio/kamailio/pull/4004.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4004 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4004(a)github.com>

1 2

[kamailio/kamailio] [WIP] ims_registrar_scscf: fixing em_max_expires (PR #3989)
by Dragos Vingarzan 22 Oct '24

22 Oct '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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  In case of Emergency-Registrations the S-CSCF was wrongly setting the expires of the `;sos` contacts to `em_min_expires` if they were above `em_max_expires`. Other smaller related fixes: - Fixed also another typo in the config params definition. - Added some code to more easily make sense of which attributes of a struct are set with what. - Added conditions to respect the parameter documentation which indicate that if set to 0, the expires conditions won't be used. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3989 -- Commit Summary -- * ims_registrar_scscf: fixing em_max_expires -- File Changes -- M src/modules/ims_registrar_scscf/config.c (26) M src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c (2) M src/modules/ims_registrar_scscf/save.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3989.patch https://github.com/kamailio/kamailio/pull/3989.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3989 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3989(a)github.com>

1 7

git:master:3f38206d: ims_registrar_scscf: fixing em_max_expires
by Dragos Vingarzan 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: 3f38206d88af0fae4c64ee3072eb78ea68f813cb URL: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-10-22T16:21:49+02:00 ims_registrar_scscf: fixing em_max_expires --- Modified: src/modules/ims_registrar_scscf/config.c Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… Patch: https://github.com/kamailio/kamailio/commit/3f38206d88af0fae4c64ee3072eb78e… --- diff --git a/src/modules/ims_registrar_scscf/config.c b/src/modules/ims_registrar_scscf/config.c index a01b4185f79..e4a2b5b5a14 100644 --- a/src/modules/ims_registrar_scscf/config.c +++ b/src/modules/ims_registrar_scscf/config.c @@ -31,19 +31,19 @@ #include "config.h" struct cfg_group_registrar default_registrar_cfg = { - 3600, /* default_expires */ - 0, /* default_expires_range */ - 60, /* min_expires */ - 0, /* max_expires */ - 3600, /* emergency contact default expires */ - 60, /* emergency contact max expires */ - 0, /* emergency contact min expires */ - 0, /* max_contacts */ - 0, /* retry_after */ - 0, /* case_sensitive */ - Q_UNSPECIFIED, /* default_q */ - 1, /* append_branches */ - "" /* realm_pref */ + .default_expires = 3600, /* default_expires */ + .default_expires_range = 0, /* default_expires_range */ + .min_expires = 60, /* min_expires */ + .max_expires = 600000, /* max_expires */ + .em_default_expires = 1800, /* emergency contact default expires */ + .em_max_expires = 3600, /* emergency contact max expires */ + .em_min_expires = 0, /* emergency contact min expires */ + .max_contacts = 0, /* max_contacts */ + .retry_after = 0, /* retry_after */ + .case_sensitive = 0, /* case_sensitive */ + .default_q = Q_UNSPECIFIED, /* default_q */ + .append_branches = 1, /* append_branches */ + .realm_pref = "" /* realm_pref */ }; void *registrar_cfg = &default_registrar_cfg; diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index 08260dcb0a3..9c0b5c534e3 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -284,7 +284,7 @@ static param_export_t params[] = { {"max_expires", INT_PARAM, &default_registrar_cfg.max_expires}, {"em_default_expires", INT_PARAM, &default_registrar_cfg.em_default_expires}, - {"em_min_expires", INT_PARAM, &default_registrar_cfg.em_max_expires}, + {"em_max_expires", INT_PARAM, &default_registrar_cfg.em_max_expires}, {"em_min_expires", INT_PARAM, &default_registrar_cfg.em_min_expires}, {"default_q", INT_PARAM, &default_registrar_cfg.default_q}, diff --git a/src/modules/ims_registrar_scscf/save.c b/src/modules/ims_registrar_scscf/save.c index cf3bea78277..8c67b62c241 100644 --- a/src/modules/ims_registrar_scscf/save.c +++ b/src/modules/ims_registrar_scscf/save.c @@ -125,20 +125,24 @@ static inline int calc_contact_expires( : default_registrar_cfg.default_expires; goto end; } - if(!sos_reg && r < default_registrar_cfg.min_expires) { + if(!sos_reg && r < default_registrar_cfg.min_expires + && default_registrar_cfg.min_expires != 0) { r = default_registrar_cfg.min_expires; goto end; } - if(sos_reg && r < default_registrar_cfg.em_min_expires) { + if(sos_reg && r < default_registrar_cfg.em_min_expires + && default_registrar_cfg.em_min_expires != 0) { r = default_registrar_cfg.em_min_expires; goto end; } - if(!sos_reg && r > default_registrar_cfg.max_expires) { + if(!sos_reg && r > default_registrar_cfg.max_expires + && default_registrar_cfg.max_expires != 0) { r = default_registrar_cfg.max_expires; goto end; } - if(sos_reg && r > default_registrar_cfg.em_max_expires) { - r = default_registrar_cfg.em_min_expires; + if(sos_reg && r > default_registrar_cfg.em_max_expires + && default_registrar_cfg.em_max_expires != 0) { + r = default_registrar_cfg.em_max_expires; goto end; } end:

1 0

[kamailio/kamailio] Add ims_icscf module db tables schema (PR #3991)
by Xenofon Karamanos 22 Oct '24

22 Oct '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) - [ ] 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 - [x] Related to issue #3876 #### Description  This PR add the schemas for the table needed for the module ims-icscf You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3991 -- Commit Summary -- * Add ims_icscf db schema -- File Changes -- A src/lib/srdb1/schema/kamailio-ims_icscf.xml (14) A src/lib/srdb1/schema/nds_trusted_domains.xml (41) A src/lib/srdb1/schema/s_cscf.xml (49) A src/lib/srdb1/schema/s_cscf_capabilities.xml (58) M utils/kamctl/kamdbctl.base (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3991.patch https://github.com/kamailio/kamailio/pull/3991.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3991 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3991(a)github.com>

2 3

git:master:a0941254: db_schema: Create new table definitions
by Henning Westerholt 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: a094125433122313c2e02dfc0e9ad5d3a5beaa50 URL: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-10-22T12:59:03+02:00 db_schema: Create new table definitions --- Added: utils/kamctl/db_berkeley/kamailio/nds_trusted_domains Added: utils/kamctl/db_berkeley/kamailio/s_cscf Added: utils/kamctl/db_berkeley/kamailio/s_cscf_capabilities Added: utils/kamctl/db_redis/kamailio/nds_trusted_domains Added: utils/kamctl/db_redis/kamailio/s_cscf Added: utils/kamctl/db_redis/kamailio/s_cscf_capabilities Added: utils/kamctl/db_sqlite/ims_icscf-create.sql Added: utils/kamctl/dbtext/kamailio/nds_trusted_domains Added: utils/kamctl/dbtext/kamailio/s_cscf Added: utils/kamctl/dbtext/kamailio/s_cscf_capabilities Added: utils/kamctl/mongodb/kamailio/nds_trusted_domains.json Added: utils/kamctl/mongodb/kamailio/s_cscf.json Added: utils/kamctl/mongodb/kamailio/s_cscf_capabilities.json Added: utils/kamctl/mysql/ims_icscf-create.sql Added: utils/kamctl/oracle/ims_icscf-create.sql Added: utils/kamctl/postgres/ims_icscf-create.sql Added: utils/kamctl/xhttp_pi/ims_icscf-mod Added: utils/kamctl/xhttp_pi/ims_icscf-table Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d… Patch: https://github.com/kamailio/kamailio/commit/a094125433122313c2e02dfc0e9ad5d…

1 0

git:master:e2ea7279: db_schema: Add ims_icscf db schema
by Henning Westerholt 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: e2ea727988828a9683ef112637e25ee4d58032f7 URL: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-10-22T12:59:03+02:00 db_schema: Add ims_icscf db schema --- Added: src/lib/srdb1/schema/kamailio-ims_icscf.xml Added: src/lib/srdb1/schema/nds_trusted_domains.xml Added: src/lib/srdb1/schema/s_cscf.xml Added: src/lib/srdb1/schema/s_cscf_capabilities.xml Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee… Patch: https://github.com/kamailio/kamailio/commit/e2ea727988828a9683ef112637e25ee…

1 0

git:master:c823f413: core: parser sdp - check length for rtpmap extract
by Daniel-Constantin Mierla 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: c823f41350ab9186a323707e9be32e31922bec17 URL: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-22T07:41:08+02:00 core: parser sdp - check length for rtpmap extract --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… Patch: https://github.com/kamailio/kamailio/commit/c823f41350ab9186a323707e9be32e3… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index a74f78abb84..fe5b464e473 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -151,6 +151,9 @@ int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, char *cp, *cp1; int len; + if(body->len <= 9) { + return -1; + } if(strncasecmp(body->s, "a=rtpmap:", 9) != 0) { /*LM_DBG("We are not pointing to an a=rtpmap: attribute =>`%.*s'\n", * body->len, body->s); */

1 0

git:master:0cbb2eb0: jwt: print decode result in error log message
by Daniel-Constantin Mierla 22 Oct '24

22 Oct '24

Module: kamailio Branch: master Commit: 0cbb2eb035c7d2a29ae707cde94a2c0573e0ffd5 URL: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-22T07:34:29+02:00 jwt: print decode result in error log message --- Modified: src/modules/jwt/jwt_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… Patch: https://github.com/kamailio/kamailio/commit/0cbb2eb035c7d2a29ae707cde94a2c0… --- diff --git a/src/modules/jwt/jwt_mod.c b/src/modules/jwt/jwt_mod.c index 0efb793c47f..af3d42f79c5 100644 --- a/src/modules/jwt/jwt_mod.c +++ b/src/modules/jwt/jwt_mod.c @@ -498,7 +498,7 @@ static int ki_jwt_verify_key( ret = jwt_decode( &jwt, jwtval->s, (unsigned char *)kdata.s, (size_t)kdata.len); if(ret != 0 || jwt == NULL) { - LM_ERR("failed to decode jwt value\n"); + LM_ERR("failed to decode jwt value (ret: %d jwt: %p)\n", ret, jwt); goto error; } if(jwt_validate(jwt, jwt_valid) != 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