sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
285 discussions

git:5.6:26d5639f: xlog: docs - updated section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 26d5639f8a81bd797cb409c3170aee2bc0428d8e URL: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T19:12:00+02:00 xlog: docs - updated section ids (cherry picked from commit c6ecf1d18a41167e54dbcfca566ebf7eb8fa5b74) --- Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… Patch: https://github.com/kamailio/kamailio/commit/26d5639f8a81bd797cb409c3170aee2… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3fcda4c105..ba43403308 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -149,7 +149,7 @@ modparam("xlog", "long_format", 1) </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix"> <title><varname>prefix</varname> (str)</title> <para> Prefix to be output before the log message. @@ -168,7 +168,7 @@ modparam("xlog", "prefix", "-xlog: ") </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix_mode"> <title><varname>prefix_mode</varname> (str)</title> <para> control behaviour of <varname>prefix</varname> value.

2 years, 7 months

git:5.6:213e3a85: kazoo: docs - removed unnecessary xinclude entity

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 213e3a850987f53913c9545dcde259d897780fd1 URL: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T19:11:52+02:00 kazoo: docs - removed unnecessary xinclude entity (cherry picked from commit 8caf4ece54623fb3b85cc5c98315d9e53ae56fbf) --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… Patch: https://github.com/kamailio/kamailio/commit/213e3a850987f53913c9545dcde259d… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 4565c078a0..2d47ce83c1 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,9 +6,6 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>

2 years, 7 months

git:master:c6ecf1d1: xlog: docs - updated section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c6ecf1d18a41167e54dbcfca566ebf7eb8fa5b74 URL: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T18:51:51+02:00 xlog: docs - updated section ids --- Modified: src/modules/xlog/doc/xlog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… Patch: https://github.com/kamailio/kamailio/commit/c6ecf1d18a41167e54dbcfca566ebf7… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3fcda4c105..ba43403308 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -149,7 +149,7 @@ modparam("xlog", "long_format", 1) </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix"> <title><varname>prefix</varname> (str)</title> <para> Prefix to be output before the log message. @@ -168,7 +168,7 @@ modparam("xlog", "prefix", "-xlog: ") </programlisting> </example> </section> - <section id="xlog.p.varname"> + <section id="xlog.p.prefix_mode"> <title><varname>prefix_mode</varname> (str)</title> <para> control behaviour of <varname>prefix</varname> value.

2 years, 7 months

git:master:8caf4ece: kazoo: docs - removed unnecessary xinclude entity

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8caf4ece54623fb3b85cc5c98315d9e53ae56fbf URL: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T18:51:25+02:00 kazoo: docs - removed unnecessary xinclude entity --- Modified: src/modules/kazoo/doc/kazoo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… Patch: https://github.com/kamailio/kamailio/commit/8caf4ece54623fb3b85cc5c98315d9e… --- diff --git a/src/modules/kazoo/doc/kazoo_admin.xml b/src/modules/kazoo/doc/kazoo_admin.xml index 4565c078a0..2d47ce83c1 100644 --- a/src/modules/kazoo/doc/kazoo_admin.xml +++ b/src/modules/kazoo/doc/kazoo_admin.xml @@ -6,9 +6,6 @@ <!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> %docentities; -<!ENTITY % xinclude SYSTEM "http://www.docbook.org/xml/4.4/xinclude.mod" > -%xinclude; - ]>

2 years, 7 months

git:master:d32f8f52: core: tcp main - check setsockopt() result for SO_LINGER

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d32f8f52198d04a90f53a221a1797faa1a0f39af URL: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T13:48:28+02:00 core: tcp main - check setsockopt() result for SO_LINGER --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… Patch: https://github.com/kamailio/kamailio/commit/d32f8f52198d04a90f53a221a1797fa… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b046d9a848..9edbe79a36 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3199,8 +3199,7 @@ int tcp_init(struct socket_info* sock_info) inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) { int fd; - - + fd=tcpconn->s; #ifdef USE_TLS if (tcpconn->type==PROTO_TLS || tcpconn->type==PROTO_WSS) @@ -3214,7 +3213,10 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) .l_onoff = 1, /* non-zero value enables linger option in kernel */ .l_linger = 0, /* timeout interval in seconds */ }; - setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl)); + if(setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl))<0) { + LM_WARN("setsockopt SO_LINGER %d - %s\n", errno, + strerror(errno)); + } } if (unlikely(tcp_safe_close(fd)<0)) LM_ERR("(%p): %s close(%d) failed (flags 0x%x): %s (%d)\n", tcpconn,

2 years, 7 months

git: new commits in branch 5.6

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/2f27c6f6765c5356cbfff2e2a81da62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:01:44+02:00 ipops: warning when too many dns containers are created (cherry picked from commit 0f9a833fcc7cbc306a5d47413f6449ccc5a37f59) - URL: https://github.com/kamailio/kamailio/commit/b9418cfae910264696b9b6c6c002e9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:01:54+02:00 ipops: add dns container in dns_update_pv() if not created before - dns context creation relied on using the dns variable in some way, the main purpose of dns_update_pv() being to fill the variable, but one may want to use it for testing only (cherry picked from commit 543cd8f897bc43d5fe1eb4c562d8351b32778209) - URL: https://github.com/kamailio/kamailio/commit/6cb54c218ae8d088720061abe1f8481… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:12+02:00 doc: Fix typos (cherry picked from commit 5497d15766d25625b4704a3bd3e884ef2f1149da) - URL: https://github.com/kamailio/kamailio/commit/6051768c472f5a30467866f38966d0b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:21+02:00 pkg: Fix typos (cherry picked from commit e8bdf2b99de1ecfe8f276e2d9bed54e01588210b) - URL: https://github.com/kamailio/kamailio/commit/d7fcb3178bba4e2084662ddc3a2c43b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:30+02:00 core: Fix typos (cherry picked from commit 5dd8f0a6ff30fd3aa917a98b006106bef61506e5) - URL: https://github.com/kamailio/kamailio/commit/b9f29aff97c4a5a3a78560b915a9325… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:38+02:00 lib: Fix typos (cherry picked from commit 4b2b8925c2c8f195f135ff262f7b45601b111b0d) - URL: https://github.com/kamailio/kamailio/commit/a3d4672795583e5fd955a7c6f549da0… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:47+02:00 acc: Fix typos (cherry picked from commit 5e71d0100ff93e345d31b7210e93be92cde88111) - URL: https://github.com/kamailio/kamailio/commit/141183abadd2e0cc6484ef213cbb122… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:02:55+02:00 auth: Fix typos (cherry picked from commit ba3f7d5157819d55a67a054de1b7d0f8fc521140) - URL: https://github.com/kamailio/kamailio/commit/ef7d6def2802014f03a2e1b45c5af4e… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:05+02:00 ctl: Fix typos (cherry picked from commit 4caf7e70c09a5b61f5c28b89fa1ea5c951e4cbc0) - URL: https://github.com/kamailio/kamailio/commit/3349a521487c0b39f3338948ee9a13c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:25+02:00 ldap: Fix typos (cherry picked from commit f6da37aa7dec1cdc5a737ed354a68ae15cfc7a43) - URL: https://github.com/kamailio/kamailio/commit/ceb88c9a302ad87f951d786eb411907… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:03:35+02:00 pike: Fix typos (cherry picked from commit b94f8da598ef99d06a0db8f9bb2f9ca29a198740) - URL: https://github.com/kamailio/kamailio/commit/668a2f8e80b0e8eadfb37eeb5625070… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:04:30+02:00 sanity: Fix typos (cherry picked from commit c5ff6d9638b1033d2536ed46a7d254c016d8b103) - URL: https://github.com/kamailio/kamailio/commit/73df223b4e78a422f3c3c32ed97266b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:04:47+02:00 tls: Fix typos (cherry picked from commit ff9b030be39f82d0e952301ddd0b61a0de5a8041) - URL: https://github.com/kamailio/kamailio/commit/af6533f0797601dd710ce254adba17c… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-16T10:07:17+02:00 uid_auth_db: Fix typos (cherry picked from commit f72c574372abf4c0286799137896a247ed6269b6) - URL: https://github.com/kamailio/kamailio/commit/d9c87c114b32cfa8af676685557183a… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Date: 2022-05-16T10:17:45+02:00 userblocklist: fix restart errors (cherry picked from commit 778374aba27d81058869dba18b5dd0833893056a) - URL: https://github.com/kamailio/kamailio/commit/616026b4888c4e8b3e42cdb104642e7… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-16T10:18:04+02:00 userblocklist: fix function comment, related to gh #3102 (cherry picked from commit a21c929a389c6e5f85e9166d01adb0d474c6ebaf) - URL: https://github.com/kamailio/kamailio/commit/b90b950712b841a1ce477cd6dd1f8db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:18:50+02:00 app_jsdt: duktape interpreter upgraded to v2.7.0 (cherry picked from commit 3bd6eb0d7322b9f4654656b3f0b5080cd44c6e5b) - URL: https://github.com/kamailio/kamailio/commit/150a66f51ade6484d570a877ff96928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:19:04+02:00 app_squirrel: updated squirrel interpreter to latest git version (3.2+) (cherry picked from commit c5da175fd79ecd17752bb2fd8af2b5a65739e58e) - URL: https://github.com/kamailio/kamailio/commit/f1c7d72f00a2c65c65241d97e2901af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:19:36+02:00 usrloc: connect to db for main process in PROC_POSTCHILDINIT child init (cherry picked from commit 4780d46976a7a392f23af0d89f05855d473bcb30) - URL: https://github.com/kamailio/kamailio/commit/a1c0788f33485bbc80db8993c9fcdfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:26:25+02:00 dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN (cherry picked from commit 1ff86ffceede46c7a67fec92c8319c34c916a545) - URL: https://github.com/kamailio/kamailio/commit/d40aa29915b4621b783384a9b3a69d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:26:37+02:00 mtree: remove single-used small function (cherry picked from commit 2e38d1a5a1178ca437d5256d7619fee251b06d6f) - URL: https://github.com/kamailio/kamailio/commit/0c7abf1010afe72da8d4c117937e6fd… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-16T10:26:49+02:00 geoip2: log errors for cases where the container could not evaluated and add docs - log errors for cases where the container could not evaluated due to missing initialization of the pvc container because no actual access is done in the cfg - add documentation describing that at least one access to the container is necessary for the match function to work correctly (cherry picked from commit 0c16d6824fda729bf481e300992fb6bad057c89d) - URL: https://github.com/kamailio/kamailio/commit/43a8f66903ce11f9017a6c7e2bdfe22… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-16T10:27:56+02:00 siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter - possibility to switch to other then UDP transport protocol in diplicate_uri (cherry picked from commit 2d24221e3b409a13f3724267860d8f8411ae063e) - URL: https://github.com/kamailio/kamailio/commit/bf65c0e229e2bcf2967d3e5fb0a43da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:28:16+02:00 dialog: docs -remark wabout to-tag parameter for dlg_get() (cherry picked from commit b498a0ad470a83f1e21c45a585926509827dda50) - URL: https://github.com/kamailio/kamailio/commit/f8365576dd8291c924870f43b765196… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T10:29:03+02:00 Makefile.defs: version set to 5.6.0-rc1

2 years, 7 months

git:master:2538ddd3: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 2538ddd36245c86424ef4911c7bc8bf65f99eefb URL: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-16T09:16:18+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… Patch: https://github.com/kamailio/kamailio/commit/2538ddd36245c86424ef4911c7bc8bf… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 73e16a5977..bae07dc79d 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1705,7 +1705,8 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", Meaning of the parameters is as follows: * callid - SIP call-id. * ftag - SIP From tag. - * ttag - SIP To tag. + * ttag - SIP To tag (it can be empty string to match a dialog during + call setup (eg., match for CANCEL)). This function can be used from BRANCH_ROUTE, REQUEST_ROUTE, ONREPLY_ROUTE and FAILURE_ROUTE.

2 years, 7 months

git:master:b498a0ad: dialog: docs -remark wabout to-tag parameter for dlg_get()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b498a0ad470a83f1e21c45a585926509827dda50 URL: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T09:09:42+02:00 dialog: docs -remark wabout to-tag parameter for dlg_get() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… Patch: https://github.com/kamailio/kamailio/commit/b498a0ad470a83f1e21c45a58592650… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index f8cbfb2e9c..5b8d99b180 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2081,7 +2081,8 @@ dlg_bridge("sip:user@kamailio.org", "sip:annoucement@kamailio.org", </para> </listitem> <listitem> - <para><emphasis>ttag</emphasis> - SIP To tag. + <para><emphasis>ttag</emphasis> - SIP To tag (it can be empty string + to match a dialog during call setup (eg., match for CANCEL)). </para> </listitem> </itemizedlist>

2 years, 7 months

[kamailio/kamailio] core: add an option to trigger also an RST on tcp connection close (PR #3101)

by Rick Barenthin

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] 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  We have seen that in deployments where there are strict port requirements on both side, there are tcp connections in TIME_WAIT state causing no fresh TCP connections possible until the TIME_WAIT is gone. In a lot of these case the clients are sending from them self a RST after they send a FIN,ACK from there side but some aren't doing this. The basic idea of this PR is to give an extra option for the tcp configuration from the cfg to trigger always an RST on connection close from Kamailio side. This currently done by enabling SO_LINGER with a value of 0 just before close. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3101 -- Commit Summary -- * core: add an option to trigger also an RST on tcp connection close -- File Changes -- M src/core/cfg.lex (2) M src/core/cfg.y (9) M src/core/tcp_main.c (7) M src/core/tcp_options.c (3) M src/core/tcp_options.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3101.patch https://github.com/kamailio/kamailio/pull/3101.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3101 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3101(a)github.com>

2 years, 7 months

git:master:e46c90c5: core: add an option to trigger also an RST on tcp connection close

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e46c90c5ca98a9fba08382686c25c707efd57bf3 URL: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T08:01:02+02:00 core: add an option to trigger also an RST on tcp connection close - This gives an option to also send RST in case kamailio closes the connection. There are cases where a FIN,ACK back forth leaves the connection in the host in TIME_WAIT state, but the ports on both sides are fixed. This leads to no request can send until the TIME_WAIT state is gone. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/tcp_main.c Modified: src/core/tcp_options.c Modified: src/core/tcp_options.h --- Diff: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… Patch: https://github.com/kamailio/kamailio/commit/e46c90c5ca98a9fba08382686c25c70… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e5e269ebc0..fc259b2147 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -421,6 +421,7 @@ TCP_OPT_CRLF_PING "tcp_crlf_ping" TCP_OPT_ACCEPT_NO_CL "tcp_accept_no_cl" TCP_OPT_ACCEPT_HEP3 "tcp_accept_hep3" TCP_OPT_ACCEPT_HAPROXY "tcp_accept_haproxy" +TCP_OPT_CLOSE_RST "tcp_close_rst" TCP_CLONE_RCVBUF "tcp_clone_rcvbuf" TCP_REUSE_PORT "tcp_reuse_port" TCP_WAIT_DATA "tcp_wait_data" @@ -917,6 +918,7 @@ IMPORTFILE "import_file" return TCP_OPT_ACCEPT_HEP3; } <INITIAL>{TCP_OPT_ACCEPT_HAPROXY} { count(); yylval.strval=yytext; return TCP_OPT_ACCEPT_HAPROXY; } +<INITIAL>{TCP_OPT_CLOSE_RST} { count(); yylval.strval=yytext; return TCP_OPT_CLOSE_RST; } <INITIAL>{TCP_CLONE_RCVBUF} { count(); yylval.strval=yytext; return TCP_CLONE_RCVBUF; } <INITIAL>{TCP_REUSE_PORT} { count(); yylval.strval=yytext; return TCP_REUSE_PORT; } diff --git a/src/core/cfg.y b/src/core/cfg.y index 7db37bbc09..5b5c51258d 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -450,6 +450,7 @@ extern char *default_routename; %token TCP_OPT_ACCEPT_NO_CL %token TCP_OPT_ACCEPT_HEP3 %token TCP_OPT_ACCEPT_HAPROXY +%token TCP_OPT_CLOSE_RST %token TCP_CLONE_RCVBUF %token TCP_REUSE_PORT %token TCP_WAIT_DATA @@ -1301,6 +1302,14 @@ assign_stm: #endif } | TCP_OPT_ACCEPT_HAPROXY EQUAL error { yyerror("boolean value expected"); } + | TCP_OPT_CLOSE_RST EQUAL NUMBER { + #ifdef USE_TCP + tcp_default_cfg.close_rst=$3; + #else + warn("tcp support not compiled in"); + #endif + } + | TCP_OPT_CLOSE_RST EQUAL error { yyerror("boolean value expected"); } | TCP_CLONE_RCVBUF EQUAL NUMBER { #ifdef USE_TCP diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index c60ce7f2b2..b046d9a848 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3209,6 +3209,13 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) #ifdef TCP_FD_CACHE if (likely(cfg_get(tcp, tcp_cfg, fd_cache))) shutdown(fd, SHUT_RDWR); #endif /* TCP_FD_CACHE */ + if(unlikely(cfg_get(tcp, tcp_cfg, close_rst))) { + struct linger sl = { + .l_onoff = 1, /* non-zero value enables linger option in kernel */ + .l_linger = 0, /* timeout interval in seconds */ + }; + setsockopt(fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl)); + } if (unlikely(tcp_safe_close(fd)<0)) LM_ERR("(%p): %s close(%d) failed (flags 0x%x): %s (%d)\n", tcpconn, su2a(&tcpconn->rcv.src_su, sizeof(tcpconn->rcv.src_su)), diff --git a/src/core/tcp_options.c b/src/core/tcp_options.c index 54f23a0cdb..211bcfb1e9 100644 --- a/src/core/tcp_options.c +++ b/src/core/tcp_options.c @@ -110,6 +110,8 @@ static cfg_def_t tcp_cfg_def[] = { "reuse TCP ports "}, { "wait_data_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 7200000, 0, 0, "wait for data on new tcp connetions (milliseconds)"}, + { "close_rst", CFG_VAR_INT | CFG_READONLY, 0, 1, 0, 0, + "trigger an RST on connection close"}, /* internal and/or "fixed" versions of some vars (not supposed to be writeable, read will provide only debugging value*/ { "rd_buf_size", CFG_VAR_INT | CFG_ATOMIC, 512, 16777216, 0, 0, @@ -167,6 +169,7 @@ void init_tcp_options() tcp_default_cfg.wq_blk_size=DEFAULT_TCP_WBUF_SIZE; tcp_default_cfg.reuse_port=0; tcp_default_cfg.wait_data_ms=5000; + tcp_default_cfg.close_rst=0; } diff --git a/src/core/tcp_options.h b/src/core/tcp_options.h index 284956647b..dd4d8ac20c 100644 --- a/src/core/tcp_options.h +++ b/src/core/tcp_options.h @@ -139,6 +139,7 @@ struct cfg_group_tcp{ int accept_no_cl; /* on/off - accept messages without content-length */ int reuse_port; /* enable SO_REUSEPORT */ int wait_data_ms; /* wait for data in milliseconds */ + int close_rst; /* on /off trigger an RST on connection close */ /* internal, "fixed" vars */ unsigned int rd_buf_size; /* read buffer size (should be > max. datagram)*/

2 years, 7 months

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022