sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
389 discussions

git:master:f461081a: core: dns cache - catch unknown record type to avoid compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f461081a400b398a8c47b1cb338ffc4bf8bd2ede URL: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T10:11:50+02:00 core: dns cache - catch unknown record type to avoid compile warnings --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… Patch: https://github.com/kamailio/kamailio/commit/f461081a400b398a8c47b1cb338ffc4… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 39bed3d315..3b0f5404c4 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2402,6 +2402,10 @@ inline static struct hostent* dns_entry2he(struct dns_hash_entry* e) case T_AAAA: ip = ((struct aaaa_rdata*)rr->rdata)->ip6; break; + default: + LM_CRIT("wrong entry type %d for %.*s\n", + e->type, e->name_len, e->name); + return 0; } memcpy(p_addr[i], ip, len); }

7 years, 5 months

git:5.0:8cdee50d: kamctl: kamdbctl - proper use of DBPORT for postgres

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 8cdee50d7c89c1617b68e2eff1ce646eba0c33fb URL: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:39:23+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres (cherry picked from commit 17f907d5fa1267f434f422fb61e4b315e3eafb97) --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… Patch: https://github.com/kamailio/kamailio/commit/8cdee50d7c89c1617b68e2eff1ce646… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

7 years, 5 months

git:master:17f907d5: kamctl: kamdbctl - proper use of DBPORT for postgres

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 17f907d5fa1267f434f422fb61e4b315e3eafb97 URL: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-30T08:38:11+02:00 kamctl: kamdbctl - proper use of DBPORT for postgres --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… Patch: https://github.com/kamailio/kamailio/commit/17f907d5fa1267f434f422fb61e4b31… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index a946f2a204..059b6faa82 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -55,8 +55,8 @@ if [ -z "$DBPORT" ] ; then CMD="psql -q -h $DBHOST -U $DBROOTUSER " DUMP_CMD="pg_dump -h $DBHOST -U $DBROOTUSER -c" else - CMD="psql -q -h $DBHOST -p $DBHOST -U $DBROOTUSER " - DUMP_CMD="pg_dump -h $DBHOST -p $DBHOST -U $DBROOTUSER -c" + CMD="psql -q -h $DBHOST -p $DBPORT -U $DBROOTUSER " + DUMP_CMD="pg_dump -h $DBHOST -p $DBPORT -U $DBROOTUSER -c" fi #################################################################

7 years, 5 months

git:master:4826ba74: permissions: new parameter load_backends

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4826ba749a3d8589d57bc5fcb38eeb6f9e840e02 URL: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:21:22+02:00 permissions: new parameter load_backends - control what backends should be loaded - 1 - address table - 2 - trusted table - 4 - allow file - 8 - deny file - it can be a combination (sum) of the options to load many backends - default value 0xffff (load all backends) --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h --- Diff: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… Patch: https://github.com/kamailio/kamailio/commit/4826ba749a3d8589d57bc5fcb38eeb6… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 3d50c6b0b7..f6715556a3 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -89,6 +89,8 @@ static int check_all_branches = 1; int _perm_max_subnets = 512; +int _perm_load_backends = 0xFFFF; + /* * Convert the name of the files into table index */ @@ -178,6 +180,7 @@ static param_export_t params[] = { {"mask_col", PARAM_STR, &mask_col }, {"port_col", PARAM_STR, &port_col }, {"max_subnets", PARAM_INT, &_perm_max_subnets }, + {"load_backends", PARAM_INT, &_perm_load_backends }, {0, 0, 0} }; @@ -576,33 +579,42 @@ static int double_fixup(void** param, int param_no) */ static int mod_init(void) { - if(permissions_init_rpc()!=0) - { - LM_ERR("failed to register RPC commands\n"); + if(_perm_load_backends==0) { + LM_ERR("failure - no backend to be loaded\n"); return -1; } - allow[0].filename = get_pathname(default_allow_file); - allow[0].rules = parse_config_file(allow[0].filename); - if (allow[0].rules) { - LM_DBG("default allow file (%s) parsed\n", allow[0].filename); - } else { - LM_INFO("default allow file (%s) not found => empty rule set\n", - allow[0].filename); + if(permissions_init_rpc()!=0) { + LM_ERR("failed to register RPC commands\n"); + return -1; } - deny[0].filename = get_pathname(default_deny_file); - deny[0].rules = parse_config_file(deny[0].filename); - if (deny[0].rules) { - LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + if(_perm_load_backends&PERM_LOAD_ALLOWFILE) { + allow[0].filename = get_pathname(default_allow_file); + allow[0].rules = parse_config_file(allow[0].filename); + if (allow[0].rules) { + LM_DBG("default allow file (%s) parsed\n", allow[0].filename); + } else { + LM_INFO("default allow file (%s) not found => empty rule set\n", + allow[0].filename); + } } else { - LM_INFO("default deny file (%s) not found => empty rule set\n", - deny[0].filename); + allow[0].filename = NULL; + allow[0].rules = NULL; } - if (init_trusted() != 0) { - LM_ERR("failed to initialize the allow_trusted function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_DENYFILE) { + deny[0].filename = get_pathname(default_deny_file); + deny[0].rules = parse_config_file(deny[0].filename); + if (deny[0].rules) { + LM_DBG("default deny file (%s) parsed\n", deny[0].filename); + } else { + LM_INFO("default deny file (%s) not found => empty rule set\n", + deny[0].filename); + } + } else { + deny[0].filename = NULL; + deny[0].rules = NULL; } if (init_tag_avp(&tag_avp_param) < 0) { @@ -610,9 +622,18 @@ static int mod_init(void) return -1; } - if (init_addresses() != 0) { - LM_ERR("failed to initialize the allow_address function\n"); - return -1; + if(_perm_load_backends&PERM_LOAD_TRUSTEDDB) { + if (init_trusted() != 0) { + LM_ERR("failed to initialize the allow_trusted function\n"); + return -1; + } + } + + if(_perm_load_backends&PERM_LOAD_ADDRESSDB) { + if (init_addresses() != 0) { + LM_ERR("failed to initialize the allow_address function\n"); + return -1; + } } if ((db_mode != DISABLE_CACHE) && (db_mode != ENABLE_CACHE)) { diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 1613652ee6..bec8a7c236 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,12 @@ extern str mask_col; /* Name of mask column */ extern str port_col; /* Name of port column */ extern int peer_tag_mode; /* Matching mode */ +/* backends to be loaded */ +#define PERM_LOAD_ADDRESSDB (1<<0) +#define PERM_LOAD_TRUSTEDDB (1<<1) +#define PERM_LOAD_ALLOWFILE (1<<2) +#define PERM_LOAD_DENYFILE (1<<3) +extern int _perm_load_backends; /* */ typedef struct int_or_pvar { unsigned int i;

7 years, 5 months

git:master:e703b10c: keepalive: removed duplicated typedef definition

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e703b10cab467a0bd2a147fe63177a29310ece81 URL: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:33:47+02:00 keepalive: removed duplicated typedef definition --- Modified: src/modules/keepalive/api.h --- Diff: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… Patch: https://github.com/kamailio/kamailio/commit/e703b10cab467a0bd2a147fe63177a2… --- diff --git a/src/modules/keepalive/api.h b/src/modules/keepalive/api.h index 020989b4ce..33b7db135b 100644 --- a/src/modules/keepalive/api.h +++ b/src/modules/keepalive/api.h @@ -29,6 +29,7 @@ #define __KEEPALIVE_API_H_ #include "../../core/sr_module.h" +#include "keepalive.h" typedef int ka_state; @@ -36,7 +37,6 @@ typedef int ka_state; #define KA_STATE_UP 1 #define KA_STATE_DOWN 2 -typedef void (*ka_statechanged_f)(str *uri, int state, void *user_attr); typedef int (*ka_add_dest_f)(str *uri, str *owner, int flags, ka_statechanged_f callback, void *user_attr); typedef ka_state (*ka_dest_state_f)(str *uri); @@ -70,4 +70,4 @@ static inline int keepalive_load_api(keepalive_api_t *api) return 0; } -#endif /* __KEEPALIVE_API_H__ */ \ No newline at end of file +#endif /* __KEEPALIVE_API_H__ */

7 years, 5 months

git:master:6ad1744f: modules: readme files regenerated - permissions ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 6ad1744f13d8ceda7463024e6df37a7d229bc4cc URL: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-29T09:31:37+02:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7… Patch: https://github.com/kamailio/kamailio/commit/6ad1744f13d8ceda7463024e6df37a7…

7 years, 5 months

git:master:64c529d1: permissions: documented load_backends parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 64c529d15262921bed26f7f4b15af043382bba36 URL: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-29T09:27:33+02:00 permissions: documented load_backends parameter --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… Patch: https://github.com/kamailio/kamailio/commit/64c529d15262921bed26f7f4b15af04… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index 6579b7dfb1..315a70c832 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -792,6 +792,30 @@ modparam("permissions", "max_subnets", 1024) </programlisting> </example> </section> + <section id ="permissions.p.load_backends"> + <title><varname>load_backends</varname> (int)</title> + <para> + Control what backends should be loaded: 1 - address table; + 2 - trusted table; 4 - allow file; 8 - deny file. + </para> + <para> + It can be a combination (sum) of the options to load many backends + (e.g., 3 - loads address and trusted tables). + </para> + <para> + <emphasis> + Default value is <quote>0xffff</quote> (load all backends). + </emphasis> + </para> + <example> + <title>Set <varname>load_backends</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "load_backends", 1) +... +</programlisting> + </example> + </section> </section> <section>

7 years, 5 months

[kamailio/kamailio] radius : Fixes use of freeradiusclient library (#1170)

by Yasin CANER

Fixes use of freeradiusclient library for radius modules. Setting right path. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1170 -- Commit Summary -- * radius : Fixes freeradiusclient library -- File Changes -- M src/modules/misc_radius/radius.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1170.patch https://github.com/kamailio/kamailio/pull/1170.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/1170

7 years, 5 months

[kamailio/kamailio] jansson: can't extract values from string-only json array (#1171)

by Sebastian Damm

### Description I have a json string stored in a variable, and I want to iterate over the values in it. This works if there are integer values in the json string. But if it consists only of string values, jansson_get throws an error. According to jsonlint, all my json strings are valid. ### Troubleshooting #### Reproduction This is the part of kamailio.cfg leading to the error: ``` # Integer json array $var(myIntList) = '[2,3,4,5]'; xlog("L_INFO", "Integer json string is >>>> $var(myIntList) <<<<"); jansson_get('[0]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "First Int Element: >> $var(intValue) <<"); jansson_get('[1]', $var(myIntList), "$var(intValue)"); xlog("L_INFO", "Second Int Element: >> $var(intValue) <<"); # String json array $var(myStringList) = '["foo", "bar", "baz"]'; xlog("L_INFO", "String json string is >>>> $var(myStringList) <<<<"); jansson_get('[0]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "First Str Element: >> $var(strValue) <<"); jansson_get('[1]', $var(myStrList), "$var(strValue)"); xlog("L_INFO", "Second Str Element: >> $var(strValue) <<"); # Mixed json array $var(myMixedList) = '[2, "bar"]'; xlog("L_INFO", "Mixed json string (int first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); $var(myMixedList) = '["bar", 2]'; xlog("L_INFO", "Mixed json string (string first) is >>>> $var(myMixedList) <<<<"); jansson_get('[0]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "First Mixed Element: >> $var(mixedValue) <<"); jansson_get('[1]', $var(myMixedList), "$var(mixedValue)"); xlog("L_INFO", "Second Mixed Element: >> $var(mixedValue) <<"); ``` #### Log Messages This is the output generated by the above kamailio.cfg snippet. ``` Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Integer json string is >>>> [2,3,4,5] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Int Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Int Element: >> 3 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: String json string is >>>> ["foo", "bar", "baz"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:59]: janssonmod_get(): failed to parse: 0 Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: ERROR: jansson [jansson_funcs.c:61]: janssonmod_get(): json error at line 1: '[' or '{' expected near '0' Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Str Element: >> 0 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (int first) is >>>> [2, "bar"] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> 2 << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Mixed json string (string first) is >>>> ["bar", 2] <<<< Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: First Mixed Element: >> bar << Jun 28 15:31:12 busch /usr/sbin/kamailio[29961]: INFO: <script>: Second Mixed Element: >> 2 << ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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_LISTEN 16, 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 4.9.2 ``` * **Operating System**: Debian Jessie ``` Linux busch.domain 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u1 (2017-02-22) 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/1171

7 years, 5 months

Re: [sr-dev] [kamailio/kamailio] kamctl: added DBPORT option (18e3327)

by Joseph F. Berghof III

When DBENGINE=PGSQL and DBPORT is set in kamctlrc the DBHOST is used instead of DBPORT (typo in utils/kamctl/kamdbctl.pgsql lines 58-59) when issuing the 'psql' command. This introduces a bug that appears to be fixed in the master branch. -- 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/commit/18e3327bedc1647a5abe0d377b15b74…

7 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017