- sr-dev - kamailio.org

git:master:1535031a: etc/kamailio.cfg: remove executable flag
by Daniel-Constantin Mierla 08 May '24

08 May '24

Module: kamailio Branch: master Commit: 1535031a6c992c23270050793b23d290a631b684 URL: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-08T06:59:23+02:00 etc/kamailio.cfg: remove executable flag --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… Patch: https://github.com/kamailio/kamailio/commit/1535031a6c992c23270050793b23d29… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg old mode 100755 new mode 100644

1 0

git:5.7:a49a4aef: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: a49a4aefa7c72e113d354f0e71add874fb191ec9 URL: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T21:16:27+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… Patch: https://github.com/kamailio/kamailio/commit/a49a4aefa7c72e113d354f0e71add87… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:5.8:191aec6e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 191aec6ef644024741c23776c35fc712aa82a6b5 URL: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T21:16:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… Patch: https://github.com/kamailio/kamailio/commit/191aec6ef644024741c23776c35fc71… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:5.7:289ab7dd: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 289ab7ddceaaf923edfe15b11361f0acb16c0dde URL: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T19:02:35Z sipcapture: fix default DB URL docs (cherry picked from commit aeeeb0c2f46c2575639dd725bef78fac64219a07) (cherry picked from commit 29ef69b8807023e082d7c9880c63bee11d4f3b30) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… Patch: https://github.com/kamailio/kamailio/commit/289ab7ddceaaf923edfe15b11361f0a… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.8:29ef69b8: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 29ef69b8807023e082d7c9880c63bee11d4f3b30 URL: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T19:02:16Z sipcapture: fix default DB URL docs (cherry picked from commit aeeeb0c2f46c2575639dd725bef78fac64219a07) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… Patch: https://github.com/kamailio/kamailio/commit/29ef69b8807023e082d7c9880c63bee… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.8:c3f424bd: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: c3f424bd6c0f8b9a2557cd58a3e3f5ac586d8c99 URL: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T19:46:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… Patch: https://github.com/kamailio/kamailio/commit/c3f424bd6c0f8b9a2557cd58a3e3f5a… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index bbebe20ffb3..1897be96e1b 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -437,6 +437,14 @@ event_route[tcp:closed] { Whether these routes are always called, never, or on a per socket basis is controlled by the closed_event parameter. + Note that the event routes can be executed by TCP main process, which + manages the TCP connections but does not hande the SIP traffic over + them. It is very important not do do any time consuming operations + inside the event routes. Also, many resources might not be available in + the TCP main process (e.g., database connections), consider using async + module with async_task_data(...) or async_task_group_data() functions + for delegating task execution to async workers. + 4.1. tcp:closed Called for each "normal" TCP socket closure by the other side

1 0

git:master:29910ecc: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 29910ecc8f27cf70aa4490f8ed5188199ad8e612 URL: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T19:46:10+02:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… Patch: https://github.com/kamailio/kamailio/commit/29910ecc8f27cf70aa4490f8ed51881… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index bbebe20ffb3..1897be96e1b 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -437,6 +437,14 @@ event_route[tcp:closed] { Whether these routes are always called, never, or on a per socket basis is controlled by the closed_event parameter. + Note that the event routes can be executed by TCP main process, which + manages the TCP connections but does not hande the SIP traffic over + them. It is very important not do do any time consuming operations + inside the event routes. Also, many resources might not be available in + the TCP main process (e.g., database connections), consider using async + module with async_task_data(...) or async_task_group_data() functions + for delegating task execution to async workers. + 4.1. tcp:closed Called for each "normal" TCP socket closure by the other side

1 0

git:5.8:383a81bb: tcpops: note about execution of event routes by TCP main process
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 383a81bb9d81e06ab9da99cdaa3def3b63028040 URL: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T19:34:35+02:00 tcpops: note about execution of event routes by TCP main process (cherry picked from commit be9af338e3afdab1045cdd7c30a72a9ecddcb680) --- Modified: src/modules/tcpops/doc/eventroutes.xml --- Diff: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… Patch: https://github.com/kamailio/kamailio/commit/383a81bb9d81e06ab9da99cdaa3def3… --- diff --git a/src/modules/tcpops/doc/eventroutes.xml b/src/modules/tcpops/doc/eventroutes.xml index ff05df24cdc..1166d366f0c 100644 --- a/src/modules/tcpops/doc/eventroutes.xml +++ b/src/modules/tcpops/doc/eventroutes.xml @@ -31,6 +31,16 @@ <emphasis>closed_event</emphasis> parameter. </para> + <para> + Note that the event routes can be executed by TCP main process, + which manages the TCP connections but does not hande the SIP traffic + over them. It is very important not do do any time consuming + operations inside the event routes. Also, many resources might not + be available in the TCP main process (e.g., database connections), + consider using async module with async_task_data(...) or + async_task_group_data() functions for delegating task execution + to async workers. + </para> <section> <title> <function moreinfo="none">tcp:closed</function> @@ -77,4 +87,4 @@ event_route[tcp:reset] { </programlisting> </para> </section> -</section> \ No newline at end of file +</section>

1 0

git:master:be9af338: tcpops: note about execution of event routes by TCP main process
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: be9af338e3afdab1045cdd7c30a72a9ecddcb680 URL: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T19:32:39+02:00 tcpops: note about execution of event routes by TCP main process --- Modified: src/modules/tcpops/doc/eventroutes.xml --- Diff: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… Patch: https://github.com/kamailio/kamailio/commit/be9af338e3afdab1045cdd7c30a72a9… --- diff --git a/src/modules/tcpops/doc/eventroutes.xml b/src/modules/tcpops/doc/eventroutes.xml index ff05df24cdc..1166d366f0c 100644 --- a/src/modules/tcpops/doc/eventroutes.xml +++ b/src/modules/tcpops/doc/eventroutes.xml @@ -31,6 +31,16 @@ <emphasis>closed_event</emphasis> parameter. </para> + <para> + Note that the event routes can be executed by TCP main process, + which manages the TCP connections but does not hande the SIP traffic + over them. It is very important not do do any time consuming + operations inside the event routes. Also, many resources might not + be available in the TCP main process (e.g., database connections), + consider using async module with async_task_data(...) or + async_task_group_data() functions for delegating task execution + to async workers. + </para> <section> <title> <function moreinfo="none">tcp:closed</function> @@ -77,4 +87,4 @@ event_route[tcp:reset] { </programlisting> </para> </section> -</section> \ No newline at end of file +</section>

1 0

[kamailio/kamailio] sql_query fails from tcp:closed event_route (Issue #3843)
by juha-h 07 May '24

07 May '24

### Description I noticed that sql_query does not work (using latest 5.8 on Debian 12) when called from `tcp:closed` event_route: ``` event_route [tcp:closed] { # Handle TCP connection close # Delete possible leftover registration if ($conid) sql_query("sip_proxy_cache", "DELETE FROM location WHERE server_id=0 AND connection_id=$conid", "result"); } ``` The query produces errors: ``` 2024-05-07T11:30:14.785915+03:00 siika /usr/bin/sip-proxy[2848078]: CRITICAL: sqlops [sqlops.c:213]: sql_check_connection(): no database handle with reconnect disabled 2024-05-07T11:30:14.785978+03:00 siika /usr/bin/sip-proxy[2848078]: ERROR: sqlops [sqlops.c:232]: sql_query(): invalid connection to database 2024-05-07T11:30:14.786013+03:00 siika /usr/bin/sip-proxy[2848078]: ERROR: sqlops [sqlops.c:237]: sql_query(): with query [DELETE FROM location WHERE server_id=0 AND connection_id=7] ``` I added the last debug message in order to find out where the error comes from. The same query works fine when executed from regular route and earlier (but don't remember when), the same query worked fine also from `tcp:closed` event_route. This may be related to https://github.com/kamailio/kamailio/issues/3768. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3843 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3843(a)github.com>

2 11

git:master:3b7754fd: modules: readme files regenerated - sipcapture ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 3b7754fd3a75f849bb7509968843817d5888b2f8 URL: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T18:16:09+02:00 modules: readme files regenerated - sipcapture ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… Patch: https://github.com/kamailio/kamailio/commit/3b7754fd3a75f849bb7509968843817… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index c9bb2daca98..c551663536f 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,11 +218,12 @@ Chapter 1. Admin Guide Database URL. - Default value is ��DEFAULT_DB_URL��. + Default value is ��mysql://kamailio:kamailiorw@localhost/kamailio��. Example 1.1. Set db_url parameter ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio +") ... 3.2. table_name (str)

1 0

git:master:aeeeb0c2: sipcapture: fix default DB URL docs
by Henning Westerholt 07 May '24

07 May '24

Module: kamailio Branch: master Commit: aeeeb0c2f46c2575639dd725bef78fac64219a07 URL: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T16:14:46Z sipcapture: fix default DB URL docs --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… Patch: https://github.com/kamailio/kamailio/commit/aeeeb0c2f46c2575639dd725bef78fa… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 6a428133866..258e30fe237 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,14 +89,14 @@ </para> <para> <emphasis> - Default value is <quote>DEFAULT_DB_URL</quote>. + Default value is <quote>&defaultdb;</quote>. </emphasis> </para> <example> <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sipcapture", "db_url", "mysql://user:passwd@host/dbname") +modparam("sipcapture", "db_url", "&defaultdb;") ... </programlisting> </example>

1 0

git:5.7:278e29a5: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 278e29a5750401fe5d0e7482792dbb113362103b URL: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T17:46:25+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… Patch: https://github.com/kamailio/kamailio/commit/278e29a5750401fe5d0e7482792dbb1… --- diff --git a/src/modules/sipcapture/README b/src/modules/sipcapture/README index dda17d994c6..c9bb2daca98 100644 --- a/src/modules/sipcapture/README +++ b/src/modules/sipcapture/README @@ -218,7 +218,7 @@ Chapter 1. Admin Guide Database URL. - Default value is "". + Default value is ��DEFAULT_DB_URL��. Example 1.1. Set db_url parameter ...

1 0

git:5.7:5566647a: ctl: info log on ECONNRESET (connection reset by peer)
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 5566647a85f23e753774fa4c87e213c2fbb7b317 URL: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:41+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio (cherry picked from commit 446c75e0e2194b6e42d768d2e3c79b5f0222905f) (cherry picked from commit b5eb4f5ca037239f2ec1d99a16a71af0383f737e) --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… Patch: https://github.com/kamailio/kamailio/commit/5566647a85f23e753774fa4c87e213c… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index eb93f5f960d..4c15a6b1f21 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -486,7 +486,11 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) } else if(errno == EINTR) { goto again; } - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("handle_stream read: eof on %s\n", s_c->parent->name); @@ -602,7 +606,11 @@ static int handle_fifo_read(struct ctrl_socket *cs, int idx) goto no_read; /* nothing has been read */ } else if(errno == EINTR) goto again; - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("eof on %s\n", cs->name);

1 0

git:5.7:d9e63ac9: ctl: removed level and function names from log messages
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: d9e63ac912c1f0b3ec71611516ea3e52206b6edf URL: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:35+02:00 ctl: removed level and function names from log messages (cherry picked from commit 65bafaffd6bcfebc508b774cfbb78120e68bb3f0) (cherry picked from commit 24e43d27544bdfa1acfce7ebb8b6e3ba7841fc13) --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5… Patch: https://github.com/kamailio/kamailio/commit/d9e63ac912c1f0b3ec71611516ea3e5…

1 0

git:5.7:64421e2d: core: parse/contact: jump to error on too many contacts
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 64421e2d4ed48e4a77cd997e389ae4a5225b40ab URL: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:27+02:00 core: parse/contact: jump to error on too many contacts (cherry picked from commit f69b22d44cb5abc803c2b58790dd33f2310c1c59) (cherry picked from commit 11f0cfec4d2fc6043d282cdb2258520559f0fcd1) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… Patch: https://github.com/kamailio/kamailio/commit/64421e2d4ed48e4a77cd997e389ae4a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index caf2e38d904..4b02ab608cb 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -329,7 +329,7 @@ int parse_contacts(str *_s, contact_t **_c) if(n > KSR_MAX_CONTACTS) { LM_ERR("too many contacts: %d\n", n); - return -1; + goto error; } if(_s->len == 0) { LM_ERR("text after comma missing\n");

1 0

git:5.7:45fd99f5: core: parser/contact - basic validation tests for contact uri
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 45fd99f53643b56bce65eb9d603a5b81059aa21d URL: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:21+02:00 core: parser/contact - basic validation tests for contact uri (cherry picked from commit fc52a54370c085d6fa951da876eee99580677922) (cherry picked from commit d75dba611808322356fc8d1ebc9f8c30b4124a15) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… Patch: https://github.com/kamailio/kamailio/commit/45fd99f53643b56bce65eb9d603a5b8… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 56a37af1785..caf2e38d904 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -220,10 +220,12 @@ int parse_contacts(str *_s, contact_t **_c) param_hooks_t hooks; str sv; int n; + int star; sv = *_s; n = 0; + star = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -265,6 +267,25 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } + if(c->uri.len == 1) { + if(c->uri.s[0] == '*') { + if(star == 1) { + LM_ERR("too many star contacts - index %d\n", n); + goto error; + } else { + star = 1; + } + } else { + LM_ERR("contact uri size 1 is too short - index %d\n", n); + goto error; + } + } else if(c->uri.len < 3) { + /* minimum length 's:a' (s - schema; a - address) */ + LM_ERR("contact uri size %d is too short - index %d\n", n, + c->uri.len); + goto error; + } + if(_s->len == 0) goto ok;

1 0

git:5.7:49135f37: core: parser/contact - add limit for max number of contacts
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 49135f37d94aaf49a1c6b6a47bdc5a80bd3e5028 URL: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:31:14+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 (cherry picked from commit d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96) (cherry picked from commit 5b97d29f1bbac2656eba506c7fd94b412dfb9b7f) --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… Patch: https://github.com/kamailio/kamailio/commit/49135f37d94aaf49a1c6b6a47bdc5a8… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 3c66a2082b0..56a37af1785 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -209,6 +209,8 @@ static inline int skip_name(str *_s) } +#define KSR_MAX_CONTACTS 256 + /* * Parse contacts in a Contact HF */ @@ -217,9 +219,11 @@ int parse_contacts(str *_s, contact_t **_c) contact_t *c; param_hooks_t hooks; str sv; + int n; sv = *_s; + n = 0; while(1) { /* Allocate and clear contact structure */ c = (contact_t *)pkg_malloc(sizeof(contact_t)); @@ -261,7 +265,6 @@ int parse_contacts(str *_s, contact_t **_c) LM_ERR("invalid contact uri\n"); goto error; } - if(_s->len == 0) goto ok; @@ -301,7 +304,12 @@ int parse_contacts(str *_s, contact_t **_c) c->next = *_c; *_c = c; c = NULL; + n++; + if(n > KSR_MAX_CONTACTS) { + LM_ERR("too many contacts: %d\n", n); + return -1; + } if(_s->len == 0) { LM_ERR("text after comma missing\n"); goto error;

1 0

git:5.7:65c8761d: sipcapture: docs - fix default value for parameter
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: 65c8761d9b04d01d0609b09c7ed75c9518f72d77 URL: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:50+02:00 sipcapture: docs - fix default value for parameter (cherry picked from commit 265c948286f2df5136179c95fbb1d7f1255e4c71) (cherry picked from commit 3aac0c7379577480fb09902bfb31b9aed49e7f88) --- Modified: src/modules/sipcapture/doc/sipcapture_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… Patch: https://github.com/kamailio/kamailio/commit/65c8761d9b04d01d0609b09c7ed75c9… --- diff --git a/src/modules/sipcapture/doc/sipcapture_admin.xml b/src/modules/sipcapture/doc/sipcapture_admin.xml index 8bca159432f..6a428133866 100644 --- a/src/modules/sipcapture/doc/sipcapture_admin.xml +++ b/src/modules/sipcapture/doc/sipcapture_admin.xml @@ -89,7 +89,7 @@ </para> <para> <emphasis> - Default value is "". + Default value is <quote>DEFAULT_DB_URL</quote>. </emphasis> </para> <example>

1 0

git:5.7:ac56db7f: uid_auth_db: spelling fix in documentation
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: ac56db7fab9d1157e89a6daf81915e3058f7178c URL: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:16+02:00 uid_auth_db: spelling fix in documentation (cherry picked from commit 9f28450312749dfbc021a8cbc23472c8a39d3fef) (cherry picked from commit b2352bc1c6f3eff3aba85a087107f4ca29cedc22) --- Modified: src/modules/uid_auth_db/auth_db.xml --- Diff: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… Patch: https://github.com/kamailio/kamailio/commit/ac56db7fab9d1157e89a6daf81915e3… --- diff --git a/src/modules/uid_auth_db/auth_db.xml b/src/modules/uid_auth_db/auth_db.xml index 25849663c54..99e5eb7c594 100644 --- a/src/modules/uid_auth_db/auth_db.xml +++ b/src/modules/uid_auth_db/auth_db.xml @@ -66,7 +66,7 @@ the <serdoc:module>textops</serdoc:module> module. </para> <para> - The reason for the failure can be determined from the interger + The reason for the failure can be determined from the integer return value stored in the <varname>$?</varname> attribute. A value of <literal>-3</literal> indicates that it was impossible to retrieve credentials from the request. A 400 (Bad Request)

1 0

git:5.7:ff5d1e73: core: spelling fix in comment and log message
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: 5.7 Commit: ff5d1e73cd04ca84e423cd9efbec4014e9dbc2e4 URL: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:30:08+02:00 core: spelling fix in comment and log message (cherry picked from commit db176a4918c0b500f5f051cad16fd8d442450ab7) (cherry picked from commit 0bf03aa1987b9cff2fc0d776605620e26c163609) --- Modified: src/core/switch.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… Patch: https://github.com/kamailio/kamailio/commit/ff5d1e73cd04ca84e423cd9efbec401… --- diff --git a/src/core/switch.c b/src/core/switch.c index 79cee21c501..e12b7e5f6d1 100644 --- a/src/core/switch.c +++ b/src/core/switch.c @@ -203,7 +203,7 @@ int fix_switch(struct action *t) return E_BUG; } if(rval_expr_eval_long(0, 0, &c->label.match_int, c->ct_rve) < 0) { - LM_ERR("case expression (%d,%d) has non-interger type\n", + LM_ERR("case expression (%d,%d) has non-integer type\n", c->ct_rve->fpos.s_line, c->ct_rve->fpos.s_col); return E_BUG; } diff --git a/src/core/ut.h b/src/core/ut.h index 8e2e4f0d8f0..d7e2c64e05f 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -312,7 +312,7 @@ static inline char *int2strbuf(unsigned long l, char *r, int r_size, int *len) } extern char ut_buf_int2str[INT2STR_MAX_LEN]; -/** interger(long) to string conversion. +/** integer(long) to string conversion. * This version uses a static buffer (shared with sint2str()). * WARNING: other function calls might overwrite the static buffer, so * either always save the result immediately or use int2strbuf(...).

1 0

git:5.8:1ee553a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 May '24

07 May '24

Module: kamailio Branch: 5.8 Commit: 1ee553a6f406af5eb4838a8c46a992c4099dd30b URL: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-05-07T17:31:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/sipcapture/README --- Diff: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c… Patch: https://github.com/kamailio/kamailio/commit/1ee553a6f406af5eb4838a8c46a992c…

1 0

git: new commits in branch 5.8
by Daniel-Constantin Mierla 07 May '24

07 May '24

- URL: https://github.com/kamailio/kamailio/commit/0bf03aa1987b9cff2fc0d776605620e… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:05:58+02:00 core: spelling fix in comment and log message (cherry picked from commit db176a4918c0b500f5f051cad16fd8d442450ab7) - URL: https://github.com/kamailio/kamailio/commit/b2352bc1c6f3eff3aba85a087107f4c… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2024-05-07T17:06:04+02:00 uid_auth_db: spelling fix in documentation (cherry picked from commit 9f28450312749dfbc021a8cbc23472c8a39d3fef) - URL: https://github.com/kamailio/kamailio/commit/1dd7c4038eb9a0c7eec506994a58a56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:14+02:00 ims_usrloc_scscf: reformat exported structures (cherry picked from commit 15d859e1e96552fca2708cf56047021beae29711) - URL: https://github.com/kamailio/kamailio/commit/620aa3f2a0faf3a4d54908bac0aa3ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:20+02:00 ims_usrloc_scscf: enclose examples in dotted lines for better visibility (cherry picked from commit 8506a6fe781e6e0b0b1418f4087db50480db6b57) - URL: https://github.com/kamailio/kamailio/commit/89343b6031f186c59ecd6707109bd02… Author: Ostap <ostap_mal(a)hotmail.com> Date: 2024-05-07T17:06:39+02:00 modules/statsd: ensure statsd failures do not stop execution (#3819) * modules/statsd: avoid stopping flow when sending statsd metric fails Currently statsd functions return bool: `true` or `false` depending when the function succeeds or fails respectively. This value gets implicitly converted to `int`: `true` -> `1`, `false` -> `0`. For Kamailio `1` means succesfull execution, but `0` means to stop processing messages, which is not what we want as statsd should not impact flow execution. Instead we want to return `-1` which signifies error, but the flow continues. * modules/statsd: do not fail module initilization when statsd init fails statsd_init executes `statsd_connect` which tries to connect to statd server. If connection fails then kamailio fails to start. This is not the desired behaviour as: 1. Kamailio should continue working even if statsd server is down, metrics should not impact runtime. 2. `statsd_connect` is also re-executed each time we try to send the metric https://github.com/salemove/kamailio/blame/master/src/modules/statsd/lib_st…, so it's initial result is not essential. Note, that before 5.8 the result of init was already ignored due to implicit conversion of `false` to `0` until after https://github.com/kamailio/kamailio/commit/0186246fce8f0e4bb46b30c05174983… was introduced (which could be considered a breaking change even if it seemingly fixes a bug in conversion). (cherry picked from commit 5e66ba23851f115bcb88d7e3f71f78ab33fc1e30) - URL: https://github.com/kamailio/kamailio/commit/8af0605ade36566597ff691a2adc1e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:06:49+02:00 ims_registrar_scscf: init variable to fix analyzer warning (cherry picked from commit 8558947034f16b162c15eda39d18f5f5df4ef562) - URL: https://github.com/kamailio/kamailio/commit/1387c32dfa601496c38f9c10d554c49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:01+02:00 ims_ipsec_pcscf: decouple IPSEC_FORWARD_USEVIA and IPSEC_TCPPORT_UEC for requests - both flags should be avaible for use at the same time in ipsec_forward() - for request IPSEC_FORWARD_USEVIA gets the protocol from the next hop address (cherry picked from commit ab261540d656ed456bac8876f77f940457a9baf6) - URL: https://github.com/kamailio/kamailio/commit/7e202ec38593462559e81db7b0f97e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:11+02:00 ims_ipsec_pcscf: docs updated for ipsec_forward() flags (cherry picked from commit 575b17d23cd5fa060f775bc56b42c735048bc849) - URL: https://github.com/kamailio/kamailio/commit/9493dc0c895d1dde50239c903fd976c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:18+02:00 ims_ipsec_pcscf: updated comments for ipsec_forward() flags (cherry picked from commit f7f93828993b5975dfe5f26ad63ba6c489aa69f7) - URL: https://github.com/kamailio/kamailio/commit/00f51e28875c209cbf25a47c96e60c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:07:24+02:00 ims_ipsec_pcscf: handle tls for replies (cherry picked from commit 48dab490965fa7f2f7200d95edd7dbb1407b2536) - URL: https://github.com/kamailio/kamailio/commit/4aa0920b2e573661959d5c9149ee041… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:07:38+02:00 ims_registrar_scscf: fix uninitialized arguments in save() The script "save" command can be used with different arguments: 2, 3 and 4. But internally for all save() calls the exact same function is use, w_save(). When calling save("PRE_REG_SAR_REPLY","location"); as given by the examples, kamailio will call w_save(). Because the command code will cast the function pointer, the w_save() function is called with 2 uninitialized arguments *mode, *c_flags. mode is unused, seems a legacy argument. c_flags is referenced resulting in a crash if not null. Use separate wrapper functions to handle different argument number. Fixes: a627c9a04a74 ("ims_registrar_scscf: Extend save() with optional flag") (cherry picked from commit 20a75004d53a06da0f22b11804a4d83496ad8919) - URL: https://github.com/kamailio/kamailio/commit/8bb9f0601eb94597f3bfab4ede97971… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:03+02:00 ims_registrar_scscf: refactor save_fixup4 Rename function to match argument number. Use assign_save_fixup3_async instead of the code copy (cherry picked from commit 82a6d7ea6edbaca60879a38c5e74e40920e89342) - URL: https://github.com/kamailio/kamailio/commit/569662043b656063be97d0ea0e22dd8… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:11+02:00 ims_registrar_scscf: fix typo in function name uint_fixup (cherry picked from commit 6f908f05d4691abcb1b3a745048d3cc2a9996676) - URL: https://github.com/kamailio/kamailio/commit/4b3620d0f0d7d636bf1d9e4c2b19bf5… Author: Alexander Couzens <lynxis(a)fe80.eu> Date: 2024-05-07T17:08:22+02:00 ims_registrar_scscf: free_uint_fixup: fix memleak/freeing the wrong parameter The free_uint_fixup() freed the wrong parameter in the past. (cherry picked from commit c3e6c1edc7531406208efe2965243e6e81506127) - URL: https://github.com/kamailio/kamailio/commit/4e98a4ae06ec0bbff408af211680c97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:32+02:00 ims_ipsec_pcscf: cascade on options to get the uri for fill_contact() (cherry picked from commit 60d2ab6464657abf38136a771c297c6f5536e27a) - URL: https://github.com/kamailio/kamailio/commit/3aac0c7379577480fb09902bfb31b9a… Author: Jannik <40364587+volkland(a)users.noreply.github.com> Date: 2024-05-07T17:08:41+02:00 sipcapture: docs - fix default value for parameter (cherry picked from commit 265c948286f2df5136179c95fbb1d7f1255e4c71) - URL: https://github.com/kamailio/kamailio/commit/fc54fdcd67e244ad075c54b5f24bb64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:52+02:00 tm: free new buffer on drop for local requests - GH #3403 (cherry picked from commit ee06666c43d96029315dae7618e10d381265a85a) - URL: https://github.com/kamailio/kamailio/commit/f9ca6854d88e4fcc161e1083a953f47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:08:58+02:00 tm: cb flag to mark local uac on request drop (cherry picked from commit f5da773c5fa29edbf9d0e65a83a62f495928ddec) - URL: https://github.com/kamailio/kamailio/commit/a86d7d2bad119fc4cccf5c19719b445… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:06+02:00 tm: cb_flags made unsigned for uac_req (cherry picked from commit ebd1c6c75a1b832ce85d576aad134b99d47b5738) - URL: https://github.com/kamailio/kamailio/commit/e54b03fc41bc55486430b09d9a4839b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:15+02:00 pv_headers: print also the new TMCB_LOCAL_REQUEST_DROP in debug function (cherry picked from commit 68624c2da093ab789d4e8d35df65ef1bce024bca) - URL: https://github.com/kamailio/kamailio/commit/965a02ba4aca9283e4f43f8153ebeb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:25+02:00 presence: check if the local notify was dropped in event route - free tm cb parameter on drop - related to GH #3403 (cherry picked from commit d12fc31056cb37aac347ec05f9ada7bafa5f52de) - URL: https://github.com/kamailio/kamailio/commit/46c8e1a5b0e11162eee2c0b201bb535… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:39+02:00 uac: check if local requests are dropped and free the param (cherry picked from commit 00aac8d48370fac356eecff535835d918c631cc5) - URL: https://github.com/kamailio/kamailio/commit/244319c67a191cf1f093b2220fa1a85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:09:49+02:00 pua: check if local requests are dropped and free the param (cherry picked from commit 53e1a29c265df1489c9bd91deddc0719f8ca2092) - URL: https://github.com/kamailio/kamailio/commit/5b97d29f1bbac2656eba506c7fd94b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:17+02:00 core: parser/contact - add limit for max number of contacts - defined to 256 (cherry picked from commit d6b0beb5a219ae57a62e9e7201a6ec1fe66e5a96) - URL: https://github.com/kamailio/kamailio/commit/d75dba611808322356fc8d1ebc9f8c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:10:25+02:00 core: parser/contact - basic validation tests for contact uri (cherry picked from commit fc52a54370c085d6fa951da876eee99580677922) - URL: https://github.com/kamailio/kamailio/commit/11f0cfec4d2fc6043d282cdb2258520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:19+02:00 core: parse/contact: jump to error on too many contacts (cherry picked from commit f69b22d44cb5abc803c2b58790dd33f2310c1c59) - URL: https://github.com/kamailio/kamailio/commit/24e43d27544bdfa1acfce7ebb8b6e3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:35+02:00 ctl: removed level and function names from log messages (cherry picked from commit 65bafaffd6bcfebc508b774cfbb78120e68bb3f0) - URL: https://github.com/kamailio/kamailio/commit/b5eb4f5ca037239f2ec1d99a16a71af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T17:11:46+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio (cherry picked from commit 446c75e0e2194b6e42d768d2e3c79b5f0222905f)

1 0

git:master:446c75e0: ctl: info log on ECONNRESET (connection reset by peer)
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 446c75e0e2194b6e42d768d2e3c79b5f0222905f URL: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:55:24+02:00 ctl: info log on ECONNRESET (connection reset by peer) - not a type of error that can be controlled by kamailio --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… Patch: https://github.com/kamailio/kamailio/commit/446c75e0e2194b6e42d768d2e3c79b5… --- diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index eb93f5f960d..4c15a6b1f21 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -486,7 +486,11 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) } else if(errno == EINTR) { goto again; } - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("handle_stream read: eof on %s\n", s_c->parent->name); @@ -602,7 +606,11 @@ static int handle_fifo_read(struct ctrl_socket *cs, int idx) goto no_read; /* nothing has been read */ } else if(errno == EINTR) goto again; - LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + if(errno == ECONNRESET) { + LOG(L_INFO, "error reading: %s [%d]\n", strerror(errno), errno); + } else { + LOG(L_ERR, "error reading: %s [%d]\n", strerror(errno), errno); + } goto error_read; } else if(bytes_read == 0) { /* eof */ DBG("eof on %s\n", cs->name);

1 0

git:master:65bafaff: ctl: removed level and function names from log messages
by Daniel-Constantin Mierla 07 May '24

07 May '24

Module: kamailio Branch: master Commit: 65bafaffd6bcfebc508b774cfbb78120e68bb3f0 URL: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-05-07T16:49:49+02:00 ctl: removed level and function names from log messages --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812… Patch: https://github.com/kamailio/kamailio/commit/65bafaffd6bcfebc508b774cfbb7812…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev