sr-dev May 2024

sr-dev@lists.kamailio.org

15 participants
169 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2024