sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
274 discussions

git:master:1fd075c4: core: clone values for defines

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1fd075c4e7db180c61fcb2838e9e817ddd623003 URL: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T11:01:56+02:00 core: clone values for defines --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… Patch: https://github.com/kamailio/kamailio/commit/1fd075c4e7db180c61fcb2838e9e817… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index abaaba3974..97ce62f1eb 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2144,8 +2144,17 @@ int pp_define_set(int len, char *text, int mode) return -1; } + pp_defines[ppos].value.s = (char*)pkg_malloc(len+1); + if (pp_defines[ppos].value.s == NULL) { + LM_ERR("no more memory to define %.*s [%d]\n", + pp_defines[ppos].name.len, + pp_defines[ppos].name.s, ppos); + return -1; + } + + memcpy(pp_defines[ppos].value.s, text, len); + pp_defines[ppos].value.s[len] = '\0'; pp_defines[ppos].value.len = len; - pp_defines[ppos].value.s = text; LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s,

1 year, 7 months

git:master:b7a0d8a0: core: use defines for types of preprocessor defs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7a0d8a084a25a1b02e2c9845ef4e3b19f988c02 URL: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T10:52:42+02:00 core: use defines for types of preprocessor defs --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h Modified: src/core/sr_module.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b… Patch: https://github.com/kamailio/kamailio/commit/b7a0d8a084a25a1b02e2c9845ef4e3b…

1 year, 7 months

git:master:abe04ea0: core: snexpr - updated to version supporting escaped chars in string values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: abe04ea06c68c7df180831bba1f4e73f53512db5 URL: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T08:43:05+02:00 core: snexpr - updated to version supporting escaped chars in string values --- Modified: src/core/utils/snexpr.h --- Diff: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… Patch: https://github.com/kamailio/kamailio/commit/abe04ea06c68c7df180831bba1f4e73… --- diff --git a/src/core/utils/snexpr.h b/src/core/utils/snexpr.h index 8cebdf8614..d6e853ffb4 100644 --- a/src/core/utils/snexpr.h +++ b/src/core/utils/snexpr.h @@ -799,6 +799,7 @@ static int snexpr_next_token(const char *s, size_t len, int *flags) { unsigned int i = 0; char b; + int bsf = 0; if(len == 0) { return 0; } @@ -845,7 +846,12 @@ static int snexpr_next_token(const char *s, size_t len, int *flags) b = c; i++; c = s[i]; - while(c != b && i < len) { + while(i < len && (bsf==1 || c != b)) { + if(bsf == 0 && c == '\\') { + bsf = 1; + } else { + bsf = 0; + } i++; c = s[i]; } @@ -956,6 +962,9 @@ static struct snexpr snexpr_varref(struct snexpr_var *v) static struct snexpr snexpr_conststr(const char *value, int len) { struct snexpr e = snexpr_init(); + char *p; + int i; + int bsf = 0; if(len < 2) { len = 0; } else { @@ -966,9 +975,34 @@ static struct snexpr snexpr_conststr(const char *value, int len) e.param.stz.sval = malloc(len + 1); if(e.param.stz.sval) { if(len > 0) { - /* do not copy the quotes */ - memcpy(e.param.stz.sval, value + 1, len); - e.param.stz.sval[len] = '\0'; + /* do not copy the quotes - start from value[1] */ + p = e.param.stz.sval; + for(i=0; i<len; i++) { + if(bsf==0 && value[i+1]=='\\') { + bsf = 1; + } else if(bsf==1) { + bsf = 0; + switch(value[i+1]) { + case 'n': + *p = '\n'; + break; + case 'r': + *p = '\r'; + break; + case 't': + *p = '\t'; + break; + default: + *p = value[i+1]; + } + p++; + } else { + bsf = 0; + *p = value[i+1]; + p++; + } + } + *p = '\0'; } else { e.param.stz.sval[0] = '\0'; }

1 year, 7 months

[kamailio/kamailio] WebSocket Module memory leak (Issue #3236)

by iliesh

### Description By using the WebSocket module we noticed that the memory on the server keeps increasing daily even if the number of registered devices is decreasing ### Troubleshooting #### Reproduction Connect to the server through the wss and then disable the network adapter. #### Debugging Data If the TCP connection is closed forcefully (tested by disabling network adapter) then the number of current wss connections is not decreasing: ``` kamcmd stats.get_statistics all | grep "ws_current_connections" ``` The same happens with the allocated shared memory: ``` kamcmd mod.stats all shm | grep 'wsconn_' ``` wsconn_add(198) - this value is not decreasing. Everything is working properly if the TCP connection is properly closed. * **Operating System**: ``` CentOS 7 X64 3.10.0-1160.76.1.el7.x86_64 version: kamailio 5.6.1 (x86_64/linux) d8f98b ``` XHTTP Request Route: ``` event_route[xhttp:request] { set_reply_close(); set_reply_no_connect(); if (ws_handle_handshake()) { xlog("L_INFO", "[$cfg(route)] websocket|log|handled HTTP request $rm from $si:$sp\n"); exit; } } ``` TCP Settings: ``` tcp_connection_lifetime=3605 tcp_accept_no_cl=yes tcp_rd_buf_size=16384 tcp_connect_timeout=10 tcp_crlf_ping=yes tcp_delayed_ack = yes tcp_fd_cache = yes tcp_keepalive = yes tcp_keepcnt = 3 tcp_keepidle = 30 tcp_keepintvl = 10 tcp_accept_aliases=no tcp_async=yes tcp_linger2=30 tcp_max_connections=4096 tcp_send_timeout = 10 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3236 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3236(a)github.com>

1 year, 7 months

Jenkins build is back to stable : kamailio55-binaries » amd64,focal #9

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 year, 7 months

Jenkins build is back to stable : kamailio55-binaries » amd64,bullseye #9

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 year, 7 months

Jenkins build is back to stable : kamailio55-binaries » amd64,bionic #9

by kamailio＠sipwise.com

See <https://kamailio.sipwise.com/job/kamailio55-binaries/architecture=amd64,dis…>

1 year, 7 months

Kamailio v5.5.5 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v5.5.5 stable release is out. This is a maintenance release of the stable branch 5.5 that includes fixes since the release of v5.5.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.5. Note that 5.5 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.6, with v5.6.1 being release out of it. For more details about version 5.5.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2022/09/kamailio-v5-5-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Oct 10-13, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 year, 7 months

git:5.5:c26b6d0b: ChangeLog: content updated for v5.5.5

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: c26b6d0b2d38aee1f541dde3b522cf507db8a32b URL: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T11:28:32+02:00 ChangeLog: content updated for v5.5.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5… Patch: https://github.com/kamailio/kamailio/commit/c26b6d0b2d38aee1f541dde3b522cf5…

1 year, 7 months

git:5.5:b92a8a0d: Makefile.defs: version set to 5.5.5

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b92a8a0db4cfa25f6c9231c4bc855ff3fb3a5845 URL: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:21:25+02:00 Makefile.defs: version set to 5.5.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Patch: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5fdc880c31..0e49c6f0c4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 year, 7 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022