sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
163 discussions

git:master:be9af338: tcpops: note about execution of event routes by TCP main process

by Daniel-Constantin Mierla

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>

4 months, 2 weeks

[kamailio/kamailio] sql_query fails from tcp:closed event_route (Issue #3843)

by juha-h

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

4 months, 2 weeks

git:master:3b7754fd: modules: readme files regenerated - sipcapture ... [skip ci]

by Kamailio Dev

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)

4 months, 2 weeks

git:master:aeeeb0c2: sipcapture: fix default DB URL docs

by Henning Westerholt

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>

4 months, 2 weeks

git:5.7:278e29a5: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

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

4 months, 2 weeks

git:5.7:5566647a: ctl: info log on ECONNRESET (connection reset by peer)

by Daniel-Constantin Mierla

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);

4 months, 2 weeks

git:5.7:d9e63ac9: ctl: removed level and function names from log messages

by Daniel-Constantin Mierla

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…

4 months, 2 weeks

git:5.7:64421e2d: core: parse/contact: jump to error on too many contacts

by Daniel-Constantin Mierla

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");

4 months, 2 weeks

git:5.7:45fd99f5: core: parser/contact - basic validation tests for contact uri

by Daniel-Constantin Mierla

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;

4 months, 2 weeks

git:5.7:49135f37: core: parser/contact - add limit for max number of contacts

by Daniel-Constantin Mierla

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;

4 months, 2 weeks

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024