sr-dev December 2023

sr-dev@lists.kamailio.org

14 participants
234 discussions

git:master:0e5b8178: msilo: remove redundant condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0e5b8178de281db5ddfe30af28244a1ebaf12382 URL: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T14:06:49+01:00 msilo: remove redundant condition --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… Patch: https://github.com/kamailio/kamailio/commit/0e5b8178de281db5ddfe30af28244a1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 2be3bdd09cd..78e238437a2 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -448,7 +448,7 @@ int lua_sr_reload_script(int pos) lock_set_release(sr_lua_locks, i); } } else { - if(pos >= 0 && pos < len) { + if(pos < len) { lock_set_get(sr_lua_locks, pos); sr_lua_script_ver->version[pos] += 1; lock_set_release(sr_lua_locks, pos);

1 year

event_route names with underscore before the semicolon

by Luca Nardin

Hello, In the kamailio core cookbook (https://www.kamailio.org/wiki/cookbooks/5.5.x/core#event_route) I read that the name of an event_route should be like this: event_route[groupid:eventid] Where: groupid - should be the name of the module that triggers the event eventid - some meaningful short text describing the event Some modules of kamailio have underscores in the name, for example: http_async_client Years ago a fix have been committed in order to allow underscores in the second part of the name, after the semicolon: https://github.com/kamailio/kamailio/commit/5806703c1ff72243457ff55758f41c3… But it seems that an underscore is still not allowed in the first part of the name: https://github.com/kamailio/kamailio/blob/master/src/core/cfg.lex EVENT_RT_NAME [a-zA-Z][0-9a-zA-Z-]*(":"[a-zA-Z][0-9a-zA-Z_-]*)+ So I wonder if this is a bug in the code or a mistake in the cookbook. Thanks, Luca

1 year

Info: Next Kamailio World Conference - April 18-19, 2024, Berlin, Germany

by Daniel-Constantin Mierla

Hello, a short announcement to inform that the dates for next Kamailio World Conference have been set to April 18-19, 2024, the event to take place again in Berlin, Germany. It will be a different venue than the past editions, that one not being available. A pre-conference day is considered on April 17, 2024, but it is not yet known in what form and where. The conference is scheduled a bit earlier than the usual in the year because Germany hosts the Euro 2024 football championship during June-July 2024, making May very busy and harder to find adequate conferencing space in Berlin. The website and more details will be published soon. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 year

git:master:2f43510b: pv: removed unnecessary condition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2f43510be37c157f800389dfb432b6c52d7435a7 URL: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:31:34+01:00 pv: removed unnecessary condition --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… Patch: https://github.com/kamailio/kamailio/commit/2f43510be37c157f800389dfb432b6c… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 7eb50ee9a2b..84c3a0c703f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1439,7 +1439,7 @@ int tr_eval_string( get_cfg_crt_line()); return -1; } - if(n == 0 || m >= val->rs.len) { + if(m >= val->rs.len) { if(val->rs.len > TR_BUFFER_SIZE - 2) { LM_ERR("value too large: %d\n", val->rs.len); return -1;

1 year

git:master:ca2a9479: pv: typo in transformation log message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ca2a9479adf720e67bf50c9d2795cc8937e223dc URL: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:22:25+01:00 pv: typo in transformation log message --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… Patch: https://github.com/kamailio/kamailio/commit/ca2a9479adf720e67bf50c9d2795cc8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 3c51be15f74..7eb50ee9a2b 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1406,7 +1406,7 @@ int tr_eval_string( case TR_S_FMTLINES: case TR_S_FMTLINET: if(tp == NULL || tp->next == NULL) { - LM_ERR("substr invalid parameters (cfg line: %d)\n", + LM_ERR("fmtline invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 year

git:master:f128db2b: tm: use coherent type int for tm route blocks indexes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f128db2b85a525ff82c28faffbeec3203f9560c3 URL: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:16:08+01:00 tm: use coherent type int for tm route blocks indexes --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_reply.h --- Diff: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… Patch: https://github.com/kamailio/kamailio/commit/f128db2b85a525ff82c28faffbeec32… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 8481ccde29e..d95cb7d717c 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -225,13 +225,11 @@ typedef struct ua_client */ struct retr_buf *local_ack; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; - /* unused - keep the structure aligned to 32b */ - unsigned short on_unused; + int on_reply; } tm_ua_client_t; @@ -429,18 +427,18 @@ typedef struct cell /* nr of replied branch; 0..sr_dst_max_branches=branch value, * -1 no reply, -2 local reply */ - short relayed_reply_branch; + int relayed_reply_branch; /* the route to take if no final positive reply arrived */ - unsigned short on_failure; + int on_failure; /* the route to take for all failure replies */ - unsigned short on_branch_failure; + int on_branch_failure; /* the onreply_route to be processed if registered to do so */ - unsigned short on_reply; + int on_reply; /* The route to take for each downstream branch separately */ - unsigned short on_branch; + int on_branch; /* branch route backup for late branch add (t_append_branch) */ - unsigned short on_branch_delayed; + int on_branch_delayed; /* place holder for MD5checksum, MD5_LEN bytes are extra alloc'ed */ char md5[0]; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index e9b9df434a5..c5a58bba8ab 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -224,17 +224,17 @@ void t_on_reply(unsigned int go_to) } -unsigned int get_on_failure() +int get_on_failure() { return goto_on_failure; } -unsigned int get_on_branch_failure() +int get_on_branch_failure() { return goto_on_branch_failure; } -unsigned int get_on_reply() +int get_on_reply() { return goto_on_reply; } diff --git a/src/modules/tm/t_reply.h b/src/modules/tm/t_reply.h index 709b70454ed..18ce47f457c 100644 --- a/src/modules/tm/t_reply.h +++ b/src/modules/tm/t_reply.h @@ -199,11 +199,11 @@ void on_failure_reply( replies arrive */ void t_on_failure(unsigned int go_to); -unsigned int get_on_failure(void); +int get_on_failure(void); void t_on_branch_failure(unsigned int go_to); -unsigned int get_on_branch_failure(void); +int get_on_branch_failure(void); void t_on_reply(unsigned int go_to); -unsigned int get_on_reply(void); +int get_on_reply(void); int t_retransmit_reply(struct cell *t);

1 year

git:master:678b1a68: core: srjson - init vars and check scanned values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 678b1a68de86d9539adeaf0262d9735b8d435077 URL: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T12:04:10+01:00 core: srjson - init vars and check scanned values --- Modified: src/core/utils/srjson.c --- Diff: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… Patch: https://github.com/kamailio/kamailio/commit/678b1a68de86d9539adeaf0262d9735… --- diff --git a/src/core/utils/srjson.c b/src/core/utils/srjson.c index 5960932f545..f339230232a 100644 --- a/src/core/utils/srjson.c +++ b/src/core/utils/srjson.c @@ -272,7 +272,10 @@ static const char *parse_string( *ptr2++ = '\t'; break; case 'u': /* transcode utf16 to utf8. */ - sscanf(ptr + 1, "%4x", &uc); + uc = 0; + if(sscanf(ptr + 1, "%4x", &uc) < 1) { + break; + } ptr += 4; /* get the unicode char. */ if((uc >= 0xDC00 && uc <= 0xDFFF) || uc == 0) @@ -283,8 +286,11 @@ static const char *parse_string( { if(ptr[1] != '\\' || ptr[2] != 'u') break; + uc2 = 0; //missing second - half of surrogate. - sscanf(ptr + 3, "%4x", &uc2); + if(sscanf(ptr + 3, "%4x", &uc2) < 1) { + break; + } ptr += 6; if(uc2 < 0xDC00 || uc2 > 0xDFFF) break;

1 year

git:master:586ddc6e: presence_xml: check for number of read values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 586ddc6ed3a2b757ad55fb9eb859945b279c415c URL: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-12-18T11:18:21+01:00 presence_xml: check for number of read values --- Modified: src/modules/presence_xml/pidf.c --- Diff: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… Patch: https://github.com/kamailio/kamailio/commit/586ddc6ed3a2b757ad55fb9eb859945… --- diff --git a/src/modules/presence_xml/pidf.c b/src/modules/presence_xml/pidf.c index 09d11438a0a..b9c85c65466 100644 --- a/src/modules/presence_xml/pidf.c +++ b/src/modules/presence_xml/pidf.c @@ -181,7 +181,7 @@ time_t xml_parse_dateTime(char *xml_time_str) p++; - if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 0) { + if(sscanf(p, "%c%c:%c%c", &h1, &h2, &m1, &m2) < 4) { printf("error: failed to parse time\n"); return 0; }

1 year

Jenkins build is back to stable : kamailio57-nightly-binaries » amd64,stretch #41

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio57-nightly-binaries/architecture=a…>

1 year

git:5.7:bfc63986: pkg/kamailio/deb: override lintian error on stretch [skip ci]

by Victor Seva

Module: kamailio Branch: 5.7 Commit: bfc63986ae7239a64803b8f20f634522bc584948 URL: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-12-16T20:30:10+01:00 pkg/kamailio/deb: override lintian error on stretch [skip ci] (cherry picked from commit aaeb54c8b630b4aac50df75ff430ad5baea6746c) --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452… Patch: https://github.com/kamailio/kamailio/commit/bfc63986ae7239a64803b8f20f63452…

1 year

← Newer
1
...
11
12
13
14
15
16
17
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2023