sr-dev December 2021

sr-dev@lists.kamailio.org

11 participants
270 discussions

git:5.5:d06fbbea: misc/examples: kemi - sanity check for response in lua script

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d06fbbea95b33934d841f37bff6ae2b32dde2f87 URL: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:55+01:00 misc/examples: kemi - sanity check for response in lua script (cherry picked from commit 96ba8bdf87221c985d8198fe36f7f0bd9858a738) --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… Patch: https://github.com/kamailio/kamailio/commit/d06fbbea95b33934d841f37bff6ae2b… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index bddabbaa89..a406b6429c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -195,7 +195,7 @@ function ksr_route_reqinit() end if KSR.sanity.sanity_check(1511, 7)<0 then - KSR.err("Malformed SIP message from " + KSR.err("malformed SIP message from " .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); KSR.x.exit(); end @@ -418,6 +418,11 @@ end -- SIP response handling -- equivalent of reply_route{} function ksr_reply_route() - KSR.info("===== response - from kamailio lua script\n"); + KSR.dbg("response - from kamailio lua script\n"); + if KSR.sanity.sanity_check(17604, 6)<0 then + KSR.err("malformed SIP response from " + .. KSR.kx.get_srcip() .. ":" .. KSR.kx.get_srcport() .."\n"); + KSR.x.drop(); + end return 1; end

2 years, 11 months

git:5.5:a2446f51: core: parser - clang format for parse_identityinfo.c

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: a2446f5194446ab9432aecde99522e709ecdc1e3 URL: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:32+01:00 core: parser - clang format for parse_identityinfo.c (cherry picked from commit 1cd480dfe6f2e06bac99b74e466e0c6bb8801279) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7… Patch: https://github.com/kamailio/kamailio/commit/a2446f5194446ab9432aecde99522e7…

2 years, 11 months

git:5.5:e1fb93fa: tls: docs - added note about --atexit=no cli param for newer libssl versions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: e1fb93fa9e3b79f043fd6b7379a61340ba93e071 URL: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:31:02+01:00 tls: docs - added note about --atexit=no cli param for newer libssl versions (cherry picked from commit 8dc18cab5bc32c1d34a9113242d230b7458d4075) --- Modified: src/modules/tls/doc/tls.xml --- Diff: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… Patch: https://github.com/kamailio/kamailio/commit/e1fb93fa9e3b79f043fd6b7379a6134… --- diff --git a/src/modules/tls/doc/tls.xml b/src/modules/tls/doc/tls.xml index b5ea415ae7..e356d5bff7 100644 --- a/src/modules/tls/doc/tls.xml +++ b/src/modules/tls/doc/tls.xml @@ -64,6 +64,15 @@ that uses libssl (OpenSSL library). A safe option is to have the tls module loaded first (be in the first "loadmodule" in &kamailio;.cfg). </para> + <para> + IMPORTANT: using this module compiled with newer versions of libssl + (e.g., v1.1+) may require &kamailio; to be started with + <emphasis>--atexit=no</emphasis> command line parameters to avoid + calling C atexit callbacks inside the process ending during + daemonize procedure as well as during shut down, which can lead + to crashes because it destroys and then accesses shared memory. For + example, such case has been reported for Ubuntu 20.04 or RedHat 8. + </para> </section> <section id="tls.quick_start"> <title>Quick Start</title>

2 years, 11 months

git:5.5:17bbfe97: Makefile.defs: use sed instead of awk for detecting glibc version

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 17bbfe97179a2965b145b946b76ba458c2af8bd5 URL: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:33+01:00 Makefile.defs: use sed instead of awk for detecting glibc version (cherry picked from commit 225a59475c91e154ce0a7f0ec252be841a5a8ce5) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… Patch: https://github.com/kamailio/kamailio/commit/17bbfe97179a2965b145b946b76ba45… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index ab3d6b7e27..3793705039 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -1888,7 +1888,7 @@ ifeq ($(OS), linux) endif ifeq ($(CC_NAME), gcc) # link librt for glibc <= 2.17 - GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' ) + GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' ) ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt) LIBS+=-lrt endif

2 years, 11 months

git:5.5:27875047: presence: info logs instead of error for not maching conditions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 27875047db766cc7cb3a4d5d7638bdafd98e09b1 URL: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:30:08+01:00 presence: info logs instead of error for not maching conditions (cherry picked from commit f42b6c5cf2ee9861cb1eed016a5ddcc499d2b854) --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… Patch: https://github.com/kamailio/kamailio/commit/27875047db766cc7cb3a4d5d7638bda… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a7629a4e92..0ba00f0197 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1369,10 +1369,10 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, send_412: if(!ruid) { - LM_ERR("No E_Tag match %*s\n", presentity->etag.len, + LM_INFO("No E-Tag match %*s\n", presentity->etag.len, presentity->etag.s); } else { - LM_ERR("No ruid match %*s\n", ruid->len, ruid->s); + LM_INFO("No ruid match %*s\n", ruid->len, ruid->s); } if(msg != NULL) {

2 years, 11 months

git:5.5:d7c030f5: core: parser/sdp - check for delimiter size done before comparison

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: d7c030f576fa87b5959b7156c6b2077d76bb1fee URL: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:59+01:00 core: parser/sdp - check for delimiter size done before comparison (cherry picked from commit b83810eb1eb70f326698db874a1f67cf6a8d06cf) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… Patch: https://github.com/kamailio/kamailio/commit/d7c030f576fa87b5959b7156c6b2077… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 144d63b537..c62a347ddc 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -794,12 +794,12 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) return NULL; /* We matched '--', * now let's match the boundary delimiter */ + if(cp1+2+delimiter.len >= plimit) + return NULL; if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) break; else cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; } if (cp1[-1] == '\n' || cp1[-1] == '\r') return cp1;

2 years, 11 months

git:5.5:4b9987bd: core: parser/sdp - coherent indentation of two functions

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 4b9987bd630d78aa27ea392491989ddfeeda0d98 URL: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:49+01:00 core: parser/sdp - coherent indentation of two functions (cherry picked from commit 1b5756ae9f67c3907c134eb725f19c875cccd913) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… Patch: https://github.com/kamailio/kamailio/commit/4b9987bd630d78aa27ea392491989dd… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index e118b4ac33..144d63b537 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -742,7 +742,7 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) } /* eliminate leading whitespace */ - tmp=eat_lws_end(tmp, end); + tmp=eat_lws_end(tmp, end); if (tmp>=end) { LM_ERR("hf empty\n"); goto error; @@ -781,32 +781,32 @@ char* get_sdp_hdr_field(char* buf, char* end, struct hdr_field* hdr) char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) { - static char delimiterhead[3] = "--"; - char *cp, *cp1; - /* Iterate through body */ - cp = p; - for (;;) { - if (cp >= plimit) - return NULL; - for(;;) { - cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); - if (cp1 == NULL) - return NULL; - /* We matched '--', - * now let's match the boundary delimiter */ - if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) - break; - else - cp = cp1 + 2 + delimiter.len; - if (cp >= plimit) - return NULL; - } - if (cp1[-1] == '\n' || cp1[-1] == '\r') - return cp1; - if (plimit - cp1 < 2 + delimiter.len) - return NULL; - cp = cp1 + 2 + delimiter.len; - } + static char delimiterhead[3] = "--"; + char *cp, *cp1; + /* Iterate through body */ + cp = p; + for (;;) { + if (cp >= plimit) + return NULL; + for(;;) { + cp1 = ser_memmem(cp, delimiterhead, plimit-cp, 2); + if (cp1 == NULL) + return NULL; + /* We matched '--', + * now let's match the boundary delimiter */ + if (strncmp(cp1+2, delimiter.s, delimiter.len) == 0) + break; + else + cp = cp1 + 2 + delimiter.len; + if (cp >= plimit) + return NULL; + } + if (cp1[-1] == '\n' || cp1[-1] == '\r') + return cp1; + if (plimit - cp1 < 2 + delimiter.len) + return NULL; + cp = cp1 + 2 + delimiter.len; + } } @@ -815,10 +815,10 @@ char *find_sdp_line_delimiter(char* p, char* plimit, str delimiter) */ char *find_next_sdp_line_delimiter(char* p, char* plimit, str delimiter, char* defptr) { - char *t; - if (p >= plimit || plimit - p < 3) - return defptr; - t = find_sdp_line_delimiter(p + 2, plimit, delimiter); - return t ? t : defptr; + char *t; + if (p >= plimit || plimit - p < 3) + return defptr; + t = find_sdp_line_delimiter(p + 2, plimit, delimiter); + return t ? t : defptr; }

2 years, 11 months

git:5.5:f387209c: core: parser/sdp - cast to unsigned for left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: f387209ca7efd65a1fd7ee510d899fec6e080289 URL: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:28+01:00 core: parser/sdp - cast to unsigned for left shifting (cherry picked from commit c1ec3857f360c806b7cc856b8e6ae3d5362ef49f) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… Patch: https://github.com/kamailio/kamailio/commit/f387209ca7efd65a1fd7ee510d899fe… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 8f189cf207..e118b4ac33 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -52,7 +52,10 @@ static struct { #define READ(val) \ - (*(val + 0) + (*(val + 1) << 8) + (*(val + 2) << 16) + (*(val + 3) << 24)) + ((unsigned int)(*(val + 0)) \ + + ((unsigned int)(*(val + 1)) << 8) \ + + ((unsigned int)(*(val + 2)) << 16) \ + + ((unsigned int)(*(val + 3)) << 24)) #define advance(_ptr,_n,_str,_error) \ do{\ if ((_ptr)+(_n)>(_str).s+(_str).len)\

2 years, 11 months

git:5.5:dc5eda21: core: parser - print start of buffer on error for identity info

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: dc5eda219c152d1c08ba38849163849f62242b2d URL: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:29:16+01:00 core: parser - print start of buffer on error for identity info (cherry picked from commit 48dc90dfa1839a405e7d090b23c1fdc907107731) --- Modified: src/core/parser/parse_identityinfo.c --- Diff: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… Patch: https://github.com/kamailio/kamailio/commit/dc5eda219c152d1c08ba38849163849… --- diff --git a/src/core/parser/parse_identityinfo.c b/src/core/parser/parse_identityinfo.c index e58bcd26ff..6aaabf2377 100644 --- a/src/core/parser/parse_identityinfo.c +++ b/src/core/parser/parse_identityinfo.c @@ -313,7 +313,7 @@ void parse_identityinfo(char *buffer, char *end, struct identityinfo_body *ii_b) parseerror: if(p<end) { LM_ERR("unexpected char [%c] in status %d: <<%.*s>> .\n", - *p, status, (int)(p-buffer), ZSW(p)); + *p, status, (int)(p-buffer), buffer); } else { LM_ERR("unexpected end of buffer - status %d\n", status); }

2 years, 11 months

git:5.5:88b50be1: websockets: enable KEEPALIVE_MECHANISM_CONCHECK

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 88b50be127ca0dab57784e0ffb96d6eb44196772 URL: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-12-16T08:28:55+01:00 websockets: enable KEEPALIVE_MECHANISM_CONCHECK KEEPALIVE_MECHANISM_CONCHECK was added but can't be enabled (cherry picked from commit 29c3b865d8efde8435c2217df44d1df684caaea2) --- Modified: src/modules/websocket/websocket.c --- Diff: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… Patch: https://github.com/kamailio/kamailio/commit/88b50be127ca0dab57784e0ffb96d6e… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 5cef5d6b1a..f7273048e3 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -221,6 +221,7 @@ static int mod_init(void) switch(ws_keepalive_mechanism) { case KEEPALIVE_MECHANISM_PING: case KEEPALIVE_MECHANISM_PONG: + case KEEPALIVE_MECHANISM_CONCHECK: break; default: ws_keepalive_mechanism = DEFAULT_KEEPALIVE_MECHANISM;

2 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2021