sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
291 discussions

git:master:ef86402d: core: tcp - close connection without data traffic at all
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: ef86402d2397ff7b0416bc17ab0a2ba906402215 URL: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - close connection without data traffic at all - default timeout: 20sec - cleanup is done on timer, it can take another 10sec --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… Patch: https://github.com/kamailio/kamailio/commit/ef86402d2397ff7b0416bc17ab0a2ba… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 2e58861277c..4cb3da51f40 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -195,6 +195,8 @@ typedef enum tcp_req_flags #define TCP_REQ_BCHUNKED(tr) ((tr)->flags & F_TCP_REQ_BCHUNKED) #endif +#define KSR_TCP_REQSTATE_DATARECV (1 << 0) + typedef struct tcp_req { struct tcp_req *next; @@ -214,6 +216,7 @@ typedef struct tcp_req int bytes_to_go; /* how many bytes we have still to read from the body*/ enum tcp_req_errors error; enum tcp_req_states state; + unsigned int dxstate; struct timeval tvrstart; } tcp_req_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index f4f00c23420..9f39dd72444 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5454,6 +5454,7 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) struct timeval tvnow; long long tvdiff; long mcmd[2]; + int cidset = 0; if(tcp_disable) { return; @@ -5466,6 +5467,7 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) for(i = 0; i < TCP_ID_HASH_SIZE && n < TCPIDLIST_SIZE; i++) { for(con = tcpconn_id_hash[i]; con && n < TCPIDLIST_SIZE; con = con->id_next) { + cidset = 0; if(con->state == S_CONN_OK) { if(con->req.tvrstart.tv_sec > 0) { tvdiff = 1000000 @@ -5478,18 +5480,34 @@ void tcp_timer_check_connections(unsigned int ticks, void *param) n, con->id, tvdiff); tcpidlist[n] = con->id; n++; + cidset = 1; } } } + if((cidset == 0) + && !(con->req.dxstate & KSR_TCP_REQSTATE_DATARECV)) { + if(tvnow.tv_sec - con->timestamp + >= KSR_TCP_MSGREAD_TIMEOUT) { + LM_DBG("n: %d - connection id: %d (state: %d) - " + "message " + "receiving timeout: %ld\n", + n, con->id, con->state, + (long)(tvnow.tv_sec - con->timestamp)); + tcpidlist[n] = con->id; + n++; + cidset = 1; + } + } } } TCPCONN_UNLOCK; if(n > 0) { for(i = 0; i < n; i++) { if((con = tcpconn_get(tcpidlist[i], 0, 0, 0, 0))) { - LM_CRIT("message reading timeout on connection id: %d - " + LM_CRIT("message processing timeout on connection id: %d " + "(state: %d) - " "closing\n", - tcpidlist[i]); + tcpidlist[i], con->state); mcmd[0] = (long)con; mcmd[1] = CONN_EOF; diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 1592936238b..e6e79c2a174 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1580,6 +1580,7 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, } /* if we are here everything is nice and ok*/ resp = CONN_RELEASE; + req->dxstate |= KSR_TCP_REQSTATE_DATARECV; #ifdef EXTRA_DEBUG LM_DBG("receiving msg(%p, %d)\n", req->start, (int)(req->parsed - req->start));

1 0

git:master:f5b46efc: core: tcp - set limit for reading a message
by Daniel-Constantin Mierla 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: f5b46efc3a97aa45d090f46990a40bcc9dd91390 URL: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-13T17:33:51+02:00 core: tcp - set limit for reading a message - default 10sec - if message is not read, close connection - cleanup is done on timer, it can take an additional 10sec to clean up connection --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_init.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc… Patch: https://github.com/kamailio/kamailio/commit/f5b46efc3a97aa45d090f46990a40bc…

1 0

git:master:2df623c7: github: fix cleanup perms [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 2df623c78fd8605b9f7f936efc4cb2011d0a60b5 URL: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T12:42:35+02:00 github: fix cleanup perms [skip ci] --- Modified: .github/workflows/cleanup.yml --- Diff: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… Patch: https://github.com/kamailio/kamailio/commit/2df623c78fd8605b9f7f936efc4cb20… --- diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml index babf4956fb2..bea47fa30dc 100644 --- a/.github/workflows/cleanup.yml +++ b/.github/workflows/cleanup.yml @@ -13,7 +13,7 @@ jobs: x86_64: runs-on: ubuntu-latest permissions: - packages: admin + packages: write steps: - name: Delete untagged images uses: camargo/delete-untagged-action@v1

1 0

git:master:09729561: github: move cleanup of untagged packages to its own workflow [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 097295616f6387d192c5774ce7fc1a95b1913542 URL: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T12:35:35+02:00 github: move cleanup of untagged packages to its own workflow [skip ci] --- Added: .github/workflows/cleanup.yml Modified: .github/workflows/alpine.yml --- Diff: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… Patch: https://github.com/kamailio/kamailio/commit/097295616f6387d192c5774ce7fc1a9… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index eb64a32d73b..3bf126e588d 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -175,10 +175,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - - name: Delete untagged images - if: ${{ steps.should_run.outputs.should_run != 'false' }} - uses: camargo/delete-untagged-action@v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - package-name: ${{ env.IMAGE_NAME }} diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml new file mode 100644 index 00000000000..babf4956fb2 --- /dev/null +++ b/.github/workflows/cleanup.yml @@ -0,0 +1,22 @@ +--- +name: cleanup packages +on: + schedule: + - cron: '0 5 * * *' + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +env: + IMAGE_NAME: kamailio-ci + +jobs: + x86_64: + runs-on: ubuntu-latest + permissions: + packages: admin + steps: + - name: Delete untagged images + uses: camargo/delete-untagged-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + package-name: ${{ env.IMAGE_NAME }}

1 0

git:master:5632d346: github: allow trigger actions manually from panel [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 5632d34677eb9d6feeacda9dba12244f0c5de838 URL: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T10:13:33+02:00 github: allow trigger actions manually from panel [skip ci] --- Modified: .github/workflows/alpine.yml Modified: .github/workflows/cifuzz.yml Modified: .github/workflows/codeql.yml --- Diff: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… Patch: https://github.com/kamailio/kamailio/commit/5632d34677eb9d6feeacda9dba12244… --- diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index c11d7056086..eb64a32d73b 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -6,6 +6,8 @@ on: push: tags: - '[0-9]+.[0-9]+.[0-9]+' + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: env: IMAGE_NAME: kamailio-ci diff --git a/.github/workflows/cifuzz.yml b/.github/workflows/cifuzz.yml index a8294516c2a..bb1b712cb5b 100644 --- a/.github/workflows/cifuzz.yml +++ b/.github/workflows/cifuzz.yml @@ -4,6 +4,8 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: Fuzzing: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 71c8e66cb6c..59e3dbf476f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -5,6 +5,8 @@ on: branches: [ "master" ] schedule: - cron: "30 0 * * *" + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: jobs: analyze: name: Analyze

1 0

git:master:7f4fdfa6: pkg/kamailio/alpine: switch to pcre2 [skip ci]
by Victor Seva 13 Oct '23

13 Oct '23

Module: kamailio Branch: master Commit: 7f4fdfa61444ab38b49b74829a40d9ec6d1e050a URL: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-13T09:54:53+02:00 pkg/kamailio/alpine: switch to pcre2 [skip ci] --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… Patch: https://github.com/kamailio/kamailio/commit/7f4fdfa61444ab38b49b74829a40d9e… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e585cdb66b6..c69e4dca7fe 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -27,7 +27,7 @@ depends="gawk" options="!check" makedepends="bison db-dev flex freeradius-client-dev expat-dev lksctp-tools-dev perl-dev postgresql-dev python3-dev - pcre-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev + pcre2-dev mariadb-dev libxml2-dev curl-dev unixodbc-dev confuse-dev ncurses-dev sqlite-dev lua-dev openldap-dev openssl-dev net-snmp-dev libuuid libev-dev jansson-dev json-c-dev libevent-dev linux-headers libmemcached-dev rabbitmq-c-dev hiredis-dev @@ -79,7 +79,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ # - modules for devel purposes _mod_list_devel="misctest print print_lib" -# - modules depending on pcre3 library +# - modules depending on pcre2 library _mod_list_pcre="dialplan lcr regex" # - modules depending on radius client library

1 0

git:master:2f212ba4: core: added proto file to use info structure
by Daniel-Constantin Mierla 12 Oct '23

12 Oct '23

Module: kamailio Branch: master Commit: 2f212ba4deab4841382690eed08f9afcae1ec46f URL: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-12T17:46:00+02:00 core: added proto file to use info structure - can be set via socket global parameter structure --- Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af… Patch: https://github.com/kamailio/kamailio/commit/2f212ba4deab4841382690eed08f9af…

1 0

[kamailio/kamailio] cdp: Not possible to load module with older openssl version than 1.1.1 (Issue #3600)
by mtryfoss 11 Oct '23

11 Oct '23

### Description After adding TLS support to the CDP module, it's no longer possible to load on systems running a version of openssl older than 1.1.1. #### Reproduction Run on system with openssl older than 1.1.1. #### Log Messages  ``` ERROR: <core> [core/sr_module.c:599]: ksr_load_module(): could not open module </usr/local/kamailio-devel/lib64/kamailio/modules/cdp.so>: /usr/local/kamailio-devel/lib64/kamailio/modules/cdp.so: undefined symbol: SSL_CTX_set_max_proto_version ``` ### Possible Solutions I've made a local change based on the approach used in the tls module for different versions of openssl. Do you want me to open a PR for this, or do you want this module clean? Currently I do not have any possibility to test it's actually working, but at least it compiles/loads and makes to module possible to use without encryption. Another solution might be to just include TLS support if the openssl version on the system is 1.1.1 or newer. Else, just do not support it. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` master ``` * **Operating System**:  ``` CentOS 7.9 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3600 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3600(a)github.com>

2 4

[kamailio/kamailio] cdp: Disable TLS support for openssl versions older than 1.1.0 (PR #3601)
by mtryfoss 11 Oct '23

11 Oct '23

#### 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 - [x] Related to issue #3600 #### Description Disabled parts of code if installed openssl version is older than 1.1.0 based on feedback in issue #3600. Tested non-TLS connection locally. Not tested with TLS. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3601 -- Commit Summary -- * cdp: Disable TLS support for openssl versions older than 1.1.0 -- File Changes -- M src/modules/cdp/cdp_mod.c (7) M src/modules/cdp/cdp_tls.c (2) M src/modules/cdp/receiver.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3601.patch https://github.com/kamailio/kamailio/pull/3601.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3601 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3601(a)github.com>

2 4

git:master:4045f3d7: cdp: changed format
by Daniel-Constantin Mierla 11 Oct '23

11 Oct '23

Module: kamailio Branch: master Commit: 4045f3d7c0302ae47f0d6c2160160767d56826eb URL: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-11T13:19:04+02:00 cdp: changed format --- Modified: src/modules/cdp/cdp_mod.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… Patch: https://github.com/kamailio/kamailio/commit/4045f3d7c0302ae47f0d6c216016076… --- diff --git a/src/modules/cdp/cdp_mod.c b/src/modules/cdp/cdp_mod.c index 5f776f57a1f..963d46c8705 100644 --- a/src/modules/cdp/cdp_mod.c +++ b/src/modules/cdp/cdp_mod.c @@ -239,7 +239,7 @@ static int cdp_init(void) return 1; } - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { init_ssl_methods(); method = tls_parse_method(&tls_method); @@ -248,12 +248,12 @@ static int cdp_init(void) return -1; } } - #else +#else if(enable_tls) { LM_ERR("TLS requires openssl 1.1.0 or newer\n"); return -1; } - #endif +#endif register_procs(2 + config->workers + 2 * config->peers_cnt); cfg_register_child(2 + config->workers + 2 * config->peers_cnt); diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0a15ce3aaeb..ceee98127f6 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -813,12 +813,12 @@ int receive_loop(peer *original_peer) p->R_sock = fd; } - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } - #endif +#endif } else { sp2 = add_serviced_peer(NULL); if(!sp2) { @@ -826,12 +826,12 @@ int receive_loop(peer *original_peer) continue; } sp2->tcp_socket = fd; - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L if(enable_tls) { to_ssl(&sp2->tls_ctx, &sp2->tls_conn, sp->tcp_socket, method); } - #endif +#endif } } } @@ -883,9 +883,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, strerror(errno)); AAAFreeMessage(&msg); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); - #endif +#endif close(sp->tcp_socket); goto drop_peer; } @@ -898,9 +898,9 @@ int receive_loop(peer *original_peer) sp->p ? sp->p->fqdn.s : "", sp->tcp_socket, cnt, msg->buf.len); AAAFreeMessage(&msg); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if OPENSSL_VERSION_NUMBER >= 0x10100000L cleanup_ssl(sp->tls_ctx, sp->tls_conn); - #endif +#endif close(sp->tcp_socket); goto drop_peer; }

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023