sr-dev

sr-dev@lists.kamailio.org

22 participants
45190 discussions

git:master:8064a1d3: build: harden pull_request.yml permissions
by Victor Seva 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: 8064a1d3cd35e76f0e563fa401c181632f33b43a URL: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Author: Alex <aleksandrosansan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-09-21T09:29:31+02:00 build: harden pull_request.yml permissions Signed-off-by: Alex <aleksandrosansan(a)gmail.com> --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… Patch: https://github.com/kamailio/kamailio/commit/8064a1d3cd35e76f0e563fa401c1816… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2633e7e29e..e2f6416ce4 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,6 +6,8 @@ name: checks_pr - master # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest

1 0

git:master:ddb39dd0: build: harden main.yml permissions
by Victor Seva 21 Sep '22

21 Sep '22

Module: kamailio Branch: master Commit: ddb39dd0f4fae470083006a7965d21512cd759b1 URL: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… Author: Alex <aleksandrosansan(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-09-21T09:29:31+02:00 build: harden main.yml permissions Signed-off-by: Alex <aleksandrosansan(a)gmail.com> --- Modified: .github/workflows/main.yml --- Diff: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… Patch: https://github.com/kamailio/kamailio/commit/ddb39dd0f4fae470083006a7965d215… --- diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8704cda5e84..10acce3a6e1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,6 +8,8 @@ name: build - '5.5' # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +permissions: + contents: read # to fetch code (actions/checkout) jobs: build: runs-on: ubuntu-latest

1 0

git:master:411fb392: core: added #!defexp ID STM preprocessor directive
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

Module: kamailio Branch: master Commit: 411fb392fc3f2b399857dde2fb717ec2286e7fee URL: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-20T17:41:36+02:00 core: added #!defexp ID STM preprocessor directive - abity to set a defined it to the result of snexpr statement - example: #!define ADDR 127.0.0.1 #!defexp SIPURI "sip:" + ADDR + ":5060" --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.c Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec… Patch: https://github.com/kamailio/kamailio/commit/411fb392fc3f2b399857dde2fb717ec…

1 0

git:master:b7a0d8a0: core: use defines for types of preprocessor defs
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

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 0

git:master:1fd075c4: core: clone values for defines
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

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 0

git:master:abe04ea0: core: snexpr - updated to version supporting escaped chars in string values
by Daniel-Constantin Mierla 20 Sep '22

20 Sep '22

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 0

[kamailio/kamailio] WebSocket Module memory leak (Issue #3236)
by iliesh 19 Sep '22

19 Sep '22

### 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>

2 6

Jenkins build is back to stable : kamailio55-binaries » amd64,focal #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

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

1 0

Jenkins build is back to stable : kamailio55-binaries » amd64,bullseye #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

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

1 0

Jenkins build is back to stable : kamailio55-binaries » amd64,bionic #9
by kamailio＠sipwise.com 19 Sep '22

19 Sep '22

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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev