sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:33392275: src/lib/srdb1/schema: renaming userblacklist to userblocklist

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 333922750e71af0af21db741de440a25443083e2 URL: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a2… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-11-06T19:04:54+02:00 src/lib/srdb1/schema: renaming userblacklist to userblocklist --- Added: src/lib/srdb1/schema/globalblocklist.xml Added: src/lib/srdb1/schema/kamailio-userblocklist.xml Added: src/lib/srdb1/schema/userblocklist.xml Removed: src/lib/srdb1/schema/globalblacklist.xml Removed: src/lib/srdb1/schema/kamailio-userblacklist.xml Removed: src/lib/srdb1/schema/userblacklist.xml --- Diff: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a2… Patch: https://github.com/kamailio/kamailio/commit/333922750e71af0af21db741de440a2… --- diff --git a/src/lib/srdb1/schema/globalblacklist.xml b/src/lib/srdb1/schema/globalblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/globalblacklist.xml rename to src/lib/srdb1/schema/globalblocklist.xml diff --git a/src/lib/srdb1/schema/kamailio-userblacklist.xml b/src/lib/srdb1/schema/kamailio-userblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/kamailio-userblacklist.xml rename to src/lib/srdb1/schema/kamailio-userblocklist.xml diff --git a/src/lib/srdb1/schema/userblacklist.xml b/src/lib/srdb1/schema/userblocklist.xml similarity index 100% rename from src/lib/srdb1/schema/userblacklist.xml rename to src/lib/srdb1/schema/userblocklist.xml

4 years

git:master:15dd032c: userblocklist: renaming userblacklist module

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 15dd032c7cd4d3029aa9e0100a3d52e24ab9c2ae URL: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2020-11-06T18:13:30+02:00 userblocklist: renaming userblacklist module --- Added: src/modules/userblocklist/Makefile Added: src/modules/userblocklist/README Added: src/modules/userblocklist/db.c Added: src/modules/userblocklist/db.h Added: src/modules/userblocklist/db_userblocklist.c Added: src/modules/userblocklist/db_userblocklist.h Added: src/modules/userblocklist/doc/Makefile Added: src/modules/userblocklist/doc/userblocklist.xml Added: src/modules/userblocklist/doc/userblocklist_admin.xml Added: src/modules/userblocklist/userblocklist.c Modified: src/Makefile.groups Removed: src/modules/userblacklist/Makefile Removed: src/modules/userblacklist/README Removed: src/modules/userblacklist/db.c Removed: src/modules/userblacklist/db.h Removed: src/modules/userblacklist/db_userblacklist.c Removed: src/modules/userblacklist/db_userblacklist.h Removed: src/modules/userblacklist/doc/Makefile Removed: src/modules/userblacklist/doc/userblacklist.xml Removed: src/modules/userblacklist/doc/userblacklist_admin.xml Removed: src/modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e… Patch: https://github.com/kamailio/kamailio/commit/15dd032c7cd4d3029aa9e0100a3d52e…

4 years

git:master:1896db2b: core: switch on cfg print mode also on #!SERi, #!MAXCOMPAT and #!ALL

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1896db2b44c967066d973f760c7342621a837db9 URL: https://github.com/kamailio/kamailio/commit/1896db2b44c967066d973f760c73426… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T14:14:39+01:00 core: switch on cfg print mode also on #!SERi, #!MAXCOMPAT and #!ALL --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/1896db2b44c967066d973f760c73426… Patch: https://github.com/kamailio/kamailio/commit/1896db2b44c967066d973f760c73426… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 3a863b46e5..76f4ba0491 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1265,6 +1265,10 @@ IMPORTFILE "import_file" <COMMENT>.|{EAT_ABLE}|{CR} { count(); }; <INITIAL>{COM_LINE}!{SER_CFG}{CR} { count(); + if(ksr_cfg_print_mode == 1) { + printf("%s", yytext); + BEGIN(CFGPRINTMODE); + } sr_cfg_compat=SR_COMPAT_SER;} <INITIAL>{COM_LINE}!{KAMAILIO_CFG}{CR} { count(); if(ksr_cfg_print_mode == 1) { @@ -1273,7 +1277,11 @@ IMPORTFILE "import_file" } sr_cfg_compat=SR_COMPAT_KAMAILIO;} <INITIAL>{COM_LINE}!{MAXCOMPAT_CFG}{CR} { count(); - sr_cfg_compat=SR_COMPAT_MAX;} + if(ksr_cfg_print_mode == 1) { + printf("%s", yytext); + BEGIN(CFGPRINTMODE); + } + sr_cfg_compat=SR_COMPAT_MAX;} <INITIAL>{PREP_START}{DEFINE}{EAT_ABLE}+ { count(); pp_define_set_type(0); state = DEFINE_S; BEGIN(DEFINE_ID); }

4 years

git:master:e5a723df: core: added --cfg-print to help message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e5a723dfb0f38b0871d4fe624d57dbaa90e3b3bb URL: https://github.com/kamailio/kamailio/commit/e5a723dfb0f38b0871d4fe624d57dba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T12:36:23+01:00 core: added --cfg-print to help message --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/e5a723dfb0f38b0871d4fe624d57dba… Patch: https://github.com/kamailio/kamailio/commit/e5a723dfb0f38b0871d4fe624d57dba… --- diff --git a/src/main.c b/src/main.c index 722ad6c33b..0917561a4a 100644 --- a/src/main.c +++ b/src/main.c @@ -169,6 +169,7 @@ Options:\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ + --cfg-print Print configuration file evaluating includes and ifdefs\n\ -d Debugging level control (multiple -d to increase the level from 0)\n\ --debug=val Debugging level value\n\ -D Control how daemonize is done:\n\

4 years

git:master:62ac640b: core: new command line parameter --cfg-print

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 62ac640b113103648d6d8f9028f15be66b775fa0 URL: https://github.com/kamailio/kamailio/commit/62ac640b113103648d6d8f9028f15be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-10T12:29:16+01:00 core: new command line parameter --cfg-print - print the config file by evaluating include_file, import_file, ifdef and ifndef preprocessor directive - define and subst (and the variants) tokens are not replaced --- Modified: src/core/cfg.lex Modified: src/core/globals.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/62ac640b113103648d6d8f9028f15be… Patch: https://github.com/kamailio/kamailio/commit/62ac640b113103648d6d8f9028f15be…

4 years

[kamailio/kamailio] auth_radius + freeradius-client error (#2496)

by Paris

### Description I've been trying to setup kamailio with the latest freeradius-client. I've been using the docker image `kamailio/kamailio:5.3.1-jessie` adding the freeradius-client (latest github pool). However it seems that kamailio cannot create a proper radius request and fails with error `3(9) ERROR: auth_radius [sterman.c:264]: radius_authorize_sterman(): unable to add User-Name attribute` ### Troubleshooting #### Reproduction Install freeradius-client ``` git clone https://github.com/FreeRADIUS/freeradius-client.git \ && cd freeradius-client/ \ && ./configure \ && make \ && make install ``` Modify the `/usr/local/etc/radiusclient/dictionary` and append the following lines ``` $INCLUDE /etc/radiusclient/dictionary.sip $INCLUDE /etc/radiusclient/dictionary.kamailio # https://github.com/kamailio/kamailio/blob/master/src/modules/auth_radius/cf… ``` Configure auth_radius ``` loadmodule "auth_radius.so" loadmodule "misc_radius.so" modparam("auth_radius|misc_radius", "radius_config", "/usr/local/etc/radiusclient/radiusclient.conf") ``` #### Debugging Data I've went on the tried to debug the issue from the freeradius-client's point of view since it was easier to compile and iterate, and I've added various logs here and there to try and figure out what was wrong. From what I've seen, kamailio invokes `INIT_AV` to setup the `attrs` dictionary containing the dictionary attributes and matching values. https://github.com/kamailio/kamailio/blob/360e012d9d93c80b62b6e75bfac6e3340… I've traced the `rc_dict_findattr` and it seems that the library properly returns `User-Name` attribute with value `1`. However in the `radius_authorize_sterman` function https://github.com/kamailio/kamailio/blob/360e012d9d93c80b62b6e75bfac6e3340… the application tries to add the AVPs by invoking `rc_avpair_add` and passing `attr[...].v` value. I've logged the `rc_avpair_add` parameters passed and it seems that `attr[...].v` is not 1 as expected but 0, thus failing since 0 is an invalid attribute code. I modified freeradius-client to replace `attrid` with 1 if it were a 0 as a test, and it seems that all calls to `rc_avpair_add` by sterman.c are passing 0 as attribute value leading to a radius message like: ``` (0) User-Name = "test@localhost" (0) User-Name = "test" (0) User-Name = "localhost" (0) User-Name = "X3q5AV96t9WlJ5ZnoFFQQq/ftg7u+Mx5KRxYYIA=" (0) User-Name = "sip:localhost" (0) User-Name = "REGISTER" (0) User-Name = "bc6c2152d2e068e16f76188d69e66340" (0) User-Name = "\017" (0) User-Name = "test" (0) NAS-Port = 5060 (0) NAS-IP-Address = 10.10.10.4 ``` (As you can see pretty much all attributes are replaced by User-Name) It looks like `attrs` dictionary although initialized at `mod_init`, at a later stage is somehow corrupted or reset. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, 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 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 4.9.2 ``` * **Operating System**:  ``` Linux bea2be591c38 4.19.76-linuxkit #1 SMP Tue May 26 11:42:35 UTC 2020 x86_64 GNU/Linux ``` This is tested on a docker installation using `kamailio/kamailio:5.3.1-jessie` -- 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/2496

4 years

git:5.4:4b5f5636: crypto: properly initialize key and iv to 0, add comment regarding the size of IV

by Henning Westerholt

Module: kamailio Branch: 5.4 Commit: 4b5f5636143037ff6620b88e03e57c05a91eabc4 URL: https://github.com/kamailio/kamailio/commit/4b5f5636143037ff6620b88e03e57c0… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-09T12:53:36Z crypto: properly initialize key and iv to 0, add comment regarding the size of IV - properly initialize key and iv to 0, otherwise invalid data might be printed - the initialization vector for AES will be always AES blocksize, e.g. 128 bits (cherry picked from commit e9624bc4823cfba0bd9536a70b9eeadecb2a537e) --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/4b5f5636143037ff6620b88e03e57c0… Patch: https://github.com/kamailio/kamailio/commit/4b5f5636143037ff6620b88e03e57c0… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 8b80d62a29..f9aacf5410 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -76,7 +76,9 @@ int crypto_aes_init(unsigned char *key_data, int key_data_len, { int i, nrounds = 5; int x; - unsigned char key[32], iv[32]; + unsigned char key[32], iv[32]; /* IV is only 16 bytes, but makes it easier */ + memset(key, 0, sizeof(key)); + memset(iv, 0, sizeof(iv)); /* * Gen key & IV for AES 256 CBC mode. A SHA1 digest is used to hash

4 years

git:master:e9624bc4: crypto: properly initialize key and iv to 0, add comment regarding the size of IV

by Henning Westerholt

Module: kamailio Branch: master Commit: e9624bc4823cfba0bd9536a70b9eeadecb2a537e URL: https://github.com/kamailio/kamailio/commit/e9624bc4823cfba0bd9536a70b9eead… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-11-09T12:52:07Z crypto: properly initialize key and iv to 0, add comment regarding the size of IV - properly initialize key and iv to 0, otherwise invalid data might be printed - the initialization vector for AES will be always AES blocksize, e.g. 128 bits --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/e9624bc4823cfba0bd9536a70b9eead… Patch: https://github.com/kamailio/kamailio/commit/e9624bc4823cfba0bd9536a70b9eead… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 8b80d62a29..f9aacf5410 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -76,7 +76,9 @@ int crypto_aes_init(unsigned char *key_data, int key_data_len, { int i, nrounds = 5; int x; - unsigned char key[32], iv[32]; + unsigned char key[32], iv[32]; /* IV is only 16 bytes, but makes it easier */ + memset(key, 0, sizeof(key)); + memset(iv, 0, sizeof(iv)); /* * Gen key & IV for AES 256 CBC mode. A SHA1 digest is used to hash

4 years

git:master:4bb099b0: sctp: memcpy field data to avoid unaligned access warning

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4bb099b046939b85e1827b804167a51ef4bc00c4 URL: https://github.com/kamailio/kamailio/commit/4bb099b046939b85e1827b804167a51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-09T13:10:43+01:00 sctp: memcpy field data to avoid unaligned access warning - GH #2543 --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4bb099b046939b85e1827b804167a51… Patch: https://github.com/kamailio/kamailio/commit/4bb099b046939b85e1827b804167a51… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index d58c96fad6..3bc0c6a4e4 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -2258,6 +2258,7 @@ static int sctp_handle_notification(struct socket_info *si, { union sctp_notification *snp; char su_buf[SU2A_MAX_STR_SIZE]; + struct sockaddr_storage sa_storage; #define SNOT DBG #define ERR_LEN_TOO_SMALL(length, val, bind_addr, from_su, text) \ @@ -2311,8 +2312,9 @@ static int sctp_handle_notification(struct socket_info *si, sctp_paddr_change_state2s(snp->sn_paddr_change.spc_state), snp->sn_paddr_change.spc_state, &snp->sn_paddr_change.spc_aaddr); - strcpy(su_buf, su2a((union sockaddr_union *)&snp->sn_paddr_change - .spc_aaddr, + memcpy(&sa_storage, &snp->sn_paddr_change.spc_aaddr, + sizeof(snp->sn_paddr_change.spc_aaddr)); + strcpy(su_buf, su2a((union sockaddr_union *)&sa_storage, sizeof(snp->sn_paddr_change.spc_aaddr))); SNOT("sctp notification from %s on %.*s:%d: SCTP_PEER_ADDR_CHANGE" ": %s: %s: assoc_id %d \n",

4 years

git:master:8f30c75c: http_async_client: include poll.h instead sys/poll.h

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8f30c75cff7787a39f7c934e00e933b1beb43c20 URL: https://github.com/kamailio/kamailio/commit/8f30c75cff7787a39f7c934e00e933b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-09T12:31:24+01:00 http_async_client: include poll.h instead sys/poll.h - according to POSIX specs - GH #2543 --- Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/8f30c75cff7787a39f7c934e00e933b… Patch: https://github.com/kamailio/kamailio/commit/8f30c75cff7787a39f7c934e00e933b… --- diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index c830daa9b1..10070eb6bd 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -37,7 +37,7 @@ #include <sys/time.h> #include <time.h> #include <unistd.h> -#include <sys/poll.h> +#include <poll.h> #include <curl/curl.h> #include <event2/event.h> #include <fcntl.h>

4 years

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020