sr-dev

sr-dev@lists.kamailio.org

3 participants
45196 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev