sr-dev November 2019

sr-dev@lists.kamailio.org

22 participants
381 discussions

[kamailio/kamailio] utils: Change sh(1) "test ==" usage to "=" (#2159)
by Greg Troxel 29 Nov '19

29 Nov '19

The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This commit simply changes "==" within test/[ to "=". #### 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 - [ ] Tested changes locally - [x] Related to issue #2157 #### Description This changes instances of "==" as a an operator to test(1) to "=". I have not yes tested running the script, because I am still working through issues to package kamailio in pkgsrc. However, this patch avoids a lint-type warning from pkgsrc about non-portable shell script constructs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2159 -- Commit Summary -- * utils: Change sh(1) "test ==" usage to "=" -- File Changes -- M utils/kamctl/kamdbctl (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2159.patch https://github.com/kamailio/kamailio/pull/2159.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/2159

2 2

git:master:e8b8251f: utils: Change sh(1) "test ==" usage to "="
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: e8b8251f6c7382f8e373c2b309422973a3bf730d URL: https://github.com/kamailio/kamailio/commit/e8b8251f6c7382f8e373c2b30942297… Author: Greg Troxel <gdt(a)lexort.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T18:39:58+01:00 utils: Change sh(1) "test ==" usage to "=" The POSIX sh(1) specification says that strings are compared with test(1) (also "[") with "=". Bash accepts "==" and this leads to non-portable code. This commit simply changes "==" within test/[ to "=". --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/e8b8251f6c7382f8e373c2b30942297… Patch: https://github.com/kamailio/kamailio/commit/e8b8251f6c7382f8e373c2b30942297… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index faa07cb38a..89ddc81477 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -153,7 +153,7 @@ kamailio_dump() # pars: <database name> merr "kamailio_dump function takes two param" exit 1 fi - if [ "$USED_DBENGINE" == "oracle" ]; then + if [ "$USED_DBENGINE" = "oracle" ]; then oracle_dump $1 $2 elif [ "$PW" = "" ] ; then $DUMP_CMD $1 > $2 @@ -174,7 +174,7 @@ kamailio_restore() #pars: <database name> <filename> merr "kamailio_restore function takes two params" exit 1 fi - if [ "$USED_DBENGINE" == "oracle" ]; then + if [ "$USED_DBENGINE" = "oracle" ]; then oracle_restore $1 $2 else sql_query $1 < $2 @@ -290,7 +290,7 @@ kamailio_pframework() #pars: <action> case $1 in copy) # copy database to some other name - if [ "$USED_DBENGINE" == "berkeley" -o "$USED_DBENGINE" == "dbtext" ] ; then + if [ "$USED_DBENGINE" = "berkeley" -o "$USED_DBENGINE" = "dbtext" ] ; then merr "$USED_DBENGINE don't support this operation" exit 1 fi @@ -323,7 +323,7 @@ case $1 in exit $ret ;; backup) - if [ "$USED_DBENGINE" == "berkeley" -o "$USED_DBENGINE" == "dbtext" ] ; then + if [ "$USED_DBENGINE" = "berkeley" -o "$USED_DBENGINE" = "dbtext" ] ; then merr "$USED_DBENGINE don't support this operation" exit 1 fi @@ -337,7 +337,7 @@ case $1 in exit $? ;; restore) - if [ "$USED_DBENGINE" == "berkeley" -o "$USED_DBENGINE" == "dbtext" ] ; then + if [ "$USED_DBENGINE" = "berkeley" -o "$USED_DBENGINE" = "dbtext" ] ; then merr "$USED_DBENGINE don't support this operation" exit 1 fi

1 0

git:master:0d800324: Revert "core: increase SHM memory pool to 128 MB"
by Henning Westerholt 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: 0d80032442df3f684f62d92841c2911e5d4af5b5 URL: https://github.com/kamailio/kamailio/commit/0d80032442df3f684f62d92841c2911… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-11-29T15:55:55+01:00 Revert "core: increase SHM memory pool to 128 MB" - This reverts commit 063e6a025b8ca0163af2147f057d29447c6f9760. - to be added as comment to default sysconfig packaging files --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/0d80032442df3f684f62d92841c2911… Patch: https://github.com/kamailio/kamailio/commit/0d80032442df3f684f62d92841c2911… --- diff --git a/src/core/config.h b/src/core/config.h index 96196a0224..0eda20302b 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -142,7 +142,7 @@ #endif #define PKG_MEM_POOL_SIZE PKG_MEM_SIZE*1024*1024 /*!< used only if PKG_MALLOC is defined*/ -#define SHM_MEM_SIZE 128 /*!< used if SH_MEM is defined*/ +#define SHM_MEM_SIZE 64 /*!< used if SH_MEM is defined*/ #define SHM_MEM_POOL_SIZE SHM_MEM_SIZE*1024*1024 /* dimensioning buckets in q_malloc */

1 0

Kamailio as SBC for Microsoft Teams
by Henning Westerholt 29 Nov '19

29 Nov '19

Hello, I have created a "How-To" blog post on using Kamailio as "session border controller" for Microsoft Teams Direct Routing: https://skalatan.de/de/blog/kamailio-sbc-teams You can this way use all the existing possibilities that Kamailio provide to interact with MS Teams as well. Best regards, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

6 8

git:5.2:65d13ddf: dialplan: fixed avp usage in subst_exp field
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: 65d13ddf14c134555fa99555ef46273cb8f56248 URL: https://github.com/kamailio/kamailio/commit/65d13ddf14c134555fa99555ef46273… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T12:51:53+01:00 dialplan: fixed avp usage in subst_exp field - in case both match_exp and subst_exp contain avps, the content of match_exp were used to evaluate the substitute expression. (cherry picked from commit 81b268d9610ea16420d7ce2aa1a9e3ba5364773c) --- Modified: src/modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/65d13ddf14c134555fa99555ef46273… Patch: https://github.com/kamailio/kamailio/commit/65d13ddf14c134555fa99555ef46273… --- diff --git a/src/modules/dialplan/dp_repl.c b/src/modules/dialplan/dp_repl.c index 093e48fd37..f50b328034 100644 --- a/src/modules/dialplan/dp_repl.c +++ b/src/modules/dialplan/dp_repl.c @@ -703,7 +703,7 @@ int dp_translate_helper(sip_msg_t *msg, str *input, str *output, dpl_id_p idp, return 0; } if(rulep->tflags&DP_TFLAGS_PV_SUBST) { - re_list = dpl_dynamic_pcre_list(msg, &rulep->match_exp); + re_list = dpl_dynamic_pcre_list(msg, &rulep->subst_exp); if(re_list==NULL) { /* failed to compile dynamic pcre -- ignore */ LM_DBG("failed to compile dynamic pcre[%.*s]\n",

1 0

git:5.3:aa26d787: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.3 Commit: aa26d787ee21733dd1f4d13a6869302b28a229a5 URL: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:31:50+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route (cherry picked from commit e0ed91acb88091caf285704689f72e48c5127ae4) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… Patch: https://github.com/kamailio/kamailio/commit/aa26d787ee21733dd1f4d13a6869302… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index e9f18718dc..b8a6456fc4 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -327,7 +327,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -465,9 +465,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -475,12 +481,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -488,6 +502,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route;

1 0

git:5.2:60aa0d9f: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: 5.2 Commit: 60aa0d9fd7b3a53154b10eedcd0c51d51c6e0035 URL: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:32:03+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route (cherry picked from commit e0ed91acb88091caf285704689f72e48c5127ae4) --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… Patch: https://github.com/kamailio/kamailio/commit/60aa0d9fd7b3a53154b10eedcd0c51d… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index 0e3bfecb5d..3e6f5b8c2a 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -329,7 +329,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -467,9 +467,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -477,12 +483,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -490,6 +504,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route;

1 0

git:master:e0ed91ac: cfgt: fix detection of jump to previous-previous route
by Victor Seva 29 Nov '19

29 Nov '19

Module: kamailio Branch: master Commit: e0ed91acb88091caf285704689f72e48c5127ae4 URL: https://github.com/kamailio/kamailio/commit/e0ed91acb88091caf285704689f72e4… Author: Marco Capetta <mcapetta(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2019-11-29T09:28:45+01:00 cfgt: fix detection of jump to previous-previous route * this happends with onsend_route --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/kamailio/commit/e0ed91acb88091caf285704689f72e4… Patch: https://github.com/kamailio/kamailio/commit/e0ed91acb88091caf285704689f72e4… --- diff --git a/src/modules/cfgt/cfgt_int.c b/src/modules/cfgt/cfgt_int.c index e9f18718dc..b8a6456fc4 100644 --- a/src/modules/cfgt/cfgt_int.c +++ b/src/modules/cfgt/cfgt_int.c @@ -327,7 +327,7 @@ void cfgt_save_node(cfgt_node_p node) } dest.s[dir] = '\0'; LM_DBG("dir [%s]\n", dest.s); - if (stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if(stat(dest.s, &sb) == 0 && S_ISDIR(sb.st_mode)) { LM_DBG("dir [%s] already existing\n", dest.s); } else if(mkdir(dest.s, S_IRWXO | S_IXGRP | S_IRWXU) < 0) { LM_ERR("failed to make directory: %s\n", strerror(errno)); @@ -465,9 +465,15 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) } else { LM_DBG("actual routename:[%.*s][%d]\n", node->route->s.len, node->route->s.s, node->route->type); - if(node->route->prev) + if(node->route->prev) { + if(node->route->prev->prev) + LM_DBG("prev prev routename:[%.*s][%d]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s, + node->route->prev->prev->type); LM_DBG("prev routename:[%.*s][%d]\n", node->route->prev->s.len, node->route->prev->s.s, node->route->prev->type); + } if(node->route->next) LM_DBG("next routename:[%.*s][%d]\n", node->route->next->s.len, node->route->next->s.s, node->route->next->type); @@ -475,12 +481,20 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) LM_DBG("same route\n"); _cfgt_set_type(node->route, a); return 2; - } else if(node->route->prev - && STR_EQ(*routename, node->route->prev->s)) { - LM_DBG("back to route[%.*s]\n", node->route->prev->s.len, - node->route->prev->s.s); - _cfgt_set_type(node->route->prev, a); - return 3; + } else if(node->route->prev) { + if(STR_EQ(*routename, node->route->prev->s)) { + LM_DBG("back to prev route[%.*s]\n", node->route->prev->s.len, + node->route->prev->s.s); + _cfgt_set_type(node->route->prev, a); + return 3; + } else if(node->route->prev->prev + && STR_EQ(*routename, node->route->prev->prev->s)) { + LM_DBG("back to prev prev route[%.*s]\n", + node->route->prev->prev->s.len, + node->route->prev->prev->s.s); + _cfgt_set_type(node->route->prev->prev, a); + return 3; + } } route = pkg_malloc(sizeof(cfgt_str_list_t)); if(!route) { @@ -488,6 +502,9 @@ int _cfgt_add_routename(cfgt_node_p node, struct action *a, str *routename) return -1; } memset(route, 0, sizeof(cfgt_str_list_t)); + if(route->prev && node->route->prev) { + route->prev->prev = node->route->prev; + } route->prev = node->route; node->route->next = route; node->route = route;

1 0

git:master:f268aa2f: snmpstats: use snprintf instead of snprintf
by Daniel-Constantin Mierla 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: f268aa2f53f550eec45e5030a08f6d586941913e URL: https://github.com/kamailio/kamailio/commit/f268aa2f53f550eec45e5030a08f6d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-28T20:08:58+01:00 snmpstats: use snprintf instead of snprintf --- Modified: src/modules/snmpstats/snmpSIPContactTable.c --- Diff: https://github.com/kamailio/kamailio/commit/f268aa2f53f550eec45e5030a08f6d5… Patch: https://github.com/kamailio/kamailio/commit/f268aa2f53f550eec45e5030a08f6d5… --- diff --git a/src/modules/snmpstats/snmpSIPContactTable.c b/src/modules/snmpstats/snmpSIPContactTable.c index 77f497dce3..d23f8557ac 100644 --- a/src/modules/snmpstats/snmpSIPContactTable.c +++ b/src/modules/snmpstats/snmpSIPContactTable.c @@ -420,7 +420,7 @@ int kamailioSIPContactTable_get_value(netsnmp_request_info *request, /* Convert the float into a string, as specified by the * MIB. */ - sprintf(contactPreference, "%5.2f", preferenceAsFloat); + snprintf(contactPreference, 6, "%5.2f", preferenceAsFloat); snmp_set_var_typed_value( var, ASN_OCTET_STR, (unsigned char *)contactPreference, 5); @@ -443,4 +443,4 @@ const kamailioSIPContactTable_context *kamailioSIPContactTable_get_by_idx( { return (const kamailioSIPContactTable_context *)CONTAINER_FIND( cb.container, hdr); -} \ No newline at end of file +}

1 0

git:master:d6f16797: app_perl: use snprintf instead of sprintf
by Daniel-Constantin Mierla 28 Nov '19

28 Nov '19

Module: kamailio Branch: master Commit: d6f16797a0f895189d4a0ef2ea8fbd68acf0144e URL: https://github.com/kamailio/kamailio/commit/d6f16797a0f895189d4a0ef2ea8fbd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-11-28T20:08:57+01:00 app_perl: use snprintf instead of sprintf --- Modified: src/modules/app_perl/app_perl_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d6f16797a0f895189d4a0ef2ea8fbd6… Patch: https://github.com/kamailio/kamailio/commit/d6f16797a0f895189d4a0ef2ea8fbd6… --- diff --git a/src/modules/app_perl/app_perl_mod.c b/src/modules/app_perl/app_perl_mod.c index 954b354638..31b001c9b9 100644 --- a/src/modules/app_perl/app_perl_mod.c +++ b/src/modules/app_perl/app_perl_mod.c @@ -220,7 +220,7 @@ PerlInterpreter *parser_init(void) { PKG_MEM_ERROR; return NULL; } - sprintf(argv[argc], "-I%s", entry); + snprintf(argv[argc], strlen(entry)+20, "-I%s", entry); modpathset_end = argc; argc++; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2019