- sr-dev - kamailio.org

git:master:3abc650d: jansson: use the core macros for ending string value with '\0' and to restore
by Victor Seva 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 3abc650d37e426840f060426a851ecac5210d2e5 URL: https://github.com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-14T10:47:48+02:00 jansson: use the core macros for ending string value with '\0' and to restore fix #2327 --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… Patch: https://github.com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 7eceae4e96..a5f8b1f6fd 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -26,6 +26,7 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" +#include "../../core/str.h" #include "jansson_path.h" #include "jansson_funcs.h" @@ -33,13 +34,13 @@ int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *dst_pv) { - + char c; pv_value_t dst_val; json_t* json = NULL; json_error_t parsing_error; - + STR_VTOZ(src_s->s[src_s->len], c); json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_ZTOV(src_s->s[src_s->len], c); if(!json) { ERR("failed to parse json: %.*s\n", src_s->len, src_s->s); ERR("json error at line %d, col %d: %s\n", @@ -98,7 +99,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, str type_s; str value_s; str path_s; - + char c; pv_spec_t* result_pv; pv_value_t result_val; @@ -126,14 +127,11 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, result_val.rs.len = strlen("{}"); } -/* - ALERT("type is: %.*s\n", type_s.len, type_s.s); - ALERT("path is: %.*s\n", path_s.len, path_s.s); - ALERT("value is: %.*s\n", value_s.len, value_s.s); - ALERT("result is: %.*s\n", result_val.rs.len, result_val.rs.s); -*/ - char* result = result_val.rs.s; + LM_DBG("type is: %.*s\n", type_s.len, type_s.s); + LM_DBG("path is: %.*s\n", path_s.len, path_s.s); + LM_DBG("value is: %.*s\n", value_s.len, value_s.s); + LM_DBG("result is: %.*s\n", result_val.rs.len, result_val.rs.s); json_t* result_json = NULL; json_t* value = NULL; @@ -143,14 +141,18 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, /* check the type */ if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")){ + STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_object(value)) { ERR("value to add is not an object - \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "array")) { + STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_array(value)) { ERR("value to add is not an array - \"%s\"\n", path_s.s); goto fail; @@ -211,9 +213,9 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, } char* path = path_s.s; - - result_json = json_loads(result, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_VTOZ(result_val.rs.s[result_val.rs.len], c); + result_json = json_loads(result_val.rs.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(result_val.rs.s[result_val.rs.len], c); if(!result_json) { ERR("result has json error at line %d: %s\n", parsing_error.line, parsing_error.text); @@ -240,6 +242,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char* dst) { + char c; str src_s; str path_s; pv_spec_t *dst_pv; @@ -259,9 +262,9 @@ int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char json_t* json = NULL; json_error_t parsing_error; - + STR_VTOZ(src_s.s[src_s.len], c); json = json_loads(src_s.s, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_ZTOV(src_s.s[src_s.len], c); if(!json) { ERR("json error at line %d: %s\n", parsing_error.line, parsing_error.text);

1 0

git:master:c1d3fdb3: misc: examples/kemi - small typo in lua example
by Daniel-Constantin Mierla 13 May '20

13 May '20

Module: kamailio Branch: master Commit: c1d3fdb31871078b666278a933dbab20a0a8dca3 URL: https://github.com/kamailio/kamailio/commit/c1d3fdb31871078b666278a933dbab2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T18:35:56+02:00 misc: examples/kemi - small typo in lua example --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/c1d3fdb31871078b666278a933dbab2… Patch: https://github.com/kamailio/kamailio/commit/c1d3fdb31871078b666278a933dbab2… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index 4be9b13587..f5906d0bde 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -238,7 +238,7 @@ function ksr_route_location() end --- IP authorization and user uthentication +-- IP authorization and user authentication function ksr_route_auth() if not KSR.auth then return 1;

1 0

Kamailio 5.2.7 Released
by Henning Westerholt 13 May '20

13 May '20

Hello, Kamailio SIP Server v5.2.7 stable release is out. This is a maintenance release of the previous stable branch (5.2), that includes fixes since the release of v5.2.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.7. For more details about version 5.2.7 (including links and guidelines to download the tar file or from GIT repository), visit: https://www.kamailio.org/w/2020/05/kamailio-5-2-7-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:5.2:9ea54fe1: Changelog: update Changelog for 5.2.7
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 9ea54fe13f45723e83d773fb8a63fab98d8b8e0a URL: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T15:12:58Z Changelog: update Changelog for 5.2.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab… Patch: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab…

1 0

git:5.2:7a6c6031: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 7a6c603118acab5a515690f3c397f66088815733 URL: https://github.com/kamailio/kamailio/commit/7a6c603118acab5a515690f3c397f66… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T15:46:57+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_sqlang/README Modified: src/modules/corex/README Modified: src/modules/msilo/README Modified: src/modules/nathelper/README Modified: src/modules/permissions/README Modified: src/modules/pike/README Modified: src/modules/rr/README Modified: src/modules/sipcapture/README Modified: src/modules/siptrace/README Modified: src/modules/sst/README Modified: src/modules/textopsx/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/7a6c603118acab5a515690f3c397f66… Patch: https://github.com/kamailio/kamailio/commit/7a6c603118acab5a515690f3c397f66…

1 0

git:5.3:fc28a142: pkg/kamailio: fixed python3 deps for RHEL 6
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: fc28a14203f59c62d2c745ffd294a5091bf8cb26 URL: https://github.com/kamailio/kamailio/commit/fc28a14203f59c62d2c745ffd294a50… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:23:08Z pkg/kamailio: fixed python3 deps for RHEL 6 (cherry picked from commit 5f31a56acd25f892e6275e6ac786677f2eb2be0c) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/fc28a14203f59c62d2c745ffd294a50… Patch: https://github.com/kamailio/kamailio/commit/fc28a14203f59c62d2c745ffd294a50… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 76c08aa81c..aa5269e62c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1109,6 +1109,10 @@ UUID module for Kamailio. %prep %setup -n %{name}-%{ver} +# python3 does not exist in RHEL 6 and similar dist. +%if 0%{?rhel} == 6 +sed -i -e 's/python3/python2/' utils/kamctl/dbtextdb/dbtextdb.py +%endif %build ln -s ../obs pkg/kamailio/%{dist_name}/%{dist_version}

1 0

git:5.3:cc31c71e: core: better debug logging in mk_action function
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: cc31c71e56f8feeeab45532f8fa954991817ed6d URL: https://github.com/kamailio/kamailio/commit/cc31c71e56f8feeeab45532f8fa9549… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:07:36Z core: better debug logging in mk_action function (cherry picked from commit 10b96696b82d2e70c15f3e4bc52097f0a5062499) --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/cc31c71e56f8feeeab45532f8fa9549… Patch: https://github.com/kamailio/kamailio/commit/cc31c71e56f8feeeab45532f8fa9549… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 063e1773aa..51f48a0a6d 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -125,8 +125,7 @@ struct action* mk_action(enum action_type type, int count, ...) for (i=0; i<a->count; i++) { a->val[i].type = va_arg(args, int); a->val[i].u.data = va_arg(args, void *); - - DBG("ACTION_#%d #%d/%d: %d(%x)/ %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); + DBG("ACTION type%d, i/count %d/%d: type %d(%x)/ data %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); } va_end(args);

1 0

git:5.3:95733559: lib/srdb1/schema: removed kamailio-extensions.xml file
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 957335591e589cde0ae3127b6d2e50c092708e0e URL: https://github.com/kamailio/kamailio/commit/957335591e589cde0ae3127b6d2e50c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:16:32Z lib/srdb1/schema: removed kamailio-extensions.xml file - file didn't have any content itself, tried to include an inexistent extra.xml, which generated an warning for 'make dbschema' (cherry picked from commit 367a865e7f0c9cd67fda9176add1ca3c0dad2d46) --- Removed: src/lib/srdb1/schema/kamailio-extensions.xml --- Diff: https://github.com/kamailio/kamailio/commit/957335591e589cde0ae3127b6d2e50c… Patch: https://github.com/kamailio/kamailio/commit/957335591e589cde0ae3127b6d2e50c… --- diff --git a/src/lib/srdb1/schema/kamailio-extensions.xml b/src/lib/srdb1/schema/kamailio-extensions.xml deleted file mode 100644 index f4a0aec097..0000000000 --- a/src/lib/srdb1/schema/kamailio-extensions.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" - "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ - - <!ENTITY % entities SYSTEM "entities.xml"> - %entities; -]> - - - -<database xmlns:xi="http://www.w3.org/2001/XInclude"> - <name>CUSTOM Extensions</name> -  - <xi:include href="extra.xml"> - <xi:fallback/> - </xi:include> -  -  -</database>

1 0

git:5.3:99c3ddec: pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 99c3ddecd7887abed5ab087decdd9ff3712ff545 URL: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:56:48Z pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning - GH #2298 (cherry picked from commit 86ebb4eef482b37a3bb8bf033caa4d87fd8aeb87) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… Patch: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index b72ecf7f29..1ab15af2e7 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -189,6 +189,8 @@ static int pdb_msg_format_send(struct pdb_msg *msg, } +/* two chars to short-int without caring of memory alignment in char buffer */ +#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -199,7 +201,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct struct pdb_msg msg; struct timeval tstart, tnow; struct server_item_t *server; - short int carrierid, *_id; + short int carrierid, _id; short int _idv; char buf[sizeof(struct pdb_msg)]; size_t reqlen; @@ -345,8 +347,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break; @@ -368,8 +370,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = (short int *)&(buf[reqlen]); - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break;

1 0

git:5.3:2396526c: lib/srdb1: fix warning about wrong namespace in version.xml
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 2396526ca13f3373d41d727119326fd9a41b7eb7 URL: https://github.com/kamailio/kamailio/commit/2396526ca13f3373d41d727119326fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:52:32Z lib/srdb1: fix warning about wrong namespace in version.xml (cherry picked from commit d4311f3dfa3fc6c3836e8573fb12bc2ae4b6c264) --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://github.com/kamailio/kamailio/commit/2396526ca13f3373d41d727119326fd… Patch: https://github.com/kamailio/kamailio/commit/2396526ca13f3373d41d727119326fd… --- diff --git a/src/lib/srdb1/schema/version.xml b/src/lib/srdb1/schema/version.xml index c18ea3b0c3..14b3dd4be9 100644 --- a/src/lib/srdb1/schema/version.xml +++ b/src/lib/srdb1/schema/version.xml @@ -6,7 +6,7 @@ ]> -<table id="version" xmlns:xi="http://www.w3.org/2001/XInclude"> +<table id="version" xmlns:db="http://docbook.org/ns/docbook">> <name>version</name> <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type>

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/f1c05b27544736f9f7f4db25072e62e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:43:15Z core: initialize memory to 0 in cfg parser in a few more places (cherry picked from commit 5e42adae624f9741e26dfb0af4accede2a8f92d2) - URL: https://github.com/kamailio/kamailio/commit/1cc1cd9d1f921af74aaf4355b860605… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:43:15Z core: small improvement related to commit 5e42adae624f9741 in cfg parser (cherry picked from commit f879b4c4d75777892f160d8abe639c6f15f68569) - URL: https://github.com/kamailio/kamailio/commit/fbcee7886e704d5f83eb0ddaad0b4f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:43:15Z tm: safe list iteration in tm_clean_lifetime() (cherry picked from commit 325a45e846faae3e5dfa333727d5fab294e44dac) - URL: https://github.com/kamailio/kamailio/commit/0b6f5d890da1b20c43a15d5ce980a0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:43:15Z kamctl: kamctlrc - fix CHROOT_DIR example and coherent use of ## for comments - ## is used for explanatory comments - # is used for commented options (cherry picked from commit 517b3be4b06473d1d64d1fe198c4a9c149bcc1b0) - URL: https://github.com/kamailio/kamailio/commit/c81fc143ea2b90573112f4e3aad23b7… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:43:15Z textopsx: small spelling fix in docs (cherry picked from commit 53ccb420c0414a12af0783add864bb4d97a65d90) - URL: https://github.com/kamailio/kamailio/commit/ee52f834092d6e2fd8e80f110ec05e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:43:15Z pike: docs - aligned ip tree example (cherry picked from commit e65ce2fd407626acc89879033a2114cf521457dc) - URL: https://github.com/kamailio/kamailio/commit/ff5280155c1740f61990949e45e5492… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:43:15Z sst: docs - more info about how timeout_avp is used (cherry picked from commit b800ffb9fb1de6ee0d7b6c2b42a25669022c1142) - URL: https://github.com/kamailio/kamailio/commit/8cc08c3a217bcd1aa4df472773dde44… Author: Nathan Bruning <nathan(a)iperity.com> Date: 2020-05-13T11:43:15Z core: fix returning multiple IPs for a cached DNS entry (cherry picked from commit 29a35ec3cec8b9c3ee4b45c8d84308701bda097c) - URL: https://github.com/kamailio/kamailio/commit/fd4d00868e3527a9841db38d0b4216c… Author: Zero King <l2dy(a)icloud.com> Date: 2020-05-13T11:43:15Z rtpengine: fix zero-length log placeholder (cherry picked from commit 740afac15b3d8d618b5101a761a37f5808d4b4f0) - URL: https://github.com/kamailio/kamailio/commit/fdefbecdce5a7153a89e29e0750dfc2… Author: Zero King <l2dy(a)icloud.com> Date: 2020-05-13T11:43:15Z rtpproxy: fix zero-length log placeholder (cherry picked from commit 030f18b5cffeb117dcf582cf12c5b3c35ace1469) - URL: https://github.com/kamailio/kamailio/commit/003c9ea66ae77957899776d10b0ef29… Author: Zero King <l2dy(a)icloud.com> Date: 2020-05-13T11:43:15Z nathelper: fix zero-length log placeholder (cherry picked from commit 69714b26c63c75df6759f9158c7181d4f86b4764) - URL: https://github.com/kamailio/kamailio/commit/a325bf7ea5bec95d3ddb638c852e46a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:43:15Z rtpengine: replaced rtpproxy with rtpengine - avoid confusion in printed log messges (cherry picked from commit dda07c69420e1a38948dae4b71f8005b2375253b) - URL: https://github.com/kamailio/kamailio/commit/dcccf002cc21af47d654d7e298147ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:45:05Z topoh: skip http reply handling (cherry picked from commit 345d6f67006e4254300209742a2778b925cafaf7) - URL: https://github.com/kamailio/kamailio/commit/f26f42712a447b033792ce3e514c70d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:45:11Z topos: skip http reply handling (cherry picked from commit fad795648f8cbf12cc099dea18092ff7beee9c75) - URL: https://github.com/kamailio/kamailio/commit/a701a78df5b0affb267153ffa878f7d… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:45:31Z db: update README describing the DB XML framework (cherry picked from commit 25e61922244ec9c438fc472500472b59d191093a) - URL: https://github.com/kamailio/kamailio/commit/c1e9fac3284c84110cbf1406313acf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:45:57Z dispatcher: docs - added modparams for keepalives in sample config file (cherry picked from commit 6fb8cb820207e51e7e6ae07020c17c32b9fa9aa0) - URL: https://github.com/kamailio/kamailio/commit/22c79b10542f004cce245a7412ccf5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:46:50Z kamcmd: use pkg-config to get compile flags for lib readline (cherry picked from commit 0e6e05f8bec1fb451375d71a6b929a6908c5689d) - URL: https://github.com/kamailio/kamailio/commit/ab544f384da96fbed41b5856b0b5698… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:47:02Z kamcmd: Makefile - updated the msg target to print pkg-config detections (cherry picked from commit 331ffea6c8c8b2c7cf38e3d7eda882a6becd326a) - URL: https://github.com/kamailio/kamailio/commit/c77a9efc7295fed897de805be08f002… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:47:33Z kamctl: cmd trap output file with txt extension - easier to view inline when sent via email, without extensions being binary encoding and requiring explicit download (cherry picked from commit 41841dfc153894a97609bdc95d78a12cb2b304ca) - URL: https://github.com/kamailio/kamailio/commit/f140b9e04021fe6957c1a8712025847… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-05-13T11:47:48Z sipcapture: fix spelling errors (cherry picked from commit cc1142fcc15e0875d309de894a239325526fa186) - URL: https://github.com/kamailio/kamailio/commit/beb772654d0602cd2f146b60b8c000f… Author: Greg Troxel <gdt(a)lexort.com> Date: 2020-05-13T11:48:17Z Makefile.defs: On NetBSD, link with -lm (cherry picked from commit 3ccaac365da6078a96681109efebc70dcb12fc55) - URL: https://github.com/kamailio/kamailio/commit/40a540f8ec966d0ed1ec7fffe1ce609… Author: Greg Troxel <gdt(a)lexort.com> Date: 2020-05-13T11:48:24Z Makefile.defs: Only add -ldl on systems that use it kamailio uses dlopen, and on some systems, one must link with -ldl. On others, this is not needed and there is no libdl. For now, simply omit -ldl on NetBSD (which doesn't have or require it), and don't try to change behavior on other systems. (cherry picked from commit bca9768b6f2667bad8472fa99a113b8249ca0f9a) - URL: https://github.com/kamailio/kamailio/commit/8764cbf3af221fe6ce6ec3c29eebc6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:50:17Z corex: docs - examples with setting xavps for via functions (cherry picked from commit 1e58a56cb7f9d83ca0c943481d02c429d33e188a) - URL: https://github.com/kamailio/kamailio/commit/4f94de7f26482002918cbb25c0d045e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:52:38Z lib/srdb1: fix warning about wrong namespace in version.xml (cherry picked from commit d4311f3dfa3fc6c3836e8573fb12bc2ae4b6c264) - URL: https://github.com/kamailio/kamailio/commit/87e8cfa00bf2d21aa4267dd8b1c8df7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:56:30Z pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning - GH #2298 (cherry picked from commit 86ebb4eef482b37a3bb8bf033caa4d87fd8aeb87) - URL: https://github.com/kamailio/kamailio/commit/670ca687be62d130c4db38563eefa01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T11:58:30Z permissions: docs - note about netmask value 0 in the database column (cherry picked from commit 8729a55f00b8ba6adbf97921ef09d56080145810) - URL: https://github.com/kamailio/kamailio/commit/870f2cc861fde0ed0f8bc3322bbe097… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:04:15Z dispatcher: handle the case of maxload 0 for call load distribution - GH #2297 (cherry picked from commit 0115d3424c0f8780a661882527f39b2b39d0e74e) - URL: https://github.com/kamailio/kamailio/commit/e0d8e300ccb6a4fa54ab15f558a4017… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:04:25Z db_redis: var initialization and safety check to avoid compiler warnings (cherry picked from commit b9b177ccffd58b11cf460764514486d29637dd55) - URL: https://github.com/kamailio/kamailio/commit/71c692abb4a17d799cc162860ebd329… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:05:50Z pv: do not set ending '\0' for port value in pv_set_ruri_port() - it can be a reference to a static string, ending up in a crash - GH #2258 (cherry picked from commit 1f76bca74839f35d11f42edf758eb046cedb752c) - URL: https://github.com/kamailio/kamailio/commit/8a06a8e456c1a6cd7deb7626efb012b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:06:28Z core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:241:17: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:241:17: note: use array indexing to silence this warning > SIP_VERSION+1, SIP_VERSION_LEN-1)) { > ^ > & [ ] > core/parser/parse_fline.c:247:18: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ~~~~~~~~~~~~^~ > > core/parser/parse_fline.c:247:18: note: use array indexing to silence this warning > HTTP_VERSION+1, HTTP_VERSION_LEN-1)) { > ^ > & [ ] > > 2 warnings generated. (cherry picked from commit f2959f422bb8171241728f5148d4b21c9cc2c681) - URL: https://github.com/kamailio/kamailio/commit/990e0f3d0a483c9bdc52de538d5e9b5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:06:37Z core: remove compiler warnings [-Wstring-plus-int] > core/parser/parse_fline.c:93:34: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 && > ~~~~~~~~~~~^~ > > core/parser/parse_fline.c:121:9: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] > } else IFISMETHOD( INVITE, 'I' ) > ^~~~~~~~~~~~~~~~~~~~~~~~~ > > core/parser/msg_parser.h:131:35: note: expanded from macro 'IFISMETHOD' > strncasecmp( tmp+1, #methodname +1, methodname##_LEN-1)==0 && \ > ~~~~~~~~~~~~^~ (cherry picked from commit 2b070a622fa3c78d929580fda3c7952963c4066b) - URL: https://github.com/kamailio/kamailio/commit/0b33f3b2cdb5950c816723cb310b284… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:07:18Z core: better debug logging in mk_action function (cherry picked from commit 10b96696b82d2e70c15f3e4bc52097f0a5062499) - URL: https://github.com/kamailio/kamailio/commit/a18f9ae5110207b0d99283cd987aeba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:08:12Z dialog: keep route block index as signed int - otherwise it can be broken value when route block doesn't exit and kemi callback should be executed - reported by David Escartin (cherry picked from commit 6c557efc1b9cb8c880a05235c94780bbaf305073) - URL: https://github.com/kamailio/kamailio/commit/9e3e24726e9c60b3e61b3a46366cfa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:10:54Z dmq: init worker structure in chid_init for PROC_INIT rank - have it ready when other processes are started (cherry picked from commit 21bdbff049571ca22f1205a041c8b1162005d319) - URL: https://github.com/kamailio/kamailio/commit/889938f19a5b012f149f6e853c40211… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:11:17Z dialog: detailed debug messages when resolving the timeout (cherry picked from commit 20013e4e2bf1a5d5ce8535e07320dca034639286) - URL: https://github.com/kamailio/kamailio/commit/60092cc36f8e1b0869d16b1e684cf3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:11:28Z sst: debug message when setting timeout avp (cherry picked from commit 56ed5c028bd97837c7a9e0017a2599f09554211f) - URL: https://github.com/kamailio/kamailio/commit/b150eacb841b1a7565b763767eb790f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:11:50Z dialog: dmq operations under locked dlg table entry - protect against races that could be due to rentransmissions or other parallel processing cases - related to GH #2224 (cherry picked from commit 8965ff07f2e9fa105fc56896eed9caf4b6faf261) - URL: https://github.com/kamailio/kamailio/commit/bccfb5ad45bc58cc77f2a64efc60942… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:12:35Z dialog: exposed functions to search dlg and lock table entry (cherry picked from commit 125031daeade9dab5c36b912dda65700d95c4c6a) - URL: https://github.com/kamailio/kamailio/commit/843138e4455c6c0aa0e74b2e3f0d008… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:12:40Z dialog: functions to search dialog by uuid and keep table entry locked - helper macros to lock/unlock table entry with dlg cell structure (cherry picked from commit a4f8c0291bfd32752c0c2c323f618c6ac0c91d53) - URL: https://github.com/kamailio/kamailio/commit/8149fc45b6188a129440e7ac2754899… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:15:31Z cfgutils: use same type for local variable in rpc gflags functions (cherry picked from commit 5411eda4e44a487479d00433583a68a328aca9a3) - URL: https://github.com/kamailio/kamailio/commit/0cbdd5e676aa9f01932182c6b70030a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:16:37Z lib/srdb1/schema: removed kamailio-extensions.xml file - file didn't have any content itself, tried to include an inexistent extra.xml, which generated an warning for 'make dbschema' (cherry picked from commit 367a865e7f0c9cd67fda9176add1ca3c0dad2d46) - URL: https://github.com/kamailio/kamailio/commit/181c8e3dc6b2aca5eb66f91a7db3c3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:18:27Z msilo: docs - fixed position of parameter and whitespacing - parameter position was broken at the end of file (cherry picked from commit 1e3d7d319d07cd022c374ed2698fb905dacf50b7) - URL: https://github.com/kamailio/kamailio/commit/895df41d33fdec3f090da59a210847d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:19:41Z app_sqlang: docs - fix for rpc command name (cherry picked from commit a072e170c07370f97716ae719abb35c508d98564) - URL: https://github.com/kamailio/kamailio/commit/47a8be938c39ffb335a36bfa34a9d37… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:19:54Z misc: kemi examples, add missing kemix module change introduced at 01ac570c2fbda800d1e00cd50305739cf0596ebf (cherry picked from commit e123971726a8d18627091870086ee7d244e9802f) - URL: https://github.com/kamailio/kamailio/commit/5f5372e3d94db873d810d15154b5d96… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:19:59Z misc: examples kemi, don't fail if optional modules are not loaded kamailio-basic-kemi.cfg has some define instructions that can be removed ( WITH_MYSQL, WITH_AUTH, ...) So lets make sure that modules are there in the lua script before using the defined routes. (cherry picked from commit 661fc0193da9e559e22b83b006db3e23345c092c) - URL: https://github.com/kamailio/kamailio/commit/20d7188d253020e82eb6d880c0cc516… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2020-05-13T12:20:35Z app_python3: update Python3 detection mechanism This commit - removes the python calls whose output is never actually used. - changes the include discovery to use python3(.x)-config. This is preferable because it also works for cross-compiling. Calling python3(.x) directly will always provide host flags, which for cross-compiling is not feasible. - updates LDFLAGS discovery to also work with >= Python 3.8. To achieve this python3(.x)-config is first run with the argument "--embed". If this does not succeed (exit status 1) python3(.x)-config is run again without "--embed". This is the method suggested by Python upstream to provide backwards compatibility. See [1] for more details. [1] https://docs.python.org/3/whatsnew/3.8.html Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> (cherry picked from commit 05af36d34aa2668780aa111878206c6797fa98b0) - URL: https://github.com/kamailio/kamailio/commit/a6fc2a5f726d494e28ff171db83a136… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:21:57Z app_python3: Makefile - suppress warning if --embed is not supported by python3-config (cherry picked from commit 392688fc756a97f65c2433bb6af7adedca4e0abf) - URL: https://github.com/kamailio/kamailio/commit/59eb7e9efcef2d22d32cf8a9ac57c51… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-05-13T12:23:11Z pkg/kamailio: fixed python3 deps for RHEL 6 (cherry picked from commit 5f31a56acd25f892e6275e6ac786677f2eb2be0c) - URL: https://github.com/kamailio/kamailio/commit/e031f66a6cd431745ec9b58e6b22b9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:23:29Z misc/examples/kemi: make reply code integer everywhere (cherry picked from commit 28be94ea97216ba7ac1420130cc01ebda167c5d8) - URL: https://github.com/kamailio/kamailio/commit/2c69d0eb1ce460c36adb540676035f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:35:44Z core: parser - removed temporarily remark for module reserved internal flags (cherry picked from commit 8801ee89856d4a37709869a5c01dfa66988b8f5a) - URL: https://github.com/kamailio/kamailio/commit/0ec5987ffedcee6dfe00a5fe1c233cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:38:22Z siptrace: docs - fix siptrace control command example in the overview (cherry picked from commit 768b0b2c1559211dbc3c5b2e01a25bac8fd2540a) - URL: https://github.com/kamailio/kamailio/commit/9b2b3679129c2fe1e9fe0ca4124308f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:45:10Z rr: docs - updated ids for xref linkend (cherry picked from commit 62a2553043f81cd47f611d2829181604488a4b0c) - URL: https://github.com/kamailio/kamailio/commit/6dba53cbcae5ad5f2b796cd81383973… Author: fredposner <fred(a)qxork.com> Date: 2020-05-13T12:45:36Z tls: fix typo in documentation - params.xml: replace "private" with "private_key" (cherry picked from commit ad91985849e46beee757d48ee9041b81bef9bd81) - URL: https://github.com/kamailio/kamailio/commit/8bbe86b45d80cbb0be96979b0634db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:54:39Z core: data lump - updated comments and param names reflect better the purpose - coherent whitespacing (cherry picked from commit 36d55b1fca14eb1a055dedac2e3cdb81b48c3a22) - URL: https://github.com/kamailio/kamailio/commit/7c237acb1f5f7b4ddde21d8f3700d44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:55:16Z nathelper: new parameter nat_addr_mode - if set to 0, default private net addresses are checked by nat_uac_test() - if set to 1, other reserved net addresses are checked by nat_uac_test() - default 1 (reserved addresses are considered not routable) - related at GH #2277 (cherry picked from commit a10e7652f24bc7ed8e74ff27d16da5d77689b6ac) - URL: https://github.com/kamailio/kamailio/commit/d3a617a3bf81e9665d6d6da23697038… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:55:21Z nathelper: docs for nat_addr_mode parameter (cherry picked from commit 9721922e2e47f3e8403bc540ecd73b55f41d5d91) - URL: https://github.com/kamailio/kamailio/commit/094719a56211e826cb0b26ef5ac7cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:55:32Z nathelper: docs - fix ending tags issues introduced with previous commit (cherry picked from commit 288f1f17cb36cd69ea2daed7afcaa859ccc72d58) - URL: https://github.com/kamailio/kamailio/commit/9c14f4bca395a0fbd1cc3b62d0c6651… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:56:15Z tm: do not return if kemi callback execution fails for t_continue() - have same behaviour as with route blocks (cherry picked from commit 2161f0cc316af0e1153b01f327d0e7c50523060c) - URL: https://github.com/kamailio/kamailio/commit/1b9fb8a42d9b1f6e66e403af494ecaf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:57:53Z redis: init variables to get rid of compile warnings - GH #2298 (cherry picked from commit f1de08eef86dc2cd98509c90fa8b28212d47ca37) - URL: https://github.com/kamailio/kamailio/commit/ed089ab7a65b268e0b519ab3ebd889f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T12:58:10Z app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 (cherry picked from commit 3366bf4f3746285d9dc29e8a2461f53983f0acf0) - URL: https://github.com/kamailio/kamailio/commit/23abc1faa014e4a6ef3cb3bca64a33e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T13:07:06Z sipdump: safety check for local socket pointer - use generic address is not set (cherry picked from commit 3e969a5b4d9a75d082f7d59b0fa1dc6362391675) - URL: https://github.com/kamailio/kamailio/commit/cd6a3035c1fca7783b9996829fe2c89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T13:07:18Z core: safer truncation of hostname using memcpy (cherry picked from commit aac577a4655ebf09d5cbef3e1a49f72d25ea57d7) - URL: https://github.com/kamailio/kamailio/commit/e00f0b567a1f1891fe23bf2a21b1c85… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T13:07:41Z cfgt: fix implicit declaration of 'strcasestr' > cfgt_int.c: In function 'cfgt_msgout': > cfgt_int.c:863:21: warning: implicit declaration of function 'strcasestr'; did you mean 'strcasecmp'? [-Wimplicit-function-declaration] > 863 | if(buf->len > 7 && strcasestr(buf->s, "OPTIONS")) { > | ^~~~~~~~~~ > | strcasecmp (cherry picked from commit 361542a953ceaab1894f790e21eecf74008b749a) - URL: https://github.com/kamailio/kamailio/commit/79bc074ec4bb1c9b8d008104526827e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T13:08:13Z regex: leave enough space in buffers for parenthesis and -ending (cherry picked from commit 9cae069832c8f37ebf9e686b3fbcab5d63652755) - URL: https://github.com/kamailio/kamailio/commit/582d4c9cca243843c45b736f69a480a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T13:09:44Z core: explicit cast to (void*) for %p format printing - c standard required that for a defined value and in some cases the code analysers complain, especially when reading the value via socket/file descriptor (cherry picked from commit 730f65c06d0b8436e4a9cd0c1a62d2433819dc45) - URL: https://github.com/kamailio/kamailio/commit/ef6a2a7eded3ce5eaf2a881b5a1f72b… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T13:17:49Z Makefile.defs: version set to 5.2.7 - URL: https://github.com/kamailio/kamailio/commit/2bfdc008a5ec6bafa0746854e057654… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T13:18:06Z pkg: update spec files for obs and alpine to 5.2.7

1 0

warnings with gcc 9.3 on app_sqlang ,squirrel
by Henning Westerholt 13 May '20

13 May '20

Hello, Just a quick note - I get the following warnings on app_sqlang with gcc 9.3.0 (Ubuntu 20.04): henning@static:~/repositories/kamailio/src/modules/app_sqlang$ make CC (gcc) [M app_sqlang.so] app_sqlang_api.o CC (gcc) [M app_sqlang.so] app_sqlang_kemi_export.o CC (gcc) [M app_sqlang.so] app_sqlang_mod.o make --no-print-directory -C ./squirrel/squirrel SQMARCH64="-m64" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" sq64 gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude -fPIC In file included from sqobject.h:5, from sqpcheader.h:17, from sqapi.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqapi.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqbaselib.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqbaselib.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqobject.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqobject.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqstate.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqstate.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqvm.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqvm.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

3 3

[kamailio/kamailio] ndb_redis: failed build on alpine (#2325)
by sergey-safarov 13 May '20

13 May '20

### Description ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o redis_client.c: In function 'redisc_append_cmd': redis_client.c:558:31: error: expected 'while' before ';' token 558 | STR_ZTOV(cmd->s[cmd->len], c); | ^ redis_client.c: In function 'redisc_exec': redis_client.c:949:33: error: expected 'while' before ';' token 949 | STR_ZTOV(cmd->s[cmd->len], c); | ^ redis_client.c:983:34: error: expected 'while' before ';' token 983 | STR_ZTOV(cmd->s[cmd->len], c); | ^ redis_client.c:988:31: error: expected 'while' before ';' token 988 | STR_ZTOV(cmd->s[cmd->len], c); | ^ redis_client.c:1000:31: error: expected 'while' before ';' token 1000 | STR_ZTOV(cmd->s[cmd->len], c); | ^ redis_client.c:1005:31: error: expected 'while' before ';' token 1005 | STR_ZTOV(cmd->s[cmd->len], c); | ^ make[2]: *** [../../Makefile.rules:100: redis_client.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [Makefile:511: modules] Error 1 make[1]: Leaving directory '/usr/src/kamailio/pkg/kamailio/alpine/src/kamailio-4d758d5258097760c09a762929c5893c14ac3eef/src' make: *** [Makefile:34: all] Error 2 >>> ERROR: kamailio: build failed >>> kamailio: Uninstalling dependencies... (1/1) Purging .makedepends-kamailio (20200427.180718) OK: 786 MiB in 178 packages pre_build hook failed! (1) ``` Build failed after 4d758d5258097760c09a762929c5893c14ac3eef commit -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2325

1 2

git:5.2:c291d25b: pkg/kamailio/deb: version set 5.2.7
by Victor Seva 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: c291d25b4da3b13eee49121f30947b12ea8562e1 URL: https://github.com/kamailio/kamailio/commit/c291d25b4da3b13eee49121f30947b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:43:45+02:00 pkg/kamailio/deb: version set 5.2.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/c291d25b4da3b13eee49121f30947b1… Patch: https://github.com/kamailio/kamailio/commit/c291d25b4da3b13eee49121f30947b1…

1 0

git:5.2:08889eb0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 08889eb0cf8986920fdbd81ce5097913296a6fd3 URL: https://github.com/kamailio/kamailio/commit/08889eb0cf8986920fdbd81ce509791… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T12:31:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/rtjson/README Modified: src/modules/tls/README Modified: src/modules/usrloc/README Modified: src/modules/websocket/README --- Diff: https://github.com/kamailio/kamailio/commit/08889eb0cf8986920fdbd81ce509791… Patch: https://github.com/kamailio/kamailio/commit/08889eb0cf8986920fdbd81ce509791…

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/93d19643fa01c821ca653c7d10f5904… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-05-13T10:23:09Z usrloc: doc fixes * add doc for parameter reg_id_column * fix title for parameter partition_column (cherry picked from commit 305ba1b23bae19a4042c3e8fa88451b47ac69ff5) - URL: https://github.com/kamailio/kamailio/commit/1cedde96d36c24e6fd2f1a98d6ea9a2… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-05-13T10:23:09Z websocket: docs - fix title for parameter rm_delay_interval (cherry picked from commit c4a566bf8df05b55a690a4ad9ea5f5dfe8961e0e) - URL: https://github.com/kamailio/kamailio/commit/c076756dd4e7fe17b8dedd656f9d30e… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-13T10:23:09Z TLS: fix typo in docs (cherry picked from commit f75e64b2335fcf07c3371a4108063e8c0a3a52b9) - URL: https://github.com/kamailio/kamailio/commit/0bb4c39ca2ff7324d70336b438861f2… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-13T10:23:09Z TLS: Fix TLS session id example to match source code (cherry picked from commit 70bcb5f88dc87e27940cc71e293d1c68a7717af6) - URL: https://github.com/kamailio/kamailio/commit/077b395f9562fd119974e7fe8f4b5db… Author: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-13T10:23:09Z TLS: Try to always refer to OpenSSL as "OpenSSL" instead of other names (cherry picked from commit ff887fe5d0d7cec7fc0640a54c80b322d421ed36) - URL: https://github.com/kamailio/kamailio/commit/05f89d395803dad9c8fa6e08f032ece… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:23:09Z tm: small spelling fix in comments (cherry picked from commit 1d555161195ebccd35534f8533eacdcbba7020fc) - URL: https://github.com/kamailio/kamailio/commit/a134dd99ed43a9701bde4e19c61a41b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z core: hash_func.h - use file name specific include guard (cherry picked from commit 9691f6e0cab48114ef4067a22cc8f9c1efb8944c) - URL: https://github.com/kamailio/kamailio/commit/7fdcc9e5ca5c3077b59cbe1199f5446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z uid_domain: use module specific include guards (cherry picked from commit b3c981db67845622fb8c85a20e18e1b98c29eb69) - URL: https://github.com/kamailio/kamailio/commit/d892e82095b5538b64efcc68e8ecb9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z usrloc: use file name specific include guard (cherry picked from commit f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f) - URL: https://github.com/kamailio/kamailio/commit/db6a4e0f942ffb44ebd09ade3cb4c8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z app_sqlang: use file name specific include guard (cherry picked from commit 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef) - URL: https://github.com/kamailio/kamailio/commit/4b2499054d78e790d76dbf3c6d2ae20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z pipelimit: use file name specific include guard (cherry picked from commit e4356d56d57599ff063e6849cab8cab5267d26e0) - URL: https://github.com/kamailio/kamailio/commit/13f7c148c5258371446a8fe0cf2a8e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z ratelimit: use file name specific include guard (cherry picked from commit 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5) - URL: https://github.com/kamailio/kamailio/commit/3a3f82e22954d3d9801c006334a87cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z snmpstats: use file name specific include guard (cherry picked from commit 13622cf6e36e50c42ec882272b1c48107fa55677) - URL: https://github.com/kamailio/kamailio/commit/642f92276bc8690a473f71b129a884e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z pua: use file name specific include guard (cherry picked from commit 076649793bfdbdc4f03f96961f23997c87ce4268) - URL: https://github.com/kamailio/kamailio/commit/4bc4bef58e7e2251f10669883ac82b0… Author: Semen Darienko <semen.darienko(a)wildix.com> Date: 2020-05-13T10:23:09Z core: dns - use all NAPTR records - enable using of all NAPTR records instead of the first one ordered by priority - GH #2290 (cherry picked from commit 28049aafc8dd06c160ce5e7b8d5e4fc728441b0c) - URL: https://github.com/kamailio/kamailio/commit/f7d2e93cd6f8f1cf88b0a8f6d9444e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser (cherry picked from commit 66ef7ab7b078794b96ecee13f6867d5f90a8d63e) - URL: https://github.com/kamailio/kamailio/commit/ef1bb542986c525205a673aab62963f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z htable: docs - more details about size attribute for htable (cherry picked from commit 35f711e6ec74c6e67edf99adaa15cc353f2ce949) - URL: https://github.com/kamailio/kamailio/commit/a1f7ac2248df18fb0dde008829d7413… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py (cherry picked from commit 6b69754f28ab8df61852b9f8695e59305a7c6c3a) - URL: https://github.com/kamailio/kamailio/commit/d6e84f7da6b9f2689fdf1dc82ef9006… Author: Mathias WOLFF <mathias(a)celea.org> Date: 2020-05-13T10:23:09Z update example using IP address reserved for documentation (cherry picked from commit abecca7f6515a454b3394ec0df7f535a6a52e1e9) - URL: https://github.com/kamailio/kamailio/commit/3218f623f98d0fbeab0288f88200c4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z rtjson: fixed the updated example - included invalid characters for xml text, rendering empty readme (cherry picked from commit a23476600666d0cf0604a6a7e3212fa5b1223af8) - URL: https://github.com/kamailio/kamailio/commit/05083ee454b8a8cc3d22b5869b609ad… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-05-13T10:23:09Z ims_usrloc_scscf: extend and fix log messages (cherry picked from commit b2487d95f61b46033eb2825c5f54d5f19ca1e878) - URL: https://github.com/kamailio/kamailio/commit/fcd3938267fce229784ca1afae19faf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z dmq: use PROC_RPC rank to init the worker process (cherry picked from commit f2a4fd419c27b99ce4ff6f93dc3f235d4f74a33c) - URL: https://github.com/kamailio/kamailio/commit/7a605d11bf92a4b3476e1523ae23de4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T10:23:09Z auth: safety check for auth header pointer in pv_auth_check() (cherry picked from commit ea2ea2f8274eda9d8d7055b22fab8910cd773a19) - URL: https://github.com/kamailio/kamailio/commit/aead6cc11323d60d51ca9423b7bb453… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-05-13T10:23:09Z ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. (cherry picked from commit e53b25f89a14aba93d3c48a1b2f983114db1760c)

1 0

git:5.3:11f64c95: ims_usrloc_scscf: extend and fix log messages
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 11f64c9562c71b45497901be6b606ba86546126e URL: https://github.com/kamailio/kamailio/commit/11f64c9562c71b45497901be6b606ba… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:35Z ims_usrloc_scscf: extend and fix log messages (cherry picked from commit b2487d95f61b46033eb2825c5f54d5f19ca1e878) --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/subscribe.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/11f64c9562c71b45497901be6b606ba… Patch: https://github.com/kamailio/kamailio/commit/11f64c9562c71b45497901be6b606ba…

1 0

git:5.3:ebd35b33: ims_registrar_scscf: fix aor generation in lookup()
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: ebd35b33f3afe9aa1b1858f07b672370267f532c URL: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:18Z ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. (cherry picked from commit e53b25f89a14aba93d3c48a1b2f983114db1760c) --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… Patch: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s);

1 0

git:5.3:702ec6fb: ims_registrar_scscf: fix multiple contacts in NOTIFY
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 702ec6fb87ede0fe20e621b1e4a8eead057b0fcc URL: https://github.com/kamailio/kamailio/commit/702ec6fb87ede0fe20e621b1e4a8eea… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:11Z ims_registrar_scscf: fix multiple contacts in NOTIFY - Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure. (cherry picked from commit fa8b7941c4d14625beadd4943d89e898543c7377) --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/702ec6fb87ede0fe20e621b1e4a8eea… Patch: https://github.com/kamailio/kamailio/commit/702ec6fb87ede0fe20e621b1e4a8eea…

1 0

git:5.2:55ee4b0e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 55ee4b0ec44b57612653188ea6394f269f47138b URL: https://github.com/kamailio/kamailio/commit/55ee4b0ec44b57612653188ea6394f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T11:46:39+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/55ee4b0ec44b57612653188ea6394f2… Patch: https://github.com/kamailio/kamailio/commit/55ee4b0ec44b57612653188ea6394f2… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index f02bd970df..3f44f1fbd4 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -974,7 +974,9 @@ modparam("dispatcher", "ds_db_extra_attrs", "socket=socket;pref=prefix") + “8” - select destination sorted by priority attribute value (serial forking ordered by priority). + “9” - use weight based load distribution. You have to set the - attribute 'weight' per each address in destination set. + attribute 'weight' for each address (gateway) in destination + set. For more see the description of the 'weight' attribute in + the 'Special Attributes' section. + “10” - use call load distribution. You have to set the attribute 'duid' (as an unique string id) per each address in destination set. Also, you must set the parameter

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/8c09b29f1a9e577dbf3c42df83e20ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:15:13Z dispatcher: docs - note about special attributes section for weight dispatching (cherry picked from commit 7602329391760b2f18d653f46d6a596be1daade5) - URL: https://github.com/kamailio/kamailio/commit/6f096013bf782f35e9ea96fc2174884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:00Z xmlops: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 64d37971d2d3fbd87176fe71ae19adca7f47a6ea) - URL: https://github.com/kamailio/kamailio/commit/fea6520b3815e2694ae19c5283a081e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:06Z presence: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 5ce9690245e0a075742c7cb8eac1786622c976f4) - URL: https://github.com/kamailio/kamailio/commit/f43cc0fa9110e078405ad4c62b6718a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:11Z presence_xml: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 77ad9e626a8b9f26f3ce904fe35dda70ad4ce164) - URL: https://github.com/kamailio/kamailio/commit/705e1737bf0990858906ec27d079aa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:17Z presence_dialoginfo: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 517283c245be8c35d3c6ee9721fa1e85865b4638) - URL: https://github.com/kamailio/kamailio/commit/aa5bd6dfa556e0fea81172356e97d2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:23Z utils: Makefile - try to use pkg-config if xml2-config is not found (cherry picked from commit 02cf454fc601dd3b246a8886ec6d86103ad87a6e) - URL: https://github.com/kamailio/kamailio/commit/96f0cbd8ffab63ddb2e1d0cfb28de17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:17:44Z lib/ims: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 58deac2e7fd62afca409b17903deb951493b213a) - URL: https://github.com/kamailio/kamailio/commit/fcb0ac2c47cb9861f38f84c3ecd59cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:17:55Z cdp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 2749962b8354be1731ab68a0ae4aa0fac4f944e1) - URL: https://github.com/kamailio/kamailio/commit/6da63a2a9473ce21c7eff7954dc3a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:04Z cplc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit f05a46dc79de45c6cb958b845b9f2d85452c4f37) - URL: https://github.com/kamailio/kamailio/commit/b4d5bd208d90b5d109dd81532c05c91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:11Z ims_auth: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4d3496fb82df1d249a78365e0c50b4ec13989261) - URL: https://github.com/kamailio/kamailio/commit/d684dd3862277b5d4ff1cd7537002c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:21Z ims_icscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 80f2eb33a967ede3e70fef572dc9b42172ad067c) - URL: https://github.com/kamailio/kamailio/commit/004e5f20b4a8e329da75df2e35dcbed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:34Z test/mod_httpapitest: removed unused xml2-config discovery (cherry picked from commit b88b2306a0bdd8ba8df92cfeb60eb4032f337f44) - URL: https://github.com/kamailio/kamailio/commit/534931ce18bf01eb82221e8f243cecb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:43Z ims_isc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 71e67531194aa867b8f3f32b72d07e1bd4ad7dff) - URL: https://github.com/kamailio/kamailio/commit/4d7dc10923defb7667b96b8015657e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:18:51Z ims_registrar_pcscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 29573bbdb09412c9cbfe839f0c80b7dd7fe77804) - URL: https://github.com/kamailio/kamailio/commit/ffd04724da296fe2dba3c3db9ae9e9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:19:44Z ims_registrar_scscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit ff92622c3b4c6224f75318ba9e39c9b4389bff1e) - URL: https://github.com/kamailio/kamailio/commit/b3ac786b35b6b70f8c624cc3885676f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:00Z presence_conference: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8e9e1fdeacc4c1b2b0cd67f1b36d73737dacd015) - URL: https://github.com/kamailio/kamailio/commit/148d063edf8993fb7e55234737f0324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:08Z pua: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4f43047172260e1a524700a866693f99ea11383b) - URL: https://github.com/kamailio/kamailio/commit/b6a9617ca5f9f8b08f2fb7635aa1039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:14Z pua_bla: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit e00ce6016afd5c0fba084a19a45fb13353e7f6f4) - URL: https://github.com/kamailio/kamailio/commit/35c0a605719386b7d79ca7f1da3695d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:20Z pua_dialoginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit b4842e81e3aa861739c996ff795b6d7261202b66) - URL: https://github.com/kamailio/kamailio/commit/d1ff8f84d6b420625f62ebe807ab454… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:26Z pua_reginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 7f6648a8586fdfd5a1fdba05556333095bc25777) - URL: https://github.com/kamailio/kamailio/commit/e1a5176caa05f1aa32b9570852c28a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:33Z pua_usrloc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 20d9453cd3259e8afa1de92a7dba1d25f5f43fe4) - URL: https://github.com/kamailio/kamailio/commit/64db37850a4c0ab56e2456ca92af08f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:38Z pua_xmpp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit d40a924bd698ddf365b4db52cba2ab45f7d7a6e2) - URL: https://github.com/kamailio/kamailio/commit/4825182c0fa448cd1dbdf8cf4ba74d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:43Z rls: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fbfe21f54c7fd845bf9c99c4091980b1ee4d61d5) - URL: https://github.com/kamailio/kamailio/commit/4d01c41746d47d74745161f90ea5d5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:48Z xcap_server: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 169ccce5e3cb302352b1e4d5ac0a0dc58eb552cb) - URL: https://github.com/kamailio/kamailio/commit/454e441e10f46a1efa590b01df0655d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:20:53Z xhttp_pi: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fe173b2af121b2d6388fea3632037a0ea2999988) - URL: https://github.com/kamailio/kamailio/commit/baff4a1c240362a7ad5af4576df80d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:21:17Z xmlrpc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 994a8dfc070d84b5dad28fa873d8759280c910f2) - URL: https://github.com/kamailio/kamailio/commit/199c00984191f73d1e9bf637444740e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:25Z ims_qos: use extern in header files not to redeclare variables (cherry picked from commit df5521fcdfc96462eb191b774f242fe1d4616adb) - URL: https://github.com/kamailio/kamailio/commit/1afb7afde87f1022c10fc9e3796174b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:29Z ims_icscf: stats global variables made extern in header file (cherry picked from commit bfb717fc8504a079066a0fdc09b856a937a7b430) - URL: https://github.com/kamailio/kamailio/commit/786d18db8a1ad839cdeeda9ebb6419f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:34Z ims_isc: avoid duplicate declaration of isc_ulb by using extern (cherry picked from commit 32f37cdc876abcd7127993e079c9a0132d1f6460) - URL: https://github.com/kamailio/kamailio/commit/28f6d74dcfc68b3d7ac680ad0c3e625… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:40Z ims_auth: declare extern the stats variables in header file (cherry picked from commit 8156dd87a977a011abb9652a997f4ba61eb3e642) - URL: https://github.com/kamailio/kamailio/commit/b91953f88b4ee5343393172531c2251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:46Z ims_dialog: declare extern dlg stats structure in header file (cherry picked from commit 15d5676fd7b6d64616fbf8ebf9517f0d56a47f5c) - URL: https://github.com/kamailio/kamailio/commit/76b5cf2dcd16e9496ba97fda947dcc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:51Z cdp: global variables declared extern in header file (cherry picked from commit a88cf96b8ba3358c08e0e210f76320f6d7926b7d) - URL: https://github.com/kamailio/kamailio/commit/2c4601d767c65da651d33411c28a336… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:25:56Z sipcapture: declare extern heptime in hep.c and init it to null (cherry picked from commit 16bc15156ecc8a8f4f66c44b064db854d0e3e4e0) - URL: https://github.com/kamailio/kamailio/commit/d1f187b78956ca8f515d31c36cc9370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:26:02Z sms: removed duplicate declaration of global variables (cherry picked from commit f8284418ea7d16dec970260cb92eb1af35bbf643) - URL: https://github.com/kamailio/kamailio/commit/e2db44b2fbc6cd05e557e63d3f606ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:22Z ims_charging: extern declaration for cdpb (cherry picked from commit 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f) - URL: https://github.com/kamailio/kamailio/commit/e6bd029c33c36a8de28ed630d6009bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:27Z ims_charging: use extern to avoid double declaration of globals (cherry picked from commit a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae) - URL: https://github.com/kamailio/kamailio/commit/225536c1254d9bee48f7291a9e01c27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:32Z ims_usrloc_scscf: extern declaration for duplicated global vars (cherry picked from commit 1bbab692b749feee7f23a6c5c3fbee1ac890fffa) - URL: https://github.com/kamailio/kamailio/commit/ed81bd378fed68f9e3c117179631222… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:27:37Z ims_registrar_scscf: global vars declared extern in header files (cherry picked from commit a041e94c4dce464737d6531d11fbe4d61292d7b4) - URL: https://github.com/kamailio/kamailio/commit/19fcac6a792823ecf4fd360962650f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:28:03Z ims_diameter_server: extern declaration of global vars in header file (cherry picked from commit 19263243127c40d0418ff04e56048d31e9dd9d0c) - URL: https://github.com/kamailio/kamailio/commit/2bc21c1dc24418a0228908ac4212ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:01Z app_python3: declare global vars extern in header file (cherry picked from commit a771d9abd9ce97228efa7a0dfc9c4d89690e9b38) - URL: https://github.com/kamailio/kamailio/commit/2d80f8984dd2f8a13468b0b961d4d3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:08Z app_python: declare global vars extern in header file (cherry picked from commit 9cc9576c025c541264a3679618bb2be8d108a9f6) - URL: https://github.com/kamailio/kamailio/commit/9a90b41e636af948326bb552e4fb628… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:13Z pua_reginfo: extern declaration of global vars in header file (cherry picked from commit 7afe5b9837d38cd77f75c3028c9134673c95404e) - URL: https://github.com/kamailio/kamailio/commit/94268c1e65c3f2414b4b22eab2a677c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:19Z janssonrpcc: use extern not to declare tmb global many times (cherry picked from commit 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385) - URL: https://github.com/kamailio/kamailio/commit/39615a12aba6834b34041812f87156b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:26Z ims_ocs: declare extern global variables in header file (cherry picked from commit 13da8cf58a2abfcd87a48fbc963d4e1a26d60085) - URL: https://github.com/kamailio/kamailio/commit/f00711733b071709fcffb874f80426d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:31Z pua: extern declaration of global variable in header file (cherry picked from commit e260447833f616066e0fa23e51e791822b55b039) - URL: https://github.com/kamailio/kamailio/commit/5cad26c5bef19de73feba84668b2f8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:29:37Z ims_qos: more extern declarations in the header files (cherry picked from commit 7bea30203b85b7ed17434ee3f301faa0cedcba76)

1 0

git:5.2:3235a046: Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 3235a04621dbcc3196d7e49641ec73fcebcf0ece URL: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T08:47:09Z Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Patch: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f…

1 0

Releasing Kamailio 5.2.7
by Henning Westerholt 13 May '20

13 May '20

Hello, as discussed in the last development meeting, I am planning to release next week (likely on Wednesday 13th May) the next minor version out of branch 5.2, version 5.2.7. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:730f65c0: core: explicit cast to (void*) for %p format printing
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 730f65c06d0b8436e4a9cd0c1a62d2433819dc45 URL: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T19:52:52+02:00 core: explicit cast to (void*) for %p format printing - c standard required that for a defined value and in some cases the code analysers complain, especially when reading the value via socket/file descriptor --- Modified: src/core/async_task.c Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… Patch: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 870241b0d3..ee50412790 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -277,8 +277,8 @@ int async_task_run(int idx) continue; } if(ptask->exec!=NULL) { - LM_DBG("task executed [%p] (%p/%p)\n", ptask, - ptask->exec, ptask->param); + LM_DBG("task executed [%p] (%p/%p)\n", (void*)ptask, + (void*)ptask->exec, (void*)ptask->param); ptask->exec(ptask->param); } shm_free(ptask); diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 89e3b56b7c..fd5a644ee5 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3606,7 +3606,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) _wbufq_non_empty(tcpconn) )){ if (unlikely(TICKS_GE(t, tcpconn->wbuf_q.wr_timeout))){ LM_DBG("wr. timeout on CONN_RELEASE for %p refcnt= %d\n", - tcpconn, atomic_get(&tcpconn->refcnt)); + (void*)tcpconn, atomic_get(&tcpconn->refcnt)); /* timeout */ if (unlikely(tcpconn->state==S_CONN_CONNECT)){ #ifdef USE_DST_BLACKLIST

1 0

git:master:702630b4: imc: reserve last char in global buffer for ending zero
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 702630b484ac6f7c017829c24294ce7552f1682a URL: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T18:01:15+02:00 imc: reserve last char in global buffer for ending zero --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… Patch: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 757b17b342..bf68967d21 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -960,7 +960,8 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, } p = imc_body_buf; - left = sizeof(imc_body_buf); + imc_body_buf[IMC_BUF_SIZE - 1] = '\0'; + left = sizeof(imc_body_buf) - 1; memcpy(p, MEMBERS, sizeof(MEMBERS) - 1); p += sizeof(MEMBERS) - 1; @@ -975,22 +976,22 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, } if (imp->flags & IMC_MEMBER_OWNER) { - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '*'; left--; } else if (imp->flags & IMC_MEMBER_ADMIN) { - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '~'; left--; } name = format_uri(imp->uri); - if (left < name->len) goto overrun; + if (left < name->len + 1) goto overrun; strncpy(p, name->s, name->len); p += name->len; left -= name->len; - if (left < 1) goto overrun; + if (left < 2) goto overrun; *p++ = '\n'; left--;

1 0

git:master:94eb9fed: keepalive: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 94eb9fed8b1d4a0aaaf76506e339f2d6a9e34e7d URL: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:45:23+02:00 keepalive: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… Patch: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 3a72b31474..e6a64dbcd1 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -78,24 +78,19 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) { void *sub; ka_dest_t *dest; - char *_ctime; - char *_utime; - char *_dtime; + char t_buf[26] = {0}; for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { rpc->add(ctx, "{", &sub); rpc->struct_add(sub, "SS", "uri", &dest->uri, "owner", &dest->owner); - _ctime = ctime(&dest->last_checked); - _ctime[strlen(_ctime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last checked", _ctime); - _utime = ctime(&dest->last_up); - _utime[strlen(_utime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last up", _utime); - _dtime = ctime(&dest->last_down); - _dtime[strlen(_dtime) - 1] = '\0'; - rpc->struct_add(sub, "s", "last down", _dtime); + ctime_r(&dest->last_checked, t_buf); + rpc->struct_add(sub, "s", "last checked", t_buf); + ctime_r(&dest->last_up, t_buf); + rpc->struct_add(sub, "s", "last up", t_buf); + ctime_r(&dest->last_down, t_buf); + rpc->struct_add(sub, "s", "last down", t_buf); rpc->struct_add(sub, "d", "state", (int) dest->state); }

1 0

git:master:259af0c1: sipdump: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 259af0c1eea8419df247c8da0f12b1881afa5332 URL: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:32:31+02:00 sipdump: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… Patch: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 03ed711d81..29face97c4 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -137,7 +137,8 @@ static int sipdump_write_meta(char *fpath) int len; int i; FILE *mfile = NULL; - struct tm *ti; + struct tm ti; + char t_buf[26] = {0}; len = strlen(fpath); if(len>=SIPDUMP_FPATH_SIZE-1) { @@ -156,14 +157,14 @@ static int sipdump_write_meta(char *fpath) LM_ERR("failed to open meta file %s\n", mpath); return -1; } - ti = localtime(&up_since); + localtime_r(&up_since, &ti); fprintf(mfile, "v: 1.0\n" "version: %s %s\n" "start: %s" "nrprocs: %d\n", ver_name, ver_version, - asctime(ti), + asctime_r(&ti, t_buf), *process_count ); for (i=0; i<*process_count; i++) { @@ -182,7 +183,7 @@ static int sipdump_write_meta(char *fpath) static int sipdump_rotate_file(void) { time_t tv; - struct tm *ti = NULL; + struct tm ti; int n; tv = time(NULL); @@ -197,12 +198,12 @@ static int sipdump_rotate_file(void) if(_sipdump_file != NULL) { fclose(_sipdump_file); } - ti = localtime(&tv); + localtime_r(&tv, &ti); n = snprintf(_sipdump_fpath+_sipdump_fpath_prefix.len, SIPDUMP_FPATH_SIZE-_sipdump_fpath_prefix.len, "%d-%02d-%02d--%02d-%02d-%02d.data", - 1900+ti->tm_year, ti->tm_mon, ti->tm_mday, - ti->tm_hour, ti->tm_min, ti->tm_sec); + 1900+ti.tm_year, ti.tm_mon, ti.tm_mday, + ti.tm_hour, ti.tm_min, ti.tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); _sipdump_file = fopen( _sipdump_fpath, "w" ); if(_sipdump_file==NULL) {

1 0

git:master:92e2c22c: tmrec: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 92e2c22c3c709c3c9a5243b5d5bdd48293865b0c URL: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:27:58+02:00 tmrec: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/tmrec/tmrec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… Patch: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… --- diff --git a/src/modules/tmrec/tmrec_mod.c b/src/modules/tmrec/tmrec_mod.c index 4bf21f9bad..cc97cc9b55 100644 --- a/src/modules/tmrec/tmrec_mod.c +++ b/src/modules/tmrec/tmrec_mod.c @@ -128,9 +128,9 @@ static void mod_destroy(void) static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) { time_t tv; - struct tm *tb; + struct tm tb; int y; - + if(msg==NULL) return -1; @@ -143,8 +143,8 @@ static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) } } else { tv = time(NULL); - tb = localtime(&tv); - y = 1900 + tb->tm_year; + localtime_r(&tv, &tb); + y = 1900 + tb.tm_year; } if(tr_is_leap_year(y)) @@ -155,12 +155,12 @@ static int w_is_leap_year(struct sip_msg* msg, char* t, char* str2) static int ki_is_leap_year_now(sip_msg_t* msg) { time_t tv; - struct tm *tb; + struct tm tb; int y; tv = time(NULL); - tb = localtime(&tv); - y = 1900 + tb->tm_year; + localtime_r(&tv, &tb); + y = 1900 + tb.tm_year; if(tr_is_leap_year(y)) return 1;

1 0

git:master:19769eb3: pv: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 19769eb372ca4d37ed45fef561cf966360ea6fd4 URL: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:26:07+02:00 pv: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… Patch: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… --- diff --git a/src/modules/pv/pv_time.c b/src/modules/pv/pv_time.c index f3baccf6df..87b62b71e9 100644 --- a/src/modules/pv/pv_time.c +++ b/src/modules/pv/pv_time.c @@ -246,10 +246,12 @@ int pv_get_timenowf(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; + char t_buf[26] = {0}; time_t t; t = time(NULL); - s.s = ctime(&t); + + s.s = ctime_r(&t, t_buf); s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)t); } @@ -269,13 +271,14 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str s; + char t_buf[26] = {0}; if(msg==NULL) return -1; msg_set_time(msg); - s.s = ctime(&msg->tval.tv_sec); + s.s = ctime_r(&msg->tval.tv_sec, t_buf); s.len = strlen(s.s)-1; return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); }

1 0

git:master:f72cc60b: msilo: use [c|gm]time_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f72cc60b9e82bc810c08d42a49bb23e5134ffa9d URL: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:19:18+02:00 msilo: use [c|gm]time_r() for a safer multi-thread usage --- Modified: src/modules/msilo/msfuncs.c --- Diff: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… Patch: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 5262a81159..dd2f4762b7 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -93,24 +93,24 @@ int m_apo_escape(char* src, int slen, char* dst, int dlen) */ int timetToSipDateStr(time_t date, char* buf, int bufLen) { - struct tm *gmt; + struct tm gmt; char* dayArray[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; char* monthArray[12] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; int len = 0; - gmt = gmtime(&date); + gmtime_r(&date, &gmt); /* In RFC 3261 the format is always GMT and in the string form like * "Wkday, Day Month Year HOUR:MIN:SEC GMT" * "Mon, 19 Feb 2007 18:42:27 GMT" */ len = snprintf(buf,bufLen,"Date: %s, %02d %s %d %02d:%02d:%02d GMT\r\n", - dayArray[gmt->tm_wday], - gmt->tm_mday, - monthArray[gmt->tm_mon], - 1900 + gmt->tm_year, - gmt->tm_hour, - gmt->tm_min, - gmt->tm_sec + dayArray[gmt.tm_wday], + gmt.tm_mday, + monthArray[gmt.tm_mon], + 1900 + gmt.tm_year, + gmt.tm_hour, + gmt.tm_min, + gmt.tm_sec ); /* snprintf returns number of chars it should have printed, so you @@ -243,7 +243,7 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) return -1; } -/** build MESSAGE body --- add incoming time and 'from' +/** build MESSAGE body --- add incoming time and 'from' * * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated @@ -252,11 +252,12 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) int m_build_body(str *body, time_t date, str msg, time_t sdate) { char *p; - + char t_buf[26] = {0}; + if(!body || !(body->s) || body->len <= 0 || msg.len <= 0 || date < 0 || msg.len < 0 || (46+msg.len > body->len) ) goto error; - + p = body->s; if(ms_add_date!=0) @@ -265,28 +266,28 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) { memcpy(p, "[Reminder message - ", 20); p += 20; - - memcpy(p, ctime(&sdate), 24); + ctime_r(&sdate, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } else { memcpy(p, "[Offline message - ", 19); p += 19; - - memcpy(p, ctime(&date), 24); + ctime_r(&date, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } *p++ = ' '; } - + memcpy(p, msg.s, msg.len); p += msg.len; body->len = p - body->s; - + return 0; error: return -1;

1 0

git:master:2394c0a9: msrp: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2394c0a97387efefde6a6784e09e02f3ff8a841c URL: https://github.com/kamailio/kamailio/commit/2394c0a97387efefde6a6784e09e02f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:14:39+02:00 msrp: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/2394c0a97387efefde6a6784e09e02f… Patch: https://github.com/kamailio/kamailio/commit/2394c0a97387efefde6a6784e09e02f… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index 0390173f91..9764c0903f 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -421,6 +421,7 @@ static void msrp_cmap_rpc_list(rpc_t* rpc, void* ctx) msrp_citem_t *it; int i; int n; + char t_buf[26] = {0}; str edate; if(_msrp_cmap_head==NULL) @@ -457,7 +458,8 @@ static void msrp_cmap_rpc_list(rpc_t* rpc, void* ctx) lock_release(&_msrp_cmap_head->cslots[i].lock); return; } - edate.s = ctime(&it->expires); + ctime_r(&it->expires, t_buf); + edate.s = t_buf; edate.len = 24; if(rpc->struct_add(vh, "dSSSSSdd", "CITEMID", it->citemid,

1 0

git:master:0cdd35c7: acc: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 0cdd35c7c685cf65687be12c23135be89728cbf3 URL: https://github.com/kamailio/kamailio/commit/0cdd35c7c685cf65687be12c23135be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:11:29+02:00 acc: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/0cdd35c7c685cf65687be12c23135be… Patch: https://github.com/kamailio/kamailio/commit/0cdd35c7c685cf65687be12c23135be… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 9879e697ff..91a12f6cdb 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -195,7 +195,7 @@ int acc_log_request( struct sip_msg *rq) int m; int o; int i; - struct tm *t; + struct tm t; double dtime; /* get default values */ @@ -262,12 +262,12 @@ int acc_log_request( struct sip_msg *rq) acc_time_attr.s, dtime, log_msg); } else if(acc_time_mode==3 || acc_time_mode==4) { if(acc_time_mode==3) { - t = localtime(&acc_env.ts); + localtime_r(&acc_env.ts, &t); } else { - t = gmtime(&acc_env.ts); + gmtime_r(&acc_env.ts, &t); } if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, - acc_time_format, t)<=0) { + acc_time_format, &t)<=0) { acc_time_format_buf[0] = '\0'; } LM_GEN2(log_facility, log_level, "%.*stimestamp=%lu;%s=%s%s", @@ -412,7 +412,7 @@ int acc_db_request( struct sip_msg *rq) int n; int i; int o; - struct tm *t; + struct tm t; double dtime; /* formated database columns */ @@ -435,12 +435,12 @@ int acc_db_request( struct sip_msg *rq) i++; } else if(acc_time_mode==3 || acc_time_mode==4) { if(acc_time_mode==3) { - t = localtime(&acc_env.ts); + localtime_r(&acc_env.ts, &t); } else { - t = gmtime(&acc_env.ts); + gmtime_r(&acc_env.ts, &t); } if(strftime(acc_time_format_buf, ACC_TIME_FORMAT_SIZE, - acc_time_format, t)<=0) { + acc_time_format, &t)<=0) { acc_time_format_buf[0] = '\0'; } VAL_STRING(db_vals+(m++)) = acc_time_format_buf;

1 0

git:master:a05d313e: sipdump: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: a05d313e0fa27952d7b10329ca1da9b041369ffb URL: https://github.com/kamailio/kamailio/commit/a05d313e0fa27952d7b10329ca1da9b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:08:21+02:00 sipdump: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a05d313e0fa27952d7b10329ca1da9b… Patch: https://github.com/kamailio/kamailio/commit/a05d313e0fa27952d7b10329ca1da9b… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index e61fea014d..a9868462e7 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -204,10 +204,11 @@ typedef struct sipdump_info { int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) { struct timeval tv; - struct tm *ti; + struct tm ti; + char t_buf[26] = {0}; gettimeofday(&tv, NULL); - ti = localtime(&tv.tv_sec); + localtime_r(&tv.tv_sec, &ti); obuf->len = snprintf(_sipdump_wbuf, SIPDUMP_WBUF_SIZE, "====================\n" "tag: %.*s\n" @@ -227,7 +228,7 @@ int sipdump_buffer_write(sipdump_info_t *sdi, str *obuf) my_pid(), process_no, (unsigned long)tv.tv_sec, (unsigned long)tv.tv_usec, - asctime(ti), + asctime_r(&ti, t_buf), sdi->proto.len, sdi->proto.s, sdi->af.len, sdi->af.s, sdi->src_ip.len, sdi->src_ip.s, sdi->src_port, sdi->dst_ip.len, sdi->dst_ip.s, sdi->dst_port,

1 0

git:master:14aa67d7: xhttp_rpc: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 14aa67d750150cf6eb588b350ce156b770d4816d URL: https://github.com/kamailio/kamailio/commit/14aa67d750150cf6eb588b350ce156b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T15:02:50+02:00 xhttp_rpc: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/14aa67d750150cf6eb588b350ce156b… Patch: https://github.com/kamailio/kamailio/commit/14aa67d750150cf6eb588b350ce156b… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index e51ff838bf..b9269c294d 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -283,7 +283,7 @@ static int print_value(rpc_ctx_t* ctx, char fmt, va_list* ap, str *id) str *sp; char buf[PRINT_VALUE_BUF_LEN]; time_t dt; - struct tm* t; + struct tm t; switch(fmt) { case 'd': @@ -306,9 +306,9 @@ static int print_value(rpc_ctx_t* ctx, char fmt, va_list* ap, str *id) body.s = buf; body.len = sizeof("19980717T14:08:55") - 1; dt = va_arg(*ap, time_t); - t = gmtime(&dt); + gmtime_r(&dt, &t); if (strftime(buf, PRINT_VALUE_BUF_LEN, - "%Y%m%dT%H:%M:%S", t) == 0) { + "%Y%m%dT%H:%M:%S", &t) == 0) { LM_ERR("Error while converting time\n"); return -1; }

1 0

git:master:c244381c: acc: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: c244381c69459b3708d3603e548fafac8321acf8 URL: https://github.com/kamailio/kamailio/commit/c244381c69459b3708d3603e548fafa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:59:13+02:00 acc: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/c244381c69459b3708d3603e548fafa… Patch: https://github.com/kamailio/kamailio/commit/c244381c69459b3708d3603e548fafa… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index 7b052440e6..d59192156a 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -141,7 +141,7 @@ static int db_write_cdr( struct dlg_cell* dialog, long long_val; double double_val; char * end; - struct tm *t; + struct tm t; char cdr_time_format_buf[MAX_CDR_CORE][TIME_STR_BUFFER_SIZE]; if(acc_cdrs_table.len<=0) @@ -191,9 +191,9 @@ static int db_write_cdr( struct dlg_cell* dialog, } if (acc_time_mode==4) { VAL_TYPE(db_cdr_vals+i)=DB1_STRING; - t = gmtime(&timeval_val.tv_sec); + gmtime_r(&timeval_val.tv_sec, &t); /* Convert time_t structure to format accepted by the database */ - if (strftime(cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE, TIME_STRING_FORMAT, t) <= 0) { + if (strftime(cdr_time_format_buf[i], TIME_STR_BUFFER_SIZE, TIME_STRING_FORMAT, &t) <= 0) { cdr_time_format_buf[i][0] = '\0'; }

1 0

git:master:1fe9da8c: drouting: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 1fe9da8c118f2ff3ebe1913238b609500cca8f23 URL: https://github.com/kamailio/kamailio/commit/1fe9da8c118f2ff3ebe1913238b6095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:57:13+02:00 drouting: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/1fe9da8c118f2ff3ebe1913238b6095… Patch: https://github.com/kamailio/kamailio/commit/1fe9da8c118f2ff3ebe1913238b6095… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0af2e51326..9e71ce7221 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -130,10 +130,12 @@ int ac_tm_fill(ac_tm_p _atp, struct tm *_tm) int ac_tm_set_time(ac_tm_p _atp, time_t _t) { + struct tm _tm; if(!_atp) return -1; _atp->time = _t; - return ac_tm_fill(_atp, localtime(&_t)); + localtime_r(&_t, &_tm); + return ac_tm_fill(_atp, &_tm); } int ac_get_mweek(struct tm *_tm)

1 0

git:master:d780945b: smsops: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: d780945bc9a186d54439e1258ac540cd5f7bd86d URL: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:54:04+02:00 smsops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… Patch: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… --- diff --git a/src/modules/smsops/smsops_impl.c b/src/modules/smsops/smsops_impl.c index 5271444039..b284d83c62 100644 --- a/src/modules/smsops/smsops_impl.c +++ b/src/modules/smsops/smsops_impl.c @@ -370,24 +370,24 @@ static int DecodePhoneNumber(char* buffer, int len, str phone) { // Generate a 7 Byte Long Time static void EncodeTime(char * buffer) { time_t ts; - struct tm * now; + struct tm now; int i = 0; time(&ts); /* Get GMT time */ - now = gmtime(&ts); + gmtime_r(&ts, &now); - i = now->tm_year % 100; + i = now.tm_year % 100; buffer[0] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_mon + 1; + i = now.tm_mon + 1; buffer[1] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_mday; + i = now.tm_mday; buffer[2] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_hour; + i = now.tm_hour; buffer[3] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_min; + i = now.tm_min; buffer[4] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); - i = now->tm_sec; + i = now.tm_sec; buffer[5] = (unsigned char)((((i % 10) << 4) | (i / 10)) & 0xff); buffer[6] = 0; // Timezone, we use no time offset. }

1 0

git:master:150e757e: db_mysql: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 150e757ec0fdadeee7b0ce8b6362f1a01aa0c382 URL: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:51:48+02:00 db_mysql: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… Patch: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… --- diff --git a/src/modules/db_mysql/my_cmd.c b/src/modules/db_mysql/my_cmd.c index c12d649dd4..23dfb27f81 100644 --- a/src/modules/db_mysql/my_cmd.c +++ b/src/modules/db_mysql/my_cmd.c @@ -476,7 +476,7 @@ static int build_update_cmd(str* sql_cmd, db_cmd_t* cmd) static inline void update_field(MYSQL_BIND *param, db_fld_t* fld) { struct my_fld* fp; /* field payload */ - struct tm* t; + struct tm t; fp = DB_GET_PAYLOAD(fld); @@ -524,13 +524,13 @@ static inline void update_field(MYSQL_BIND *param, db_fld_t* fld) break; case DB_DATETIME: - t = gmtime(&fld->v.time); - fp->time.second = t->tm_sec; - fp->time.minute = t->tm_min; - fp->time.hour = t->tm_hour; - fp->time.day = t->tm_mday; - fp->time.month = t->tm_mon + 1; - fp->time.year = t->tm_year + 1900; + gmtime_r(&fld->v.time, &t); + fp->time.second = t.tm_sec; + fp->time.minute = t.tm_min; + fp->time.hour = t.tm_hour; + fp->time.day = t.tm_mday; + fp->time.month = t.tm_mon + 1; + fp->time.year = t.tm_year + 1900; break; case DB_NONE:

1 0

git:master:60072749: jsonrpcs: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 6007274938387359bb0a9b54528a5f3c87700356 URL: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:49:47+02:00 jsonrpcs: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… Patch: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5843d87a5f..b07ae802df 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -470,7 +470,7 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) srjson_t *nj = NULL; char buf[JSONRPC_PRINT_VALUE_BUF_LEN]; time_t dt; - struct tm* t; + struct tm t; str *sp; switch(fmt) { @@ -488,9 +488,9 @@ static srjson_t* jsonrpc_print_value(jsonrpc_ctx_t* ctx, char fmt, va_list* ap) break; case 't': dt = va_arg(*ap, time_t); - t = gmtime(&dt); + gmtime_r(&dt, &t); if (strftime(buf, JSONRPC_PRINT_VALUE_BUF_LEN, - "%Y%m%dT%H:%M:%S", t) == 0) { + "%Y%m%dT%H:%M:%S", &t) == 0) { LM_ERR("Error while converting time\n"); return NULL; }

1 0

git:master:d54eed9e: msilo: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: d54eed9eb2f3a09a70f679ea0fb7cac64a5aa14a URL: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:46:15+02:00 msilo: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which should have > room for at least 26 bytes. --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… Patch: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index bf5758d350..0bf53ecc5a 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -1337,6 +1337,7 @@ void m_send_ontimer(unsigned int ticks, void *param) str str_vals[4], hdr_str, body_str; str extra_hdrs_str = {0}; time_t stime; + char t_buf[26] = {0}; if(ms_reminder.s==NULL) { @@ -1384,14 +1385,13 @@ void m_send_ontimer(unsigned int ticks, void *param) goto done; } + ctime_r((const time_t*)&ttime, t_buf); if (RES_ROW_N(db_res) <= 0) { - LM_DBG("no message for <%.*s>!\n", 24, ctime((const time_t*)&ttime)); + LM_DBG("no message for <%.*s>!\n", 24, t_buf); goto done; } - - LM_DBG("dumping [%d] messages for <%.*s>!!!\n", RES_ROW_N(db_res), 24, - ctime((const time_t*)&ttime)); + LM_DBG("dumping [%d] messages for <%.*s>!!!\n", RES_ROW_N(db_res), 24, t_buf); for(i = 0; i < RES_ROW_N(db_res); i++) {

1 0

git:master:3dc960b6: xprint: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 3dc960b6db3dc5807814fc73887f985bf2ff91d7 URL: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:38:43+02:00 xprint: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which should have > room for at least 26 bytes. --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… Patch: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index bbe2ceaafe..5771b77399 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -164,7 +164,7 @@ static int xl_get_times(struct sip_msg *msg, str *res, str *hp, int hi, int hf) } static int xl_get_timef(struct sip_msg *msg, str *res, str *hp, int hi, int hf) { - char *ch = NULL; + char ch[26] = {0}; if(msg==NULL || res==NULL) return -1; @@ -174,7 +174,7 @@ static int xl_get_timef(struct sip_msg *msg, str *res, str *hp, int hi, int hf) msg_id = msg->id; } - ch = ctime(&msg_tm); + ctime_r(&msg_tm, ch); res->s = ch; res->len = strlen(ch)-1;

1 0

git:master:f9ae1174: db_redis: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f9ae11746fb820bb24057f4b3509bd59b6d3e936 URL: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:30:26+02:00 db_redis: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… Patch: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… --- diff --git a/src/modules/db_redis/redis_dbase.c b/src/modules/db_redis/redis_dbase.c index f3b7c1f019..ea1a6aa43e 100644 --- a/src/modules/db_redis/redis_dbase.c +++ b/src/modules/db_redis/redis_dbase.c @@ -81,6 +81,7 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { const char *s; const str *tmpstr; int vtype = VAL_TYPE(v); + struct tm _time; _str->s = NULL; _str->len = 32; // default for numbers @@ -144,7 +145,8 @@ static int db_redis_val2str(const db_val_t *v, str *_str) { LM_DBG("converting datetime value %ld to str\n", VAL_TIME(v)); _str->s = (char*)pkg_malloc(_str->len); if (!_str->s) goto memerr; - strftime(_str->s, _str->len, "%Y-%m-%d %H:%M:%S", localtime(&(VAL_TIME(v)))); + localtime_r(&(VAL_TIME(v)), &_time); + strftime(_str->s, _str->len, "%Y-%m-%d %H:%M:%S", &_time); _str->len = strlen(_str->s); break; case DB1_DOUBLE:

1 0

git:master:8f8ebbe6: textops: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 8f8ebbe65cfa5d90a7a4186be605192c179a6483 URL: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:22:24+02:00 textops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… Patch: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index e2884745ea..fb1c08eac2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1950,17 +1950,15 @@ static int append_time_f(struct sip_msg* msg, char* p1, char *p2) size_t len; char time_str[MAX_TIME]; time_t now; - struct tm *bd_time; + struct tm bd_time; now=time(0); - - bd_time=gmtime(&now); - if (bd_time==NULL) { + if (gmtime_r(&now, &bd_time)==NULL) { LM_ERR("gmtime failed\n"); return -1; } - len=strftime(time_str, MAX_TIME, TIME_FORMAT, bd_time); + len=strftime(time_str, MAX_TIME, TIME_FORMAT, &bd_time); if (len>MAX_TIME-2 || len==0) { LM_ERR("unexpected time length\n"); return -1; @@ -1983,14 +1981,12 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) { str time_str = {0, 0}; time_t now; - struct tm *bd_time; + struct tm bd_time; struct hdr_field *hf = msg->headers; struct lump *anchor = anchor_lump(msg, hf->name.s + hf->len - msg->buf, 0, 0); now=time(0); - - bd_time=gmtime(&now); - if (bd_time==NULL) { + if (gmtime_r(&now, &bd_time)==NULL) { LM_ERR("gmtime failed\n"); goto error; } @@ -2000,7 +1996,7 @@ static int append_time_request_f(struct sip_msg* msg, char* p1, char *p2) LM_ERR("no more pkg memory\n"); goto error; } - time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, bd_time); + time_str.len=strftime(time_str.s, MAX_TIME, TIME_FORMAT, &bd_time); if (time_str.len>MAX_TIME-2 || time_str.len==0) { LM_ERR("unexpected time length\n"); goto error;

1 0

git:master:90275e02: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 90275e02faf75454026597c1e720487b5d845f79 URL: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T14:16:12+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… Patch: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 4437803128..f69641e421 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -56,7 +56,7 @@ Yasin CANER 1. Available Functions 1.1. add_destination(uri, owner, flags, ping_interval, - [callback, [user_attr]]) + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -324,8 +324,8 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -338,13 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples -1.1. add_destination(uri, owner, flags, ping_interval, [callback, -[user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [statechanged_clb, +response_clb, [user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -361,7 +361,7 @@ Chapter 2. Developer Guide * flags (integer) - destination flags (unused for now, use 0 value) * ping_interval (integer) - Pinging interval in seconds for this destination - * callback (ka_statechanged_f, optional) - callback function, + * statechanged_clb (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str *uri, int state, void *user_attr);. Use NULL to set no callback. @@ -370,9 +370,17 @@ Chapter 2. Developer Guide waiting first ping replies or timeout) + 1 - destination is UP + 2 - destination is DOWN - * user_attr (void * pointer, optional) - If callback function is - setup, this parameter will be forwarded to it, as last parameter. - Use NULL to set no user_attr parameter. + * response_clb (ka_response_f, optional) - callback function, + executed on destination's response provided. + The callback function is of type void (*ka_response_f)(str *uri, + struct tmcb_params *ps, void *user_attr);. Use NULL to set no + callback. + ps is a pack structure with all params passed to callback function. + Defined in t_hooks.h + * user_attr (void * pointer, optional) - If any callback function is + setup, this parameter will be forwarded to it (or both callbacks in + both are defined), as last parameter. Use NULL to set no user_attr + parameter. Returned values: * 0 if ok @@ -395,17 +403,18 @@ if (bind_keepalive( &ka_api ) != 0) { } ... ... -/* callback function */ -void my_callback(str uri, int state, void *user_attr) { - +/* callback function (on state changed) */ +void my_state_changed_clb(str uri, int state, void *user_attr) { printf("%.*s new state is: %d\n", uri.len, uri.str, state) } -/* register a new destination */ -str dest = str_init("sip:192.168.10.21:5060"); -str owner = str_init("mymodule"); +/* callback function (on each response received) */ +void my_response_clb(str *uri, struct tmcb_params *ps, void *user_attr) { + printf("response [%d] from %.*s\n", ps->code, uri.len, uri.str) +} -if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_state_changed_clb, + my_response_clb, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; }

1 0

[kamailio/kamailio] keepalive: update rpc response to include current state (#2323)
by Kinshuk Bairagi 12 May '20

12 May '20

#### 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 Expose current state of keepalive monitor in rpc response so that the response can be parsed easlily and used to populate external dashboards You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2323 -- Commit Summary -- * keepalive: update rpc response -- File Changes -- M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2323.patch https://github.com/kamailio/kamailio/pull/2323.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2323

2 3

git:master:2372dc93: Merge pull request #2323 from voiceip/keepalive-rpc-change
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2372dc933926611dad22812e0d550ae736249a06 URL: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:05:27+02:00 Merge pull request #2323 from voiceip/keepalive-rpc-change keepalive: update rpc response to include current state --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Patch: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 8d9a84a428..3a72b31474 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -96,6 +96,7 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) _dtime = ctime(&dest->last_down); _dtime[strlen(_dtime) - 1] = '\0'; rpc->struct_add(sub, "s", "last down", _dtime); + rpc->struct_add(sub, "d", "state", (int) dest->state); } return;

1 0

git:master:7ae22f68: keepalive: update rpc response
by kinshuk.bairagi 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 7ae22f6872cc3f74fecb0ebee797ff3f80c34fd3 URL: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… Author: kinshuk.bairagi <me(a)kinshuk.in> Committer: kinshuk.bairagi <me(a)kinshuk.in> Date: 2020-05-11T17:53:28+05:30 keepalive: update rpc response - Adds current state as part of rpc response per destination wise --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… Patch: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 136a150c95..cdf8008541 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -96,6 +96,7 @@ static void keepalive_rpc_list(rpc_t *rpc, void *ctx) _dtime = ctime(&dest->last_down); _dtime[strlen(_dtime) - 1] = '\0'; rpc->struct_add(sub, "s", "last down", _dtime); + rpc->struct_add(sub, "d", "state", (int) dest->state); } return;

1 0

[kamailio/kamailio] ndb_redis: add sentinel support to reconnection logic (#2319)
by Carlos Cruz Luengo 12 May '20

12 May '20

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR replicates sentinel logic added in initial redis connection (via cc8e621) into reconnection function. This way, in case of loosing connection with Redis, Kamailio will be able to reconnect to redis asking to sentinel servers defined in modparams. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2319 -- Commit Summary -- * ndb_redis: add sentinel support to reconnection logic -- File Changes -- M src/modules/ndb_redis/redis_client.c (84) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2319.patch https://github.com/kamailio/kamailio/pull/2319.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2319

2 2

git:master:62e51095: Merge pull request #2319 from cruzccl/redis-sentinel-reconnection
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 62e510957c28e8b8419f7f65b6a866c1a9d0de5b URL: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:04:21+02:00 Merge pull request #2319 from cruzccl/redis-sentinel-reconnection ndb_redis: add sentinel support to reconnection logic --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Patch: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 44460aa2fd..5ad063f89a 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -408,8 +408,11 @@ redisc_server_t *redisc_get_server(str *name) */ int redisc_reconnect_server(redisc_server_t *rsrv) { - char addr[256], pass[256], unix_sock_path[256]; - unsigned int port, db, sock = 0, haspass = 0; + char addr[256], pass[256], unix_sock_path[256], sentinel_group[256]; + unsigned int port, db, sock = 0, haspass = 0, sentinel_master = 1; + char sentinels[MAXIMUM_SENTINELS][256]; + uint8_t sentinels_count = 0; + int i, row; param_t *pit = NULL; struct timeval tv_conn; struct timeval tv_cmd; @@ -442,6 +445,84 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } else if(pit->name.len==4 && strncmp(pit->name.s, "pass", 4)==0) { snprintf(pass, sizeof(pass)-1, "%.*s", pit->body.len, pit->body.s); haspass = 1; + } else if(pit->name.len==14 && strncmp(pit->name.s, + "sentinel_group", 14)==0) { + snprintf(sentinel_group, sizeof(sentinel_group)-1, "%.*s", + pit->body.len, pit->body.s); + } else if(pit->name.len==15 && strncmp(pit->name.s, + "sentinel_master", 15)==0) { + if(str2int(&pit->body, &sentinel_master) < 0) + sentinel_master = 1; + } else if(pit->name.len==8 && strncmp(pit->name.s, + "sentinel", 8)==0) { + if( sentinels_count < MAXIMUM_SENTINELS ){ + snprintf(sentinels[sentinels_count], + sizeof(sentinels[sentinels_count])-1, "%.*s", + pit->body.len, pit->body.s); + sentinels_count++; + } + else { + LM_ERR("too many sentinels, maximum %d supported.\n", + MAXIMUM_SENTINELS); + return -1; + } + } + } + + // if sentinels are provided, we need to connect to them and retrieve the redis server + // address / port + if(sentinels_count > 0) { + for(i= 0; i< sentinels_count; i++) { + char *sentinelAddr = sentinels[i]; + char *pos; + redisContext *redis; + redisReply *res, *res2; + + port = 6379; + if( (pos = strchr(sentinelAddr, ':')) != NULL ) { + port = atoi(pos+1); + pos[i] = '\0'; + } + + redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn); + if( redis ) { + if(sentinel_master != 0) { + res = redisCommand(redis, + "SENTINEL get-master-addr-by-name %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) + && (res->elements == 2) ) { + strncpy(addr, res->element[0]->str, + res->element[0]->len + 1); + port = atoi(res->element[1]->str); + LM_DBG("sentinel replied: %s:%d\n", addr, port); + } + } + else { + res = redisCommand(redis, "SENTINEL slaves %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) ) { + for(row = 0; row< res->elements; row++){ + res2 = res->element[row]; + for(i= 0; i< res2->elements; i+= 2) { + if( strncmp(res2->element[i]->str, + "ip", 2) == 0 ) { + strncpy(addr, res2->element[i+1]->str, + res2->element[i+1]->len); + addr[res2->element[i+1]->len] = '\0'; + } + else if( strncmp(res2->element[i]->str, + "port", 4) == 0) { + port = atoi(res2->element[i+1]->str); + break; + } + } + } + LM_DBG("slave for %s: %s:%d\n", sentinel_group, + addr, port); + } + } + } } }

1 0

[kamailio/kamailio] Keepalive/response callback (#2318)
by Nacho G. 12 May '20

12 May '20

#### 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) - [x] 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  This change allows you to set a new callback for keepalive that will be executed each time it receives a response for an OPTIONS message. This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2318 -- Commit Summary -- * keepalive: Added callback to run on each destination response. * drouting: update to new keepalive interface, using new on response callback -- File Changes -- M src/modules/drouting/drouting.c (2) M src/modules/keepalive/api.h (3) M src/modules/keepalive/doc/keepalive.xml (1) M src/modules/keepalive/doc/keepalive_devel.xml (32) M src/modules/keepalive/keepalive.h (7) M src/modules/keepalive/keepalive_api.c (5) M src/modules/keepalive/keepalive_core.c (3) M src/modules/keepalive/keepalive_mod.c (6) M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2318.patch https://github.com/kamailio/kamailio/pull/2318.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2318

2 2

git:master:2373495a: Merge pull request #2318 from NGSegovia/keepalive/response_callback
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2373495a3f79509a2f79830da0105d02bf1b649e URL: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:02:18+02:00 Merge pull request #2318 from NGSegovia/keepalive/response_callback Keepalive/response callback --- Modified: src/modules/drouting/drouting.c Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0… Patch: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0…

1 0

git:master:9700a8da: keepalive: Added callback to run on each destination response.
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9700a8dae237758e162e509455bc3a62b19730f4 URL: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:10+02:00 keepalive: Added callback to run on each destination response. - This functionality it's just available when using api.h bindings. For exported functions no callback will be used, so this doesn't break cfg or rpc api. - Modified add_destination function to provide this new callback as a parameter. --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6… Patch: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6…

1 0

git:master:9cd73c58: drouting: update to new keepalive interface, using new on response callback
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9cd73c58239e50574d73d88792240a4ca569d709 URL: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:20+02:00 drouting: update to new keepalive interface, using new on response callback - Changes required because of dependencies from module keepalive. --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… Patch: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index 4fd0786ffe..394049ac51 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -223,7 +223,7 @@ static int dr_update_keepalive(pgw_t *addrs) for(cur = addrs; cur != NULL; cur = cur->next) { LM_DBG("uri: %.*s\n", cur->ip.len, cur->ip.s); keepalive_api.add_destination( - &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, cur); + &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, 0, cur); } return 0;

1 0

git:master:66aebfd6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 66aebfd65be6b6f9645413b1c2cff932c9dfc2dd URL: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T10:31:19+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93… Patch: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93…

1 0

git:master:bcada2c8: rtpengine: Update docs - fix formatting, some typos
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: bcada2c8afbea70e2f05c9c2419af857577316a3 URL: https://github.com/kamailio/kamailio/commit/bcada2c8afbea70e2f05c9c2419af85… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T10:22:07+02:00 rtpengine: Update docs - fix formatting, some typos --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bcada2c8afbea70e2f05c9c2419af85… Patch: https://github.com/kamailio/kamailio/commit/bcada2c8afbea70e2f05c9c2419af85…

1 0

git:master:4d450116: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 4d450116309d1a2e2b6aceb6fa16657a1e9f44fb URL: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T09:16:20+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… Patch: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 04503393a2..81eb47590b 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -638,7 +638,7 @@ Place holder use SSLv3 for anything which should be secure. * SSLv2 - only SSLv2 connections, for old clients. Note: you shouldn't use SSLv2 for anything which should be secure. Newer - versions of libssl don't include support for it anymore. + versions of OpenSSL libraries don't include support for it anymore. * SSLv23 - any of the SSLv2, SSLv3 and TLSv1 or newer methods will be accepted. From the OpenSSL manual: "A TLS/SSL connection established with @@ -649,9 +649,9 @@ Place holder TLSv1.2 and permits a fallback to SSLv3. A server will support SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. This is the best choice when compatibility is a concern." - Note: For older libssl version, this option allows SSLv2, with - hello messages done over SSLv2. You shouldn't use SSLv2 or SSLv3 - for anything which should be secure. + Note: For older OpenSSL library versions, this option allows SSLv2, + with hello messages done over SSLv2. You shouldn't use SSLv2 or + SSLv3 for anything which should be secure. If RFC 3261 conformance is desired, at least TLSv1 must be used. For compatibility with older clients SSLv23 is the option, but again, be @@ -1220,7 +1220,7 @@ modparam("tls", "session_cache", 1) The value for session ID context, making sense when session caching is enabled. - By default TLS session_id is "sip-router-tls-3.1". + By default TLS session_id is "kamailio-tls-5.x.y". Example 1.38. Set session_id parameter ... @@ -1477,7 +1477,7 @@ modparam("tls", "private_key", "/engine:my_HSM_key_label") modparam("tls", "engine", "pkcs11") modparam("tls", "private_key", "/engine:pkcs11:token=MYTOKEN;object=MYKEYLABEL") -modparam("tls", "engine_conf", "/usr/local/etc/kamailio/openssl.cnf") +modparam("tls", "engine_config", "/usr/local/etc/kamailio/openssl.cnf") modparam("tls", "engine_algorithms", "ALL") ...

1 0

git:master:ff887fe5: TLS: Try to always refer to OpenSSL as "OpenSSL" instead of other names
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: ff887fe5d0d7cec7fc0640a54c80b322d421ed36 URL: https://github.com/kamailio/kamailio/commit/ff887fe5d0d7cec7fc0640a54c80b32… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:08:33+02:00 TLS: Try to always refer to OpenSSL as "OpenSSL" instead of other names --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/ff887fe5d0d7cec7fc0640a54c80b32… Patch: https://github.com/kamailio/kamailio/commit/ff887fe5d0d7cec7fc0640a54c80b32… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 8cc7f2f7b9..f23aa921f0 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -65,7 +65,7 @@ <para> <emphasis>SSLv2</emphasis> - only SSLv2 connections, for old clients. Note: you shouldn't use SSLv2 for anything which should be secure. - Newer versions of libssl don't include support for it anymore. + Newer versions of OpenSSL libraries don't include support for it anymore. </para> </listitem> <listitem> @@ -84,7 +84,7 @@ is a concern." </para> <para> - Note: For older libssl version, this option allows SSLv2, with hello + Note: For older OpenSSL library versions, this option allows SSLv2, with hello messages done over SSLv2. You shouldn't use SSLv2 or SSLv3 for anything which should be secure. </para>

1 0

git:master:70bcb5f8: TLS: Fix TLS session id example to match source code
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 70bcb5f88dc87e27940cc71e293d1c68a7717af6 URL: https://github.com/kamailio/kamailio/commit/70bcb5f88dc87e27940cc71e293d1c6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:07:02+02:00 TLS: Fix TLS session id example to match source code --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/70bcb5f88dc87e27940cc71e293d1c6… Patch: https://github.com/kamailio/kamailio/commit/70bcb5f88dc87e27940cc71e293d1c6… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index 9c89ae8be9..8cc7f2f7b9 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -982,7 +982,7 @@ modparam("tls", "session_cache", 1) The value for session ID context, making sense when session caching is enabled. </para> <para> - By default TLS session_id is "sip-router-tls-3.1". + By default TLS session_id is "kamailio-tls-5.x.y". </para> <example> <title>Set <varname>session_id</varname> parameter</title>

1 0

git:master:f75e64b2: TLS: fix typo in docs
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f75e64b2335fcf07c3371a4108063e8c0a3a52b9 URL: https://github.com/kamailio/kamailio/commit/f75e64b2335fcf07c3371a4108063e8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:05:51+02:00 TLS: fix typo in docs --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f75e64b2335fcf07c3371a4108063e8… Patch: https://github.com/kamailio/kamailio/commit/f75e64b2335fcf07c3371a4108063e8… --- diff --git a/src/modules/tls/doc/params.xml b/src/modules/tls/doc/params.xml index eb78ac31b6..9c89ae8be9 100644 --- a/src/modules/tls/doc/params.xml +++ b/src/modules/tls/doc/params.xml @@ -1310,7 +1310,7 @@ modparam("tls", "private_key", "/engine:my_HSM_key_label") modparam("tls", "engine", "pkcs11") modparam("tls", "private_key", "/engine:pkcs11:token=MYTOKEN;object=MYKEYLABEL") -modparam("tls", "engine_conf", "/usr/local/etc/kamailio/openssl.cnf") +modparam("tls", "engine_config", "/usr/local/etc/kamailio/openssl.cnf") modparam("tls", "engine_algorithms", "ALL") ... </programlisting>

1 0

[kamailio/kamailio] No reply on dispatcher ping with asterisk 16.10.0 (#2320)
by Alvaro Mazuera 12 May '20

12 May '20

Hi, I am implementing a sip proxy with kamailio and multiple asterisk servers, when kamailio send the OPTIONS asterisk don´t reply, and i see with sngrep tool that in the asterisk servers the SIP message OPTIONS arrives, but has no reply from asterisk, and enabling the sip debug nothing occurs, but the OPTIONS message between asterisk servers is all ok. On kamailio logs get: dispatcher [dispatch.c:3159]: ds_options_callback(): OPTIONS-Request was finished with code 408 (to sip:172.20.20.4, group 1) The SIP traffic arrives the asterisk servers, but asterisk don´t reply the message, (I know this because i can see it with the sngrep tool, because the sip debug on asterisk doesn't show it) . However when the message is from another asterisk all is ok. Sip kamailio OPTIONS message on asterisk ``` OPTIONS sip:172.20.20.3 SIP/2.0 Via: SIP/2.0/UDP 172.16.10.195;branch=z9hG4bKef0b.b1358 To: <sip:172.20.20.3> From: <sip:kamailio@172.20.20.6>;tag=3393f0703fb0ccaca7 09ff37de39f5-b7044ca5 CSeq: 10 OPTIONS Call-ID: 791b966c5d00cd60-24281(a)127.0.0.1 Max-Forwards: 70 Content-Length: 0 User-Agent: kamailio (5.3.4 (x86_64/linux)) ``` ### Additional Information ``` version: kamailio 5.3.4 (x86_64/linux) 117ff9 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_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: 117ff9 compiled on 13:37:37 May 6 2020 with gcc 8.2.1 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2320

3 5

git:master:a08b7640: core: dprint - escaped control chars need 6 bytes
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: a08b7640e27524863acd7dc732dffc744f801b5d URL: https://github.com/kamailio/kamailio/commit/a08b7640e27524863acd7dc732dffc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T20:34:27+02:00 core: dprint - escaped control chars need 6 bytes - they are encoded as \uXXXX --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/a08b7640e27524863acd7dc732dffc7… Patch: https://github.com/kamailio/kamailio/commit/a08b7640e27524863acd7dc732dffc7… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index f75b2f1684..ba5cad0ee8 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -521,7 +521,7 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) if (strchr("\"\\\b\f\n\r\t", s_in->s[i])) { len += 2; } else if (s_in->s[i] < 32) { - len += 5; + len += 6; } else { len++; } @@ -542,9 +542,9 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) p2 = s_out->s; p1 = s_in->s; while (p1 < s_in->s + s_in->len) { - if ((unsigned char) *p1 > 31 && *p1 != '\"' && *p1 != '\\') + if ((unsigned char) *p1 > 31 && *p1 != '\"' && *p1 != '\\') { *p2++ = *p1++; - else { + } else { *p2++ = '\\'; switch (token = *p1++) { case '\\': @@ -569,9 +569,10 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) *p2++ = 't'; break; default: + /* escape and print */ snprintf(p2, 6, "u%04x", token); p2 += 5; - break; /* escape and print */ + break; } } }

1 0

git:master:d13f863e: core: udp server - add sockaddr_storage to ensure enough size for sockaddr_union
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: d13f863e74c6c0275264e588f1dca206cf099587 URL: https://github.com/kamailio/kamailio/commit/d13f863e74c6c0275264e588f1dca20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T17:46:29+02:00 core: udp server - add sockaddr_storage to ensure enough size for sockaddr_union - safety check that from addr len is matching expected size for listen socket - rename local variables to suggest better their purpose --- Modified: src/core/ip_addr.h Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/d13f863e74c6c0275264e588f1dca20… Patch: https://github.com/kamailio/kamailio/commit/d13f863e74c6c0275264e588f1dca20…

1 0

git:master:9cae0698: regex: leave enough space in buffers for parenthesis and -ending
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: 9cae069832c8f37ebf9e686b3fbcab5d63652755 URL: https://github.com/kamailio/kamailio/commit/9cae069832c8f37ebf9e686b3fbcab5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T17:46:29+02:00 regex: leave enough space in buffers for parenthesis and -ending --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9cae069832c8f37ebf9e686b3fbcab5… Patch: https://github.com/kamailio/kamailio/commit/9cae069832c8f37ebf9e686b3fbcab5… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 880e1924fd..475c3542eb 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -275,7 +275,7 @@ static int load_pcres(int action) /* Read the file and extract the patterns */ memset(line, 0, FILE_MAX_LINE); i = -1; - while (fgets(line, FILE_MAX_LINE, f) != NULL) { + while (fgets(line, FILE_MAX_LINE-4, f) != NULL) { /* Ignore comments and lines starting by space, tab, CR, LF */ if(isspace(line[0]) || line[0]=='#') { @@ -306,7 +306,7 @@ static int load_pcres(int action) } /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 2) { + if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err;

1 0

git:master:361542a9: cfgt: fix implicit declaration of 'strcasestr'
by Victor Seva 11 May '20

11 May '20

Module: kamailio Branch: master Commit: 361542a953ceaab1894f790e21eecf74008b749a URL: https://github.com/kamailio/kamailio/commit/361542a953ceaab1894f790e21eecf7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-11T15:06:26+02:00 cfgt: fix implicit declaration of 'strcasestr' > cfgt_int.c: In function 'cfgt_msgout': > cfgt_int.c:863:21: warning: implicit declaration of function 'strcasestr'; did you mean 'strcasecmp'? [-Wimplicit-function-declaration] > 863 | if(buf->len > 7 && strcasestr(buf->s, "OPTIONS")) { > | ^~~~~~~~~~ > | strcasecmp --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/361542a953ceaab1894f790e21eecf7… Patch: https://github.com/kamailio/kamailio/commit/361542a953ceaab1894f790e21eecf7… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 382d696f53..c47a1cecc0 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ +#define _GNU_SOURCE #include <stdio.h> #include <sys/stat.h> #include <dirent.h>

1 0

git: new commits in branch 5.3
by Victor Seva 11 May '20

11 May '20

- URL: https://github.com/kamailio/kamailio/commit/2012b6ff81c87be6c05cdf25f4f2a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:28+02:00 xmlops: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 64d37971d2d3fbd87176fe71ae19adca7f47a6ea) - URL: https://github.com/kamailio/kamailio/commit/c81c26637bd9a4869cb446c6f70f21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:29+02:00 lib/ims: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 58deac2e7fd62afca409b17903deb951493b213a) - URL: https://github.com/kamailio/kamailio/commit/9708c4b553692747603923fa8562f37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:30+02:00 cdp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 2749962b8354be1731ab68a0ae4aa0fac4f944e1) - URL: https://github.com/kamailio/kamailio/commit/863882cc2b4980a3215bbb5310720fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:31+02:00 cplc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit f05a46dc79de45c6cb958b845b9f2d85452c4f37) - URL: https://github.com/kamailio/kamailio/commit/c3ec851cae8609660372b28f6c4eba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:31+02:00 ims_auth: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4d3496fb82df1d249a78365e0c50b4ec13989261) - URL: https://github.com/kamailio/kamailio/commit/457d46778bd8b88ffb319779cdc3b96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:32+02:00 ims_icscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 80f2eb33a967ede3e70fef572dc9b42172ad067c) - URL: https://github.com/kamailio/kamailio/commit/dad9ce4a79efa93bb0541bc610ab406… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:33+02:00 ims_isc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 71e67531194aa867b8f3f32b72d07e1bd4ad7dff) - URL: https://github.com/kamailio/kamailio/commit/d2076d22d30f1ad71a69c178d6f5ff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:34+02:00 ims_registrar_pcscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 29573bbdb09412c9cbfe839f0c80b7dd7fe77804) - URL: https://github.com/kamailio/kamailio/commit/44442227e6477f52ed06287827ac818… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:34+02:00 ims_registrar_scscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit ff92622c3b4c6224f75318ba9e39c9b4389bff1e) - URL: https://github.com/kamailio/kamailio/commit/65228082e4cddec5377632e50fbf09a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:35+02:00 lost: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8d7c0f80083351de98b99d2505170b740974080a) - URL: https://github.com/kamailio/kamailio/commit/9e01d1bc26443b7fe95ce8bc894ba5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:36+02:00 presence_conference: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8e9e1fdeacc4c1b2b0cd67f1b36d73737dacd015) - URL: https://github.com/kamailio/kamailio/commit/f05809a2a1aaf2e599646f18ffd42bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:37+02:00 pua: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4f43047172260e1a524700a866693f99ea11383b) - URL: https://github.com/kamailio/kamailio/commit/016747536accc3fd32654b0197735da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:38+02:00 pua_bla: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit e00ce6016afd5c0fba084a19a45fb13353e7f6f4) - URL: https://github.com/kamailio/kamailio/commit/74b7f6bca2e286a151a093d5b1f4d26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:38+02:00 pua_dialoginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit b4842e81e3aa861739c996ff795b6d7261202b66) - URL: https://github.com/kamailio/kamailio/commit/ac699321c417232a0444d84b7e0c147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:39+02:00 pua_reginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 7f6648a8586fdfd5a1fdba05556333095bc25777) - URL: https://github.com/kamailio/kamailio/commit/ef5a8bcc8bc986e1658dc863f4eaecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:40+02:00 pua_usrloc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 20d9453cd3259e8afa1de92a7dba1d25f5f43fe4) - URL: https://github.com/kamailio/kamailio/commit/31097600fa8ee6867e6c6dccdb95370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:41+02:00 pua_xmpp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit d40a924bd698ddf365b4db52cba2ab45f7d7a6e2) - URL: https://github.com/kamailio/kamailio/commit/40c925ae5cd7726d5730486999671cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:41+02:00 rls: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fbfe21f54c7fd845bf9c99c4091980b1ee4d61d5) - URL: https://github.com/kamailio/kamailio/commit/5cd1c93c452dc37ee96b2cf9959ac3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:42+02:00 xcap_server: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 169ccce5e3cb302352b1e4d5ac0a0dc58eb552cb) - URL: https://github.com/kamailio/kamailio/commit/81eb48d0627e9b677114fdce8e0890b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:43+02:00 xhttp_pi: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fe173b2af121b2d6388fea3632037a0ea2999988) - URL: https://github.com/kamailio/kamailio/commit/a91e7fdc9128b59c2084cab1a0e7c0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:44+02:00 xmlrpc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 994a8dfc070d84b5dad28fa873d8759280c910f2)

1 0

[kamailio/kamailio] support pkg-config when detecting libxml2 (#2199)
by Victor Seva 11 May '20

11 May '20

>From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949521: > your package is using `xml2-config` to detect and use libxml2. I'm removing that script, so please update your build system to use pkg-config instead. > >Additionally, your package is not failing to build, so it's creating binaries that are not linked against libxml2 anymore: -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2199

4 12

git:master:0fff35bd: usrloc: fix define name typo for the new keepalive management
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 0fff35bd8368bc0a2a2236a6ee01456db1807911 URL: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:48:29+02:00 usrloc: fix define name typo for the new keepalive management - user right db value index for null checking - ensure ending 0 doesn't overflow on aor building --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… Patch: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index a78f0aff54..cba8ec425c 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -101,8 +101,8 @@ int ul_ka_db_records(int partidx) int proto = 0; str host = STR_NULL; char *p = NULL; -#define ULKA_AURBUF_SIZE 1024 - char aorbuf[ULKA_AURBUF_SIZE]; +#define ULKA_AORBUF_SIZE 1024 + char aorbuf[ULKA_AORBUF_SIZE]; int i = 0; /* select fields */ @@ -231,12 +231,12 @@ int ul_ka_db_records(int partidx) /* user */ p = (char*)VAL_STRING(ROW_VALUES(row) + 6); - if (VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0) { + if (VAL_NULL(ROW_VALUES(row)+6) || p==0 || p[0]==0) { LM_ERR("empty username -> skipping\n"); continue; } ur.aor.len = strlen(p); - if(ur.aor.len >= ULKA_AURBUF_SIZE) { + if(ur.aor.len >= ULKA_AORBUF_SIZE) { LM_DBG("long username ->skipping\n"); continue; } @@ -244,8 +244,8 @@ int ul_ka_db_records(int partidx) /* domain */ p = (char*)VAL_STRING(ROW_VALUES(row) + 7); - if (!(VAL_NULL(ROW_VALUES(row)+1) || p==0 || p[0]==0)) { - if(ur.aor.len + strlen(p) >= ULKA_AURBUF_SIZE - 1) { + if (!(VAL_NULL(ROW_VALUES(row)+7) || p==0 || p[0]==0)) { + if(ur.aor.len + strlen(p) >= ULKA_AORBUF_SIZE - 2) { LM_DBG("long aor ->skipping\n"); continue; }

1 0

git:master:aac577a4: core: safer truncation of hostname using memcpy
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: aac577a4655ebf09d5cbef3e1a49f72d25ea57d7 URL: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:28:01+02:00 core: safer truncation of hostname using memcpy --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… Patch: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 6fba6bf147..d96cc99d0e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -800,11 +800,14 @@ static inline struct hostent* ip_addr2he(str* name, struct ip_addr* ip) static char* p_aliases[1]; static char* p_addr[2]; static char address[16]; + int len; p_aliases[0]=0; /* no aliases*/ p_addr[1]=0; /* only one address*/ p_addr[0]=address; - strncpy(hostname, name->s, (name->len<256)?(name->len)+1:256); + len = (name->len<255)?name->len:255; + memcpy(hostname, name->s, len); + hostname[len] = '\0'; if (ip->len>16) return 0; memcpy(address, ip->u.addr, ip->len);

1 0

git:master:375d0146: presence: check for null head when reordering returned presentity list
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 375d01466dffcef9e7064f4100a5afef48dbde39 URL: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:37:52+02:00 presence: check for null head when reordering returned presentity list --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… Patch: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 9c81b7bd8e..c313b01cf0 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1296,7 +1296,9 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) ptl->prev = NULL; } ptd->next = pte; - pte->prev = ptd; + if(pte) { + pte->prev = ptd; + } pte = ptd; } else { if(ptd->prev) { @@ -1307,7 +1309,9 @@ ps_presentity_t *ps_ptable_search(ps_presentity_t *ptm, int mmode, int rmode) } ptd->next = pte; ptd->prev = NULL; - pte->prev = ptd; + if(pte) { + pte->prev = ptd; + } pte = ptd; } } @@ -1394,4 +1398,4 @@ ps_presentity_t *ps_ptable_get_expired(int eval) } return ptl; -} \ No newline at end of file +}

1 0

git:master:3e969a5b: sipdump: safety check for local socket pointer
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 3e969a5b4d9a75d082f7d59b0fa1dc6362391675 URL: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T18:01:13+02:00 sipdump: safety check for local socket pointer - use generic address is not set --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… Patch: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index ad867ff0ce..e61fea014d 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -433,8 +433,14 @@ int sipdump_msg_sent(sr_event_param_t *evp) sdi.tag.s = "snd"; sdi.tag.len = 3; - sdi.src_ip = evp->dst->send_sock->address_str; - sdi.src_port = (int)evp->dst->send_sock->port_no; + if(evp->dst->send_sock==NULL || evp->dst->send_sock->address_str.s==NULL) { + sdi.src_ip.len = 7; + sdi.src_ip.s = "0.0.0.0"; + sdi.src_port = 0; + } else { + sdi.src_ip = evp->dst->send_sock->address_str; + sdi.src_port = (int)evp->dst->send_sock->port_no; + } su2ip_addr(&ip, &evp->dst->to); sdi.dst_ip.len = ip_addr2sbufz(&ip, dstip_buf, IP_ADDR_MAX_STRZ_SIZE); sdi.dst_ip.s = dstip_buf;

1 0

git:master:fc7b0d65: core: events - increased SREV_CB_LIST_SIZE
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: fc7b0d65a227a176f79459c86844668bcd519148 URL: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T13:54:49+02:00 core: events - increased SREV_CB_LIST_SIZE - there can be several modules registering for these core callbacks --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… Patch: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… --- diff --git a/src/core/events.h b/src/core/events.h index 6282e65a5a..df8a313055 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -38,7 +38,7 @@ #define SREV_NET_DATA_RECV 14 #define SREV_NET_DATA_SEND 15 -#define SREV_CB_LIST_SIZE 3 +#define SREV_CB_LIST_SIZE 8 typedef struct sr_event_param { void *data;

1 0

git:master:e996aec3: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 07 May '20

07 May '20

Module: kamailio Branch: master Commit: e996aec353972e7f0a4cb5e2a6156e2eee478954 URL: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-07T20:46:12+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… Patch: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 89a26c5948..9006415a23 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -444,8 +444,8 @@ modparam("siptrace", "trace_db_mode", 1) Kept for backward compatibily, use trace_db_mode instead. - If set to non-zero, ot sets trace_db_mode paremter to 1 when the module - is initialized. + If set to non-zero, ot sets trace_db_mode parameter to 1 when the + module is initialized. Default value is 0.

1 0

git:master:5429a0ed: modules: readme files regenerated - keepalive ... [skip ci]
by The Root 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 5429a0ed51a04c484e1def93887b344b2d90379f URL: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2020-05-07T20:46:04+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… Patch: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 150da0acdc..4437803128 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -55,8 +55,8 @@ Yasin CANER 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [callback, [user_attr]]) 1.2. Examples @@ -324,7 +324,9 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples The KeepAlive module provides an internal API to be used by other @@ -336,10 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples -1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [callback, +[user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -354,6 +359,8 @@ Chapter 2. Developer Guide * owner (string) - module name “owning” the destination (for information purpose) * flags (integer) - destination flags (unused for now, use 0 value) + * ping_interval (integer) - Pinging interval in seconds for this + destination * callback (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str @@ -398,7 +405,7 @@ void my_callback(str uri, int state, void *user_attr) { str dest = str_init("sip:192.168.10.21:5060"); str owner = str_init("mymodule"); -if (ka_api.add_destination(dest, owner, 0, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; }

1 0

git:master:9137f924: siptrace: small spelling fix in docs
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 9137f924956920d660d9f9353d5117aa6eafe8a3 URL: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:22Z siptrace: small spelling fix in docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Patch: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 56d69cb95b..5bd274a2f0 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -461,7 +461,7 @@ modparam("siptrace", "trace_db_mode", 1) Kept for backward compatibily, use trace_db_mode instead. </para> <para> - If set to non-zero, ot sets trace_db_mode paremter to 1 + If set to non-zero, ot sets trace_db_mode parameter to 1 when the module is initialized. </para> <para>

1 0

git:master:1d555161: tm: small spelling fix in comments
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 1d555161195ebccd35534f8533eacdcbba7020fc URL: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:04Z tm: small spelling fix in comments --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Patch: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 7600237398..c76fbb887a 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -408,7 +408,7 @@ static void rpc_uac_callback(struct cell* t, int type, struct tmcb_params* ps) * If all the parameters are ok it will call t_uac() using them. * Note: this version will wait for the transaction final reply * only if reply_wait is set to 1. Otherwise the rpc reply will be sent - * immediately and it will be success if the paremters were ok and t_uac did + * immediately and it will be success if the parameters were ok and t_uac did * not report any error. * Note: reply waiting (reply_wait==1) is not yet supported. * @param rpc - rpc handle

1 0

[kamailio/kamailio] ims_usrloc_scscf: extend and fix log messages (#2316)
by alexyosifov 07 May '20

07 May '20

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2316 -- Commit Summary -- * ims_usrloc_scscf: extend and fix log messages -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (22) M src/modules/ims_usrloc_scscf/subscribe.c (4) M src/modules/ims_usrloc_scscf/udomain.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2316.patch https://github.com/kamailio/kamailio/pull/2316.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2316

2 2

git:master:b2487d95: ims_usrloc_scscf: extend and fix log messages
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: b2487d95f61b46033eb2825c5f54d5f19ca1e878 URL: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T14:18:21+02:00 ims_usrloc_scscf: extend and fix log messages --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/subscribe.c Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f… Patch: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f…

1 0

[kamailio/kamailio] ims_registrar_scscf: pass event type as parameter (#2296)
by alexyosifov 07 May '20

07 May '20

- pass event type as parameter in notify_subscribers()   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2296 -- Commit Summary -- * ims_registrar_scscf: pass event type as parameter -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_callbacks.c (4) M src/modules/ims_registrar_scscf/reg_rpc.c (2) M src/modules/ims_registrar_scscf/registrar_notify.c (6) M src/modules/ims_registrar_scscf/registrar_notify.h (2) M src/modules/ims_registrar_scscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2296.patch https://github.com/kamailio/kamailio/pull/2296.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2296

3 4

git:master:1c7b7603: ims_registrar_scscf: pass event type as parameter
by Aleksandar Yosifov 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 1c7b7603937cb7f32d6109c22a978bb8efd37e6c URL: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-22T16:25:32+03:00 ims_registrar_scscf: pass event type as parameter - pass event type as parameter in notify_subscribers() --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c Modified: src/modules/ims_registrar_scscf/reg_rpc.c Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb… Patch: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb…

1 0

git:master:d35e9768: Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: d35e97684ae3dcefa2351172cc477bb11927305d URL: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:16:09+02:00 Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg ims_registrar_scscf: pass event type as parameter --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c Modified: src/modules/ims_registrar_scscf/reg_rpc.c Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb… Patch: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb…

1 0

[kamailio/kamailio] ims_registrar_scscf: fix aor generation in lookup() (#2292)
by alexyosifov 07 May '20

07 May '20

- Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters.   #### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2292 -- Commit Summary -- * ims_registrar_scscf: fix aor generation in lookup() -- File Changes -- M src/modules/ims_registrar_scscf/lookup.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2292.patch https://github.com/kamailio/kamailio/pull/2292.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2292

3 5

git:master:465211bc: Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 465211bc18152c9a4c5b60341a9d02f82971afb0 URL: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:14:53+02:00 Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix ims_registrar_scscf: fix aor generation in lookup() --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Patch: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s);

1 0

git:master:e53b25f8: ims_registrar_scscf: fix aor generation in lookup()
by Aleksandar Yosifov 07 May '20

07 May '20

Module: kamailio Branch: master Commit: e53b25f89a14aba93d3c48a1b2f983114db1760c URL: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-21T13:55:36+03:00 ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Patch: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s);

1 0

git:5.3:39fce673: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: 39fce673e50a52dbb0b1c8c786c98b15e8bdfeb7 URL: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:03+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… Patch: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index a4531801b4..acdc978768 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -953,6 +953,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -987,6 +995,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } } cmd->s[cmd->len] = c; rsrv->disable.consecutive_errors = 0;

1 0

git:5.2:13f4b108: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: 5.2 Commit: 13f4b108e1a424c42121f752de91fdeca8c0480a URL: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:27+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… Patch: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 7e3ddb0d8c..f2dbc82244 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -953,6 +953,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -987,6 +995,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } } cmd->s[cmd->len] = c; rsrv->disable.consecutive_errors = 0;

1 0

[kamailio/kamailio] ndb_redis: redis_cmd() doesn't return error with a faulty command (#2300)
by Victor Seva 07 May '20

07 May '20

### Description Detected that a command like this was not returning <0 ``` if(redis_cmd("test", "HSET dd field1", "r")) { [...] } ``` Same command on redis-cli: ``` # redis-cli 127.0.0.1:6379> HSET dd field1 (error) ERR wrong number of arguments for 'hset' command ``` ### Troubleshooting #### Reproduction I've added some debug to the code and I find out that the command is returning: ``` Apr 23 10:55:02 spce proxy[12880]: DEBUG: ndb_redis [redis_client.c:956]: redisc_exec(): rpl->rplRedis->type:3 ``` That's an INTEGER. From hiredis/read.h: ``` #define REDIS_REPLY_INTEGER 3 #define REDIS_REPLY_NIL 4 #define REDIS_REPLY_STATUS 5 #define REDIS_REPLY_ERROR 6 ``` I've created a simple test code to check the same command: ``` #include <stdio.h> #include <stdarg.h> #include "hiredis.h" void check(redisContext *c, const char *cmd, ...) { va_list ap; va_start(ap,cmd); redisReply *r = redisvCommand(c, cmd, ap); va_end(ap); if(r == NULL) { printf("reply NULL\n"); } printf("reply->type:%d\n", r->type); freeReplyObject(r); } int main(void) { redisContext *c = redisConnect("127.0.0.1", 6379); if (c == NULL || c->err) { if (c) { printf("Error: %s\n", c->errstr); } else { printf("Can't allocate redis context\n"); } return 1; } check(c, "HSET dd field"); redisFree(c); return 0; } ``` ``` root@spce:/usr/local/devel# cc t.c -o t -lhiredis -I/usr/include/hiredis root@spce:/usr/local/devel# ./t reply->type:6 ``` No problems there. The reply is ERROR. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_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: unknown compiled with gcc 8.3.0 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2300

2 6

[kamailio/kamailio] ndb_redis: redis_cmd() check reply type to detect command errors (#2314)
by Victor Seva 07 May '20

07 May '20

#### 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 - [x] Related to issue #2300 #### Description from https://github.com/redis/hiredis#using-replies > The standard replies that redisCommand are of the type redisReply. The type field in the redisReply should be used to test what kind of reply was received: > > - REDIS_REPLY_STATUS: > The command replied with a status reply. The status string can be accessed using reply->str. The length of this string can be accessed using reply->len. > > - REDIS_REPLY_ERROR: > The command replied with an error. The error string can be accessed identical to REDIS_REPLY_STATUS. adding checks for the reply type to detect command errors You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2314 -- Commit Summary -- * ndb_redis: redis_cmd() check reply type to detect command errors -- File Changes -- M src/modules/ndb_redis/redis_client.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2314.patch https://github.com/kamailio/kamailio/pull/2314.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2314

2 2

git:master:d00b1470: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: master Commit: d00b14704805d728f5a845a6af900eff1ed372ac URL: https://github.com/kamailio/kamailio/commit/d00b14704805d728f5a845a6af900ef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:09:15+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/d00b14704805d728f5a845a6af900ef… Patch: https://github.com/kamailio/kamailio/commit/d00b14704805d728f5a845a6af900ef… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index edeee8d597..44460aa2fd 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -950,6 +950,14 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } + if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -984,6 +992,13 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; + } } STR_ZTOV(cmd->s[cmd->len], c); rsrv->disable.consecutive_errors = 0;

1 0

[kamailio/kamailio] keepalive: custom pinging interval per destination (#2313)
by Nacho G. 07 May '20

07 May '20

- This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used. - Modified add_destination function to provide this new parameter. - Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are removed.   #### 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) - [x] 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  With this code, you can have a different pinging timeout for each destination, instead of the fixed (default 30 seconds) one. This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2313 -- Commit Summary -- * keepalive: custom pinging interval per destination -- File Changes -- M src/modules/keepalive/api.h (2) M src/modules/keepalive/doc/keepalive.xml (3) M src/modules/keepalive/doc/keepalive_devel.xml (9) M src/modules/keepalive/keepalive.h (9) M src/modules/keepalive/keepalive_api.c (23) M src/modules/keepalive/keepalive_core.c (46) M src/modules/keepalive/keepalive_mod.c (12) M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2313.patch https://github.com/kamailio/kamailio/pull/2313.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2313

2 4

git:master:10fd9fb2: Merge pull request #2313 from NGSegovia/keepalive/custom_ping_interval
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 10fd9fb2d8785fe9670a96b8e699135cbde3f28e URL: https://github.com/kamailio/kamailio/commit/10fd9fb2d8785fe9670a96b8e699135… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:08:51+02:00 Merge pull request #2313 from NGSegovia/keepalive/custom_ping_interval keepalive: custom pinging interval per destination --- Modified: src/modules/drouting/drouting.c Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/10fd9fb2d8785fe9670a96b8e699135… Patch: https://github.com/kamailio/kamailio/commit/10fd9fb2d8785fe9670a96b8e699135…

1 0

git:master:616aa146: drouting: update to new keepalive interface, using custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 616aa146f919b8a42101a323c611a6a525b19236 URL: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:13:27+02:00 drouting: update to new keepalive interface, using custom pinging interval per destination - Changes required because of dependencies from module keepalive. --- Modified: src/modules/drouting/drouting.c --- Diff: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… Patch: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… --- diff --git a/src/modules/drouting/drouting.c b/src/modules/drouting/drouting.c index e16f5ae804..4fd0786ffe 100644 --- a/src/modules/drouting/drouting.c +++ b/src/modules/drouting/drouting.c @@ -223,7 +223,7 @@ static int dr_update_keepalive(pgw_t *addrs) for(cur = addrs; cur != NULL; cur = cur->next) { LM_DBG("uri: %.*s\n", cur->ip.len, cur->ip.s); keepalive_api.add_destination( - &cur->ip, &owner, 0, dr_keepalive_statechanged, cur); + &cur->ip, &owner, 0, 0, dr_keepalive_statechanged, cur); } return 0;

1 0

git:master:4cebb16b: keepalive: custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 4cebb16b536c35ec74ecbdf595c5c6dbafe5afa1 URL: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:10:40+02:00 keepalive: custom pinging interval per destination - This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used. - Modified add_destination function to provide this new parameter. - Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are removed. --- Modified: src/modules/keepalive/api.h Modified: src/modules/keepalive/doc/keepalive.xml Modified: src/modules/keepalive/doc/keepalive_devel.xml Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d… Patch: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d…

1 0

git:5.3:f977da4c: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: f977da4c7058a62919557eba3f6edcd5faa61cda URL: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:12+02:00 kamctl: regenerated db schema for secfilter (cherry picked from commit 59c49af039f468466b0d853a4ceab8fe7f566215) --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Patch: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL );

1 0

git:5.3:221175ff: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: 221175ff31bfead160ef9f3bc8ac613a107f98cf URL: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:02+02:00 srdb1: default value set to 0 for number types (cherry picked from commit b0f1486f8a656922aac02020c9e3141639f2ecb9) --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… Patch: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml index 4edab34e6c..0b3cbc8878 100644 --- a/src/lib/srdb1/schema/secfilter.xml +++ b/src/lib/srdb1/schema/secfilter.xml @@ -37,14 +37,14 @@ <column id="action"> <name>action</name> <type>short</type> - <default/> + <default>0</default> <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> </column> <column id="type"> <name>type</name> <type>short</type> - <default/> + <default>0</default> <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> </column>

1 0

git:5.3:ac1b7f30: pua: use file name specific include guard
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: ac1b7f30b4cdc6d48d77f19421822300bcaa34be URL: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:20:53+02:00 pua: use file name specific include guard (cherry picked from commit 076649793bfdbdc4f03f96961f23997c87ce4268) --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… Patch: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index cc73d3e761..454e4bb853 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 57cc379ebe..908f5b0cb3 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -15,13 +15,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PUBLISH_H -#define PUBLISH_H +#ifndef _PUA_H_ +#define _PUA_H_ #include "../../core/str.h" #include "../../lib/srdb1/db.h"

1 0

git:master:59c49af0: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 59c49af039f468466b0d853a4ceab8fe7f566215 URL: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:36+02:00 kamctl: regenerated db schema for secfilter --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Patch: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL );

1 0

git:master:b0f1486f: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: b0f1486f8a656922aac02020c9e3141639f2ecb9 URL: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:05+02:00 srdb1: default value set to 0 for number types --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… Patch: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… --- diff --git a/src/lib/srdb1/schema/secfilter.xml b/src/lib/srdb1/schema/secfilter.xml index 4edab34e6c..0b3cbc8878 100644 --- a/src/lib/srdb1/schema/secfilter.xml +++ b/src/lib/srdb1/schema/secfilter.xml @@ -37,14 +37,14 @@ <column id="action"> <name>action</name> <type>short</type> - <default/> + <default>0</default> <description>Action to do (0=blacklisted data, 1=whitelisted data, 2=blacklisted destination).</description> </column> <column id="type"> <name>type</name> <type>short</type> - <default/> + <default>0</default> <description>Type of data (0=user-agent, 1=country, 2=domain, 3=IP address, 4=user).</description> </column>

1 0

ICMP port-unreachable for UDP INVITEs
by James Browne 06 May '20

06 May '20

I've searched, but I cannot find anything recent about this. My kamailio 5.0.8 proxy sends an INVITE downstream over UDP and gets an ICMP port-unreachable response from the UAS. Apparently ignoring this, it re-transmits the INVITEs and eventually times out and sends to the next host (from the SRV lookup). According to RFC 3261 (https://tools.ietf.org/html/rfc3261#section-8.1.3.1), If a fatal transport error is reported by the transport layer (generally, due to fatal ICMP errors in UDP or connection failures in TCP), the condition MUST be treated as a 503 (Service Unavailable) status code. Does kamailio support handling ICMP responses to INVITEs (and therefore either failing over immediately, or sending 503 upstream immediately)? I don't know for sure the "correct" behavior because the RFC3261 is so old and because ICMP responses are limited in size and therefore can't guarantee to uniquely identify the transactions that caused them.

2 2

git:master:07664979: pua: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 076649793bfdbdc4f03f96961f23997c87ce4268 URL: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:15:36+02:00 pua: use file name specific include guard --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… Patch: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… --- diff --git a/src/modules/pua/hash.h b/src/modules/pua/hash.h index cc73d3e761..454e4bb853 100644 --- a/src/modules/pua/hash.h +++ b/src/modules/pua/hash.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ diff --git a/src/modules/pua/pua.h b/src/modules/pua/pua.h index 57cc379ebe..908f5b0cb3 100644 --- a/src/modules/pua/pua.h +++ b/src/modules/pua/pua.h @@ -15,13 +15,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PUBLISH_H -#define PUBLISH_H +#ifndef _PUA_H_ +#define _PUA_H_ #include "../../core/str.h" #include "../../lib/srdb1/db.h"

1 0

git:master:14645b55: pv: use localtime_r() for a safer multi-thread usage
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 14645b550cf9500e6a6e4a7d2ed8749e9aa174dc URL: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:03:45+02:00 pv: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… Patch: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 826fa9c2ef..d07e55e719 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -195,6 +195,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v, w; time_t t; uint32_t sz1, sz2; + struct tm tmv; if(val==NULL || val->flags&PV_VAL_NULL) return -1; @@ -1045,8 +1046,8 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(s, st.s, st.len); s[st.len] = '\0'; t = val->ri; - val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE-1, s, - localtime(&t)); + localtime_r(&t, &tmv); + val->rs.len = strftime(_tr_buffer, TR_BUFFER_SIZE-1, s, &tmv); pkg_free(s); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer;

1 0

git:master:a6a40467: htable: use localtime_r() for a safer multi-thread usage
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: a6a4046757c2cac79455aa4a2d2ac632faa5e379 URL: https://github.com/kamailio/kamailio/commit/a6a4046757c2cac79455aa4a2d2ac63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:13:16+02:00 htable: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/a6a4046757c2cac79455aa4a2d2ac63… Patch: https://github.com/kamailio/kamailio/commit/a6a4046757c2cac79455aa4a2d2ac63… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index a1a8e04c48..55717ecd94 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1322,7 +1322,7 @@ static void htable_rpc_get(rpc_t* rpc, void* c) { ht_cell_t *htc; /*!< One HT cell */ void* th; void* vh; - struct tm *_expire_t; + struct tm _expire_t; char expire_buf[RPC_DATE_BUF_LEN]="NEVER"; if (rpc->scan(c, "SS", &htname, &keyname) < 2) { @@ -1357,9 +1357,9 @@ static void htable_rpc_get(rpc_t* rpc, void* c) { } if (htc->expire) { - _expire_t = localtime(&htc->expire); + localtime_r(&htc->expire, &_expire_t); strftime(expire_buf, RPC_DATE_BUF_LEN - 1, - "%Y-%m-%d %H:%M:%S", _expire_t); + "%Y-%m-%d %H:%M:%S", &_expire_t); } if(htc->flags&AVP_VAL_STR) {

1 0

Kamailio v5.3.4 Released
by Daniel-Constantin Mierla 06 May '20

06 May '20

Hello, Kamailio SIP Server v5.3.4 stable release is out. This is a maintenance release of the latest stable branch, 5.3, that includes fixes since the release of v5.3.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.4. For more details about version 5.3.4 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/05/kamailio-v5-3-4-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.3:117ff918: ChangeLog: content updated for v5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 117ff918b9df221475682d1755d6dfbd704c846e URL: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T13:24:27+02:00 ChangeLog: content updated for v5.3.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb… Patch: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb…

1 0

git:5.3:195c2602: Makefile.defs: version set to 5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 195c2602db69b37db66662e736e6e43dc65a16b1 URL: https://github.com/kamailio/kamailio/commit/195c2602db69b37db66662e736e6e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T13:21:19+02:00 Makefile.defs: version set to 5.3.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/195c2602db69b37db66662e736e6e43… Patch: https://github.com/kamailio/kamailio/commit/195c2602db69b37db66662e736e6e43… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5555ba0957..ea5545681a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:9f2af321: pkg: set version to 5.3.4 for pkg specs
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 9f2af321f677c0b5173ea4f99bef667fd6320a1f URL: https://github.com/kamailio/kamailio/commit/9f2af321f677c0b5173ea4f99bef667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:48:04+02:00 pkg: set version to 5.3.4 for pkg specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9f2af321f677c0b5173ea4f99bef667… Patch: https://github.com/kamailio/kamailio/commit/9f2af321f677c0b5173ea4f99bef667… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 4f2b286946..0d421c624c 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.3.3 +pkgver=5.3.4 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 92729b8e82..76c08aa81c 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.3 +%define ver 5.3.4 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.3:4322479f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 4322479f914cc4a256000c1dae44129939d4dd10 URL: https://github.com/kamailio/kamailio/commit/4322479f914cc4a256000c1dae44129… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-06T12:31:52+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/4322479f914cc4a256000c1dae44129… Patch: https://github.com/kamailio/kamailio/commit/4322479f914cc4a256000c1dae44129… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 78b7547085..5acb910b23 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -442,11 +442,17 @@ $ kamcmd htable.dump htable configuration file. * htname - string specifying the name of the hash table. This string is used by $sht(...) to refer to the hash table. - * size - number specifying the size of hash table. Larger value means - less collisions. The number of entries (aka slots or buckets) in - the table is 2^size. The possible range for this value is from 2 to - 31, smaller or larger values will be increased to 3 (8 slots) or - decreased to 14 (16384 slots). + * size - number to control how many slots (buckets) to create for the + hash table. Larger value means more slots with higher probability + for less collisions. The actual number slots (or buckets) created + for the table is 2^size. The possible range for this value is from + 2 to 31, smaller or larger values will be increased to 3 (8 slots) + or decreased to 14 (16384 slots). Note that each slot can store + more than one item, when there are collisions of hash ids computed + for keys. The items in the same slot are stored in a linked list. + In other words, the size is not setting a limit of how many items + can be stored in a hash table, as long as there is enough free + shared memory, new items can be added. * autoexpire -time in seconds to delete an item from a hash table if no update was done to it. If is missing or set to 0, the items won't expire.

1 0

git:5.3:b03c2cc7: snmpstats: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: b03c2cc751524197530899c38ca2e44845595e76 URL: https://github.com/kamailio/kamailio/commit/b03c2cc751524197530899c38ca2e44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:03:07+02:00 snmpstats: use file name specific include guard (cherry picked from commit 13622cf6e36e50c42ec882272b1c48107fa55677) --- Modified: src/modules/snmpstats/snmp_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/b03c2cc751524197530899c38ca2e44… Patch: https://github.com/kamailio/kamailio/commit/b03c2cc751524197530899c38ca2e44… --- diff --git a/src/modules/snmpstats/snmp_statistics.h b/src/modules/snmpstats/snmp_statistics.h index 3ab4c4a98d..8bca2afee4 100644 --- a/src/modules/snmpstats/snmp_statistics.h +++ b/src/modules/snmpstats/snmp_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _SNMP_KSTATISTICS_H_ +#define _SNMP_KSTATISTICS_H_ #include "../../core/counters.h" @@ -106,4 +106,4 @@ int get_socket_list_from_proto_and_family( */ int get_total_bytes_waiting(void); -#endif \ No newline at end of file +#endif

1 0

git:5.3:f8445492: ratelimit: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f84454927bf9435a44bef595dc2df924eb051487 URL: https://github.com/kamailio/kamailio/commit/f84454927bf9435a44bef595dc2df92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:58+02:00 ratelimit: use file name specific include guard (cherry picked from commit 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5) --- Modified: src/modules/ratelimit/rl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/f84454927bf9435a44bef595dc2df92… Patch: https://github.com/kamailio/kamailio/commit/f84454927bf9435a44bef595dc2df92… --- diff --git a/src/modules/ratelimit/rl_statistics.h b/src/modules/ratelimit/rl_statistics.h index dab7a4f375..de86d01f61 100644 --- a/src/modules/ratelimit/rl_statistics.h +++ b/src/modules/ratelimit/rl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _RL_KSTATISTICS_H_ +#define _RL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:5.3:9e5c25ea: pipelimit: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 9e5c25ea35fd949e3ed458b23dd4ecd369bb09c8 URL: https://github.com/kamailio/kamailio/commit/9e5c25ea35fd949e3ed458b23dd4ecd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:46+02:00 pipelimit: use file name specific include guard (cherry picked from commit e4356d56d57599ff063e6849cab8cab5267d26e0) --- Modified: src/modules/pipelimit/pl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/9e5c25ea35fd949e3ed458b23dd4ecd… Patch: https://github.com/kamailio/kamailio/commit/9e5c25ea35fd949e3ed458b23dd4ecd… --- diff --git a/src/modules/pipelimit/pl_statistics.h b/src/modules/pipelimit/pl_statistics.h index dab7a4f375..69db473e22 100644 --- a/src/modules/pipelimit/pl_statistics.h +++ b/src/modules/pipelimit/pl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _PL_KSTATISTICS_H_ +#define _PL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:5.3:a7a65053: app_sqlang: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: a7a6505314d47346b728c65fbe26485d42293599 URL: https://github.com/kamailio/kamailio/commit/a7a6505314d47346b728c65fbe26485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:11+02:00 app_sqlang: use file name specific include guard (cherry picked from commit 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef) --- Modified: src/modules/app_sqlang/app_sqlang_api.h --- Diff: https://github.com/kamailio/kamailio/commit/a7a6505314d47346b728c65fbe26485… Patch: https://github.com/kamailio/kamailio/commit/a7a6505314d47346b728c65fbe26485… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.h b/src/modules/app_sqlang/app_sqlang_api.h index 31c824a99d..eae6de31cf 100644 --- a/src/modules/app_sqlang/app_sqlang_api.h +++ b/src/modules/app_sqlang/app_sqlang_api.h @@ -20,8 +20,8 @@ * */ -#ifndef _APP_JSDT_API_H_ -#define _APP_JSDT_API_H_ +#ifndef _APP_SQLANG_API_H_ +#define _APP_SQLANG_API_H_ #include <squirrel.h>

1 0

git:5.3:25d173a9: usrloc: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 25d173a98ea0b5c07e4018da0cd03649ae6db563 URL: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:55+02:00 usrloc: use file name specific include guard (cherry picked from commit f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f) --- Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… Patch: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… --- diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 12735f11ee..f04b61c2bf 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -26,8 +26,8 @@ * \ingroup usrloc */ -#ifndef UL_MOD_H -#define UL_MOD_H +#ifndef _USRLOC_MOD_H_ +#define _USRLOC_MOD_H_ #include "../../lib/srdb1/db.h" @@ -129,4 +129,4 @@ extern int ul_expires_type; #define UL_DB_EXPIRES_GET(r) ((ul_expires_type==1)?(time_t)VAL_BIGINT(r):VAL_TIME(r)) -#endif /* UL_MOD_H */ +#endif /* _USRLOC_MOD_H_ */

1 0

git:5.3:3234f21e: uid_domain: use module specific include guards
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 3234f21edcffdf74fdf23efc5fae4fbc524e58a2 URL: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:46+02:00 uid_domain: use module specific include guards (cherry picked from commit b3c981db67845622fb8c85a20e18e1b98c29eb69) --- Modified: src/modules/uid_domain/domain.h Modified: src/modules/uid_domain/domain_api.h Modified: src/modules/uid_domain/domain_rpc.h Modified: src/modules/uid_domain/hash.h Modified: src/modules/uid_domain/uid_domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… Patch: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… --- diff --git a/src/modules/uid_domain/domain.h b/src/modules/uid_domain/domain.h index 44ad7ee4db..c52417a601 100644 --- a/src/modules/uid_domain/domain.h +++ b/src/modules/uid_domain/domain.h @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_H -#define _DOMAIN_H +#ifndef _UID_DOMAIN_H_ +#define _UID_DOMAIN_H_ #include <time.h> #include <stdio.h> diff --git a/src/modules/uid_domain/domain_api.h b/src/modules/uid_domain/domain_api.h index acc957971f..4a64a469cb 100644 --- a/src/modules/uid_domain/domain_api.h +++ b/src/modules/uid_domain/domain_api.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_API_H -#define _DOMAIN_API_H +#ifndef _UID_DOMAIN_API_H_ +#define _UID_DOMAIN_API_H_ #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/uid_domain/domain_rpc.h b/src/modules/uid_domain/domain_rpc.h index 27641b6d47..996e7f01aa 100644 --- a/src/modules/uid_domain/domain_rpc.h +++ b/src/modules/uid_domain/domain_rpc.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_RPC_H -#define _DOMAIN_RPC_H +#ifndef _UID_DOMAIN_RPC_H_ +#define _UID_DOMAIN_RPC_H_ #include "../../core/rpc.h" diff --git a/src/modules/uid_domain/hash.h b/src/modules/uid_domain/hash.h index e72616f775..1c07a83321 100644 --- a/src/modules/uid_domain/hash.h +++ b/src/modules/uid_domain/hash.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _HASH_H -#define _HASH_H +#ifndef _UID_DOMAIN_HASH_H_ +#define _UID_DOMAIN_HASH_H_ #include <stdio.h> #include "uid_domain_mod.h" diff --git a/src/modules/uid_domain/uid_domain_mod.h b/src/modules/uid_domain/uid_domain_mod.h index 4f15b6d0ef..75c21c2175 100644 --- a/src/modules/uid_domain/uid_domain_mod.h +++ b/src/modules/uid_domain/uid_domain_mod.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UID_DOMAIN_MOD_H -#define _UID_DOMAIN_MOD_H +#ifndef _UID_DOMAIN_MOD_H_ +#define _UID_DOMAIN_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:5.3:c0b87c2c: core: hash_func.h - use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: c0b87c2cc13b1f46b8c5c902a0f5a82e913b85d9 URL: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:19+02:00 core: hash_func.h - use file name specific include guard (cherry picked from commit 9691f6e0cab48114ef4067a22cc8f9c1efb8944c) --- Modified: src/core/hash_func.h --- Diff: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… Patch: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… --- diff --git a/src/core/hash_func.h b/src/core/hash_func.h index 203e10b1c8..aeb9794bf2 100644 --- a/src/core/hash_func.h +++ b/src/core/hash_func.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -26,14 +26,14 @@ -#ifndef _HASH_H -#define _HASH_H +#ifndef _HASH_FUNC_H_ +#define _HASH_FUNC_H_ #include "str.h" #include "hashes.h" /* always use a power of 2 for hash table size */ -#define T_TABLE_POWER 16 +#define T_TABLE_POWER 16 #define TABLE_ENTRIES (1 << (T_TABLE_POWER)) unsigned int new_hash( str call_id, str cseq_nr );

1 0

git:5.3:ac3fe062: libs/srdb1: use thread safe localtime_r()
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: ac3fe062bd9b429133ab086fc28e15b97421a092 URL: https://github.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:02+02:00 libs/srdb1: use thread safe localtime_r() (cherry picked from commit c01633dc54d8d4dc3b3bc2cab064f91a49c8257d) --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… Patch: https://github.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 39ac11d379..318b442e44 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -350,7 +350,7 @@ int db_str2time(const char* _s, time_t* _v) */ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) { - struct tm* t; + struct tm t; int l; if ((!_s) || (!_l) || (*_l < 2)) { @@ -361,8 +361,8 @@ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) if(_qmode) *_s++ = '\''; /* Convert time_t structure to format accepted by the database */ - t = localtime(&_v); - l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", t); + localtime_r(&_v, &t); + l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", &t); if (l == 0) { LM_ERR("Error during time conversion\n");

1 0

git:5.3:758229d4: misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 758229d440d95a58e839a50e9e8ea2591a43a992 URL: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:00:14+02:00 misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py (cherry picked from commit 6b69754f28ab8df61852b9f8695e59305a7c6c3a) --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… Patch: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index dc0f7957da..64e0cc43fd 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -362,7 +362,7 @@ def ksr_onreply_manage(self, msg): # Manage failure routing cases # -- equivalent of failure_route[...]{} def ksr_failure_manage(self, msg): - if self.ksr_route_natmanage()==-255 : return 1; + if self.ksr_route_natmanage(msg)==-255 : return 1; if KSR.tm.t_is_canceled()>0 : return 1;

1 0

git:5.3:f3dbeda6: core: utils/tmrec - use safer localtime_r() instead of localtime()
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f3dbeda6825b5cd6c28a3258503e27ec2462ebd7 URL: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:00:31+02:00 core: utils/tmrec - use safer localtime_r() instead of localtime() - coherent whitespacing and indentation (cherry picked from commit a7496069c60479e41d92830172bd5b9315001df5) --- Modified: src/lib/srutils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e… Patch: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e…

1 0

git:5.3:f128c37d: core: more debug messages when matching myself
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f128c37d77d2568f7b378e8d08265e1fb2265bf5 URL: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:51+02:00 core: more debug messages when matching myself - coherent coding style for related functions (cherry picked from commit 34b9b59b97f7d529025863992408fd60a27a941a) --- Modified: src/core/forward.c Modified: src/core/name_alias.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1… Patch: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1…

1 0

git:5.3:8f5653e6: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 8f5653e6cd84bc1dfa2498959b99f3fe2911b483 URL: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:37+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser (cherry picked from commit 66ef7ab7b078794b96ecee13f6867d5f90a8d63e) --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… Patch: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index e8f8d2e861..358742dad4 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

1 0

git:5.3:4790825c: htable: docs - more details about size attribute for htable
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 4790825cc98068b07c1e0402bdea93f839a1fd77 URL: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:22+02:00 htable: docs - more details about size attribute for htable (cherry picked from commit 35f711e6ec74c6e67edf99adaa15cc353f2ce949) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… Patch: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 17391626a1..f0b560cfd1 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -341,11 +341,17 @@ $ kamcmd htable.dump htable </listitem> <listitem> <para> - <emphasis>size</emphasis> - number specifying the size of hash - table. Larger value means less collisions. The number of entries - (aka slots or buckets) in the table is 2^size. The possible range + <emphasis>size</emphasis> - number to control how many slots + (buckets) to create for the hash table. Larger value means more + slots with higher probability for less collisions. The actual number + slots (or buckets) created for the table is 2^size. The possible range for this value is from 2 to 31, smaller or larger values will be - increased to 3 (8 slots) or decreased to 14 (16384 slots). + increased to 3 (8 slots) or decreased to 14 (16384 slots). Note + that each slot can store more than one item, when there are + collisions of hash ids computed for keys. The items in the same + slot are stored in a linked list. In other words, the size is not + setting a limit of how many items can be stored in a hash table, as + long as there is enough free shared memory, new items can be added. </para> </listitem> <listitem>

1 0

git:5.3:291dc3e6: pkg/kamailio/deb: version set 5.3.4
by Victor Seva 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 291dc3e6cdc77e912e6a2e71b01250e709d26183 URL: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-06T09:23:41+02:00 pkg/kamailio/deb: version set 5.3.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e… Patch: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e…

1 0

Releasing Kamailio v5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Hello, based on the discussions from yesterday's online devel meeting, I am planning to release next week (likely on Wednesday, May 6) the next minor version out of branch 5.3, respectively 5.3.4. Should anyone be aware of issues not reported to the bug tracker or commits for fixes in master not backported to 5.3 branch, let us know. For new issues, the best is to report them on the tracker. For commits, you can provide links/hashids or make pull requests. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

[kamailio/kamailio] Continued OpenSSL 1.1 crashes with 5.3.0 (#2121)
by Nathan Whitehorn 05 May '20

05 May '20

### Description After upgrading to 5.3.0 from 5.2.2 (standard packages on FreeBSD 12.0), I am experiencing intermittent crashes related to handling of BYE messages. ### Troubleshooting #### Reproduction This happens ~ weekly and I have not found a good way to reproduce it. #### Debugging Data An example backtrace is below from the last dumped core (the SIGSEGV one); unfortunately it overwrote the earlier one: ``` * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: 0x00000008009c5b79 libc.so.7`___lldb_unnamed_symbol403$$libc.so.7 + 41 frame #1: 0x00000008009ed63e libc.so.7`__free + 990 frame #2: 0x000000080271562b libthr.so.3`pthread_rwlock_destroy + 59 frame #3: 0x0000000802bedbf6 libcrypto.so.111`CRYPTO_THREAD_lock_free + 22 frame #4: 0x0000000802aef3c4 libcrypto.so.111`RSA_free + 100 frame #5: 0x0000000802b10c32 libcrypto.so.111`EVP_PKEY_free + 66 frame #6: 0x000000080296ed86 libssl.so.111`___lldb_unnamed_symbol646$$libssl.so.111 + 134 frame #7: 0x000000080295f93c libssl.so.111`SSL_CTX_free + 236 frame #8: 0x00000008028aee42 tls.so`tls_free_domain + 114 frame #9: 0x00000008028af1d7 tls.so`tls_free_cfg + 199 frame #10: 0x00000008028af2df tls.so`tls_destroy_cfg + 191 frame #11: 0x00000008028ad1f1 tls.so`destroy_tls_h + 1185 frame #12: 0x000000000041adea kamailio`destroy_tls + 26 frame #13: 0x00000000002e36fd kamailio`cleanup + 269 frame #14: 0x00000000002eb5b7 kamailio`___lldb_unnamed_symbol5$$kamailio + 1351 frame #15: 0x00000000002ea5e5 kamailio`handle_sigs + 21669 frame #16: 0x00000000002fb83e kamailio`main_loop + 40014 frame #17: 0x0000000000307d2b kamailio`main + 50267 frame #18: 0x00000000002e311b kamailio`_start + 283 ``` This is with OpenSSL 1.1 With the LD_PRELOAD hack to 5.2.2, things were completely stable; I am trying to use kamailio without the LD_PRELOAD'ed mutex wrapper now, which I believe is no longer required. It looks like the SSL-related stuff in the TLS crash (which was 5 minutes later!) is unrelated to the initial problem and may just be an artifact of one of the kamailio processes crashing earlier. #### Log Messages ``` Nov 2 08:11:31 home /usr/local/sbin/kamailio[94702]: CRITICAL: {1 527440 BYE 973470944-5061-16392(a)BA.A.B.I} <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0c0c000, abcdefed)[0x801544c58:0x801544c90]! Memory allocator was called from core: core/action.c:754. Fragment marked by core: core/dset.c:733. Exec from core/mem/q_malloc.c:504. Nov 2 08:13:41 home /usr/local/sbin/kamailio[94703]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 22 Nov 2 08:13:41 home kernel: pid 94702 (kamailio), uid 0: exited on signal 6 (core dumped) Nov 2 08:13:41 home /usr/local/sbin/kamailio[94692]: ALERT: <core> [main.c:767]: handle_sigs(): child process 94702 exited by a signal 6 Nov 2 08:13:41 home /usr/local/sbin/kamailio[94692]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated Nov 2 08:14:56 home login[8284]: ROOT LOGIN (root) ON ttyu0 Nov 2 08:16:26 home kernel: pid 94692 (kamailio), uid 0: exited on signal 11 (core dumped) ``` I had an identical problem a week ago, also with a crash on a BYE for an active call: ``` Oct 27 13:00:02 home /usr/local/sbin/kamailio[79819]: CRITICAL: {1 598425 BYE 649761149-5061-291(a)BA.A.B.I} <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0c0c000, abcdefed)[0x801551808:0x801551840]! Memory allocator was called from core: core/action.c:754. Fragment marked by core: core/dset.c:733. Exec from core/mem/q_malloc.c:504. Oct 27 13:02:09 home /usr/local/sbin/kamailio[79820]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 22 Oct 27 13:02:09 home kernel: pid 79819 (kamailio), uid 0: exited on signal 6 (core dumped) Oct 27 13:02:09 home /usr/local/sbin/kamailio[79809]: ALERT: <core> [main.c:767]: handle_sigs(): child process 79819 exited by a signal 6 Oct 27 13:02:09 home /usr/local/sbin/kamailio[79809]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated Oct 27 13:04:55 home kernel: pid 79809 (kamailio), uid 0: exited on signal 11 (core dumped) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0 (x86_64/freebsd) 4cc67a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 4cc67a compiled on 18:51:34 Oct 25 2019 with cc 6.0 ``` * **Operating System**: FreeBSD 12.0 ``` FreeBSD home.XXX 12.0-RELEASE-p10 FreeBSD 12.0-RELEASE-p10 GENERIC amd64 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2121

2 16

git:master:57dbfba9: cfgt: don't process non-sip messages
by Victor Seva 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 57dbfba97f03370db3ad36e1d52f85f725f12972 URL: https://github.com/kamailio/kamailio/commit/57dbfba97f03370db3ad36e1d52f85f… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-05T12:39:28+02:00 cfgt: don't process non-sip messages * Skip OPTION messages internally generated --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/57dbfba97f03370db3ad36e1d52f85f… Patch: https://github.com/kamailio/kamailio/commit/57dbfba97f03370db3ad36e1d52f85f…

1 0

git:master:1250364a: pv_headers: rework
by Victor Seva 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 1250364ab16aa99c0a933b27a0118ecf274c25ab URL: https://github.com/kamailio/kamailio/commit/1250364ab16aa99c0a933b27a0118ec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-05T12:07:43+02:00 pv_headers: rework * don't try to detect branch every time * reduce use of dynamic memory * rework reply scenario, keep reply_counter in xavp * hook to branch event too --- Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pv_headers.h Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_func.h Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_hash.h Modified: src/modules/pv_headers/pvh_hdr.c Modified: src/modules/pv_headers/pvh_hdr.h Modified: src/modules/pv_headers/pvh_str.c Modified: src/modules/pv_headers/pvh_str.h Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/1250364ab16aa99c0a933b27a0118ec… Patch: https://github.com/kamailio/kamailio/commit/1250364ab16aa99c0a933b27a0118ec…

1 0

Roadmap to the next major release - Kamailio v5.4.0
by Daniel-Constantin Mierla 05 May '20

05 May '20

Hello, I am going to send a few emails on different topics to inform the broader community on mailing lists about what was discussed during the last online development meeting that happened last Wednesday, so everyone becomes aware and add own opinions and suggestions. First here is about the next major release, which is considered for the mid of summer. To allow the usual 1-1.5 months of testing time frame, the development has to be frozen in the first part of June (more or less one month from now on). If there will be no other proposals in the near future that end up in postponing the release target date, then try to push to master branch (or do pull requests) any new features that you want in Kamailio 5.4.x in the next 4-5 weeks. Once the code is frozen, you would have to wait for another release cycle to get new features in a stable branch. During the online meeting there was no major missing feature reported, if anyone here knows any, describe it and maybe some developer has time to implement it. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

info: in-memory presentity records
by Daniel-Constantin Mierla 05 May '20

05 May '20

Hello, the presentity records (PUBLISH data) stored by the presence module needed always an external storage backend (sql/no-sql database), for subscriptions (active watchers) it was possible to use memory caching only. I recently added support for cache-only module for PUBLISH data as well, more details are presented in the news article: * https://www.kamailio.org/w/2020/05/in-memory-presentity-records/ That could help simplifying network architecture on distributed platforms leveraging cloud infrastructure and using replications mechanisms (e.g., dmq, evapi+pua_json, nsq, ...) between the Kamailio nodes. The impact on the code was quite significant, given that any PUBLISH triggers a series of internal tasks (apply xcap rules, update watchers, ...), therefore I am calling for community testing to be sure old operational modes were not affected as well as testing the new mode to discover eventual issues -- just open an item on bug tracker when a problem is discovered. Special credits to Fred Posner (lod.com) for supporting the development of this feature and to Emmanuel Schmidbauer for testing and troubleshooting in the early phase of development. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

rtpproxy and NAT
by Pavithra M 05 May '20

05 May '20

Hi, kamailio version - 5.3.3 I have configured rtpproxy in pcscf . rtpproxy 17002 1 0 18:40 ? 00:00:00 /usr/bin/rtpproxy -s udp:10.40.10.3 7722 -u rtpproxy rtpproxy -p /var/run/rtpproxy/rtpproxy.pid -l 10.45.4.22 -d DBUG LOG_LOCAL0 I have configured rtpproxy in kamailio.cfg as well. modparam("rtpproxy", "rtpproxy_sock", "udp:10.40.10.3:7722") 10.40.10.3 - private IP 10.45.4.22 - public IP I have enabled NAT configuration also. When i make a call from zoiper client , rtp packets are going to some other public ip Could anyone please help me in this issue. Kindly help.

1 3

git:master:13622cf6: snmpstats: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 13622cf6e36e50c42ec882272b1c48107fa55677 URL: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:07:14+02:00 snmpstats: use file name specific include guard --- Modified: src/modules/snmpstats/snmp_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… Patch: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… --- diff --git a/src/modules/snmpstats/snmp_statistics.h b/src/modules/snmpstats/snmp_statistics.h index 3ab4c4a98d..8bca2afee4 100644 --- a/src/modules/snmpstats/snmp_statistics.h +++ b/src/modules/snmpstats/snmp_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _SNMP_KSTATISTICS_H_ +#define _SNMP_KSTATISTICS_H_ #include "../../core/counters.h" @@ -106,4 +106,4 @@ int get_socket_list_from_proto_and_family( */ int get_total_bytes_waiting(void); -#endif \ No newline at end of file +#endif

1 0

git:master:e4356d56: pipelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: e4356d56d57599ff063e6849cab8cab5267d26e0 URL: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:31+02:00 pipelimit: use file name specific include guard --- Modified: src/modules/pipelimit/pl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… Patch: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… --- diff --git a/src/modules/pipelimit/pl_statistics.h b/src/modules/pipelimit/pl_statistics.h index dab7a4f375..69db473e22 100644 --- a/src/modules/pipelimit/pl_statistics.h +++ b/src/modules/pipelimit/pl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _PL_KSTATISTICS_H_ +#define _PL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:master:68b5b3ce: ratelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5 URL: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:56+02:00 ratelimit: use file name specific include guard --- Modified: src/modules/ratelimit/rl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… Patch: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… --- diff --git a/src/modules/ratelimit/rl_statistics.h b/src/modules/ratelimit/rl_statistics.h index dab7a4f375..de86d01f61 100644 --- a/src/modules/ratelimit/rl_statistics.h +++ b/src/modules/ratelimit/rl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _RL_KSTATISTICS_H_ +#define _RL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:master:c67a0eab: rr: different function parameter name to be different than global variable
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: c67a0eabea5fd11693bb716782cd581094250f7f URL: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:05:07+02:00 rr: different function parameter name to be different than global variable --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… Patch: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 236373a288..71f5fcc18e 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -303,16 +303,16 @@ static int ki_loose_route_preloaded(sip_msg_t *msg) } /** - * common wrapper for record_route(msg, params) + * common wrapper for record_route(msg, sparams) */ -static int ki_record_route_params(sip_msg_t *msg, str *params) +static int ki_record_route_params(sip_msg_t *msg, str *sparams) { if (msg->msg_flags & FL_RR_ADDED) { LM_ERR("Double attempt to record-route\n"); return -1; } - if ( record_route( msg, params )<0 ) + if ( record_route( msg, sparams )<0 ) return -1; if(get_route_type()!=BRANCH_ROUTE)

1 0

git:master:9a2fea75: app_sqlang: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef URL: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T07:59:32+02:00 app_sqlang: use file name specific include guard --- Modified: src/modules/app_sqlang/app_sqlang_api.h --- Diff: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… Patch: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.h b/src/modules/app_sqlang/app_sqlang_api.h index 31c824a99d..eae6de31cf 100644 --- a/src/modules/app_sqlang/app_sqlang_api.h +++ b/src/modules/app_sqlang/app_sqlang_api.h @@ -20,8 +20,8 @@ * */ -#ifndef _APP_JSDT_API_H_ -#define _APP_JSDT_API_H_ +#ifndef _APP_SQLANG_API_H_ +#define _APP_SQLANG_API_H_ #include <squirrel.h>

1 0

git:master:de77beff: rtpmanage: enable hadling of PRACK requests
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: de77beffb436e783031a6aa71c1887848cb2cc73 URL: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T20:05:26+02:00 rtpmanage: enable hadling of PRACK requests - they can have SDP - use more compact bitwise match for method types --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… Patch: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index d56e88e003..2d28895324 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3634,11 +3634,11 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; - if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + if (!(method & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL|METHOD_BYE + |METHOD_UPDATE|METHOD_PRACK))) return -1; - if (method==METHOD_CANCEL || method==METHOD_BYE) + if (method & (METHOD_CANCEL|METHOD_BYE)) return rtpengine_delete(msg, flags); if (msg->msg_flags & FL_SDP_BODY) @@ -3647,7 +3647,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) nosdp = parse_sdp(msg); if (msg->first_line.type == SIP_REQUEST) { - if(method==METHOD_ACK && nosdp==0) + if((method & (METHOD_ACK|METHOD_PRACK)) && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_ANSWER, 0); if(method==METHOD_UPDATE && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); @@ -3715,7 +3715,8 @@ rtpengine_answer1_f(struct sip_msg *msg, char *str1, char *str2) { if (msg->first_line.type == SIP_REQUEST) - if (msg->first_line.u.request.method_value != METHOD_ACK) + if (!(msg->first_line.u.request.method_value + & (METHOD_ACK | METHOD_PRACK))) return -1; return rtpengine_rtpp_set_wrap_fparam(msg, rtpengine_answer_wrap, str1, 2, OP_ANSWER);

1 0

git:master:f4f66ad9: usrloc: use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f URL: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:38:07+02:00 usrloc: use file name specific include guard --- Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… Patch: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… --- diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 6c3f6e078f..8c24e1230b 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -26,8 +26,8 @@ * \ingroup usrloc */ -#ifndef UL_MOD_H -#define UL_MOD_H +#ifndef _USRLOC_MOD_H_ +#define _USRLOC_MOD_H_ #include "../../lib/srdb1/db.h" @@ -129,4 +129,4 @@ extern int ul_expires_type; #define UL_DB_EXPIRES_GET(r) ((ul_expires_type==1)?(time_t)VAL_BIGINT(r):VAL_TIME(r)) -#endif /* UL_MOD_H */ +#endif /* _USRLOC_MOD_H_ */

1 0

git:master:b3c981db: uid_domain: use module specific include guards
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b3c981db67845622fb8c85a20e18e1b98c29eb69 URL: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:01:21+02:00 uid_domain: use module specific include guards --- Modified: src/modules/uid_domain/domain.h Modified: src/modules/uid_domain/domain_api.h Modified: src/modules/uid_domain/domain_rpc.h Modified: src/modules/uid_domain/hash.h Modified: src/modules/uid_domain/uid_domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Patch: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… --- diff --git a/src/modules/uid_domain/domain.h b/src/modules/uid_domain/domain.h index 44ad7ee4db..c52417a601 100644 --- a/src/modules/uid_domain/domain.h +++ b/src/modules/uid_domain/domain.h @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_H -#define _DOMAIN_H +#ifndef _UID_DOMAIN_H_ +#define _UID_DOMAIN_H_ #include <time.h> #include <stdio.h> diff --git a/src/modules/uid_domain/domain_api.h b/src/modules/uid_domain/domain_api.h index acc957971f..4a64a469cb 100644 --- a/src/modules/uid_domain/domain_api.h +++ b/src/modules/uid_domain/domain_api.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_API_H -#define _DOMAIN_API_H +#ifndef _UID_DOMAIN_API_H_ +#define _UID_DOMAIN_API_H_ #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/uid_domain/domain_rpc.h b/src/modules/uid_domain/domain_rpc.h index 27641b6d47..996e7f01aa 100644 --- a/src/modules/uid_domain/domain_rpc.h +++ b/src/modules/uid_domain/domain_rpc.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_RPC_H -#define _DOMAIN_RPC_H +#ifndef _UID_DOMAIN_RPC_H_ +#define _UID_DOMAIN_RPC_H_ #include "../../core/rpc.h" diff --git a/src/modules/uid_domain/hash.h b/src/modules/uid_domain/hash.h index e72616f775..1c07a83321 100644 --- a/src/modules/uid_domain/hash.h +++ b/src/modules/uid_domain/hash.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _HASH_H -#define _HASH_H +#ifndef _UID_DOMAIN_HASH_H_ +#define _UID_DOMAIN_HASH_H_ #include <stdio.h> #include "uid_domain_mod.h" diff --git a/src/modules/uid_domain/uid_domain_mod.h b/src/modules/uid_domain/uid_domain_mod.h index 4f15b6d0ef..75c21c2175 100644 --- a/src/modules/uid_domain/uid_domain_mod.h +++ b/src/modules/uid_domain/uid_domain_mod.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UID_DOMAIN_MOD_H -#define _UID_DOMAIN_MOD_H +#ifndef _UID_DOMAIN_MOD_H_ +#define _UID_DOMAIN_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:master:c01633dc: libs/srdb1: use thread safe localtime_r()
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: c01633dc54d8d4dc3b3bc2cab064f91a49c8257d URL: https://github.com/kamailio/kamailio/commit/c01633dc54d8d4dc3b3bc2cab064f91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T18:26:47+02:00 libs/srdb1: use thread safe localtime_r() --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/c01633dc54d8d4dc3b3bc2cab064f91… Patch: https://github.com/kamailio/kamailio/commit/c01633dc54d8d4dc3b3bc2cab064f91… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 39ac11d379..318b442e44 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -350,7 +350,7 @@ int db_str2time(const char* _s, time_t* _v) */ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) { - struct tm* t; + struct tm t; int l; if ((!_s) || (!_l) || (*_l < 2)) { @@ -361,8 +361,8 @@ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) if(_qmode) *_s++ = '\''; /* Convert time_t structure to format accepted by the database */ - t = localtime(&_v); - l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", t); + localtime_r(&_v, &t); + l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", &t); if (l == 0) { LM_ERR("Error during time conversion\n");

1 0

git:master:9691f6e0: core: hash_func.h - use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 9691f6e0cab48114ef4067a22cc8f9c1efb8944c URL: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T18:35:00+02:00 core: hash_func.h - use file name specific include guard --- Modified: src/core/hash_func.h --- Diff: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… Patch: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… --- diff --git a/src/core/hash_func.h b/src/core/hash_func.h index 203e10b1c8..aeb9794bf2 100644 --- a/src/core/hash_func.h +++ b/src/core/hash_func.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -26,14 +26,14 @@ -#ifndef _HASH_H -#define _HASH_H +#ifndef _HASH_FUNC_H_ +#define _HASH_FUNC_H_ #include "str.h" #include "hashes.h" /* always use a power of 2 for hash table size */ -#define T_TABLE_POWER 16 +#define T_TABLE_POWER 16 #define TABLE_ENTRIES (1 << (T_TABLE_POWER)) unsigned int new_hash( str call_id, str cseq_nr );

1 0

git:5.2:4061a1d7: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 4061a1d7cd130a5c3e4236c2abb999658ee02e36 URL: https://github.com/kamailio/kamailio/commit/4061a1d7cd130a5c3e4236c2abb9996… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:58+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 (cherry picked from commit 5f52f9905bbdf63d636080f7d0340af4f71ed12a) (cherry picked from commit e26e587f31eb23c431a2cfb149ec7a86b4f648bc) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/4061a1d7cd130a5c3e4236c2abb9996… Patch: https://github.com/kamailio/kamailio/commit/4061a1d7cd130a5c3e4236c2abb9996… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 7e1de04687..581496c309 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -60,6 +60,10 @@ def __init__(self, location): if not os.path.isdir(location): raise ParseError(location + ' is not a directory') + def __del__(self): + if getattr(self, 'fd', False): + self.fd.close() + def _ParseOrderBy(self): """Parse out the column name to be used for ordering the dataset. @@ -438,6 +442,8 @@ def CleanUp(self): self.command = '' # which command are we executing self.strings = [] # list of string literals parsed from the query self.parens = [] # list of parentheses parsed from the query + if getattr(self, 'fd', False): + self.fd.close() def ParseQuery(self, query): """External wrapper for the query parsing routines.

1 0

git:5.2:0d9c72b2: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 0d9c72b27d75fb2e4ec879e855ce141394ce1918 URL: https://github.com/kamailio/kamailio/commit/0d9c72b27d75fb2e4ec879e855ce141… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:05+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 (cherry picked from commit 765efa80c7d27e9447bc1ad8a354ee24723580ef) (cherry picked from commit 5a90c8bc600fe9a93a5ce4f828ce50f3bf532b99) --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/0d9c72b27d75fb2e4ec879e855ce141… Patch: https://github.com/kamailio/kamailio/commit/0d9c72b27d75fb2e4ec879e855ce141…

1 0

git:5.2:23062ed5: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 23062ed50ea4e6b6e00468cc7f8ec57ccc613429 URL: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:04+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined (cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9) (cherry picked from commit 5f6f4331811e654e75b49263f8fb823bea9874a3) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… Patch: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1)

1 0

git:5.2:a2660fbe: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: a2660fbe2e974553f0146c9ee84fcc6fa2f8f705 URL: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:05+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) (cherry picked from commit c4dd3218e6b723c688762a5c4253fa70f3f588bc) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Patch: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

git:5.3:e26e587f: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: e26e587f31eb23c431a2cfb149ec7a86b4f648bc URL: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:53+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 (cherry picked from commit 5f52f9905bbdf63d636080f7d0340af4f71ed12a) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… Patch: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 7e1de04687..581496c309 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -60,6 +60,10 @@ def __init__(self, location): if not os.path.isdir(location): raise ParseError(location + ' is not a directory') + def __del__(self): + if getattr(self, 'fd', False): + self.fd.close() + def _ParseOrderBy(self): """Parse out the column name to be used for ordering the dataset. @@ -438,6 +442,8 @@ def CleanUp(self): self.command = '' # which command are we executing self.strings = [] # list of string literals parsed from the query self.parens = [] # list of parentheses parsed from the query + if getattr(self, 'fd', False): + self.fd.close() def ParseQuery(self, query): """External wrapper for the query parsing routines.

1 0

git:5.3:5a90c8bc: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5a90c8bc600fe9a93a5ce4f828ce50f3bf532b99 URL: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:42+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 (cherry picked from commit 765efa80c7d27e9447bc1ad8a354ee24723580ef) --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f… Patch: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f…

1 0

git:5.3:c4dd3218: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: c4dd3218e6b723c688762a5c4253fa70f3f588bc URL: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:19+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Patch: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

[kamailio/kamailio] [Feature Request] Python3 compatibility for dbtextdb (#1747)
by Anthony Messina 04 May '20

04 May '20

kamctl's dbtextdb.py fails to build in a Python3-only environment. Update dbtextdb to Python3. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1747

4 12

git:master:5f52f990: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 5f52f9905bbdf63d636080f7d0340af4f71ed12a URL: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:22:36+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… Patch: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 7e1de04687..581496c309 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -60,6 +60,10 @@ def __init__(self, location): if not os.path.isdir(location): raise ParseError(location + ' is not a directory') + def __del__(self): + if getattr(self, 'fd', False): + self.fd.close() + def _ParseOrderBy(self): """Parse out the column name to be used for ordering the dataset. @@ -438,6 +442,8 @@ def CleanUp(self): self.command = '' # which command are we executing self.strings = [] # list of string literals parsed from the query self.parens = [] # list of parentheses parsed from the query + if getattr(self, 'fd', False): + self.fd.close() def ParseQuery(self, query): """External wrapper for the query parsing routines.

1 0

git:master:765efa80: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 765efa80c7d27e9447bc1ad8a354ee24723580ef URL: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:06:43+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2… Patch: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2…

1 0

git:master:b722a481: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b722a48144ac9e029bdbc2968dedbe56966a3f7c URL: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T14:48:41+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Patch: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1]

1 0

git:5.3:5f6f4331: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5f6f4331811e654e75b49263f8fb823bea9874a3 URL: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T12:10:05+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined (cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Patch: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1)

1 0

git:master:1aca79c4: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9 URL: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T11:33:12+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Patch: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1)

1 0

[kamailio/kamailio] Kamailio service is failed (#2309)
by rombojack 04 May '20

04 May '20

I recently installed kamailio and it was enabled & started--> Service is active & running But once I added users I see kamailio service is failed [root@rlab111053 kamailio]# systemctl status kamailio ● kamailio.service - Kamailio (OpenSER) - the Open Source SIP Server Loaded: loaded (/etc/systemd/system/kamailio.service; enabled; vendor preset: disabled) Active: failed (Result: start-limit) since Wed 2020-04-29 18:47:26 IST; 860ms ago Process: 16759 ExecStart=/usr/sbin/kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY (code=exited, status=255) Main PID: 16759 (code=exited, status=255) Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service: main process exited, code=exited, status=255/n/a Apr 29 18:47:25 rlab111053 systemd[1]: Unit kamailio.service entered failed state. Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service failed. Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service holdoff time over, scheduling restart. Apr 29 18:47:26 rlab111053 systemd[1]: Stopped Kamailio (OpenSER) - the Open Source SIP Server. Apr 29 18:47:26 rlab111053 systemd[1]: start request repeated too quickly for kamailio.service Apr 29 18:47:26 rlab111053 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. Apr 29 18:47:26 rlab111053 systemd[1]: Unit kamailio.service entered failed state. Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service failed. **I am using below version** [root@rlab111053 kamailio]# kamailio -version version: kamailio 5.1.10 (x86_64/linux) cfcfd5 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, 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_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_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: cfcfd5 compiled on 15:40:49 Mar 6 2020 with gcc 4.8.5 [root@rlab111053 kamailio]# Can some help to fix it  ### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2309

3 3

[kamailio/kamailio] Add iteration by all DNS NAPTR records (#2290)
by Semen Darienko 03 May '20

03 May '20

Current stable release support using only one (first by ordering) NAPTR DNS record. I didn't find any ideas how to configure possibility for use all supported NAPTR / SRV records. This pull request resolve this issue. General issue: PreConditions: # host -t naptr voip.somehost.com voip.somehost.com has NAPTR record 1 0 "S" "SIPS+D2T" "" _sips._tcp.voip.somehost.com. voip.somehost.com has NAPTR record 2 0 "S" "SIP+D2U" "" _sip._udp.voip.somehost.com. # host -t srv _sips._tcp.voip.somehost.com _sips._tcp.voip.somehost.com has SRV record 1 1 443 voip.somehost.com. _sips._tcp.voip.somehost.com has SRV record 2 1 5061 192.168.1.50. _sips._tcp.voip.somehost.com has SRV record 3 1 5061 10.100.1.20. # host -t srv _sip._udp.voip.somehost.com _sip._udp.voip.somehost.com has SRV record 1 1 5060 voip.somehost.com. _sip._udp.voip.somehost.com has SRV record 2 1 5060 192.168.1.50. _sip._udp.voip.somehost.com has SRV record 3 1 5060 10.100.1.20. In my configuration of kamailio I don't see trying to use second by priority NAPTR record: voip.somehost.com has NAPTR record 2 0 "S" "SIP+D2U" "" _sip._udp.voip.somehost.com. Kindly ask to share your ideas regarding faced issue and my pull request. Thank you. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2290 -- Commit Summary -- * Add using all NAPTR records -- File Changes -- M src/core/dns_cache.c (86) M src/core/resolve.c (1) M src/core/resolve.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2290.patch https://github.com/kamailio/kamailio/pull/2290.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2290

2 3

git:master:28049aaf: core: dns - use all NAPTR records
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 28049aafc8dd06c160ce5e7b8d5e4fc728441b0c URL: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… Author: Semen Darienko <semen.darienko(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T12:26:45+02:00 core: dns - use all NAPTR records - enable using of all NAPTR records instead of the first one ordered by priority - GH #2290 --- Modified: src/core/dns_cache.c Modified: src/core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… Patch: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 81fc6a9e45..c8567813e5 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2644,6 +2644,10 @@ struct naptr_rdata* dns_naptr_sip_iterate(struct dns_rr* naptr_head, } LM_DBG("found a valid sip NAPTR rr %.*s, proto %d\n", naptr->repl_len, naptr->repl, (int)naptr_proto); + if (naptr->skip_record) { + i++; + continue; + } if ((naptr_proto_supported(naptr_proto))){ if (naptr_choose(&naptr_saved, &saved_proto, naptr, naptr_proto)) @@ -3203,6 +3207,63 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, #ifdef USE_NAPTR + + +static void mark_skip_current_naptr(struct dns_rr* naptr_head, struct dns_hash_entry* srv) +{ + int i; + struct dns_rr* l; + struct naptr_rdata* naptr; + + if (!naptr_head || !srv) { + return; + } + + for(l=naptr_head, i=0; l && (i<MAX_NAPTR_RRS); l=l->next, i++) { + naptr = (struct naptr_rdata *) l->rdata; + if (naptr == 0) { + break; + } + if (naptr->skip_record) { + continue; + } + if (srv->name_len == naptr->repl_len && !memcmp(srv->name, naptr->repl, srv->name_len)) { + naptr->skip_record = 1; + LM_NOTICE("Mark to skip %.*s NAPTR record due to all IPs are unreachable\n", naptr->repl_len, naptr->repl); + break; + } + } +} + + +inline static int have_more_active_naptr(struct dns_rr* naptr_head) +{ + int i, res = 0; + struct dns_rr* l; + struct naptr_rdata* naptr; + char naptr_proto; + + if (!naptr_head) { + return res; + } + + for(l=naptr_head, i=0; l && (i<MAX_NAPTR_RRS); l=l->next, i++) { + naptr = (struct naptr_rdata *) l->rdata; + if (naptr == 0) { + break; + } + if (naptr->skip_record) { + continue; + } else if ((naptr_proto = naptr_get_sip_proto(naptr)) <= 0) { + continue; + } else if ((naptr_proto_supported(naptr_proto))) { + res = 1; + break; + } + } + return res; +} + /* resolves a host name trying: * - NAPTR lookup if the address is not an ip and proto!=0, port!=0 * *port==0 and *proto=0 and if flags allow NAPTR lookups @@ -3227,6 +3288,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, char n_proto, origproto; str srv_name; int ret; + int try_lookup_naptr = 0; ret=-E_DNS_NO_NAPTR; if(proto) origproto=*proto; @@ -3259,9 +3321,27 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, *port=h->port; return 0; } - /* do naptr lookup */ - if ((e=dns_get_entry(name, T_NAPTR))==0) - goto naptr_not_found; + try_lookup_naptr = 1; + } + /* do naptr lookup */ + if ((e=dns_get_entry(name, T_NAPTR))==0) + goto naptr_not_found; + + if (!try_lookup_naptr) { + if(proto) *proto=origproto; + int res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); + if (res) { + mark_skip_current_naptr(e->rr_lst, h->srv); + if (have_more_active_naptr(e->rr_lst)) { + // No more avaliable IP for current NAPTR record, let's try next one + try_lookup_naptr = 1; + } + } else { + return res; + } + } + + if (try_lookup_naptr) { naptr_iterate_init(&tried_bmp); while(dns_naptr_sip_iterate(e->rr_lst, &tried_bmp, &srv_name, &n_proto)){ diff --git a/src/core/resolve.c b/src/core/resolve.c index af269a2b42..193ac528af 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -407,6 +407,7 @@ struct naptr_rdata* dns_naptr_parser( unsigned char* msg, unsigned char* end, PKG_MEM_ERROR; goto error; } + naptr->skip_record = 0; naptr->order=ntohs(order); naptr->pref=ntohs(pref); diff --git a/src/core/resolve.h b/src/core/resolve.h index 5ef849ccf8..d49ebdc206 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -123,6 +123,7 @@ struct naptr_rdata { unsigned char services_len; unsigned char regexp_len; unsigned char repl_len; /* not currently used */ + unsigned char skip_record; char str_table[1]; /* contains all the strings */ };

1 0

git:master:3c7d378d: core: added LGTM analysis config file
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 3c7d378ddf3a21a2d4e1ac6bd64f9ea40bbd3602 URL: https://github.com/kamailio/kamailio/commit/3c7d378ddf3a21a2d4e1ac6bd64f9ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: added LGTM analysis config file - LGTM is integrated by github --- Added: .lgtm.yml --- Diff: https://github.com/kamailio/kamailio/commit/3c7d378ddf3a21a2d4e1ac6bd64f9ea… Patch: https://github.com/kamailio/kamailio/commit/3c7d378ddf3a21a2d4e1ac6bd64f9ea… --- diff --git a/.lgtm.yml b/.lgtm.yml new file mode 100644 index 0000000000..b3fa71bbf3 --- /dev/null +++ b/.lgtm.yml @@ -0,0 +1,29 @@ +extraction: + cpp: + prepare: + packages: + - "bison" + - "default-libmysqlclient-dev" + - "flex" + - "libcurl4-openssl-dev" + - "libjansson-dev" + - "libhiredis-dev" + - "liblua5.1-0-dev" + - "libpcre3-dev" + - "libncurses5-dev" + - "libpq-dev" + - "libreadline-dev" + - "libssl-dev" + - "libunistring-dev" + - "libxml2-dev" + - "pkg-config" + - "python3" + - "python3-dev" + - "uuid-dev" + - "zlib1g-dev" + after_prepare: + - "export PKG_CONFIG_PATH=$LGTM_WORKSPACE/usr/lib/pkgconfig:$PKG_CONFIG_PATH" + configure: + command: "make include_modules='app_lua app_python3 db_mysql db_postgres db_redis dialplan http_client jansson lcr ndb_redis presence presence_xml presence_dialoginfo pua pua_dialoginfo topos_redis uuid websocket xmlops' cfg" + index: + build_command: "make all"

1 0

git:master:6b69754f: misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 6b69754f28ab8df61852b9f8695e59305a7c6c3a URL: https://github.com/kamailio/kamailio/commit/6b69754f28ab8df61852b9f8695e593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/6b69754f28ab8df61852b9f8695e593… Patch: https://github.com/kamailio/kamailio/commit/6b69754f28ab8df61852b9f8695e593… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index dc0f7957da..64e0cc43fd 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -362,7 +362,7 @@ def ksr_onreply_manage(self, msg): # Manage failure routing cases # -- equivalent of failure_route[...]{} def ksr_failure_manage(self, msg): - if self.ksr_route_natmanage()==-255 : return 1; + if self.ksr_route_natmanage(msg)==-255 : return 1; if KSR.tm.t_is_canceled()>0 : return 1;

1 0

git:master:a7496069: core: utils/tmrec - use safer localtime_r() instead of localtime()
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: a7496069c60479e41d92830172bd5b9315001df5 URL: https://github.com/kamailio/kamailio/commit/a7496069c60479e41d92830172bd5b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: utils/tmrec - use safer localtime_r() instead of localtime() - coherent whitespacing and indentation --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/a7496069c60479e41d92830172bd5b9… Patch: https://github.com/kamailio/kamailio/commit/a7496069c60479e41d92830172bd5b9…

1 0

git:master:e46dcd29: core: kemi - option to return 0 instead of null for xval
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: e46dcd2930c97855b9d87061ec4e4167b119d232 URL: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: kemi - option to return 0 instead of null for xval --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… Patch: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d389c4b4e0..8a77c227b7 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -2377,16 +2377,24 @@ static sr_kemi_t _sr_kemi_hdr[] = { */ void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode) { - if(rmode==SR_KEMI_XVAL_NULL_PRINT) { - xval->vtype = SR_KEMIP_STR; - xval->v.s = *pv_get_null_str(); - } else if(rmode==SR_KEMI_XVAL_NULL_EMPTY) { - xval->vtype = SR_KEMIP_STR; - xval->v.s = *pv_get_empty_str(); - } else { - xval->vtype = SR_KEMIP_NULL; - xval->v.s.s = NULL; - xval->v.s.len = 0; + switch(rmode) { + case SR_KEMI_XVAL_NULL_PRINT: + xval->vtype = SR_KEMIP_STR; + xval->v.s = *pv_get_null_str(); + return; + case SR_KEMI_XVAL_NULL_EMPTY: + xval->vtype = SR_KEMIP_STR; + xval->v.s = *pv_get_empty_str(); + return; + case SR_KEMI_XVAL_NULL_ZERO: + xval->vtype = SR_KEMIP_INT; + xval->v.n = 0; + return; + default: + xval->vtype = SR_KEMIP_NULL; + xval->v.s.s = NULL; + xval->v.s.len = 0; + return; } } diff --git a/src/core/kemi.h b/src/core/kemi.h index 85cd521512..dd7d4bf50b 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -222,6 +222,7 @@ sr_kemi_t* sr_kemi_exports_get_pv(void); #define SR_KEMI_XVAL_NULL_NONE 0 #define SR_KEMI_XVAL_NULL_PRINT 1 #define SR_KEMI_XVAL_NULL_EMPTY 2 +#define SR_KEMI_XVAL_NULL_ZERO 3 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); void sr_kemi_xval_free(sr_kemi_xval_t *xval); #endif

1 0

git:master:855c06f4: sqlops: functions to get null result value as empty or zero
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 855c06f45ff69918c3e9502e7198cffc21be5cd9 URL: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 sqlops: functions to get null result value as empty or zero --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Patch: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7172bcc8b4..b3f21f6ff3 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -540,7 +540,8 @@ static sr_kemi_xval_t _ksr_kemi_sqlops_xval = {0}; /** * */ -static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, int col) +static sr_kemi_xval_t* ki_sqlops_result_get_mode(sip_msg_t *msg, str *resid, + int row, int col, int rmode) { sql_result_t *res = NULL; @@ -548,31 +549,31 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, if (resid == NULL || resid->s == NULL || resid->len == 0) { LM_ERR("invalid result name\n"); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } res = sql_get_result(resid); if(res==NULL) { LM_ERR("invalid result container [%.*s]\n", resid->len, resid->s); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(row >= res->nrows) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(col >= res->ncols) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_NULL) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_INT) { - _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_INT; _ksr_kemi_sqlops_xval.v.n = res->vals[row][col].value.n; return &_ksr_kemi_sqlops_xval; } @@ -581,6 +582,36 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, return &_ksr_kemi_sqlops_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_gete(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_getz(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_ZERO); +} + /** * */ @@ -626,6 +657,16 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_result_gete"), + SR_KEMIP_XVAL, ki_sqlops_result_gete, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sqlops"), str_init("sql_result_getz"), + SR_KEMIP_XVAL, ki_sqlops_result_getz, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] presence module with in-memory presentity records (#2294)
by Daniel-Constantin Mierla 02 May '20

02 May '20

Track the issues discovered by different developers while implementing in-memory only presentity records for presence module. -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2294

2 10

[kamailio/kamailio] usrloc: change "-" for "_" in stats name to be prometheus compliant (#2304)
by Federico Cabiddu 02 May '20

02 May '20

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  usrloc generated statistics (contacts, expires, users) contain "-" in their names (usrloc-contacs and so on), which is not valid according to prometheus naming convention. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2304 -- Commit Summary -- * usrloc: change "-" for "_" in stats name to be prometheus compliant -- File Changes -- M src/modules/usrloc/udomain.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2304.patch https://github.com/kamailio/kamailio/pull/2304.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2304

3 16

git:master:f6c68817: Merge pull request #2304 from kamailio/grumvalski/usrloc_stats
by GitHub 02 May '20

02 May '20

Module: kamailio Branch: master Commit: f6c688178902138dff8115cdabd72e8631a635dc URL: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-02T16:22:06+02:00 Merge pull request #2304 from kamailio/grumvalski/usrloc_stats usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/counters.c Modified: src/core/counters.h Modified: src/core/globals.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8… Patch: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8…

1 0

git:master:9948696f: core: remove stats_name_separator from cfg_group_core
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 9948696fd84605919e6ce6a7106099f1cdd0de98 URL: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-02T10:14:23+02:00 core: remove stats_name_separator from cfg_group_core --- Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/config.h Modified: src/core/counters.c Modified: src/core/counters.h Modified: src/core/globals.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f… Patch: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f…

1 0

git:master:0595795c: ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 0595795c659f6af586e63837efe56b45808cd735 URL: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:24:24+02:00 ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… Patch: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 7f63932e6b..bd5fabdb60 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -82,7 +82,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index 88612e957b..91db944a0c 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -55,7 +55,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 321b72b64a..9f5e78cfd6 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -61,7 +61,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '_'; + *(p++) = KSR_STATS_NAMESEP; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

1 0

git:master:3203a657: core: new core parameter stats_name_separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 3203a6572b874d191c3be61519853005bd5ab056 URL: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-01T13:02:39+02:00 core: new core parameter stats_name_separator --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/config.h Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300… Patch: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300…

1 0

git:master:4357b5e6: core: define KSR_STATS_NAMESEP for stats name separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 4357b5e6be2a71a401e9d53c43e787b9bfcc8ed0 URL: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:22:40+02:00 core: define KSR_STATS_NAMESEP for stats name separator --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… Patch: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… --- diff --git a/src/core/config.h b/src/core/config.h index 63ff8dc26c..6af3dfecfd 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -211,4 +211,6 @@ #define DEFAULT_MAX_WHILE_LOOPS 100 /*!< Maximum allowed iterations for a while (to catch runaways) */ +#define KSR_STATS_NAMESEP '_' + #endif

1 0

git:master:ddd27713: usrloc: change "-" for "_" in stats name to be prometheus compliant
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: ddd277139165f39406832ddd557c2b56b75a7100 URL: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T10:24:04+02:00 usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… Patch: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 59ddff92d4..321b72b64a 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -61,7 +61,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '-'; + *(p++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

1 0

git:master:2fe0378c: p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 2fe0378c3d0596e30d8ec9ea4cb7d828321d2030 URL: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T14:48:59+02:00 p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… Patch: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 1be609ad42..7f63932e6b 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -82,7 +82,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '-'; + *(p++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0; diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index c25f1c6253..88612e957b 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -55,7 +55,7 @@ static char *build_stat_name( str* domain, char *var_name) } memcpy( s, domain->s, domain->len); p = s + domain->len; - *(p++) = '-'; + *(p++) = '_'; memcpy( p , var_name, strlen(var_name)); p += strlen(var_name); *(p++) = 0;

1 0

json request fails
by Juha Heinanen 02 May '20

02 May '20

I noticed that json rpc commands have started to fail, for example, May 2 15:41:15 char /usr/bin/sip-proxy[10440]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"siptrace.status","params":["on"],"id":1}> from <127.0.0.1> with host <127.0.0.1:6060> May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: <core> [core/parser/parse_from.c:53]: parse_from_header(): bad msg or missing FROM header May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: siptrace [siptrace_send.c:55]: sip_trace_prepare(): cannot parse FROM header Has something changed that I have missed? I didn't find anything related on the wiki upgrade page. -- Juha

2 4

git:master:c840fa6e: siptrace: skip non-sip traffic for db storage using core callbacks
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: c840fa6eb19b4b5d316e36ce534f4d481805ee0b URL: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T15:02:55+02:00 siptrace: skip non-sip traffic for db storage using core callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… Patch: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 5b4c064bec..6cc3471fcf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2077,6 +2077,24 @@ int siptrace_net_data_recv(sr_event_param_t *evp) goto afterdb; } + if(tmsg.first_line.type==SIP_REQUEST) { + if(!IS_SIP(&tmsg)) { + LM_DBG("non sip request message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else if(tmsg.first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(&tmsg)) { + LM_DBG("non sip reply message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else { + LM_DBG("unknown sip message type %d\n", tmsg.first_line.type); + free_sip_msg(&tmsg); + goto afterdb; + } + if(sip_trace_msg_attrs(&tmsg, &sto) < 0) { free_sip_msg(&tmsg); goto afterdb; @@ -2179,6 +2197,24 @@ int siptrace_net_data_send(sr_event_param_t *evp) goto afterdb; } + if(tmsg.first_line.type==SIP_REQUEST) { + if(!IS_SIP(&tmsg)) { + LM_DBG("non sip request message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else if(tmsg.first_line.type==SIP_REPLY) { + if(!IS_SIP_REPLY(&tmsg)) { + LM_DBG("non sip reply message\n"); + free_sip_msg(&tmsg); + goto afterdb; + } + } else { + LM_DBG("unknown sip message type %d\n", tmsg.first_line.type); + free_sip_msg(&tmsg); + goto afterdb; + } + if(sip_trace_msg_attrs(&tmsg, &sto) < 0) { free_sip_msg(&tmsg); goto afterdb;

1 0

undefined symbol: ul_cseq_delay
by Juha Heinanen 02 May '20

02 May '20

I build my sip proxy from today's master and it didn't start: May 2 15:12:51 char sip-proxy[22422]: 0(22474) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so>: /usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so: undefined symbol: ul_cseq_delay -- Juha

2 2

git:master:d515c93a: usrloc: fixed missing symbol for ul_cseq_delay
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: d515c93a5c9c9eb920f001d04870dc6333ca60dd URL: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T14:29:53+02:00 usrloc: fixed missing symbol for ul_cseq_delay --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… Patch: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index faddeac91a..8e5258bfae 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -44,7 +44,7 @@ /*! contact matching mode */ int ul_matching_mode = CONTACT_ONLY; /*! retransmission detection interval in seconds */ -int cseq_delay = 20; +int ul_cseq_delay = 20; /*! * \brief Create and initialize new record structure @@ -801,7 +801,7 @@ int get_ucontact(urecord_t* _r, str* _c, str* _callid, str* _path, int _cseq, return -1; if (_cseq==ptr->cseq) { ul_get_act_time(); - return (ptr->last_modified+cseq_delay>ul_act_time)?-2:-1; + return (ptr->last_modified+ul_cseq_delay>ul_act_time)?-2:-1; } } *_co = ptr;

1 0

git:master:66ef7ab7: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 66ef7ab7b078794b96ecee13f6867d5f90a8d63e URL: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Patch: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index bdb8b98ab4..4050371bfe 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

1 0

git:master:34b9b59b: core: more debug messages when matching myself
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 34b9b59b97f7d529025863992408fd60a27a941a URL: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 core: more debug messages when matching myself - coherent coding style for related functions --- Modified: src/core/forward.c Modified: src/core/name_alias.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Patch: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6…

1 0

[kamailio/kamailio] hash table size issue (#2311)
by fborot 01 May '20

01 May '20

I have my hash table set to size = 16 modparam("htable", "htable", "a=>size=16;autoexpire=0;dbtable=htable;") I had around 3000 entries in that table, some entries with more than 10 duplicate keys (key_type = 1) and we found that when reading the entries of the duplicated keys it could not go pass index 9 even though in the physical table there were 17 entries. I deleted some old entries and now the table is about 2000 items and it seems to work properly again ,(loads all value in memory). I say seems because I can not dump all values: ``` ./kamcmd htable.dump a ERROR: reply too big ``` But I check manually all the ones that were not being loaded and they are now Questions: 1- the size parameter is for the buckets or entries size ? 2- is 16 a good value for a table with 3000 entries? ( 2^16 is 65k so I figured it would be ok) 3- can the the way I define my key impose a limitation? 4- what is the max size for an htable to be dumped with the above command? -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2311

2 5

git:5.3:cca28078: core: do not use tcp id for lookup if not needed
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: cca28078f7fe329046744c9b63d01bb9945a8dca URL: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Author: Donato Sciarra <donato.sciarra(a)bmw.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:55:25+02:00 core: do not use tcp id for lookup if not needed In case the first lookup (with tcp id) is not successfull, the second attempt should have been performed without a tcp id. Issue was introduced with dc43750644 (new global parameter tcp_connection_match) in 5.3. (cherry picked from commit 24a3a172dbdecb6e987df943a3ad1acb4da664b5) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Patch: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 99d33ee719..1c9859f633 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -2029,7 +2029,7 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, if (likely(port)){ /* try again w/o id */ if(tcp_connection_match==TCPCONN_MATCH_STRICT) { - c=tcpconn_lookup(dst->id, &ip, port, from, try_local_port, con_lifetime); + c=tcpconn_lookup(0, &ip, port, from, try_local_port, con_lifetime); } else { c=tcpconn_get(0, &ip, port, from, con_lifetime); }

1 0

git:5.3:21e8b244: Makefile.defs: expose CC_NAME variable
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 21e8b244cea32cd3dedba6fb515877a7cdf47a7a URL: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:19+02:00 Makefile.defs: expose CC_NAME variable (cherry picked from commit e64b29141afddf06bf7d5d68aa88679b54c5076c) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… Patch: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 41f33a51a0..5555ba0957 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -2166,10 +2166,10 @@ export exported_vars # variable changeable only at configure time (once saved in config.mak they # cannot be overwritten from environment or command line, unless make cfg # is run) -saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ +saved_fixed_vars:= MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \ SRC_NAME RELEASE OS ARCH \ C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \ - CC_MKDEP_OPTS \ + CC_NAME CC_MKDEP_OPTS \ MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \ LIB_SUFFIX LIB_PREFIX \ LIBS \

1 0

git:5.3:178cbde6: app_python: use -fno-strict-aliasing for gcc
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 178cbde6eac86a86b92b107cf2f039400c578a5f URL: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:30+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 (cherry picked from commit 3366bf4f3746285d9dc29e8a2461f53983f0acf0) --- Modified: src/modules/app_python/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Patch: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… --- diff --git a/src/modules/app_python/Makefile b/src/modules/app_python/Makefile index 0d8bc98701..d22e63e6a4 100644 --- a/src/modules/app_python/Makefile +++ b/src/modules/app_python/Makefile @@ -29,5 +29,9 @@ endif DEFS+=-I${PYTHON_INCDIR} +ifeq ($(CC_NAME), gcc) +DEFS+= -fno-strict-aliasing +endif + include ../../Makefile.modules

1 0

git:5.3:0b6283dc: db2_local: replace timelocal() with mktime()
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 0b6283dc6006c8817664dd915057442500e0dae8 URL: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:53:53+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/man/3/timegm - GH #2298 (cherry picked from commit a0fb220a8b60b135cabf6741882437317116d868) --- Modified: src/modules/db2_ldap/ld_fld.c --- Diff: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… Patch: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… --- diff --git a/src/modules/db2_ldap/ld_fld.c b/src/modules/db2_ldap/ld_fld.c index 867c873e8f..7af731f077 100644 --- a/src/modules/db2_ldap/ld_fld.c +++ b/src/modules/db2_ldap/ld_fld.c @@ -270,7 +270,7 @@ static inline int ldap_gentime2db_datetime(time_t* dst, str* src) * of expiration by one hour when daylight saving is used */ time.tm_isdst = -1; - *dst = timelocal(&time); + *dst = mktime(&time); } return 0;

1 0

git:5.3:a5d2abed: redis: init variables to get rid of compile warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: a5d2abed49bde56f4bdda42aa6a941f419186baf URL: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:04+02:00 redis: init variables to get rid of compile warnings - GH #2298 (cherry picked from commit f1de08eef86dc2cd98509c90fa8b28212d47ca37) --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… Patch: https://github.com/kamailio/kamailio/commit/a5d2abed49bde56f4bdda42aa6a941f… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index ed8105d807..721d31d8ea 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -495,13 +495,13 @@ int db_redis_parse_keys(km_redis_con_t *con) { str type_name; str column_name; - struct str_hash_entry *table_entry; - redis_table_t *table; - redis_type_t *type; - redis_type_t *type_target; - redis_key_t *key; - redis_key_t **key_target; - redis_key_t *key_location; + struct str_hash_entry *table_entry = NULL; + redis_table_t *table = NULL; + redis_type_t *type = NULL; + redis_type_t *type_target = NULL; + redis_key_t *key = NULL; + redis_key_t **key_target = NULL; + redis_key_t *key_location = NULL; enum { DBREDIS_KEYS_TABLE_ST, @@ -641,13 +641,13 @@ int db_redis_parse_schema(km_redis_con_t *con) { struct dirent* dent; char *dir_name; - str table_name; + str table_name = str_init(""); str column_name; str type_name; - struct str_hash_entry *table_entry; - struct str_hash_entry *column_entry; - redis_table_t *table; + struct str_hash_entry *table_entry = NULL; + struct str_hash_entry *column_entry = NULL; + redis_table_t *table = NULL; char full_path[_POSIX_PATH_MAX + 1]; int path_len;

1 0

git:5.3:c26f248b: ims_usrloc_pcscf: fix value array size and compile warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: c26f248ba5be9f56bc1c58ad531fc5ead060a2e2 URL: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:52:35+02:00 ims_usrloc_pcscf: fix value array size and compile warnings (cherry picked from commit 1292e40c5260fa77d34db91abf7aacf47549d5e2) --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… Patch: https://github.com/kamailio/kamailio/commit/c26f248ba5be9f56bc1c58ad531fc5e… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 1ac55734d7..e597a0daf4 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -123,8 +123,9 @@ void free_security(security_t* _p) return; } - if(_p->sec_header.s) + if(_p->sec_header.s) { shm_free(_p->sec_header.s); + } switch (_p->type) { @@ -144,8 +145,9 @@ void free_security(security_t* _p) break; case SECURITY_TLS: - if(_p->data.tls) + if(_p->data.tls) { shm_free(_p->data.tls); + } break; case SECURITY_NONE: diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ba71673e44..ca57a2b4b3 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -213,7 +213,7 @@ int db_update_pcontact(pcontact_t* _c) int db_delete_pcontact(pcontact_t* _c) { LM_DBG("Trying to delete contact: aor[%.*s], received port %u\n", _c->aor.len, _c->aor.s, _c->received_port); - db_val_t values[1]; + db_val_t values[2]; db_key_t match_keys[2] = { &aor_col, &received_port_col }; VAL_TYPE(values) = DB1_STR;

1 0

git:5.3:479ff8fb: db_redis: var initialization and safety check to avoid compiler warnings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 479ff8fb8761e9780bd33adf977bd44868f59b97 URL: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:52:25+02:00 db_redis: var initialization and safety check to avoid compiler warnings (cherry picked from commit b9b177ccffd58b11cf460764514486d29637dd55) --- Modified: src/modules/db_redis/redis_table.c --- Diff: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… Patch: https://github.com/kamailio/kamailio/commit/479ff8fb8761e9780bd33adf977bd44… --- diff --git a/src/modules/db_redis/redis_table.c b/src/modules/db_redis/redis_table.c index fe63490174..ed8105d807 100644 --- a/src/modules/db_redis/redis_table.c +++ b/src/modules/db_redis/redis_table.c @@ -491,7 +491,7 @@ int db_redis_parse_keys(km_redis_con_t *con) { char *start; char *end; - str table_name; + str table_name = str_init(""); str type_name; str column_name; @@ -539,13 +539,18 @@ int db_redis_parse_keys(km_redis_con_t *con) { table_entry = str_hash_get(&con->tables, table_name.s, table_name.len); if (!table_entry) { - LM_ERR("No table schema found for table '%.*s', fix config by adding one to the 'schema' mod-param!\n", + LM_ERR("No table schema found for table '%.*s', fix config" + " by adding one to the 'schema' mod-param!\n", table_name.len, table_name.s); goto err; } table = table_entry->u.p; break; case DBREDIS_KEYS_TYPE_ST: + if(!table) { + LM_ERR("invalid definition, table not set\n"); + goto err; + } while(p != end && *p != ':') ++p; if (p == end) { @@ -615,8 +620,6 @@ int db_redis_parse_keys(km_redis_con_t *con) { case DBREDIS_KEYS_END_ST: LM_DBG("done parsing keys definition\n"); return 0; - - } } while (p != end);

1 0

git:5.3:5b44b601: presence: increased the array size for rpc cleanup doc
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 5b44b60173cb8c5415144b88090ee0f9884f8f76 URL: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:51:20+02:00 presence: increased the array size for rpc cleanup doc - reformatted the static structure for coherence (cherry picked from commit 318c6a068916b478f16702c6f05b16eb8b64ac20) --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… Patch: https://github.com/kamailio/kamailio/commit/5b44b60173cb8c5415144b88090ee0f… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 9679501fe2..3e7185c956 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1725,7 +1725,9 @@ void rpc_presence_refresh_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_refresh_watchers_doc[2] = { - "Trigger refresh of watchers", 0}; + "Trigger refresh of watchers", + 0 +}; /*! \brief * rpc cmd: presence.updateWatchers @@ -1767,7 +1769,9 @@ void rpc_presence_update_watchers(rpc_t *rpc, void *ctx) } static const char *rpc_presence_update_watchers_doc[2] = { - "Trigger update of watchers", 0}; + "Trigger update of watchers", + 0 +}; void rpc_presence_cleanup(rpc_t *rpc, void *c) @@ -1782,18 +1786,21 @@ void rpc_presence_cleanup(rpc_t *rpc, void *c) return; } -static const char *rpc_presence_cleanup_doc[2] = { - "Manually triggers the cleanup functions for the active_watchers, " - "presentity, and watchers tables.", - 0}; +static const char *rpc_presence_cleanup_doc[3] = { + "Manually triggers the cleanup functions for the active_watchers, " + "presentity, and watchers tables.", + 0 +}; + rpc_export_t presence_rpc[] = { - {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, - {"presence.refreshWatchers", rpc_presence_refresh_watchers, - rpc_presence_refresh_watchers_doc, 0}, - {"presence.updateWatchers", rpc_presence_update_watchers, - rpc_presence_update_watchers_doc, 0}, - {0, 0, 0, 0}}; + {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, + {"presence.refreshWatchers", rpc_presence_refresh_watchers, + rpc_presence_refresh_watchers_doc, 0}, + {"presence.updateWatchers", rpc_presence_update_watchers, + rpc_presence_update_watchers_doc, 0}, + {0, 0, 0, 0} +}; static int presence_init_rpc(void) {

1 0

git:master:ac531266: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 01 May '20

01 May '20

Module: kamailio Branch: master Commit: ac531266077490a85f1ab98853fd64df6feeea43 URL: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-01T17:31:09+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… Patch: https://github.com/kamailio/kamailio/commit/ac531266077490a85f1ab98853fd64d… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 4aa4c258a9..ca193e2213 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -444,11 +444,17 @@ $ kamcmd htable.dump htable configuration file. * htname - string specifying the name of the hash table. This string is used by $sht(...) to refer to the hash table. - * size - number specifying the size of hash table. Larger value means - less collisions. The number of entries (aka slots or buckets) in - the table is 2^size. The possible range for this value is from 2 to - 31, smaller or larger values will be increased to 3 (8 slots) or - decreased to 14 (16384 slots). + * size - number to control how many slots (buckets) to create for the + hash table. Larger value means more slots with higher probability + for less collisions. The actual number slots (or buckets) created + for the table is 2^size. The possible range for this value is from + 2 to 31, smaller or larger values will be increased to 3 (8 slots) + or decreased to 14 (16384 slots). Note that each slot can store + more than one item, when there are collisions of hash ids computed + for keys. The items in the same slot are stored in a linked list. + In other words, the size is not setting a limit of how many items + can be stored in a hash table, as long as there is enough free + shared memory, new items can be added. * autoexpire -time in seconds to delete an item from a hash table if no update was done to it. If is missing or set to 0, the items won't expire.

1 0

git:master:35f711e6: htable: docs - more details about size attribute for htable
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 35f711e6ec74c6e67edf99adaa15cc353f2ce949 URL: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T17:26:39+02:00 htable: docs - more details about size attribute for htable --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… Patch: https://github.com/kamailio/kamailio/commit/35f711e6ec74c6e67edf99adaa15cc3… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 408fb137d9..573d801bba 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -341,11 +341,17 @@ $ kamcmd htable.dump htable </listitem> <listitem> <para> - <emphasis>size</emphasis> - number specifying the size of hash - table. Larger value means less collisions. The number of entries - (aka slots or buckets) in the table is 2^size. The possible range + <emphasis>size</emphasis> - number to control how many slots + (buckets) to create for the hash table. Larger value means more + slots with higher probability for less collisions. The actual number + slots (or buckets) created for the table is 2^size. The possible range for this value is from 2 to 31, smaller or larger values will be - increased to 3 (8 slots) or decreased to 14 (16384 slots). + increased to 3 (8 slots) or decreased to 14 (16384 slots). Note + that each slot can store more than one item, when there are + collisions of hash ids computed for keys. The items in the same + slot are stored in a linked list. In other words, the size is not + setting a limit of how many items can be stored in a hash table, as + long as there is enough free shared memory, new items can be added. </para> </listitem> <listitem>

1 0

git:master:ae2f1fdc: usrloc: use ul prefix for global param variables
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: ae2f1fdc40b1ce6ff9d5d06330841809f51df587 URL: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T14:47:55+02:00 usrloc: use ul prefix for global param variables --- Modified: src/modules/usrloc/dlist.c Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/ul_keepalive.c Modified: src/modules/usrloc/ul_rpc.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc.c Modified: src/modules/usrloc/usrloc_mod.c Modified: src/modules/usrloc/usrloc_mod.h Modified: src/modules/usrloc/utime.c Modified: src/modules/usrloc/utime.h --- Diff: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180… Patch: https://github.com/kamailio/kamailio/commit/ae2f1fdc40b1ce6ff9d5d0633084180…

1 0

git:master:33cb4517: permissions: use perm prefix for global param variables
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 33cb45179bbd7477b81f297ae8de0a164aea8962 URL: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T13:50:54+02:00 permissions: use perm prefix for global param variables --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/rpc.c Modified: src/modules/permissions/trusted.c Modified: src/modules/permissions/trusted.h --- Diff: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1… Patch: https://github.com/kamailio/kamailio/commit/33cb45179bbd7477b81f297ae8de0a1…

1 0

git:master:08671523: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 08671523826310b44d7f9a8963dcf948e47f6536 URL: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-01T09:16:16+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… Patch: https://github.com/kamailio/kamailio/commit/08671523826310b44d7f9a8963dcf94… --- diff --git a/src/modules/permissions/README b/src/modules/permissions/README index 31eb37e0d3..9837cfd1b2 100644 --- a/src/modules/permissions/README +++ b/src/modules/permissions/README @@ -550,7 +550,8 @@ modparam("permissions", "ip_addr_col", "ip_address") Name of address table column containing the network mask of the address. Possible values are 0-32 for IPv4 and 0-128 for IPv6 - addresses. + addresses. If the value is 0, the network mask is set to 32 for IPv4 + addresses and to 128 for IPv6 addresses. Default value is “mask”.

1 0

git:master:8729a55f: permissions: docs - note about netmask value 0 in the database column
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: 8729a55f00b8ba6adbf97921ef09d56080145810 URL: https://github.com/kamailio/kamailio/commit/8729a55f00b8ba6adbf97921ef09d56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:00:21+02:00 permissions: docs - note about netmask value 0 in the database column --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8729a55f00b8ba6adbf97921ef09d56… Patch: https://github.com/kamailio/kamailio/commit/8729a55f00b8ba6adbf97921ef09d56… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 4e003bcc1b..170f197f14 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -548,8 +548,9 @@ modparam("permissions", "ip_addr_col", "ip_address") <title><varname>mask_col</varname> (string)</title> <para> Name of address table column containing the network mask of - the address. Possible values are 0-32 for IPv4 and 0-128 for - IPv6 addresses. + the address. Possible values are 0-32 for IPv4 and 0-128 for + IPv6 addresses. If the value is 0, the network mask is set to 32 + for IPv4 addresses and to 128 for IPv6 addresses. </para> <para> <emphasis>

1 0

git:master:b5816cae: textopsx: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: master Commit: b5816caeacc4c597b5358c1dcd429581b3233667 URL: https://github.com/kamailio/kamailio/commit/b5816caeacc4c597b5358c1dcd42958… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T08:53:56+02:00 textopsx: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/b5816caeacc4c597b5358c1dcd42958… Patch: https://github.com/kamailio/kamailio/commit/b5816caeacc4c597b5358c1dcd42958… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 317abb6002..1452e1c3d1 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -352,11 +352,10 @@ static int keep_hf_helper(sip_msg_t *msg, regex_t *re) return -1; } } else { - c = hf->name.s[hf->name.len]; - hf->name.s[hf->name.len] = '\0'; + STR_VTOZ(hf->name.s[hf->name.len], c); if(regexec(re, hf->name.s, 1, &pmatch, 0) != 0) { /* no match => remove */ - hf->name.s[hf->name.len] = c; + STR_ZTOV(hf->name.s[hf->name.len], c); l = del_lump(msg, hf->name.s - msg->buf, hf->len, 0); if(l == 0) { LM_ERR("cannot remove header [%.*s]\n", hf->name.len, @@ -364,7 +363,7 @@ static int keep_hf_helper(sip_msg_t *msg, regex_t *re) return -1; } } else { - hf->name.s[hf->name.len] = c; + STR_ZTOV(hf->name.s[hf->name.len], c); } } }

1 0

git:master:4d49df44: textops: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 30 Apr '20

30 Apr '20

Module: kamailio Branch: master Commit: 4d49df443577dab22f6d4dae154468d855cf0463 URL: https://github.com/kamailio/kamailio/commit/4d49df443577dab22f6d4dae154468d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-30T15:52:04+02:00 textops: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4d49df443577dab22f6d4dae154468d… Patch: https://github.com/kamailio/kamailio/commit/4d49df443577dab22f6d4dae154468d…

1 0

git:5.1:327548cb: pkg/kamailio/deb: version set to 5.1.10.1
by Victor Seva 30 Apr '20

30 Apr '20

Module: kamailio Branch: 5.1 Commit: 327548cbfdc2c5331d9a9264aa6a1571c35ff02e URL: https://github.com/kamailio/kamailio/commit/327548cbfdc2c5331d9a9264aa6a157… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-30T14:01:27+02:00 pkg/kamailio/deb: version set to 5.1.10.1 No code changes, just bump version so we get new builds with the new schema. See for details: https://github.com/kamailio/kamailio/issues/2160 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/327548cbfdc2c5331d9a9264aa6a157… Patch: https://github.com/kamailio/kamailio/commit/327548cbfdc2c5331d9a9264aa6a157…

1 0

git:master:4ea9cdd8: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 29 Apr '20

29 Apr '20

Module: kamailio Branch: master Commit: 4ea9cdd8be210430deac4c88b804ff9ddb622da1 URL: https://github.com/kamailio/kamailio/commit/4ea9cdd8be210430deac4c88b804ff9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-29T22:16:20+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/4ea9cdd8be210430deac4c88b804ff9… Patch: https://github.com/kamailio/kamailio/commit/4ea9cdd8be210430deac4c88b804ff9…

1 0

git:master:f376c82a: permissions: support to load address records from a text file
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Module: kamailio Branch: master Commit: f376c82a9f8cac3d4428450132d4b916e3cda491 URL: https://github.com/kamailio/kamailio/commit/f376c82a9f8cac3d4428450132d4b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-29T21:38:59+02:00 permissions: support to load address records from a text file - new parameter 'address_file' to provide the file name (or full path) to the file where address records are stored - note: no support for using a file instead of trusted table --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/hash.c Modified: src/modules/permissions/hash.h Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/f376c82a9f8cac3d4428450132d4b91… Patch: https://github.com/kamailio/kamailio/commit/f376c82a9f8cac3d4428450132d4b91…

1 0

git:master:8a7526bb: permissions: docs for address_file param and address file format
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Module: kamailio Branch: master Commit: 8a7526bbf35a139c2284ed4641525e3bb194b628 URL: https://github.com/kamailio/kamailio/commit/8a7526bbf35a139c2284ed4641525e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-29T22:09:41+02:00 permissions: docs for address_file param and address file format --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a7526bbf35a139c2284ed4641525e3… Patch: https://github.com/kamailio/kamailio/commit/8a7526bbf35a139c2284ed4641525e3…

1 0

git:master:28f4cab2: dispatcher: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Module: kamailio Branch: master Commit: 28f4cab2878b441eb6ddbed03ae7ddbcdbae37e2 URL: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-29T09:43:53+02:00 dispatcher: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… Patch: https://github.com/kamailio/kamailio/commit/28f4cab2878b441eb6ddbed03ae7ddb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 004bb0cfae..589b54f5b8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -420,23 +420,16 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs) } else if(dp->attrs.socket.s && dp->attrs.socket.len > 0) { /* parse_phostport(...) expects 0-terminated string * - after socket parameter is either ';' or '\0' */ - if(dp->attrs.socket.s[dp->attrs.socket.len] != '\0') { - c = dp->attrs.socket.s[dp->attrs.socket.len]; - dp->attrs.socket.s[dp->attrs.socket.len] = '\0'; - } + STR_VTOZ(dp->attrs.socket.s[dp->attrs.socket.len], c); if(parse_phostport( dp->attrs.socket.s, &host.s, &host.len, &port, &proto) != 0) { LM_ERR("bad socket <%.*s>\n", dp->attrs.socket.len, dp->attrs.socket.s); - if(c != 0) { - dp->attrs.socket.s[dp->attrs.socket.len] = c; - } + STR_ZTOV(dp->attrs.socket.s[dp->attrs.socket.len], c); goto err; } - if(c != 0) { - dp->attrs.socket.s[dp->attrs.socket.len] = c; - } + STR_ZTOV(dp->attrs.socket.s[dp->attrs.socket.len], c); dp->sock = grep_sock_info(&host, (unsigned short)port, proto); if(dp->sock == 0) { LM_ERR("non-local socket <%.*s>\n", dp->attrs.socket.len,

1 0

Next online devel meeting - Wed, Apr 29, 2020, 14:00UTC
by Daniel-Constantin Mierla 29 Apr '20

29 Apr '20

Hello, in order to plan the roadmap to next major release, it is time to organize another online devel meeting, so the developers and community members can syncronize and plan what should be done till Kamailio v5.4 will be out. Because freenode.net service is now requiring user registration to join IRC channels on their servers, we are considering some alternatives that would allow guest participation, one of them being using a matrix chat room. More details about it will be posted soon. I created a wiki page for the event at: * https://www.kamailio.org/wiki/devel/irc-meetings/2020a Feel free to add there topics that you want to be discussed. The proposed date is next Wednesday, April 29, 2020, at 14:00UTC (15:00 London/Dublin, 16:00 most of West Europe, 10:00 New York), but other dates can be proposed if they suit for more participants. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

4 7

[kamailio/kamailio] TOS field not overtaken by RTPengine (#2303)
by mihovilkolaric 29 Apr '20

29 Apr '20

### Description Altough setting TOS to -1, the TOS-header of the outgoing RTP stream is always set to the default TOS (184, resp 0xb0). ### Troubleshooting #### Reproduction Use following flags in rtpengine_manage: `rtpengine_manage("ICE=remove record-call=on call-id=$avp(correlationId) TOS=-1");` and set up a dialog, where the RTP-stream from the UA towards the rtpengine has TOS-field (e.g.: 0x80). Based on the documentation > A value of -1 may be used to leave the currently used TOS unchanged. the expected behavior was, that also the stream from rtpengine to the other UA has the same TOS field. However, the stream from rtpengine has the default value 0xb0 #### Debugging Data Relevant call in kamailio.cfg: ``` rtpengine_manage("ICE=remove record-call=on call-id=$avp(correlationId) TOS=-1"); ``` #### Log Messages  ``` 2020-04-27T14:50:08.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000060 sec 2020-04-27T14:50:08.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000060 sec 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Received command 'offer' from 192.168.211.21:47072 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Dump for 'offer' from 192.168.211.21:47072: { "supports": [ "load limit" ], "sdp": "v=0 o=UA1 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6001 RTP/AVP 8 c=IN IP4 127.0.0.1 a=rtpmap:8 PCMA/8000 a=sendrecv a=ptime:20 a=maxptime:20 a=interval:20 ", "ICE": "remove", "record-call": "on", "TOS": -1, "call-id": "75CzR7D4L7Cjjpdhq1dbyS", "received-from": [ "IP4", "127.0.0.1" ], "from-tag": "1", "command": "offer" } 2020-04-27T14:50:08.968+02:00 vm1 rtpengine[129780] notice: NOTICE: [75CzR7D4L7Cjjpdhq1dbyS]: Creating new call 2020-04-27T14:50:08.969+02:00 vm1 rtpengine[129780] notice: NOTICE: [75CzR7D4L7Cjjpdhq1dbyS]: Turning on call recording. 2020-04-27T14:50:08.969+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel call idx is 0 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Default sink codec is PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: 0 DTMF sink entries 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Creating codec handler for PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Sink supports codec PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Using passthrough handler for PCMA/8000 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: creating send_timer 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 0 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 1 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6001 2020-04-27T14:50:08.973+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6002 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 2 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: kernel stream idx is 3 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Replying to 'offer' from 192.168.211.21:47072 (elapsed time 0.002197 sec) 2020-04-27T14:50:08.974+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Response dump for 'offer' to 192.168.211.21:47072: { "sdp": "v=0 o=UA1 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6004 RTP/AVP 8 c=IN IP4 192.168.211.21 a=maxptime:20 a=interval:20 a=rtpmap:8 PCMA/8000 a=sendrecv a=rtcp:6005 a=ptime:20 ", "result": "ok" } 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Received command 'answer' from 192.168.211.21:60917 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Dump for 'answer' from 192.168.211.21:60917: { "supports": [ "load limit" ], "sdp": "v=0 o=UA2 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6000 RTP/AVP 8 c=IN IP4 127.0.0.1 a=rtpmap:8 PCMA/8000 a=sendrecv a=ptime:20 a=maxptime:20 a=interval:20 ", "ICE": "remove", "record-call": "on", "TOS": -1, "call-id": "75CzR7D4L7Cjjpdhq1dbyS", "received-from": [ "IP4", "127.0.0.1" ], "from-tag": "1", "to-tag": "SIPp1", "command": "answer" } 2020-04-27T14:50:08.982+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Default sink codec is PCMA/8000 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: 0 DTMF sink entries 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Creating codec handler for PCMA/8000 2020-04-27T14:50:08.983+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Sink supports codec PCMA/8000 2020-04-27T14:50:08.984+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Using passthrough handler for PCMA/8000 2020-04-27T14:50:08.984+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6000 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: set FILLED flag for stream 127.0.0.1:6001 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS]: Replying to 'answer' from 192.168.211.21:60917 (elapsed time 0.000265 sec) 2020-04-27T14:50:08.985+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS]: Response dump for 'answer' to 192.168.211.21:60917: { "sdp": "v=0 o=UA2 0 1 IN IP4 127.0.0.1 s=testcall t=0 0 m=audio 6032 RTP/AVP 8 c=IN IP4 192.168.211.21 a=maxptime:20 a=interval:20 a=rtpmap:8 PCMA/8000 a=sendrecv a=rtcp:6033 a=ptime:20 ", "result": "ok" } 2020-04-27T14:50:09.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000057 sec 2020-04-27T14:50:09.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000059 sec 2020-04-27T14:50:11.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000041 sec 2020-04-27T14:50:11.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000043 sec 2020-04-27T14:50:11.494+02:00 vm1 rtpengine[129780] info: INFO: Received command 'ping' from 192.168.211.21:51806 2020-04-27T14:50:11.494+02:00 vm1 rtpengine[129780] debug: DEBUG: Dump for 'ping' from 192.168.211.21:51806: { "command": "ping" } 2020-04-27T14:50:11.495+02:00 vm1 rtpengine[129780] info: INFO: Replying to 'ping' from 192.168.211.21:51806 (elapsed time 0.000001 sec) 2020-04-27T14:50:11.495+02:00 vm1 rtpengine[129780] debug: DEBUG: Response dump for 'ping' to 192.168.211.21:51806: { "result": "pong" } 2020-04-27T14:50:13.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000050 sec 2020-04-27T14:50:13.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000058 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[130247] debug: DEBUG: timer run time = 0.000045 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] debug: DEBUG: timer run time = 0.000056 sec 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Confirmed peer address as 127.0.0.1:6001 2020-04-27T14:50:14.001+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19303 TS 160) 2020-04-27T14:50:14.021+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19304 TS 320) 2020-04-27T14:50:14.040+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19305 TS 480) 2020-04-27T14:50:14.061+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19306 TS 640) 2020-04-27T14:50:14.080+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19307 TS 800) 2020-04-27T14:50:14.102+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19308 TS 960) 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Confirmed peer address as 127.0.0.1:6000 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Kernelizing media stream: 127.0.0.1:6000 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: enabling kernel intercept with stream idx 0 2020-04-27T14:50:14.106+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6004]: Forward to sink endpoint: 127.0.0.1:6001 (RTP seq 19303 TS 160) 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] info: INFO: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Kernelizing media stream: 127.0.0.1:6001 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: enabling kernel intercept with stream idx 2 2020-04-27T14:50:14.121+02:00 vm1 rtpengine[129780] debug: DEBUG: [75CzR7D4L7Cjjpdhq1dbyS port 6032]: Forward to sink endpoint: 127.0.0.1:6000 (RTP seq 19309 TS 1120) ``` #### SIP Traffic  ``` No SIP-related issue (RTP only) ``` ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` rtpengine: 8.2.1 kamailio: 5.3.3 ``` * **Operating System**:  RHEL 7.6 ``` Linux vm1 3.10.0-957.el7.x86_64 #1 SMP Thu Oct 4 20:48:51 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2303

3 7

git:master:d815a2c9: ndb_redis: use safer macros for temporarily making zero-ending strings
by Daniel-Constantin Mierla 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: d815a2c92e49e315a9f6a614b7ee3a377836d368 URL: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-28T18:28:34+02:00 ndb_redis: use safer macros for temporarily making zero-ending strings --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3… Patch: https://github.com/kamailio/kamailio/commit/d815a2c92e49e315a9f6a614b7ee3a3…

1 0

git:master:9657764f: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 28 Apr '20

28 Apr '20

Module: kamailio Branch: master Commit: 9657764f224bb9fb4f593dc55d3c4310ca02bb16 URL: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-28T16:16:16+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… Patch: https://github.com/kamailio/kamailio/commit/9657764f224bb9fb4f593dc55d3c431… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 9f6624daa9..150da0acdc 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -178,8 +178,9 @@ modparam("keepalive", "destination", "sip.provider.com") 2.3.3. delete_counter(int) - Unsuccesful attemps increase delete_counter . After passing it , - keepalive module doesn't try to send options requests. + Unsuccesful attemps increase delete_counter. After passing it, + keepalive module doesn't try to send options requests. Ignored if it's + set to 0. Default value is 5 .

1 0

[kamailio/kamailio] keepalive: ignore delete_counter if it is set to 0 (#2306)
by Nacho G. 28 Apr '20

28 Apr '20

#### 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  Recently a new parameter `delete_counter` was added. There is no way to ignore it, (just set a really big number could serve as a workaround). This is a small change to ignore it if `delete_counter` if is set to 0. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2306 -- Commit Summary -- * keepalive: ignore delete_counter if it is set to 0 -- File Changes -- M src/modules/keepalive/doc/keepalive_admin.xml (2) M src/modules/keepalive/keepalive_core.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2306.patch https://github.com/kamailio/kamailio/pull/2306.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2306

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev