sr-dev April 2024

sr-dev@lists.kamailio.org

12 participants
252 discussions

git:master:38226473: cfgutils: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 382264730393afac09a319df46044c6ac0753ea7 URL: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T14:25:45+02:00 cfgutils: reformat exported structures --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Patch: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6…

7 months, 1 week

git:master:175d755c: tcp_main: Match wss protocol

by Henning Westerholt

Module: kamailio Branch: master Commit: 175d755c40bc50b78b2cf4f18ad22429289af90d URL: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Match wss protocol --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Patch: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e3323736cc0..b71e7ad37f2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5435,7 +5435,7 @@ int wss_send(dest_info_t *dst, const char *buf, unsigned len) if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

7 months, 2 weeks

git:master:d81e5113: core/forward: Match protocol when forwarding

by Henning Westerholt

Module: kamailio Branch: master Commit: d81e5113884b933251499630d112ec5b1150b8a4 URL: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 core/forward: Match protocol when forwarding --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Patch: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… --- diff --git a/src/core/forward.h b/src/core/forward.h index 46bd3a36171..7b51e1a5559 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -189,7 +189,7 @@ static inline int msg_send_buffer( if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

7 months, 2 weeks

git:master:0a28a93c: tcp_main: Update comment docs

by Henning Westerholt

Module: kamailio Branch: master Commit: 0a28a93c6e060081267dc686e342d45ef03358e7 URL: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Update comment docs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Patch: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 0ea1b541ea6..e3323736cc0 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1697,8 +1697,8 @@ void tcpconn_rm(struct tcp_connection *c) /* finds a connection, if id=0 uses the ip addr, port, local_ip and local port * (host byte order) and tries to find the connection that matches all of - * them. Wild cards can be used for local_ip and local_port (a 0 filled - * ip address and/or a 0 local port). + * them. Wild cards can be used for local_ip, local_port and proto (a 0 filled + * ip address and/or a 0 local port and/or PROTO_NONE). * WARNING: unprotected (locks) use tcpconn_get unless you really * know what you are doing */ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, @@ -1754,7 +1754,7 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, /** - * find if a tcp connection exits by id or remote+local address/port + * find if a tcp connection exits by id or remote+local address/port and protocol * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, @@ -1774,6 +1774,7 @@ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, /* TCP connection find with locks and timeout * - local_addr contains the desired local ip:port. If null any local address * will be used. IN*ADDR_ANY or 0 port are wild cards. + * - proto is the protocol to match (PROTO_NONE for any) * - try_local_port makes the search use it first, instead of port from local_addr * If found, the connection's reference counter will be incremented, you might * want to decrement it after use.

7 months, 2 weeks

git:master:6779efd4: tcp_main: Add proto argument to tcpconn_exists function

by Henning Westerholt

Module: kamailio Branch: master Commit: 6779efd430178adff0ae438d178e38c003e4e05c URL: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add proto argument to tcpconn_exists function --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Patch: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 73e2ef6163d..0ea1b541ea6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1758,13 +1758,12 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, - ip_addr_t *local_ip, int local_port) + ip_addr_t *local_ip, int local_port, sip_protos_t proto) { tcp_connection_t *c; TCPCONN_LOCK; - c = _tcpconn_find( - conn_id, peer_ip, peer_port, local_ip, local_port, PROTO_NONE); + c = _tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port, proto); TCPCONN_UNLOCK; if(c) { return 1; @@ -4497,7 +4496,8 @@ static inline int handle_new_connect(struct socket_info *si) if(likely(tcpconn)) { if(tcp_accept_unique) { if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, - &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port, + si->proto)) { LM_ERR("duplicated connection by local and remote addresses\n"); _tcpconn_free(tcpconn); tcp_safe_close(new_sock);

7 months, 2 weeks

git:master:4a40b16d: tcp_main: Add protocol argument for searching tcp/tls connections

by Henning Westerholt

Module: kamailio Branch: master Commit: 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8 URL: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add protocol argument for searching tcp/tls connections --- Modified: src/core/forward.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Patch: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e…

7 months, 2 weeks

[kamailio/kamailio] tcp/docs: Added tcp_accept_iplimit config sample (PR #3792)

by Arnis Voitkāns

#### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We noticed that configuration option tcp_accept_iplimit was included in newer kamailio versions (most notably 5.7.4), and it was a breaking change for us. Added sample configuration value in /etc/kamailio.cfg file - already tested in our production deployment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3792 -- Commit Summary -- * tcp/docs: Added tcp_accept_iplimit config sample -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3792.patch https://github.com/kamailio/kamailio/pull/3792.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3792 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3792(a)github.com>

7 months, 2 weeks

git:master:30a0fe2e: etc/kamailio.cfg: added tcp_accept_iplimit config sample

by Henning Westerholt

Module: kamailio Branch: master Commit: 30a0fe2ea4b1b59bb8e552f9abd3a65e1c7226ec URL: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Author: Arnis Voitkans <a.voitkans(a)dynatech.lv> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T12:40:09Z etc/kamailio.cfg: added tcp_accept_iplimit config sample --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Patch: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..cd2ecd0109f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -211,6 +211,9 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +/* upper limit for TCP connections for one ip address - default 1024 */ +#tcp_accept_iplimit=1024 + #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif

7 months, 2 weeks

[kamailio/kamailio] rtpengine: fix pkg mem leak in send_rtpp_command() (PR #3813)

by vijaykumar-exotel

#### 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 - [x] Tested changes locally - [x] Related to issue #3777 #### Description  - freed request.s after sending request to websocket in send_rtpp_command method. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3813 -- Commit Summary -- * rtpengine: fix pkg mem leak in send_rtpp_command() -- File Changes -- M src/modules/rtpengine/rtpengine.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3813.patch https://github.com/kamailio/kamailio/pull/3813.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3813 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3813(a)github.com>

7 months, 2 weeks

git:master:b4753ae4: rtpengine: fix pkg mem leak in send_rtpp_command()

by Henning Westerholt

Module: kamailio Branch: master Commit: b4753ae4216b0c960ac094f4be8232fb4d0147b0 URL: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Author: vijay kumar <vijay.kumar(a)exotel.in> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:38:27+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Patch: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c51b4742081..6d62b92900d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3672,6 +3672,7 @@ static char *send_rtpp_command( len = _rtpe_lwscb.request(&node->rn_url, (str *)&rtpe_proto, &request, &response, rtpengine_tout_ms * 1000); + pkg_free(request.s); if(len < 0) { LM_ERR("failed to do websocket request\n");

7 months, 2 weeks

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2024