- sr-dev - kamailio.org

git:master:162c1d8f: tlsa: Makefile - comment to set lib path to installation folder
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 162c1d8f1d3522fa937bc1869fe65ad87d4e3680 URL: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T09:59:40+02:00 tlsa: Makefile - comment to set lib path to installation folder - GH #2815 --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Patch: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index eb01df99aa..9295898aad 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -12,6 +12,8 @@ NAME=tlsa.so LIBSSL_STATIC_SRCLIB ?= no # set to the path of the folder with static libraries compiled from source LIBSSL_STATIC_SRCPATH ?= /usr/local/src/openssl +# or set to the path where the static libraries are installed, for example: +# LIBSSL_STATIC_SRCPATH ?= /usr/lib/x86_64-linux-gnu/ ifeq ($(CROSS_COMPILE),) SSL_BUILDER=$(shell \

1 0

[kamailio/kamailio] TLS module missing from 5.5 Debian repository (#2816)
by Simone de Blasiis 11 Aug '21

11 Aug '21

### Description I've installed Kamailio 5.5 from the Debian 10 repository and added the WITH_TLS flag to default config file but Kamailio refuses to start. Looking at the logs I found out that the tls.so file in the modules folder is missing. I checked the docs and it seems that the package has been compiled with the right flags but I'm no Kamailio expert so I decided to open this issue to have it checked. #### Log Messages ``` kamailio kamailio: ERROR: <core> [core/sr_module.c:504]: ksr_locate_module(): could not find module <tls> in </usr/lib/x86_64-linux-gnu/kamailio/modules> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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 8.3.0 ``` * **Operating System**: ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux kamailio 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) 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/2816

3 3

[kamailio/kamailio] tm: enhance fr/retr timers logging (#2817)
by Maksym Rudenko 10 Aug '21

10 Aug '21

- Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user set values - log when resetting fr/retr timers on provisional replies   #### 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:  - [X] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The main reason for these changes is that we haven't found any possibility to distinguish which of `fr` timeouts expires. The rest of the logs are also helpful, but secondary. As they all are under `ifdef TIMEOUT_DEBUG` I hope it is not a big deal. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2817 -- Commit Summary -- * tm: enhance fr/retr timers logging -- File Changes -- M src/modules/tm/t_lookup.c (6) M src/modules/tm/t_reply.c (3) M src/modules/tm/t_suspend.c (3) M src/modules/tm/timer.c (7) M src/modules/tm/timer.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2817.patch https://github.com/kamailio/kamailio/pull/2817.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/2817

1 1

git:master:28c0e78f: pv: removed unused code in parsing paramlist transformation name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 28c0e78f8f866c971172d0cdc55cfd963a0d29be URL: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:36:00+02:00 pv: removed unused code in parsing paramlist transformation name --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Patch: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 9a9a66bb47..b63ad022f8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3460,8 +3460,6 @@ char* tr_parse_paramlist(str* in, trans_t *t) LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, in->s, name.len, name.s); error: - if(tp) - tr_param_free(tp); if(spec) pv_spec_free(spec); return NULL;

1 0

git:master:52cb53b2: nathelper: better condition for no more params in handle_ruri_alias_mode()
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 52cb53b29a5a624031a7d06504afecca7c25511e URL: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:31:10+02:00 nathelper: better condition for no more params in handle_ruri_alias_mode() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Patch: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bdf1b7777a..bd71eaafc4 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1156,9 +1156,9 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) rest_len = rest_len - ALIAS_LEN; } sep = memchr(rest, 59 /* ; */, rest_len); - if(sep == NULL && start == NULL) { - LM_DBG("no alias param\n"); - return 2; + if(sep == NULL) { + /* no other parameters */ + break; } else { rest_len = rest_len - (sep - rest + 1); rest = sep + 1;

1 0

git:master:0046f35f: pv: added breaks in case of mismatching via var name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 0046f35f37a84afef9999e53c122dafa42876c69 URL: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:11:16+02:00 pv: added breaks in case of mismatching via var name --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Patch: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 44cc551212..352114d259 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(in->s[0]=='i') sp->pvp.pvn.u.isname.name.n = 7; else goto error; + break; case 4: if(strncmp(in->s, "host", 4)==0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4511,6 +4512,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(strncmp(in->s, "protoid", 7)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; + break; case 8: if(strncmp(in->s, "received", 8)==0) sp->pvp.pvn.u.isname.name.n = 6;

1 0

git:master:d4d6fd43: ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details
by GitHub 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: d4d6fd431adb94f591e6035f2fa76eff8f728a8f URL: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-08-10T09:16:17+02:00 ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details --- Modified: .github/ISSUE_TEMPLATE/bug_report.md --- Diff: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Patch: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… --- diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8132d74350..50a94c08bc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -95,7 +95,7 @@ If you found a solution or workaround for the issue, describe it. Ideally, provi  ```

1 0

git:master:4e5c1ddd: textopsx: kemi functions to get body line iterator value
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 4e5c1ddd996d60382fd6a2d549cb18e2a1657b0d URL: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-09T20:54:32+02:00 textopsx: kemi functions to get body line iterator value --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Patch: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8d106a0704..5e62546fcd 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2718,6 +2718,32 @@ static int w_bl_iterator_insert(sip_msg_t *msg, char *piname, char *ptext) return ki_bl_iterator_insert(msg, &iname, &text); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_bl_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_bl_iterator_value(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_bl_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_bl_iterator_index(msg, iname); + if(k<0 || _bl_iterators[k].it.s==NULL || _bl_iterators[k].it.len<=0) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + if(_bl_iterators[k].it.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + _sr_kemi_bl_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_bl_iterator_xval.v.s = _bl_iterators[k].it; + return &_sr_kemi_bl_iterator_xval; +} /** * @@ -3351,6 +3377,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("bl_iterator_value"), + SR_KEMIP_XVAL, ki_bl_iterator_value, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:51a77408: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 51a774089c59a3861063ee4e9b4e21051c2bf192 URL: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-06T09:01:22+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Patch: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e437234139..45b80a85c5 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -131,6 +131,10 @@ modparam("ruxc", "http_tlsmode", 1) (and TLS handshake) when all requests are performed against the same HTTP/S server. + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + Default value is 0 (new connection for each request). Example 1.3. Set http_reuse parameter

1 0

git:master:21b187f5: ruxc: docs for reuse mode 2
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 21b187f57a092f8ed9f51a62786a98c910b1febf URL: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:54:29+02:00 ruxc: docs for reuse mode 2 --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Patch: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e07c05c9f1..794301bc06 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -106,6 +106,11 @@ modparam("ruxc", "http_tlsmode", 1) handshake) when all requests are performed against the same HTTP/S server. </para> <para> + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + </para> + <para> <emphasis> Default value is 0 (new connection for each request). </emphasis>

1 0

git:master:fa728b90: ruxc: Makefile - set local paths for include and libs
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: fa728b906ec2667891fb964e21785b12a68c0173 URL: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:26:29+02:00 ruxc: Makefile - set local paths for include and libs --- Modified: src/modules/ruxc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Patch: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… --- diff --git a/src/modules/ruxc/Makefile b/src/modules/ruxc/Makefile index ae33b008bb..d11e7758e2 100644 --- a/src/modules/ruxc/Makefile +++ b/src/modules/ruxc/Makefile @@ -18,8 +18,8 @@ endif endif ifeq ($(BUILDER),) - DEFS+= -I. - LIBS = -L. -lruxc + DEFS+= -I. -I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS = -L. -L$(LOCALBASE)/lib -lruxc else DEFS+= $(shell pkg-config --cflags libruxc) LIBS = $(shell pkg-config --libs libruxc)

1 0

Usage of /proc/net/tcp
by Helio 04 Aug '21

04 Aug '21

Hello, I noticed that some Kamailio modules use /proc/net/tcp for statistics (ratelimit, pipelimit, snmpstats) but it seems to be deprecated (See https://www.kernel.org/doc/html/latest/networking/proc_net_tcp.html). Is the data from that reliable? My question is because we used the module ratelimit for a long time and after Kernel upgrades it was verified that the network limit is triggering with low traffic. Thanks

1 0

git:master:e3875c01: misc/tools/protoshoot: removed svn id and history
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: e3875c01adf576f179374a926e69e99c0094e5b4 URL: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T14:15:38+02:00 misc/tools/protoshoot: removed svn id and history --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Patch: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

1 0

new master branch compiler warnings (Debian Buster)
by Juha Heinanen 04 Aug '21

04 Aug '21

C (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function 'mod_init': outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'const unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~

2 2

[kamailio/kamailio] outbound: fix compiler warning on SHA1() call (#2812)
by Michael Furmur 04 Aug '21

04 Aug '21

#### 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description explicit types cast to fix compiler warning: https://lists.kamailio.org/pipermail/sr-dev/2021-August/063482.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2812 -- Commit Summary -- * outbound: fix compiler warning on SHA1() call -- File Changes -- M src/modules/outbound/outbound_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2812.patch https://github.com/kamailio/kamailio/pull/2812.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/2812

2 2

git:master:3297e99c: outbound: fix compiler warning on SHA1() call
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: 3297e99c1ed5d3cbd2ada5597ab2a123dce4b44d URL: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T10:35:46+02:00 outbound: fix compiler warning on SHA1() call --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Patch: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index ada7062454..df9538aace 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -109,7 +109,7 @@ static int mod_init(void) if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); - SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); } else { if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) {

1 0

git:master:fc313c17: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: fc313c17e5846ab0e9e594dd50ca156a2bd71534 URL: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-04T09:31:21+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Patch: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index a805644ef1..0712afd04a 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -80,7 +82,9 @@ Daniel-Constantin Mierla 1.24. bl_iterator_end usage 1.25. bl_iterator_next usage 1.26. bl_iterator_rm usage - 1.27. @hf_value select usage + 1.27. bl_iterator_append usage + 1.28. bl_iterator_insert usage + 1.29. @hf_value select usage Chapter 1. Admin Guide @@ -115,6 +119,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -160,6 +166,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 2.1. msg_apply_changes() @@ -653,6 +661,46 @@ bl_iterator_end("b1"); bl_iterator_end("b1"); ... +2.27. bl_iterator_append(iname, text) + + Add text after the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.27. bl_iterator_append usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_append("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + +2.28. bl_iterator_insert(iname, text) + + Add text before the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.28. bl_iterator_insert usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_insert("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + 3. Selects 3.1. @hf_value @@ -688,7 +736,7 @@ bl_iterator_end("b1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.27. @hf_value select usage + Example 1.29. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

git:master:bc25f098: textopsx: bl iterator functions to append/insert text
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: bc25f098cfd0915daf3c086251f9dbe83eecb6c5 URL: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T09:07:36+02:00 textopsx: bl iterator functions to append/insert text --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe… Patch: https://github.com/kamailio/kamailio/commit/bc25f098cfd0915daf3c086251f9dbe…

1 0

[kamailio/kamailio] SDP filtering issues with sdpops module (#2755)
by Alessio Garzi 03 Aug '21

03 Aug '21

In order to filter some specific codes from the SDP I am using this functions from sdpops module - sdp_keep_codecs_by_name() - sdp_remove_codecs_by_name() - sdp_keep_codecs_by_id - sdp_remove_codecs_by_id and since they use the same code for filtering the problem I am going to describe affects all of them. Let's say I have this data inside my SDP ``` ... a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics m=audio 7078 RTP/AVPF 96 97 98 0 8 3 9 18 101 99 100 a=rtpmap:96 opus/48000/2 a=fmtp:96 useinbandfec=1 a=rtpmap:97 speex/16000 a=fmtp:97 vbr=on a=rtpmap:98 speex/8000 a=fmtp:98 vbr=on a=fmtp:18 annexb=yes a=rtpmap:101 telephone-event/48000 a=rtpmap:99 telephone-event/16000 a=rtpmap:100 telephone-event/8000 a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr m=video 9078 RTP/AVPF 96 97 a=rtpmap:96 VP8/90000 a=rtpmap:97 H264/90000 a=fmtp:97 profile-level-id=42801F a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` The sdp_keep_codecs_by_id (and I assume all other analog filter functions) correctly detects 2 SDP sessions, one for the audio and one for the video. Now, let's say we want to allow only PCMA,PCMU,GSM,telephone-event ( id 8,0,3,100,99,101 ), this means for example that 96 and 97 codecs have to be stripped. For this reason the functions sdp_remove_str_codec_id_attrs() and sdp_remove_str_codec_id() are executed passing the correct id we want to filter. The sdp_remove_str_codec_id_attrs() will then remove the corresponding lines from the SDP but ONLY IF relative to rtpmap and fmtp. This means that a=rtcp* lines will not be filtered even if they are relative to a filtered codec and this is not what the user expects. Interestingly the sdp_remove_str_codec_id_attrs() function delete the lines only if there is a match with the sdp_payload_attr linked list. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… This linked list is built at core level and only exposes rtp_payload and fmtp_string as described here. https://github.com/kamailio/kamailio/blob/758c85a09ebb2848d0fd2ee82c48784b8… So, in other words, the sdpops module has no clue of "a=rtcp-fb*" attributes and cannot be implemented to filter them in a neat way. Another issue arises for the "m=video 9078 RTP/AVPF 96 97" line. Here, since we are filtering 96 and 97, the line remains without ids, maybe it would be better to delete the whole line? The final result after applying my filter is the following ``` m=video 23088 RTP/AVPF a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr a=rtcp-fb:96 nack pli a=rtcp-fb:96 nack sli a=rtcp-fb:96 ack rpsi a=rtcp-fb:96 ccm fir a=rtcp-fb:97 nack pli a=rtcp-fb:97 ccm fir ``` -- 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/2755

2 5

git:master:4191a819: core: parser sdp - shorten debug message with sdp line
by Daniel-Constantin Mierla 03 Aug '21

03 Aug '21

Module: kamailio Branch: master Commit: 4191a8193025499df64f13d59f5716563e573161 URL: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-03T08:51:11+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… Patch: https://github.com/kamailio/kamailio/commit/4191a8193025499df64f13d59f57165… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 7dbf259379..d5e4f0695b 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -584,7 +584,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a1p = stream->path.s + stream->path.len; } else { /* unknown a= line, ignore -- jump over it */ - LM_DBG("ignoring unknown type in a= line: `%.*s'\n", tmpstr1.len, tmpstr1.s); + LM_DBG("ignoring unknown type in a= line: `%.*s...'\n", + (tmpstr1.len>20)?20:tmpstr1.len, tmpstr1.s); a1p += 2; }

1 0

git:master:1a15a18e: sdpops: refactored sdp_remove_str_codec_id_attrs()
by Daniel-Constantin Mierla 03 Aug '21

03 Aug '21

Module: kamailio Branch: master Commit: 1a15a18eacd5764e9ba6240acbe37e645368f825 URL: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-03T08:52:19+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… Patch: https://github.com/kamailio/kamailio/commit/1a15a18eacd5764e9ba6240acbe37e6… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index bebe01ba5c..37655fde4b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -195,48 +195,45 @@ int sdp_locate_line(sip_msg_t* msg, char *pos, str *aline) int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, sdp_stream_cell_t* sdp_stream, str *rm_codec) { + str sdp_attrs_list[] = { + str_init("a=rtpmap:"), + str_init("a=fmtp:"), + str_init("a=rtcp-fb:"), + {0, 0} + }; + int i; str aline = {0, 0}; - sdp_payload_attr_t *payload; + str raw_stream = {0, 0}; struct lump *anchor; - payload = sdp_stream->payload_attr; - while (payload) { - LM_DBG("a= ... for codec %.*s/%.*s\n", - payload->rtp_payload.len, payload->rtp_payload.s, - payload->rtp_enc.len, payload->rtp_enc.s); - if(rm_codec->len==payload->rtp_payload.len - && strncmp(payload->rtp_payload.s, rm_codec->s, - rm_codec->len)==0) { - if(payload->rtp_enc.s!=NULL) { - if(sdp_locate_line(msg, payload->rtp_enc.s, &aline)==0) - { - LM_DBG("removing line: %.*s", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; - } - } - } - if(payload->fmtp_string.s!=NULL) { - if(sdp_locate_line(msg, payload->fmtp_string.s, &aline)==0) - { - LM_DBG("removing line: %.*s\n", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; + raw_stream = sdp_stream->raw_stream; + while(raw_stream.len>5) { + sdp_locate_line(msg, raw_stream.s, &aline); + /* process attribute lines: a=x:c... */ + if((aline.len>5) && ((aline.s[0] | 0x20)=='a')) { + LM_DBG("processing sdp line [%.*s]\n", aline.len, aline.s); + for(i=0; sdp_attrs_list[i].s!=NULL; i++) { + if(aline.len > sdp_attrs_list[i].len + rm_codec->len) { + if(strncasecmp(aline.s, sdp_attrs_list[i].s, + sdp_attrs_list[i].len)==0 + && strncmp(aline.s+sdp_attrs_list[i].len, rm_codec->s, + rm_codec->len)==0 + && aline.s[sdp_attrs_list[i].len + rm_codec->len]==' ') { + LM_DBG("removing line: [%.*s]\n", aline.len, aline.s); + anchor = del_lump(msg, aline.s - msg->buf, + aline.len, 0); + if (anchor == NULL) { + LM_ERR("failed to remove - id [%.*s] line [%.*s]\n", + rm_codec->len, rm_codec->s, + aline.len, aline.s); + return -1; + } } } } } - payload=payload->next; + raw_stream.s = aline.s + aline.len; + raw_stream.len -= aline.len; } return 0;

1 0

git:master:921b5cbc: textops: find start of header body for filter functions
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 921b5cbcda4637393af386219cbdf4a0f9b3d3a8 URL: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T16:09:34+02:00 textops: find start of header body for filter functions - GH #2748 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… Patch: https://github.com/kamailio/kamailio/commit/921b5cbcda4637393af386219cbdf4a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index b2ad856cfc..05491ab184 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -1598,7 +1598,7 @@ static inline int find_line_start(char *text, unsigned int text_len, } static inline int find_hdr_line_start(char *hname, unsigned int hname_len, - char **buf, unsigned int *buf_len) + char **buf, unsigned int *buf_len, char **bstart) { hdr_field_t h1; hdr_field_t h2; @@ -1624,11 +1624,11 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, if(h1.type>0 && h1.type==h2.type) { *buf = start; *buf_len = len; - return 1; - } else if(cmp_hdrname_str(&h1.name, &h2.name)==0) { + goto found; + } else if(cmpi_str(&h1.name, &h2.name)==0) { *buf = start; *buf_len = len; - return 1; + goto found; } } /* jump to next line */ @@ -1645,6 +1645,21 @@ static inline int find_hdr_line_start(char *hname, unsigned int hname_len, } } return 0; + +found: + ch = memchr(start, ':', len - 1); + if(ch==NULL) { + LM_ERR("weird - no ':' found\n"); + return 0; + } + ch++; + while((ch < start + len) && (*ch==' ' || *ch=='\t')) ch++; + if(ch==start + len) { + LM_ERR("no header body content\n"); + return 0; + } + *bstart = ch; + return 1; } /** @@ -1670,6 +1685,7 @@ static int check_multipart(struct sip_msg *msg) static int ki_filter_body(struct sip_msg* msg, str *content_type) { char *start; + char *end; unsigned int len; str body; str boundary = {0,0}; @@ -1695,11 +1711,11 @@ static int ki_filter_body(struct sip_msg* msg, str *content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - start = start + 14; - len = len - 14; + len = len - (end - start); LM_DBG("line: [%.*s]\n", len, start); + start = end; if (len > content_type->len + 2) { if (strncasecmp(start, content_type->s, content_type->len)== 0) { @@ -3239,10 +3255,9 @@ static int ki_remove_multibody(sip_msg_t* msg, str* content_type) start = body.s; len = body.len; - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (content_type->len + 2)) { if (strncasecmp(end, content_type->s, content_type->len)== 0) { @@ -3345,10 +3360,9 @@ static int ki_get_body_part_helper(sip_msg_t* msg, str* ctype, pv_spec_t *dst, len = body.len; /* note: header body can follow just after name: - fixit */ - while (find_hdr_line_start("Content-Type: ", 14, &start, &len)) + while (find_hdr_line_start("Content-Type: ", 14, &start, &len, &end)) { - end = start + 14; - len = len - 14; + len = len - (end - start); if (len > (ctype->len + 2)) { if (strncasecmp(end, ctype->s, ctype->len)== 0) {

1 0

[kamailio/kamailio] db_redis connection broken after idle serveral minutes if redis server with timeout setting (#2764)
by FredWH 02 Aug '21

02 Aug '21

### Description db_redis connection broken after idle several minutes if redis server with timeout setting ### Troubleshooting #### Reproduction 1. configure Redis server with timeout 600. (10 minutes) 2. configure Kamailio with db_redis module and usrloc module modparam("usrloc", "db_url", "REDIS_CONNECT") 3. at client side, try to register, then close client tool. 4. after idle for 10+ minutes, no any registion, reopen client tool and try to register, <- register failed. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  db_redis [redis_dbase.c:2504]: db_redis_insert(): Failed to fetch type entry: Broken pipe db_redis [redis_dbase.c:2568]: db_redis_insert(): failed to do the insert usrloc [ucontact.c:687]: db_insert_ucontact(): inserting contact in db failed 1001 (uloc-60b45e88-1c5d-d) usrloc [urecord.c:601]: insert_ucontact(): failed to insert in database registrar [save.c:537]: insert_contacts(): failed to insert contact sl [sl_funcs.c:414]: sl_reply_error(): stateless error reply used: I'm terribly sorry, server error occurred (1/SL) #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.5.0 (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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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 8.3.0 PS: 5.4.5 has the same issue. * **Operating System**:  Debian 10.9 Linux test1 4.19.0-16-cloud-amd64 #1 SMP Debian 4.19.181-1 (2021-03-19) 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/2764

2 2

[kamailio/kamailio] db_redis: fix broken pipe issue, if redis server with timeout setting. (#2791)
by FredWH 02 Aug '21

02 Aug '21

- issue #2764   #### Pre-Submission Checklist    - [ ] 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 - [*] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2791 -- Commit Summary -- * db_redis: fix broken pipe issue, if redis server with timeout setting. -- File Changes -- M src/modules/db_redis/redis_connection.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2791.patch https://github.com/kamailio/kamailio/pull/2791.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/2791

3 5

git:master:7cec977f: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 7cec977f8e12bbeb0309d903e02461d1ccbf41a8 URL: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T15:00:18+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… Patch: https://github.com/kamailio/kamailio/commit/7cec977f8e12bbeb0309d903e02461d… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

git:master:14bcf765: tlsa: new (pseudo) module to compile tls module linked statically with libssl
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 14bcf765a945d0f7e2e39d538724fe4c247615b4 URL: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:30:21+02:00 tlsa: new (pseudo) module to compile tls module linked statically with libssl --- Added: src/modules/tlsa/Makefile Added: src/modules/tlsa/doc/Makefile Added: src/modules/tlsa/doc/tlsa.xml Added: src/modules/tlsa/fixed_c_zlib.h Added: src/modules/tlsa/sbufq.h Added: src/modules/tlsa/tls_bio.c Added: src/modules/tlsa/tls_bio.h Added: src/modules/tlsa/tls_cfg.c Added: src/modules/tlsa/tls_cfg.h Added: src/modules/tlsa/tls_config.c Added: src/modules/tlsa/tls_config.h Added: src/modules/tlsa/tls_ct_q.h Added: src/modules/tlsa/tls_ct_wrq.c Added: src/modules/tlsa/tls_ct_wrq.h Added: src/modules/tlsa/tls_domain.c Added: src/modules/tlsa/tls_domain.h Added: src/modules/tlsa/tls_dump_vf.c Added: src/modules/tlsa/tls_dump_vf.h Added: src/modules/tlsa/tls_init.c Added: src/modules/tlsa/tls_init.h Added: src/modules/tlsa/tls_locking.c Added: src/modules/tlsa/tls_locking.h Added: src/modules/tlsa/tls_map.c Added: src/modules/tlsa/tls_map.h Added: src/modules/tlsa/tls_mod.h Added: src/modules/tlsa/tls_rand.c Added: src/modules/tlsa/tls_rand.h Added: src/modules/tlsa/tls_rpc.c Added: src/modules/tlsa/tls_rpc.h Added: src/modules/tlsa/tls_select.c Added: src/modules/tlsa/tls_select.h Added: src/modules/tlsa/tls_server.c Added: src/modules/tlsa/tls_server.h Added: src/modules/tlsa/tls_util.c Added: src/modules/tlsa/tls_util.h Added: src/modules/tlsa/tls_verify.c Added: src/modules/tlsa/tls_verify.h Added: src/modules/tlsa/tlsa_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4… Patch: https://github.com/kamailio/kamailio/commit/14bcf765a945d0f7e2e39d538724fe4…

1 0

git:master:2b9e2f55: Makefile.groups: group for tlsa module
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2b9e2f553284b985afb01b5b78a800b10f691c6f URL: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:33:43+02:00 Makefile.groups: group for tlsa module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… Patch: https://github.com/kamailio/kamailio/commit/2b9e2f553284b985afb01b5b78a800b… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 99a990ad83..aa709375bc 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -91,6 +91,9 @@ mod_list_tlsdeps=crypto tls # - modules depending on openssl (+curl) library mod_list_tlsdeps_curl=auth_identity +# - modules depending on static openssl library +mod_list_tlsa=tlsa + # - modules depending on openssl library mod_list_outbound=outbound @@ -276,6 +279,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ $(mod_list_stirshaken) \ + $(mod_list_tlsa) \ $(mod_list_rtp_media_server) @@ -394,6 +398,9 @@ module_group_ktls_basic=$(mod_list_tlsdeps) # pkg tls module with curl module_group_ktls=$(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) +# pkg tlsa module +module_group_ktlsa=$(mod_list_tlsa) + # pkg websocket module module_group_kwebsocket=$(mod_list_websocket)

1 0

git:master:19d0a2a2: tlsa: imported README file
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 19d0a2a2177ca206de417fc1cb412c5b6dd0f393 URL: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:38:49+02:00 tlsa: imported README file --- Added: src/modules/tlsa/README Modified: src/modules/tlsa/doc/tlsa.xml --- Diff: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… Patch: https://github.com/kamailio/kamailio/commit/19d0a2a2177ca206de417fc1cb412c5… --- diff --git a/src/modules/tlsa/README b/src/modules/tlsa/README new file mode 100644 index 0000000000..100da0fed4 --- /dev/null +++ b/src/modules/tlsa/README @@ -0,0 +1,55 @@ +TLSA Module + +Daniel-Constantin Mierla + + kamailio.org + + Copyright © 2021 kamailio.org + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + +1. Overview + + This is a pseudo module that builds TLS module compiled statically + against libssl and libcrypto (from OpenSSL project). Its C code files + simply include the files from TLS module, setting a different module + name. + + It is a replacement for tls module, with the same modparams and + functions. Just replace ' loadmodule "tls.so" ' with ' loadmodule + "tlsa.so" ' and ' modparam("tls", ...) ' with ' modparam("tlsa", ...) + '. See the docs of TLS module for all the details related to its + parameters, functions, rpc commands, variables, ... + + The benefit of this module is having the libssl and libcrypto embedded + in the module object file, thus not sharing the SSL/TLS context with + any other modules that may link indirectly to libssl (e.g., like + http_client that links against libcurl, which uses libssl). In this + way, the initialization of SSL context (e.g., setting shared memory + management functions) by tlsa module does not impact the other modules. + + Another benefit could be the ability to link a specific libssl version + (e.g., using source build), not being bound to the version shipped with + the operating system. + + The drawback is that updates to the libssl done via operating system + upgrades are not reflected in the tlsa module. It has to be recompiled + every time a new libssl version is installed and it is wanted to be + used by tlsa module. + + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) may + not support same static linking options. Also, some operating systems + may provide only dynamic libssl and libcrypto libraries via their + packages. diff --git a/src/modules/tlsa/doc/tlsa.xml b/src/modules/tlsa/doc/tlsa.xml index 75da4b765c..eecc5f9ab1 100644 --- a/src/modules/tlsa/doc/tlsa.xml +++ b/src/modules/tlsa/doc/tlsa.xml @@ -65,6 +65,13 @@ be recompiled every time a new libssl version is installed and it is wanted to be used by tlsa module. </para> + <para> + NOTE: the module is known to work to be compiled with GCC on Linux + (tested on Debian Stable 10.x). Other compilers (e.g., clang, icc) + may not support same static linking options. Also, some operating + systems may provide only dynamic libssl and libcrypto libraries + via their packages. + </para> </section> </chapter> </book>

1 0

git:master:2fe5a0d1: tls: set module name using MOD_NAME define
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: 2fe5a0d165082d7acde4695bffeb2d194e4bab58 URL: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T12:29:25+02:00 tls: set module name using MOD_NAME define --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… Patch: https://github.com/kamailio/kamailio/commit/2fe5a0d165082d7acde4695bffeb2d1… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 30a533994d..6e421635cb 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -256,12 +256,15 @@ static param_export_t params[] = { {0, 0, 0} }; +#ifndef MOD_NAME +#define MOD_NAME "tls" +#endif /* * Module interface */ struct module_exports exports = { - "tls", /* module name */ + MOD_NAME, /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ cmds, /* exported functions */ params, /* exported parameters */

1 0

git:master:f614c39a: siputils: functions to compare uri and aor exported to kemi
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: f614c39a693cea39e3d96920fda3aa7a111c1d67 URL: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 siputils: functions to compare uri and aor exported to kemi --- Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… Patch: https://github.com/kamailio/kamailio/commit/f614c39a693cea39e3d96920fda3aa7… --- diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index 4cba3c3181..5aba445b02 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -40,6 +40,18 @@ #include "sipops.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_uri_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) { str s1; @@ -64,6 +76,18 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2) +{ + int ret; + + ret = cmp_aor_str(uri1, uri2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) { str s1; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 9926358e0a..7cbe77bd98 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -34,7 +34,9 @@ #include "../../core/parser/msg_parser.h" +int ki_cmp_uri(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_aor(sip_msg_t *msg, str *uri1, str *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index a23408ab79..747bf408fa 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -740,6 +740,16 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_uri"), + SR_KEMIP_INT, ki_cmp_uri, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("siputils"), str_init("cmp_aor"), + SR_KEMIP_INT, ki_cmp_aor, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("cmp_hdr_name"), SR_KEMIP_INT, ki_cmp_hdr_name, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

git:master:fa6245ce: core: cmp hdrname fix on checking type of second header
by Daniel-Constantin Mierla 02 Aug '21

02 Aug '21

Module: kamailio Branch: master Commit: fa6245ce33602eeff1d776b921fd41400ae5bb48 URL: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-02T09:02:14+02:00 core: cmp hdrname fix on checking type of second header --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… Patch: https://github.com/kamailio/kamailio/commit/fa6245ce33602eeff1d776b921fd414… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index 7b6a40ee3e..25d58747d9 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -477,7 +477,7 @@ int cmp_hdrname_str(str *s1, str *s2) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2); @@ -508,7 +508,7 @@ int cmp_hdrname_strzn(str *s1, char *s2, size_t len) } else { return 2; } - } else if(hf1.type!=HDR_OTHER_T) { + } else if(hf2.type!=HDR_OTHER_T) { return 2; } return cmpi_str(&n1, &n2);

1 0

[kamailio/kamailio] add debuginfo on dist other then x86 (#2789)
by sergey-safarov 01 Aug '21

01 Aug '21

### Description I want to debug `Kamailio` using `GDB` and compiled sources on `aarch64` architecture (`t4g` AWS instance). But produces object files do not contain debug info. Then executed ``` make -n ``` And found that no `-g` options used during compilation. I have specified `CFLAGS` and `CPPFLAGS` but with wont help. ### Expected behavior On all dist used `-g` compilation flag by default. If I have specified `CFLAGS` and `CPPFLAGS` as environment variables, then these flags used by GCC during compilation. #### Actual observed behavior `-g` flag do not used by default on `aarch64` architecture. `CFLAGS` and `CPPFLAGS` as environment variables do not used during compilation time. ### Additional info as hotfix I have used this patch ```diff diff --git a/src/Makefile.defs b/src/Makefile.defs index 027c985798..c91c34a7bb 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -885,7 +885,7 @@ endif ifeq ($(ARCH), aarch64) use_fast_lock=yes - C_DEFS+=-DNOSMP # memory barriers not implemented for arm + C_DEFS+= -g -DNOSMP # memory barriers not implemented for arm endif ifeq ($(ARCH), ppc) ``` -- 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/2789

3 7

[kamailio/kamailio] core: enabled compilation with debug symbols by default (#2811)
by sergey-safarov 01 Aug '21

01 Aug '21

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description closes GH #2789 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2811 -- Commit Summary -- * core: enabled compilation with debug symbols by default -- File Changes -- M src/Makefile.defs (66) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2811.patch https://github.com/kamailio/kamailio/pull/2811.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/2811

2 4

git:master:ed46adad: core: enables compilation with debug symbols by default for other architectures
by Henning Westerholt 01 Aug '21

01 Aug '21

Module: kamailio Branch: master Commit: ed46adad82e7b6569eb42704c5460263d2af75f7 URL: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-01T11:40:26Z core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026… Patch: https://github.com/kamailio/kamailio/commit/ed46adad82e7b6569eb42704c546026…

1 0

git:master:c503d2bd: core: parse to compare header names
by Daniel-Constantin Mierla 31 Jul '21

31 Jul '21

Module: kamailio Branch: master Commit: c503d2bd31a580138a67f1d4a265ccde5791d271 URL: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-31T12:04:24+02:00 core: parse to compare header names --- Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… Patch: https://github.com/kamailio/kamailio/commit/c503d2bd31a580138a67f1d4a265ccd… --- diff --git a/src/core/strutils.c b/src/core/strutils.c index ff394e5470..7b6a40ee3e 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -25,6 +25,7 @@ #include "parser/parse_uri.h" #include "parser/parse_param.h" +#include "parser/parse_hname2.h" #include "dprint.h" #include "ut.h" @@ -455,22 +456,61 @@ int cmpi_str(str *s1, str *s2) int cmp_hdrname_str(str *s1, str *s2) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2 = *s2; trim_trailing(&n1); trim_trailing(&n2); - /* todo: parse hdr name and compare with short/long alternative */ + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); } int cmp_hdrname_strzn(str *s1, char *s2, size_t len) { str n1, n2; + hdr_field_t hf1, hf2; + n1 = *s1; n2.s = s2; n2.len = len; trim_trailing(&n1); trim_trailing(&n2); + + parse_hname2_str(&n1, &hf1); + parse_hname2_str(&n2, &hf2); + if(hf1.type==HDR_ERROR_T || hf2.type==HDR_ERROR_T) { + LM_ERR("error parsing header names [%.*s] [%.*s]\n", n1.len, n1.s, + n2.len, n2.s); + return -4; + } + + if(hf1.type!=HDR_OTHER_T) { + if(hf1.type==hf2.type) { + return 0; + } else { + return 2; + } + } else if(hf1.type!=HDR_OTHER_T) { + return 2; + } return cmpi_str(&n1, &n2); }

1 0

git:master:2c3df626: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 2c3df6265314bc7728c151d0d7353d8162b26a58 URL: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T20:31:13+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8… Patch: https://github.com/kamailio/kamailio/commit/2c3df6265314bc7728c151d0d7353d8…

1 0

git:master:988b70c6: siputils: added cmp_hdr_name(hname1, hname2)
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 988b70c6a8653b39753f09e8003477eadae36740 URL: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T16:04:30+02:00 siputils: added cmp_hdr_name(hname1, hname2) --- Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/sipops.c Modified: src/modules/siputils/sipops.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… Patch: https://github.com/kamailio/kamailio/commit/988b70c6a8653b39753f09e8003477e… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index b1dffa1c3e..2b7ac27951 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -921,7 +921,7 @@ if(cmp_uri("$ru", "sip:kamailio@kamailio.org")) <function moreinfo="none">cmp_aor(str1, str2)</function> </title> <para> - The function returns <emphasis>true</emphasis> if + The function returns <emphasis>true</emphasis> if the two parameters matches as AoR. The parameters have to be SIP URIs. </para> @@ -937,6 +937,29 @@ if(cmp_aor("$rU(a)KaMaIlIo.org", "sip:kamailio@$fd")) # do interesting stuff here } ... +</programlisting> + </example> + </section> + <section id="siputils.f.cmp_hdr_name"> + <title> + <function moreinfo="none">cmp_hdr_name(str1, str2)</function> + </title> + <para> + The function returns <emphasis>true</emphasis> (return code 1) if + the two parameters matches as header names. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>cmp_hdr_name</function> usage</title> + <programlisting format="linespecific"> +... +if(cmp_hdr_name("$var(hname)", "From")) +{ + # do interesting stuff here +} +... </programlisting> </example> </section> diff --git a/src/modules/siputils/sipops.c b/src/modules/siputils/sipops.c index fb1040c6ba..4cba3c3181 100644 --- a/src/modules/siputils/sipops.c +++ b/src/modules/siputils/sipops.c @@ -88,6 +88,34 @@ int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2) return -2; } +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2) +{ + int ret; + + ret = cmp_hdrname_str(shname1, shname2); + if(ret==0) + return 1; + if(ret>0) + return -1; + return -2; +} + +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2) +{ + str shname1; + str shname2; + + if(fixup_get_svalue(msg, (gparam_p)hname1, &shname1)!=0) { + LM_ERR("cannot get first parameter\n"); + return -8; + } + if(fixup_get_svalue(msg, (gparam_p)hname2, &shname2)!=0) { + LM_ERR("cannot get second parameter\n"); + return -8; + } + return ki_cmp_hdr_name(msg, &shname1, &shname2); +} + int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2) { str s1, *s2; diff --git a/src/modules/siputils/sipops.h b/src/modules/siputils/sipops.h index 97d885c71c..9926358e0a 100644 --- a/src/modules/siputils/sipops.h +++ b/src/modules/siputils/sipops.h @@ -36,6 +36,8 @@ int w_cmp_uri(struct sip_msg *msg, char *uri1, char *uri2); int w_cmp_aor(struct sip_msg *msg, char *uri1, char *uri2); +int ki_cmp_hdr_name(sip_msg_t *msg, str *shname1, str *shname2); +int w_cmp_hdr_name(sip_msg_t *msg, char *hname1, char *hname2); int w_is_gruu(sip_msg_t *msg, char *uri1, char *p2); int w_is_supported(sip_msg_t *msg, char *_option, char *p2); int w_is_first_hop(sip_msg_t *msg, char *p1, char *p2); diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 3dc7188fa8..a23408ab79 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -166,6 +166,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"cmp_aor", (cmd_function)w_cmp_aor, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"cmp_hdr_name", (cmd_function)w_cmp_hdr_name, 2, fixup_spve_spve, + 0, ANY_ROUTE}, {"is_rpid_user_e164", (cmd_function)is_rpid_user_e164, 0, 0, 0, REQUEST_ROUTE}, {"append_rpid_hf", (cmd_function)append_rpid_hf, 0, 0, @@ -738,6 +740,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("cmp_hdr_name"), + SR_KEMIP_INT, ki_cmp_hdr_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:5.5:5ecf17bc: sworker: KSR.sworker.active() exported to kemi
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: 5.5 Commit: 5ecf17bc2d308141534bdaf3a312704daf0db850 URL: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T13:33:06+02:00 sworker: KSR.sworker.active() exported to kemi - equivalent to existing sworker_active() config function (cherry picked from commit 9f140ce93b1f6db649cd0e8eda26444d6b186231) --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… Patch: https://github.com/kamailio/kamailio/commit/5ecf17bc2d308141534bdaf3a312704… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 33ee3361bd..e6dce05c9b 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -196,6 +196,17 @@ static int w_sworker_task(sip_msg_t *msg, char *pgname, char *p2) return ki_sworker_task(msg, &gname); } +/** + * + */ +static int ki_sworker_active(sip_msg_t *msg) +{ + if(_sworker_active==0) { + return -1; + } + return 1; +} + /** * */ @@ -217,6 +228,11 @@ static sr_kemi_t sr_kemi_sworker_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sworker"), str_init("active"), + SR_KEMIP_INT, ki_sworker_active, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:9f140ce9: sworker: KSR.sworker.active() exported to kemi
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9f140ce93b1f6db649cd0e8eda26444d6b186231 URL: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T13:31:30+02:00 sworker: KSR.sworker.active() exported to kemi - equivalent to existing sworker_active() config function --- Modified: src/modules/sworker/sworker_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… Patch: https://github.com/kamailio/kamailio/commit/9f140ce93b1f6db649cd0e8eda26444… --- diff --git a/src/modules/sworker/sworker_mod.c b/src/modules/sworker/sworker_mod.c index 33ee3361bd..e6dce05c9b 100644 --- a/src/modules/sworker/sworker_mod.c +++ b/src/modules/sworker/sworker_mod.c @@ -196,6 +196,17 @@ static int w_sworker_task(sip_msg_t *msg, char *pgname, char *p2) return ki_sworker_task(msg, &gname); } +/** + * + */ +static int ki_sworker_active(sip_msg_t *msg) +{ + if(_sworker_active==0) { + return -1; + } + return 1; +} + /** * */ @@ -217,6 +228,11 @@ static sr_kemi_t sr_kemi_sworker_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sworker"), str_init("active"), + SR_KEMIP_INT, ki_sworker_active, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:6a61ed5c: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 6a61ed5c963b3db81607b71d106fc615349ec466 URL: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T12:46:13+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… Patch: https://github.com/kamailio/kamailio/commit/6a61ed5c963b3db81607b71d106fc61… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 1464f8da01..a805644ef1 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -628,8 +628,8 @@ bl_iterator_end("b1"); Example 1.25. bl_iterator_next usage ... bl_iterator_start("b1"); - while(hf_iterator_next("b1")) { - xlog("body line: hdr[$hfitname(b1)]\n"); + while(bl_iterator_next("b1")) { + xlog("body line: $blitval(b1)"); } bl_iterator_end("b1"); ...

1 0

git:master:0b718d39: textopsx: docs - fix example for body line iterator
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 0b718d39a5e85e52e5fcff4ab6ed0774b4d9eb62 URL: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T12:39:32+02:00 textopsx: docs - fix example for body line iterator --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… Patch: https://github.com/kamailio/kamailio/commit/0b718d39a5e85e52e5fcff4ab6ed077… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 86b6668080..5f644316ed 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -754,8 +754,8 @@ bl_iterator_end("b1"); <programlisting format="linespecific"> ... bl_iterator_start("b1"); - while(hf_iterator_next("b1")) { - xlog("body line: hdr[$hfitname(b1)]\n"); + while(bl_iterator_next("b1")) { + xlog("body line: $blitval(b1)"); } bl_iterator_end("b1"); ...

1 0

git:master:9e039f5e: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9e039f5eb383a181ef21386668261f3eb9d30168 URL: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T12:31:15+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3… Patch: https://github.com/kamailio/kamailio/commit/9e039f5eb383a181ef21386668261f3…

1 0

git:master:0a13b912: textopsx: added body line iterator functions
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 0a13b91206e75c3bbdd70d44fa9ad98a705a549a URL: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T12:25:04+02:00 textopsx: added body line iterator functions - iterate through lines of message body, get the value via $blitval(iname) --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98… Patch: https://github.com/kamailio/kamailio/commit/0a13b91206e75c3bbdd70d44fa9ad98…

1 0

git:master:9e9ce94d: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 9e9ce94d808003209e0686e1374b48ef721723dc URL: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-30T09:31:22+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e… Patch: https://github.com/kamailio/kamailio/commit/9e9ce94d808003209e0686e1374b48e…

1 0

git:master:24172c08: textopsx: added hf_iterator_prev() function
by Daniel-Constantin Mierla 30 Jul '21

30 Jul '21

Module: kamailio Branch: master Commit: 24172c089cecaed7e03fe482946f0126fd2c6915 URL: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-30T09:10:16+02:00 textopsx: added hf_iterator_prev() function --- Modified: src/modules/textopsx/doc/functions.xml Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012… Patch: https://github.com/kamailio/kamailio/commit/24172c089cecaed7e03fe482946f012…

1 0

git:master:017ffdf7: core: main - remove commented debug function
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 017ffdf7e9067d6e7b51e4911104c314c9f8f26a URL: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T14:18:05+02:00 core: main - remove commented debug function --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… Patch: https://github.com/kamailio/kamailio/commit/017ffdf7e9067d6e7b51e4911104c31… --- diff --git a/src/main.c b/src/main.c index c1bf2c864f..d3a7c0353d 100644 --- a/src/main.c +++ b/src/main.c @@ -293,22 +293,6 @@ void print_internals(void) printf("Thank you for flying %s!\n", NAME); } -/* debugging function */ -/* -void receive_stdin_loop(void) -{ - #define BSIZE 1024 - char buf[BSIZE+1]; - int len; - - while(1){ - len=fread(buf,1,BSIZE,stdin); - buf[len+1]=0; - receive_msg(buf, len); - printf("-------------------------\n"); - } -} -*/ /* global vars */ @@ -323,7 +307,7 @@ unsigned int maxbuffer = MAX_RECV_BUFFER_SIZE; /* maximum buffer size we do not want to exceed during the auto-probing procedure; may be re-configured */ -unsigned int sql_buffer_size = 65535; /* Size for the SQL buffer. Defaults to 64k. +unsigned int sql_buffer_size = 65535; /* Size for the SQL buffer. Defaults to 64k. This may be re-configured */ int socket_workers = 0; /* number of workers processing requests for a socket - it's reset everytime with a new listen socket */

1 0

git:master:7179d4ce: modules: readme files regenerated - debugger ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 7179d4ce0a26c2c21cac87ba55dcfb8129da0db8 URL: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T13:46:17+02:00 modules: readme files regenerated - debugger ... [skip ci] --- Modified: src/modules/debugger/README --- Diff: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8… Patch: https://github.com/kamailio/kamailio/commit/7179d4ce0a26c2c21cac87ba55dcfb8…

1 0

git:master:86d0aaff: debugger: added cfgtrace_format parameter
by Daniel-Constantin Mierla 29 Jul '21

29 Jul '21

Module: kamailio Branch: master Commit: 86d0aaffd6c86c7c78e40b1e40ba37c17db44b22 URL: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T13:00:09+02:00 debugger: added cfgtrace_format parameter - control what is printed in the cfgtrace log message (e.g., do not print config file path) --- Modified: src/modules/debugger/debugger_api.c Modified: src/modules/debugger/debugger_mod.c Modified: src/modules/debugger/doc/debugger_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… Patch: https://github.com/kamailio/kamailio/commit/86d0aaffd6c86c7c78e40b1e40ba37c… --- diff --git a/src/modules/debugger/debugger_api.c b/src/modules/debugger/debugger_api.c index e9dd4c8fd7..dce2fbb19c 100644 --- a/src/modules/debugger/debugger_api.c +++ b/src/modules/debugger/debugger_api.c @@ -149,6 +149,13 @@ str *dbg_get_cmd_name(int t) */ int _dbg_cfgtrace = 0; +#define DBG_CFGTRACE_NOCFGFILE (1<<0) +/** + * + */ +int _dbg_cfgtrace_format = 0; + + /** * */ @@ -359,13 +366,23 @@ int dbg_cfg_trace(sr_event_param_t *evp) { if(is_printable(_dbg_cfgtrace_level)) { - LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, - _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, - "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", - get_current_route_type_name(), ZSW(a->rname), - ZSW(a->cfile), a->cline, - a->type, an->len, ZSW(an->s) - ); + if(unlikely(_dbg_cfgtrace_format & DBG_CFGTRACE_NOCFGFILE)) { + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, + "%s=[%s] l=%d a=%d n=%.*s\n", + get_current_route_type_name(), ZSW(a->rname), + a->cline, + a->type, an->len, ZSW(an->s) + ); + } else { + LOG_FL(_dbg_cfgtrace_facility, _dbg_cfgtrace_level, + _dbg_cfgtrace_lname, _dbg_cfgtrace_prefix, + "%s=[%s] c=[%s] l=%d a=%d n=%.*s\n", + get_current_route_type_name(), ZSW(a->rname), + ZSW(a->cfile), a->cline, + a->type, an->len, ZSW(an->s) + ); + } } } if(_dbg_pid_list[process_no].set&DBG_CFGTEST_ON) diff --git a/src/modules/debugger/debugger_mod.c b/src/modules/debugger/debugger_mod.c index 5ea494f0c4..3c35a5b033 100644 --- a/src/modules/debugger/debugger_mod.c +++ b/src/modules/debugger/debugger_mod.c @@ -62,6 +62,7 @@ extern char* dump_lump_list(struct lump *list, int s_offset, char *s_buf); /* parameters */ extern int _dbg_cfgtrace; +extern int _dbg_cfgtrace_format; extern int _dbg_cfgpkgcheck; extern int _dbg_breakpoint; extern int _dbg_cfgtrace_level; @@ -100,6 +101,7 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"cfgtrace", INT_PARAM, &_dbg_cfgtrace}, + {"cfgtrace_format", INT_PARAM, &_dbg_cfgtrace_format}, {"breakpoint", INT_PARAM, &_dbg_breakpoint}, {"log_level", INT_PARAM, &_dbg_cfgtrace_level}, {"log_facility", PARAM_STRING, &_dbg_cfgtrace_facility_str}, diff --git a/src/modules/debugger/doc/debugger_admin.xml b/src/modules/debugger/doc/debugger_admin.xml index 5757381a6d..9f39883bdc 100644 --- a/src/modules/debugger/doc/debugger_admin.xml +++ b/src/modules/debugger/doc/debugger_admin.xml @@ -101,6 +101,29 @@ modparam("debugger", "cfgtrace", 1) </example> </section> + <section id="dbg.p.cfgtrace_format"> + <title><varname>cfgtrace_format</varname> (int)</title> + <para> + Control what is printer in the cfgtrace log message. If it is set + to 1, then the configuration file path is not printed, making + the log messages shorter when not including other configuration + files in the main one. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>cfgtrace_format</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("debugger", "cfgtrace_format", 1) +... +</programlisting> + </example> + </section> + <section id="dbg.p.breakpoint"> <title><varname>breakpoint</varname> (int)</title> <para>

1 0

git:5.4:2fac539f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 29 Jul '21

29 Jul '21

Module: kamailio Branch: 5.4 Commit: 2fac539faf29184597e645c4a8b8bfe2f3bc3e9e URL: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T11:02:15+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/http_client/README Modified: src/modules/secsipid/README Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… Patch: https://github.com/kamailio/kamailio/commit/2fac539faf29184597e645c4a8b8bfe… --- diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 6724cc5716..48b07699c3 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -500,7 +500,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line). diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index d822544ba2..83bee30b2a 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -73,7 +73,7 @@ Chapter 1. Admin Guide The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) IETF extensions for SIP (RFC8224, - RFC8588). + RFC8588), known together as STIR/SHAKEN. It exports the functions to check and generate SIP Identity header. diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

[kamailio/kamailio] crush: anot alliged memory access (#2798)
by sergey-safarov 29 Jul '21

29 Jul '21

### Description I still have core generation with not alleged memory access (Related #2788 and #2736). ### Troubleshooting I have prepared minimal kamailio config that allow reproduce issue on master branch (tested 8762c56a1c78e4ba151ef9fb4290b3938c0c984f). #### Reproduction Required start Kamailio with config below: ``` ################ pv_buffer_slots = 30 loadmodule "ipops.so" loadmodule "pv.so" loadmodule "textops.so" loadmodule "outbound.so" loadmodule "corex.so" loadmodule "kex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "uac.so" loadmodule "usrloc.so" loadmodule "registrar.so" #!substdef "!DEF01!$(version(num))!g" #!substdef "!DEF02!$HN(f)!g" #!substdef "!DEF03!$HN(d)!g" #!substdef "!DEF04!$HN(i)!g" # access to not existen default value #!substdef "!DEF05!$def(NULL)!g" #!substdef "!DEF06!$def(NULL)!g" ### SQL substdef #!substdef "!DEF07!insert into dispatcher (setid, destination) select \$var(SetId), \"\$var(MediaUrl)\" from DUAL where not exists(select * from dispatcher where destination = \"\$var(MediaUrl)\")!g" #!substdef "!DEF08!select a.event, count(distinct watcher_username || \"@\" || watcher_domain) count_unique, count(*) count from event_list a, active_watchers b where b.event = a.event group by a.event!g" #!substdef "!DEF09!select event, (select count(*) from presentity b where username = \"\$var(SetId)\" and domain = \"\$var(SetId)\" and b.event = a.event) count from event_list a!g" #!substdef "!DEF10!select event, (select count(*) from active_watchers b where presentity_uri = \"\$var(presentity)\" and b.event = a.event) count from event_list a!g" #!substdef "!DEF11!delete from presentity where domain=\"\$var(SetId)\" and username = \"\$var(SetId)\"!g" #!substdef "!DEF12!delete from active_watchers where callid = \"\$ci\"!g" #!substdef "!DEF13!delete from active_watchers where watcher_username=\"\$fU\" and presentity_uri=\"\$var(presentity_uri)\" and to_user=\"\$tU\" and watcher_domain=\"\$fd\" and event=\"\$hdr(Event)\"!g" #!substdef "!DEF14!delete from presentity where domain=\"\$var(SetId)\"!g" #!substdef "!DEF15!update active_watchers set expires = \$TS where watcher_domain=\"\$var(SetId)\"!g" #!substdef "!DEF16!update active_watchers set expires = \$TS where id in (select * from (select b.id from presentity a inner join active_watchers b on a.username = b.to_user and a.domain = b.to_domain and a.event = b.event where a.sender = \"\$var(MediaUrl)\") AS presentity_temp)!g" #!substdef "!DEF17!select * from active_watchers_log where presentity_uri = \"\$var(presentity_uri)\"!g" #!substdef "!DEF18!select * from active_watchers where watcher_domain = \"\$var(Domain)\"!g" #!substdef "!DEF19!select count(*) as count from presentity where username = \"\$var(SetId)\" and domain = \"\$var(SetId)\" and event = \"\$var(SetId)\"!g" #!substdef "!DEF20!delete from presentity where sender = \"\$var(MediaUrl)\"!g" ####### Routing Logic ######## route { $var(tmp) = $hdr(X-hdr1); $var(tmp) = $hdr(X-hdr2); $var(tmp) = $hdr(X-hdr3); $var(tmp) = $hdr(X-hdr4); $var(tmp) = $hdr(X-hdr5); $var(tmp) = $hdr(X-hdr6); $var(tmp) = $hdr(X-hdr7); $var(tmp) = $hdr(X-hdr8); $var(tmp) = $hdr(X-hdr9); $var(tmp) = $hdr(X-hdr10); $var(tmp) = $hdr(X-hdr11); $var(tmp) = $hdr(X-hdr12); $var(tmp) = $hdr(X-hdr13); $var(tmp) = $hdr(X-hdr14); $var(tmp) = $hdr(X-hdr15); if (reg_fetch_contacts("location", "$hdr(X-hdr16)", "callee")) { return; } } ``` #### Debugging Data ``` Program received signal SIGSEGV, Segmentation fault. 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 Missing separate debuginfos, use: dnf debuginfo-install libgcc-10.2.1-9.fc33.x86_64 openssl-libs-1.1.1k-1.fc33.x86_64 systemd-libs-246.13-1.fc33.x86_64 zlib-1.2.11-23.fc33.x86_64 (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 #4 0x00000000005658c8 in pv_spec_lookup (name=0x7fffffffd810, len=0x7fffffffd80c) at core/pvapi.c:498 #5 0x000000000056c06c in pv_parse_format (in=0x7fffffffd910, el=0x7ffff652bfa8) at core/pvapi.c:1194 #6 0x0000000000631b16 in fix_param (type=256, param=0x7ffff65224f0) at core/sr_module.c:1223 #7 0x000000000063218e in fix_param_types (types=256, param=0x7ffff65224f0) at core/sr_module.c:1345 #8 0x000000000050f721 in fixup_spve_null (param=0x7ffff65224f0, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff5b97cbb in fetchc_fixup (param=0x7ffff65224f0, param_no=2) at registrar.c:808 #10 0x00000000005a6aed in fix_actions (a=0x7ffff6522478) at core/route.c:932 #11 0x00000000005def48 in fix_rval (rv=0x7ffff65237d8, rve=0x7ffff65237d0) at core/rvalue.c:2992 #12 0x00000000005f0a90 in fix_rval_expr (p=0x7ffff65237d0) at core/rvalue.c:3919 #13 0x00000000005a210b in fix_actions (a=0x7ffff6517ce0) at core/route.c:719 #14 0x00000000005b3e03 in fix_rl (rt=0x91f140 <main_rt>) at core/route.c:2102 #15 0x00000000005b3e3a in fix_rls () at core/route.c:2118 #16 0x00000000004381c0 in main (argc=12, argv=0x7fffffffe5f8) at main.c:3066 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 s = {s = 0x7ffff1d72f60 "`.\327\361\377\177", len = 4312016} p = 0x0 nsp = 0x0 hdr = {type = HDR_PAI_T, name = {s = 0x41cbd0 <_start> "\363\017\036\372\061\355I\211\321^H\211\342H\203\344\360PTI\307\300@\330\177", len = -11088}, body = {s = 0x566521 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -162348840}, len = -10928, parsed = 0x80d116, next = 0x7ffff652bf07} __func__ = "pv_parse_hdr_name" #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 p = 0x7ffff652c144 ")" s = {s = 0x7ffff652c13d "X-hdr16)", len = 7} pvname = {s = 0x7ffff652c139 "hdr(X-hdr16)", len = 3} pvstate = 5 tr = 0x0 pte = 0x7ffff64fef70 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 pvn = 0x7ffff652c0c0 pvid = 3075582644 p = 0x0 __func__ = "pv_cache_add" #4 0x00000000005658c8 in pv_spec_lookup (name=0x7fffffffd810, len=0x7fffffffd80c) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} __func__ = "pv_spec_lookup" #5 0x000000000056c06c in pv_parse_format (in=0x7fffffffd910, el=0x7ffff652bfa8) at core/pvapi.c:1194 p = 0x7ffff65226b0 "$hdr(X-hdr16)" p0 = 0x80b00000001 <error: Cannot access memory at address 0x80b00000001> n = 1 e = 0x7ffff652c038 e0 = 0x0 s = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} len = 13 __func__ = "pv_parse_format" #6 0x0000000000631b16 in fix_param (type=256, param=0x7ffff65224f0) at core/sr_module.c:1223 p = 0x7ffff652bf98 name = {s = 0x7ffff65226b0 "$hdr(X-hdr16)", len = 13} s = {s = 0x80d116 "core: core/counters.c", len = -163113056} num = 32767 err = 0 __func__ = "fix_param" #7 0x000000000063218e in fix_param_types (types=256, param=0x7ffff65224f0) at core/sr_module.c:1345 ret = 0 t = 256 #8 0x000000000050f721 in fixup_spve_null (param=0x7ffff65224f0, param_no=1) at core/mod_fix.c:564 ret = 32767 fp = 0x7ffff1d72f60 __func__ = "fixup_spve_null" #9 0x00007ffff5b97cbb in fetchc_fixup (param=0x7ffff65224f0, param_no=2) at registrar.c:808 No locals. #10 0x00000000005a6aed in fix_actions (a=0x7ffff6522478) at core/route.c:932 t = 0x7ffff6522478 p = 0x4f0086e1b9 tmp = 0x89a29f "core: core/cfg/cfg_struct.c" tmp_p = 0x7ffff65226b0 ret = 0 i = 1 cmd = 0x7ffff650dde0 s = {s = 0x7fffffffdc30 "", len = 7295555} he = 0x41cbd0 <_start> ip = {af = 0, len = 0, u = {addrl = {21483676084, 140737488346160}, addr32 = {8839604, 5, 4294958128, 32767}, addr16 = {57780, 134, 5, 0, 56368, 65535, 32767, 0}, addr = "\264\341\206\000\005\000\000\000\060\334\377\377\377\177\000"}} si = 0x33 lval = 0x0 rve = 0x90000000c err_rve = 0x4bc015 <sr_event_exec+415> rve_type = 32767 err_type = 4294957888 expected_type = 32767 rv = 0x7ffff5bc5360 <default_registrar_cfg> rve_param_no = 0 __func__ = "fix_actions" #11 0x00000000005def48 in fix_rval (rv=0x7ffff65237d8, rve=0x7ffff65237d0) at core/rvalue.c:2992 __func__ = "fix_rval" #12 0x00000000005f0a90 in fix_rval_expr (p=0x7ffff65237d0) at core/rvalue.c:3919 rve = 0x7ffff65237d0 ret = 0 __func__ = "fix_rval_expr" #13 0x00000000005a210b in fix_actions (a=0x7ffff6517ce0) at core/route.c:719 t = 0x7ffff65228e8 p = 0x7ffff1adb000 tmp = 0xffffffff006f4dd9 <error: Cannot access memory at address 0xffffffff006f4dd9> tmp_p = 0x4 ret = 0 i = 8566243 cmd = 0x41cbd0 <_start> s = {s = 0x82b4d8 "core", len = -163131376} he = 0x7fffffffe010 ip = {af = 4294959040, len = 32767, u = {addrl = {7294619, 8694965}, addr32 = {7294619, 0, 8694965, 0}, addr16 = {20123, 111, 0, 0, 44213, 132, 0, 0}, addr = "\233No\000\000\000\000\000\265\254\204\000\000\000\000"}} si = 0x100000000 lval = 0x7ffff65218a8 rve = 0x7ffff65237d0 err_rve = 0x0 rve_type = RV_INT err_type = 4294959040 expected_type = RV_NONE rv = 0x41cbd0 <_start> rve_param_no = -8016 __func__ = "fix_actions" #14 0x00000000005b3e03 in fix_rl (rt=0x91f140 <main_rt>) at core/route.c:2102 i = 0 ret = 51 #15 0x00000000005b3e3a in fix_rls () at core/route.c:2118 ret = 0 #16 0x00000000004381c0 in main (argc=12, argv=0x7fffffffe5f8) at main.c:3066 cfg_stream = 0x9c32d0 c = -1 r = 0 tmp = 0x7fffffffe8b6 "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x801218 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 2632239041 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 47, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1625629861, tv_nsec = 261687069}, st_ctim = {tv_sec = 1625629861, tv_nsec = 261687069}, __glibc_reserved = {0, 0, 0}} tbuf = "\360\341\377\377\377\177\000\000\000\000\000\000\000\000\000\000\360\341\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000\"\247\177\336s\027\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x8038f6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fe521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8038fb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x803901 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x803907 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x803910 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80391a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x803924 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80392f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x803938 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x803943 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x803949 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x803953 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals No symbol table info available. (gdb) list 1976 +((!sctp_disable)?sctp_listeners:0) 1977 #endif 1978 ; 1979 } 1980 1981 int main(int argc, char** argv) 1982 { 1983 1984 FILE* cfg_stream; 1985 int c,r; (gdb) f 1 #1 0x00007ffff6391fd4 in pv_parse_hdr_name (sp=0x7ffff652c0d8, in=0x7fffffffd560) at pv_core.c:3617 3617 memcpy(p, in->s, in->len); (gdb) info locals s = {s = 0x7ffff1d72f60 "`.\327\361\377\177", len = 4312016} p = 0x0 nsp = 0x0 hdr = {type = HDR_PAI_T, name = {s = 0x41cbd0 <_start> "\363\017\036\372\061\355I\211\321^H\211\342H\203\344\360PTI\307\300@\330\177", len = -11088}, body = {s = 0x566521 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -162348840}, len = -10928, parsed = 0x80d116, next = 0x7ffff652bf07} __func__ = "pv_parse_hdr_name" (gdb) list 3612 { 3613 LM_ERR("name too long\n"); 3614 return -1; 3615 } 3616 p = pv_get_buffer(); 3617 memcpy(p, in->s, in->len); 3618 p[in->len] = ':'; 3619 s.s = p; 3620 s.len = in->len+1; 3621 (gdb) f 2 #2 0x0000000000568916 in pv_parse_spec2 (in=0x7ffff652c0c0, e=0x7ffff652c0d8, silent=0) at core/pvapi.c:969 969 if(pte->parse_name(e, &s)!=0) (gdb) info locals p = 0x7ffff652c144 ")" s = {s = 0x7ffff652c13d "X-hdr16)", len = 7} pvname = {s = 0x7ffff652c139 "hdr(X-hdr16)", len = 3} pvstate = 5 tr = 0x0 pte = 0x7ffff64fef70 n = 0 __func__ = "pv_parse_spec2" (gdb) list 964 LM_ERR("pvar \"%.*s\" does not get empty name param\n", 965 pvname.len, pvname.s); 966 goto error; 967 } 968 s.len = p - s.s; 969 if(pte->parse_name(e, &s)!=0) 970 { 971 if (!silent) 972 LM_ERR("pvar \"%.*s\" has an invalid name param [%.*s]\n", 973 pvname.len, pvname.s, s.len, s.s); (gdb) f 3 #3 0x0000000000563ffd in pv_cache_add (name=0x7fffffffd750) at core/pvapi.c:359 359 p = pv_parse_spec(&pvn->pvname, &pvn->spec); (gdb) info locals pvn = 0x7ffff652c0c0 pvid = 3075582644 p = 0x0 __func__ = "pv_cache_add" (gdb) list 354 } 355 memset(pvn, 0, sizeof(pv_cache_t) + name->len + 1); 356 pvn->pvname.len = name->len; 357 pvn->pvname.s = (char*)pvn + sizeof(pv_cache_t); 358 memcpy(pvn->pvname.s, name->s, name->len); 359 p = pv_parse_spec(&pvn->pvname, &pvn->spec); 360 361 if(p==NULL) 362 { 363 pkg_free(pvn); ``` #### Log Messages ``` [root@safarov-dell kamailio]# gdb --args kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 24 -E GNU gdb (GDB) Fedora 10.1-2.fc33 Copyright (C) 2020 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <https://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from kamailio... (gdb) set pagination off (gdb) r Starting program: /usr/local/sbin/kamailio --atexit=no -DD -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg -m 64 -M 24 -E ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@safarov-dell kamailio]# kamailio -v version: kamailio 5.6.0-dev0 (x86_64/linux) 8762c5 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_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: 8762c5 compiled on 17:11:19 Jul 6 2021 with gcc 10.2.1 ``` * **Operating System**: ``` [root@safarov-dell kamailio]# cat /etc/os-release NAME=Fedora VERSION="33 (Container Image)" ID=fedora VERSION_ID=33 VERSION_CODENAME="" PLATFORM_ID="platform:f33" PRETTY_NAME="Fedora 33 (Container Image)" ANSI_COLOR="0;38;2;60;110;180" LOGO=fedora-logo-icon CPE_NAME="cpe:/o:fedoraproject:fedora:33" HOME_URL="https://fedoraproject.org/" DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f33/system-administrators-guide/" SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Fedora" REDHAT_BUGZILLA_PRODUCT_VERSION=33 REDHAT_SUPPORT_PRODUCT="Fedora" REDHAT_SUPPORT_PRODUCT_VERSION=33 PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" VARIANT="Container Image" VARIANT_ID=container ``` -- 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/2798

2 9

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev