sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
526 discussions

git:5.2:61255b01: jansson: use the core macros for ending string value with '\0' and to restore

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 61255b01f88ea904bf5694f834a5b2aec7398c69 URL: https://github.com/kamailio/kamailio/commit/61255b01f88ea904bf5694f834a5b2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T14:21:12Z jansson: use the core macros for ending string value with '\0' and to restore fix #2327 (cherry picked from commit 3abc650d37e426840f060426a851ecac5210d2e5) --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/61255b01f88ea904bf5694f834a5b2a… Patch: https://github.com/kamailio/kamailio/commit/61255b01f88ea904bf5694f834a5b2a… --- 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);

3 years, 7 months

git:5.3:a5c4f47b: keepalive: logging state of dest just if changed

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: a5c4f47b30131193439c64738652d454a5b04404 URL: https://github.com/kamailio/kamailio/commit/a5c4f47b30131193439c64738652d45… Author: Luis Martin Gil <luismartingil(a)zaleos.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T14:11:46Z keepalive: logging state of dest just if changed (cherry picked from commit 5649a24929ae7bd60154a6c58c772db9e462af27) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a5c4f47b30131193439c64738652d45… Patch: https://github.com/kamailio/kamailio/commit/a5c4f47b30131193439c64738652d45… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 8d84e8902f..68a0053d58 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -117,7 +117,6 @@ static void ka_options_callback( ka_dest->last_up = time(NULL); } - LM_DBG("new state is: %d\n", state); if(state != ka_dest->state) { ka_run_route(msg, &uri, state_routes[state]); @@ -125,6 +124,7 @@ static void ka_options_callback( ka_dest->statechanged_clb(&ka_dest->uri, state, ka_dest->user_attr); } + LM_DBG("new state is: %d\n", state); ka_dest->state = state; } }

3 years, 7 months

git:5.3:70fbe68a: remove unused import

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 70fbe68ae37bceedcd22657694eb484d4a636a00 URL: https://github.com/kamailio/kamailio/commit/70fbe68ae37bceedcd22657694eb484… Author: tsearle <tsearle(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T14:10:37Z remove unused import (cherry picked from commit 2d2594d3cdeead550ccd472f9d0288b72b98d689) --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/70fbe68ae37bceedcd22657694eb484… Patch: https://github.com/kamailio/kamailio/commit/70fbe68ae37bceedcd22657694eb484… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 4717c5057e..aa96fadfd9 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -6,7 +6,6 @@ import json import sys -import os from collections import defaultdict

3 years, 7 months

git:5.3:694b8be0: tools/kemi: add script to generate mock api for kemi python testing

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: 694b8be0ea20620c1b4ee877cca2e69223f99b95 URL: https://github.com/kamailio/kamailio/commit/694b8be0ea20620c1b4ee877cca2e69… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T14:09:48Z tools/kemi: add script to generate mock api for kemi python testing (cherry picked from commit f4ec923976cbab5c1451b65268aaca65a33919fd) --- Added: misc/tools/kemi/python_mock/README.md Added: misc/tools/kemi/python_mock/kemi_mock.py Added: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/694b8be0ea20620c1b4ee877cca2e69… Patch: https://github.com/kamailio/kamailio/commit/694b8be0ea20620c1b4ee877cca2e69…

3 years, 7 months

git:5.2:79efd5a4: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: 79efd5a4c7435fce426b219490d7499c501ec6f8 URL: https://github.com/kamailio/kamailio/commit/79efd5a4c7435fce426b219490d7499… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-02T16:02:24+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/cplc/README Modified: src/modules/db_mongodb/README Modified: src/modules/drouting/README Modified: src/modules/tm/README Modified: src/modules/websocket/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/79efd5a4c7435fce426b219490d7499… Patch: https://github.com/kamailio/kamailio/commit/79efd5a4c7435fce426b219490d7499…

3 years, 7 months

git:5.3:042a677d: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 042a677d613c91f0b0ceab4176831ff38ddb9ee5 URL: https://github.com/kamailio/kamailio/commit/042a677d613c91f0b0ceab4176831ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-02T16:02:03+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/cplc/README Modified: src/modules/db_mongodb/README Modified: src/modules/drouting/README Modified: src/modules/tm/README Modified: src/modules/websocket/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/042a677d613c91f0b0ceab4176831ff… Patch: https://github.com/kamailio/kamailio/commit/042a677d613c91f0b0ceab4176831ff…

3 years, 7 months

git:5.4:0b923cab: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.4 Commit: 0b923cabb82870e5376f79682b90b65e71050249 URL: https://github.com/kamailio/kamailio/commit/0b923cabb82870e5376f79682b90b65… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-02T16:01:38+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/cplc/README Modified: src/modules/db_mongodb/README Modified: src/modules/drouting/README Modified: src/modules/tm/README Modified: src/modules/websocket/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/0b923cabb82870e5376f79682b90b65… Patch: https://github.com/kamailio/kamailio/commit/0b923cabb82870e5376f79682b90b65…

3 years, 7 months

git:master:0dc2fa31: modules: readme files regenerated - carrierroute ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0dc2fa3168c521fd2828704098b8fbf299db9702 URL: https://github.com/kamailio/kamailio/commit/0dc2fa3168c521fd2828704098b8fbf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-02T16:01:15+02:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README Modified: src/modules/cplc/README Modified: src/modules/db_mongodb/README Modified: src/modules/drouting/README Modified: src/modules/tm/README Modified: src/modules/websocket/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/0dc2fa3168c521fd2828704098b8fbf… Patch: https://github.com/kamailio/kamailio/commit/0dc2fa3168c521fd2828704098b8fbf…

3 years, 7 months

git:5.3:bd30d11a: jansson: use the core macros for ending string value with '\0' and to restore

by Henning Westerholt

Module: kamailio Branch: 5.3 Commit: bd30d11a8e96b2c77d5dbd81221eabd0b5e45ef5 URL: https://github.com/kamailio/kamailio/commit/bd30d11a8e96b2c77d5dbd81221eabd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-10-02T13:54:20Z jansson: use the core macros for ending string value with '\0' and to restore fix #2327 (cherry picked from commit 3abc650d37e426840f060426a851ecac5210d2e5) --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/bd30d11a8e96b2c77d5dbd81221eabd… Patch: https://github.com/kamailio/kamailio/commit/bd30d11a8e96b2c77d5dbd81221eabd… --- 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);

3 years, 7 months

[kamailio/kamailio] Fix typos: Remove consecutive occurrences of 'the' (#2491)

by Jorge Vallecillo

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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  Remove consecutive ocurrences of 'the' across the repo You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2491 -- Commit Summary -- * Fix typos: Remove consecutive occurrences of 'the' -- File Changes -- M README.md (2) M src/lib/srdb1/schema/carrierfailureroute.xml (2) M src/modules/app_jsdt/duktape.c (4) M src/modules/avp/avp.xml (2) M src/modules/carrierroute/README (2) M src/modules/carrierroute/doc/carrierroute_db.xml (2) M src/modules/counters/counters.c (4) M src/modules/cplc/README (4) M src/modules/db_mongodb/README (2) M src/modules/db_mongodb/doc/db_mongodb_admin.xml (2) M src/modules/drouting/README (2) M src/modules/drouting/doc/drouting_admin.xml (2) M src/modules/ims_qos/rx_aar.c (2) M src/modules/sca/NOTES (2) M src/modules/tm/README (2) M src/modules/tm/doc/functions.xml (2) M src/modules/tm/t_reply.c (2) M src/modules/websocket/README (2) M src/modules/xmpp/README (2) M src/modules/xmpp/doc/xmpp_admin.xml (2) M test/travis/README.md (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2491.patch https://github.com/kamailio/kamailio/pull/2491.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/2491

3 years, 7 months

← Newer
1
...
43
44
45
46
47
48
49
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020