sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

git:master:fc09015b: core: small spelling fix in comment

by Henning Westerholt

Module: kamailio Branch: master Commit: fc09015bbad342b435de7ddb3300e19a415c340d URL: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:38:00Z core: small spelling fix in comment --- Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Patch: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… --- diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index 3552e8392f..b09c79be8a 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -70,7 +70,7 @@ enum dns_errors{ -- returned only by the dns_resolve* functions when called iteratively,; it signals the end of the ip/records list */ - E_DNS_UNKNOWN /**< unkown error */, + E_DNS_UNKNOWN /**< unknown error */, E_DNS_INTERNAL_ERR /**< internal error */, E_DNS_BAD_SRV_ENTRY, E_DNS_NO_SRV /**< unresolvable srv record */,

4 years, 7 months

git:master:cbb070b7: cdp: small spelling fix in log message

by Henning Westerholt

Module: kamailio Branch: master Commit: cbb070b74e63017a23355dd8d5266c2d57b762f9 URL: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:37:34Z cdp: small spelling fix in log message --- Modified: src/modules/cdp/diameter_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Patch: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… --- diff --git a/src/modules/cdp/diameter_peer.c b/src/modules/cdp/diameter_peer.c index 043d4f3d72..38386be5d9 100644 --- a/src/modules/cdp/diameter_peer.c +++ b/src/modules/cdp/diameter_peer.c @@ -257,7 +257,7 @@ int diameter_peer_start(int blocking) /* fork receiver for unknown peers */ seed = random(); - pid = fork_process(1001+k,"cdp_receiver_peer_unkown",1); + pid = fork_process(1001+k,"cdp_receiver_peer_unknown",1); if (pid==-1){ LM_CRIT("init_diameter_peer(): Error on fork() for unknown peer receiver!\n");

4 years, 7 months

[kamailio/kamailio] Debian package version don't support distribution upgrades (#2160)

by Bas Couwenberg

When upgrading from stretch to buster the kamailio packages aren't upgraded because the 5.3.1+stretch version is greater than 5.3.1+buster: ``` $ dpkg --compare-versions 5.3.1+stretch gt 5.3.1+buster ; echo $? 0 ``` The package version should include the release version instead of its codename, e.g. 5.3.1+deb9u1 & 5.3.1+deb10u1 like done for [stable updates](https://www.debian.org/doc/manuals/developers-reference/pkgs.en.ht…: ``` $ dpkg --compare-versions 5.3.1+deb10u1 gt 5.3.1+deb9u1 ; echo $? 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/2160

4 years, 7 months

[kamailio/kamailio] jansson_set() "result has json error" on long json strings (#2327)

by Victor Seva

### Description We noticed random errors from jansson module when: ``` xlog("L_NOTICE", "**** PRE '«$avp(i:901)»' - [% logres %]\n"); jansson_set("str", "cc_sub", "$avp(s:caller_concurrent_calls_count)", "$(avp(i:901)[*])"); ``` ``` May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'TEwMDEiLCJkX' ``` ### Troubleshooting #### Reproduction `` jansson_set(type, key/path, value, result)`` Using a long json result, in my tests longer than 400 chars fires the ERROR #### Log Messages ``` May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: Setting acc destination-leg for uuid '«0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e»': '«{"gpp":["long long long long","long long long long","long long long long","long long long long","long long long long","l ong long long long","long long long long","long long long long","long long long long","long long long long"],"plu":0,"s_id":"","c_id":"","a_id":315,"dialed":"4311001","uuid":"0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e","u":"testuser1001","d":"spce.test","u_in ":"4311001","d_in":"spce.test","lcr":0,"lnp_p":"","u_out":"testuser1001","lnp_t":"","fci":"","cc_quota":"","cc_sub":"","cc_cust":""}»' - R=«sip:conf=4311001@conference.local» ID=«NGCP%invite_conference_update%///1-23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: **** PRE '«{"gpp":[null,null,null,null,null,null,null,null,null,null],"clir":0,"uuid":"adeff08b-bd66-4578-8a01-194185d06827","u":"testuser1002","d":"spce.test","cli":"43110011002","s_id":"","c_id":""," a_id":315,"pau":"","par":"","s":"call","ip":"127.126.0.1","t":1589443897.908021,"lnp_p":"","cli_out":"43110011002","lnp_t":"","pai":"","div":"","cid":"","u2u":"","lcr":0,"cc_quota":"","cc_sub":"","cc_cust":""}»' - ID=«NGCP%invite_conference_update%///1- 23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' ``` ### Possible Solutions In my fast check I notice the result is forced to end in '\0'. Preparing a PR with a solution. ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise's version but with no jansson patches at all ``` version: kamailio 5.3.4 (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/2327

4 years, 7 months

git:master:3abc650d: jansson: use the core macros for ending string value with '\0' and to restore

by Victor Seva

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);

4 years, 7 months

git:master:c1d3fdb3: misc: examples/kemi - small typo in lua example

by Daniel-Constantin Mierla

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;

4 years, 7 months

Kamailio 5.2.7 Released

by Henning Westerholt

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/>

4 years, 7 months

git:5.2:9ea54fe1: Changelog: update Changelog for 5.2.7

by Henning Westerholt

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…

4 years, 7 months

git:5.2:7a6c6031: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

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…

4 years, 7 months

git:5.3:fc28a142: pkg/kamailio: fixed python3 deps for RHEL 6

by Henning Westerholt

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}

4 years, 7 months

← Newer
1
...
18
19
20
21
22
23
24
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2020