- sr-dev - kamailio.org

git:master:2e38d1a5: mtree: remove single-used small function
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 2e38d1a5a1178ca437d5256d7619fee251b06d6f URL: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T11:19:16+02:00 mtree: remove single-used small function --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… Patch: https://github.com/kamailio/kamailio/commit/2e38d1a5a1178ca437d5256d7619fee… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 8c703f3531..66f72bbd02 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -318,18 +318,6 @@ static int mod_init(void) return -1; } -static int mt_child_init(void) -{ - db_con = mt_dbf.init(&db_url); - if(db_con==NULL) - { - LM_ERR("failed to connect to database\n"); - return -1; - } - - return 0; -} - /* each child get a new connection to the database */ static int child_init(int rank) @@ -338,9 +326,12 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) return 0; - if ( mt_child_init()!=0 ) + db_con = mt_dbf.init(&db_url); + if(db_con==NULL) + { + LM_ERR("failed to connect to database\n"); return -1; - + } LM_DBG("#%d: database connection opened successfully\n", rank); return 0; @@ -942,7 +933,7 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) } rpc->rpl_printf(c, "Ok. Mtrees reloaded."); return; - } + } if(!mt_defined_trees()) { rpc->fault(c, 500, "No Mtrees defined.");

1 0

git:master:1ff86ffc: dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 1ff86ffceede46c7a67fec92c8319c34c916a545 URL: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:16:49+02:00 dialog: open db connection in POSTCHILDINIT callback for DB_MODE_SHUTDOWN --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… Patch: https://github.com/kamailio/kamailio/commit/1ff86ffceede46c7a67fec92c8319c3… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 08f0a85882..4d30b2748f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -738,6 +738,10 @@ static int mod_init(void) return -1; } + if(dlg_db_mode==DB_MODE_SHUTDOWN) { + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } + return 0; } @@ -777,9 +781,9 @@ static int child_init(int rank) } } - if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && - (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) || - (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) + && (rank>0 || rank==PROC_TIMER || rank==PROC_RPC)) + || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_POSTCHILDINIT)) ) { if ( dlg_connect_db(&db_url) ) { LM_ERR("failed to connect to database (rank=%d)\n",rank); return -1;

1 0

git:master:4780d469: usrloc: connect to db for main process in PROC_POSTCHILDINIT child init
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 4780d46976a7a392f23af0d89f05855d473bcb30 URL: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T09:05:18+02:00 usrloc: connect to db for main process in PROC_POSTCHILDINIT child init --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… Patch: https://github.com/kamailio/kamailio/commit/4780d46976a7a392f23af0d89f05855… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index d60162ed3e..797c252b85 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -358,6 +358,16 @@ static int mod_init(void) } /* Shall we use database ? */ + switch (ul_db_mode) { + case DB_ONLY: + case WRITE_THROUGH: + case WRITE_BACK: + /* + * register the need to be called post-fork of all children + * with the special rank PROC_POSTCHILDINIT + */ + ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); + } if (ul_db_mode != NO_DB) { /* Yes */ if (db_bind_mod(&ul_db_url, &ul_dbf) < 0) { /* Find database module */ LM_ERR("failed to bind database module\n"); @@ -452,14 +462,14 @@ static int child_init(int _rank) case WRITE_THROUGH: /* connect to db only from SIP workers, TIMER and MAIN processes, * and RPC processes */ - if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_MAIN + if (_rank<=0 && _rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_RPC) return 0; break; case WRITE_BACK: /* connect to db only from TIMER (for flush), from MAIN (for * final flush() and from child 1 for preload */ - if (_rank!=PROC_TIMER && _rank!=PROC_MAIN && _rank!=PROC_SIPINIT) + if (_rank!=PROC_TIMER && _rank!=PROC_POSTCHILDINIT && _rank!=PROC_SIPINIT) return 0; break; case DB_READONLY:

1 0

git:master:c5da175f: app_squirrel: updated squirrel interpreter to latest git version (3.2+)
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: c5da175fd79ecd17752bb2fd8af2b5a65739e58e URL: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:19+02:00 app_squirrel: updated squirrel interpreter to latest git version (3.2+) --- Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdio.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstream.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqclass.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqstring.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqtable.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.h --- Diff: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a… Patch: https://github.com/kamailio/kamailio/commit/c5da175fd79ecd17752bb2fd8af2b5a…

1 0

git:master:3bd6eb0d: app_jsdt: duktape interpreter upgraded to v2.7.0
by Daniel-Constantin Mierla 09 May '22

09 May '22

Module: kamailio Branch: master Commit: 3bd6eb0d7322b9f4654656b3f0b5080cd44c6e5b URL: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-09T08:36:18+02:00 app_jsdt: duktape interpreter upgraded to v2.7.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080… Patch: https://github.com/kamailio/kamailio/commit/3bd6eb0d7322b9f4654656b3f0b5080…

1 0

git:master:a21c929a: userblocklist: fix function comment, related to gh #3102
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: a21c929a389c6e5f85e9166d01adb0d474c6ebaf URL: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T15:33:56Z userblocklist: fix function comment, related to gh #3102 --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… Patch: https://github.com/kamailio/kamailio/commit/a21c929a389c6e5f85e9166d01adb0d… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index e857178f25..0377761ab3 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -61,7 +61,7 @@ void userblocklist_db_close(void) { /*! - * Initialises the DB API, check the table version and closes the connection. + * Initialises the DB API and check the table version. * This should be called from the mod_init function. * * \return 0 means ok, -1 means an error occurred.

1 0

[kamailio/kamailio] userblocklist: fix restart errors (PR #3102)
by Stefan Mititelu 08 May '22

08 May '22

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Spotted this ERRORs on kamailio restart: ``` ERROR: <core> [db.c:481]: db_use_table(): invalid connection parameter ERROR: userblocklist [db.c:123]: db_reload_source(): cannot use db table 'globalblocklist' ERROR: userblocklist [userblocklist.c:425]: load_source(): cannot load source from 'globalblocklist ``` Debugging it further, seen that the above ERRORs appear on ```check_allowlist()``` function fixup. This was happening because db connection is closed in mod_init and re-done in child_init. But the fixups happen before child_init and they need db connection. Decided to not close the db connection after mod_init because they are later, first closed and then re-opened, in each child. Figured out this fix after checked where each function of db_userblocklist.c is used. ERRORs no longer appear on restart. Thank you, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3102 -- Commit Summary -- * userblocklist: fix restart errors -- File Changes -- M src/modules/userblocklist/db_userblocklist.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3102.patch https://github.com/kamailio/kamailio/pull/3102.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3102 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3102(a)github.com>

2 2

git:master:778374ab: userblocklist: fix restart errors
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 778374aba27d81058869dba18b5dd0833893056a URL: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:32:12+02:00 userblocklist: fix restart errors --- Modified: src/modules/userblocklist/db_userblocklist.c --- Diff: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… Patch: https://github.com/kamailio/kamailio/commit/778374aba27d81058869dba18b5dd08… --- diff --git a/src/modules/userblocklist/db_userblocklist.c b/src/modules/userblocklist/db_userblocklist.c index 47469f5adc..e857178f25 100644 --- a/src/modules/userblocklist/db_userblocklist.c +++ b/src/modules/userblocklist/db_userblocklist.c @@ -91,7 +91,6 @@ int userblocklist_db_init(void) { userblocklist_db_close(); return -1; } - userblocklist_db_close(); return 0; }

1 0

git:master:97efd6a6: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 97efd6a64380025f3b4ef45372180f7e61448c1c URL: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-08T17:31:17+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/ldap/README --- Diff: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… Patch: https://github.com/kamailio/kamailio/commit/97efd6a64380025f3b4ef45372180f7… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 7c31188ac7..878623d24f 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1129,7 +1129,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) 6.34. cdr_facility (integer) Log facility to which CDR messages are issued to syslog. This allows to - easily seperate CDR-specific logging from the other log messages. + easily separate CDR-specific logging from the other log messages. Default value is LOG_DAEMON. diff --git a/src/modules/ldap/README b/src/modules/ldap/README index c7555ca3c6..921f45822f 100644 --- a/src/modules/ldap/README +++ b/src/modules/ldap/README @@ -533,7 +533,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); AVP. It can be either str for string, or int for integer. If avp_type is specified as int then ldap_result tries to convert the LDAP attribute values to integer. In this case, the values are only stored - as AVP if the conversion to integer is succesfull. + as AVP if the conversion to integer is successful. Function Parameters:

1 0

[kamailio/kamailio] Fix typos (PR #3103)
by Bastian Triller 08 May '22

08 May '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Fix typos. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3103 -- Commit Summary -- * doc: Fix typos * pkg: Fix typos * core: Fix typos * lib: Fix typos * acc: Fix typos * auth: Fix typos * ctl: Fix typos * ldap: Fix typos * pike: Fix typos * sanity: Fix typos * tls: Fix typos * uid_auth_db: Fix typos * utils: Fix typos -- File Changes -- M doc/misc/NEWS (2) M doc/tutorials/locking.txt (4) M pkg/kamailio/deb/bionic/rules (2) M pkg/kamailio/deb/bookworm/rules (2) M pkg/kamailio/deb/bullseye/rules (2) M pkg/kamailio/deb/buster/rules (2) M pkg/kamailio/deb/debian/rules (2) M pkg/kamailio/deb/focal/rules (2) M pkg/kamailio/deb/jessie/rules (2) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/rules (2) M pkg/kamailio/deb/stretch/rules (2) M pkg/kamailio/deb/trusty/rules (2) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/rules (2) M src/core/atomic/atomic_mips2.h (2) M src/core/dns_cache.c (4) M src/core/forward.c (2) M src/core/resolve.c (4) M src/core/tcp_main.c (10) M src/lib/cds/dstring.h (2) M src/lib/srdb1/schema/uid_credentials.xml (2) M src/lib/srdb2/db_cmd.c (4) M src/lib/srdb2/schema/credentials.xml (2) M src/modules/acc/doc/acc_admin.xml (2) M src/modules/auth/challenge.c (2) M src/modules/auth/nonce.c (12) M src/modules/ctl/binrpc.h (4) M src/modules/ldap/doc/ldap_admin.xml (2) M src/modules/pike/ip_tree.c (2) M src/modules/sanity/sanity.c (2) M src/modules/sanity/sanity.h (2) M src/modules/tls/tls_server.c (2) M src/modules/uid_auth_db/authorize.c (2) M utils/kamctl/kamdbctl.pgsql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3103.patch https://github.com/kamailio/kamailio/pull/3103.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3103 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3103(a)github.com>

2 2

git:master:c282b581: utils: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: c282b5812c9e9badb4c99fe8ce3bd5cce927044f URL: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 utils: Fix typos --- Modified: utils/kamctl/kamdbctl.pgsql --- Diff: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… Patch: https://github.com/kamailio/kamailio/commit/c282b5812c9e9badb4c99fe8ce3bd5c… --- diff --git a/utils/kamctl/kamdbctl.pgsql b/utils/kamctl/kamdbctl.pgsql index fa1fe1ada8..1eb5d88d2b 100644 --- a/utils/kamctl/kamdbctl.pgsql +++ b/utils/kamctl/kamdbctl.pgsql @@ -20,7 +20,7 @@ # 2006-10-19 Added address table (bogdan) # 2006-10-27 subscriber table cleanup; some columns are created only if # serweb is installed (bogdan) -# 2007-01-26 added seperate installation routine for presence related tables +# 2007-01-26 added separate installation routine for presence related tables # and fix permissions for the SERIAL sequences. # 2007-05-21 Move SQL database definitions out of this script (henning) # 2007-05-31 Move common definitions to kamdbctl.base file (henningw)

1 0

git:master:c5ff6d96: sanity: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: c5ff6d9638b1033d2536ed46a7d254c016d8b103 URL: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 sanity: Fix typos --- Modified: src/modules/sanity/sanity.c Modified: src/modules/sanity/sanity.h --- Diff: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… Patch: https://github.com/kamailio/kamailio/commit/c5ff6d9638b1033d2536ed46a7d254c… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index 4264c2c190..f49d6e50c1 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -578,7 +578,7 @@ int check_cseq_value(sip_msg_t* msg) { return SANITY_CHECK_PASSED; } -/* compare the Content-Length value with the accutal body length */ +/* compare the Content-Length value with the actual body length */ int check_cl(sip_msg_t* msg) { char *body; diff --git a/src/modules/sanity/sanity.h b/src/modules/sanity/sanity.h index 339548edf4..0808cc99a5 100644 --- a/src/modules/sanity/sanity.h +++ b/src/modules/sanity/sanity.h @@ -48,7 +48,7 @@ int check_via_protocol(struct sip_msg* _msg); /* check if the SIP version in the Via header is 2.0 */ int check_via_sip_version(struct sip_msg* _msg); -/* compare the Content-Length value with the accutal body length */ +/* compare the Content-Length value with the actual body length */ int check_cl(struct sip_msg* _msg); /* compare the method in the CSeq header with the request line value */

1 0

git:master:ff9b030b: tls: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: ff9b030be39f82d0e952301ddd0b61a0de5a8041 URL: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 tls: Fix typos --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… Patch: https://github.com/kamailio/kamailio/commit/ff9b030be39f82d0e952301ddd0b61a… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 7004096adf..00686a07dd 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -737,7 +737,7 @@ void tls_h_tcpconn_close_f(struct tcp_connection *c, int fd) tls_mbuf_init(&rd, 0, 0); /* no read */ tls_mbuf_init(&wr, wr_buf, sizeof(wr_buf)); if (tls_set_mbufs(c, &rd, &wr)==0) { - tls_shutdown(c); /* shudown only on succesfull set fd */ + tls_shutdown(c); /* shutdown only on successful set fd */ /* write as much as possible and update wr. * Since this is a close, we don't want to queue the write * (if it can't write immediately, just fail silently)

1 0

git:master:f72c5743: uid_auth_db: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: f72c574372abf4c0286799137896a247ed6269b6 URL: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 uid_auth_db: Fix typos --- Modified: src/modules/uid_auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… Patch: https://github.com/kamailio/kamailio/commit/f72c574372abf4c0286799137896a24… --- diff --git a/src/modules/uid_auth_db/authorize.c b/src/modules/uid_auth_db/authorize.c index 0dd155adda..a71fd45793 100644 --- a/src/modules/uid_auth_db/authorize.c +++ b/src/modules/uid_auth_db/authorize.c @@ -216,7 +216,7 @@ static int generate_avps(db_res_t* result, db_rec_t *row) /* this is a dirty work around to check the credentials of all users, * if the database query returned more then one result * - * Fills res (which must be db_free'd afterwards if the call was succesfull) + * Fills res (which must be db_free'd afterwards if the call was successful) * returns 0 on success, 1 on no match (?) * and -1 on error (memory, db a.s.o). * WARNING: if -1 is returned res _must_ _not_ be freed (it's empty)

1 0

git:master:f6da37aa: ldap: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: f6da37aa7dec1cdc5a737ed354a68ae15cfc7a43 URL: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 ldap: Fix typos --- Modified: src/modules/ldap/doc/ldap_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… Patch: https://github.com/kamailio/kamailio/commit/f6da37aa7dec1cdc5a737ed354a68ae… --- diff --git a/src/modules/ldap/doc/ldap_admin.xml b/src/modules/ldap/doc/ldap_admin.xml index 0e3f146ef7..5778e2ebf5 100644 --- a/src/modules/ldap/doc/ldap_admin.xml +++ b/src/modules/ldap/doc/ldap_admin.xml @@ -616,7 +616,7 @@ ldap_result("telephoneNumber/$avp(s:tel_number)"); <varname>int</varname> for integer. If <varname>avp_type</varname> is specified as <varname>int</varname> then <varname>ldap_result</varname> tries to convert the LDAP attribute values to integer. In this case, the values are only stored as AVP if the - conversion to integer is succesfull. + conversion to integer is successful. </para> <variablelist>

1 0

git:master:b94f8da5: pike: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: b94f8da598ef99d06a0db8f9bb2f9ca29a198740 URL: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 pike: Fix typos --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… Patch: https://github.com/kamailio/kamailio/commit/b94f8da598ef99d06a0db8f9bb2f9ca… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index 1fe9227a5f..12e03055b0 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -92,7 +92,7 @@ static gen_lock_set_t* init_lock_set(int *size) lset = 0; continue; } - /* alloc and init succesfull */ + /* alloc and init successful */ break; }

1 0

git:master:4caf7e70: ctl: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 4caf7e70c09a5b61f5c28b89fa1ea5c951e4cbc0 URL: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 ctl: Fix typos --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… Patch: https://github.com/kamailio/kamailio/commit/4caf7e70c09a5b61f5c28b89fa1ea5c… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bb34cd3be5..da4524878c 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -694,7 +694,7 @@ inline static int binrpc_bytes_needed(struct binrpc_parse_ctx *ctx) * known problems: no support for arrays inside STRUCT * param smode: allow simple vals inside struct (needed for * not-strict-formatted rpc responses) - * returns position after the record and *err==0 if succesfull + * returns position after the record and *err==0 if successful * original position and *err<0 if not */ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, unsigned char* buf, @@ -829,7 +829,7 @@ inline static unsigned char* binrpc_read_record(struct binrpc_parse_ctx* ctx, } break; case BINRPC_T_DOUBLE: /* FIXME: hack: represented as fixed point - inside an long long */ + inside a long long */ if (ctx->in_struct && smode==0) goto error_record; p=binrpc_read_llong(&ll, len, p, end, err); v->u.fval=((double)ll)/1000;

1 0

git:master:5e71d010: acc: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5e71d0100ff93e345d31b7210e93be92cde88111 URL: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 acc: Fix typos --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… Patch: https://github.com/kamailio/kamailio/commit/5e71d0100ff93e345d31b7210e93be9… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 036163da14..04fe28a8da 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1123,7 +1123,7 @@ modparam("acc", "cdr_start_on_confirmed", 1) <title><varname>cdr_facility</varname> (integer)</title> <para> Log facility to which CDR messages are issued to syslog. - This allows to easily seperate CDR-specific logging from + This allows to easily separate CDR-specific logging from the other log messages. </para> <para>

1 0

git:master:ba3f7d51: auth: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: ba3f7d5157819d55a67a054de1b7d0f8fc521140 URL: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 auth: Fix typos --- Modified: src/modules/auth/challenge.c Modified: src/modules/auth/nonce.c --- Diff: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… Patch: https://github.com/kamailio/kamailio/commit/ba3f7d5157819d55a67a054de1b7d0f… --- diff --git a/src/modules/auth/challenge.c b/src/modules/auth/challenge.c index 93142391b4..c5a769ed21 100644 --- a/src/modules/auth/challenge.c +++ b/src/modules/auth/challenge.c @@ -81,7 +81,7 @@ void strip_realm(str* _realm) * @param nonce_len A value/result parameter. Initially it contains the * nonce buffer length. If the length is too small, it * will be set to the needed length and the function will - * return error immediately. After a succesfull call it will + * return error immediately. After a successful call it will * contain the size of nonce written into the buffer, * without the terminating 0. * @param cfg This is the value of one of the three module parameters that diff --git a/src/modules/auth/nonce.c b/src/modules/auth/nonce.c index 4ec4d0a3af..b07515084a 100644 --- a/src/modules/auth/nonce.c +++ b/src/modules/auth/nonce.c @@ -158,12 +158,12 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * This function creates the nonce string as it will be sent to the * user agent in digest challenge. The format of the nonce string * depends on the value of three module parameters, auth_checks_register, - * auth_checks_no_dlg, and auth_checks_in_dlg. These module parameters - * control the amount of information from the SIP requst that will be + * auth_checks_no_dlg and auth_checks_in_dlg. These module parameters + * control the amount of information from the SIP request that will be * stored in the nonce string for verification purposes. * * If all three parameters contain zero then the nonce string consists - * of time in seconds since 1.1. 1970 and a secret phrase: + * of time in seconds since 1.1.1970 and a secret phrase: * <expire_time> <valid_since> MD5(<expire_time>, <valid_since>, secret) * If any of the parameters is not zero (some optional checks are enabled * then the nonce string will also contain MD5 hash of selected parts @@ -175,7 +175,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * @param nonce_len A value/result parameter. Initially it contains the * nonce buffer length. If the length is too small, it * will be set to the needed length and the function will - * return error immediately. After a succesfull call it will + * return error immediately. After a successful call it will * contain the size of nonce written into the buffer, * without the terminating 0. * @param cfg This is the value of one of the three module parameters that @@ -187,7 +187,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * @param n_id Nounce count and/or one-time nonce index value * (32 bit counter) * @param pf First 2 bits are flags, the rest is the index pool number - * used if nonce counts or one-time nonces are enabled. + * used if nonce counts or one-time nonces are enabled. * The possible flags values are: NF_VALID_NC_ID which means * the nonce-count support is enabled and NF_VALID_OT_ID * which means the one-time nonces support is enabled. @@ -200,7 +200,7 @@ inline static int calc_bin_nonce_md5(union bin_nonce* b_nonce, int cfg, * MD5(<msg_parts(auth_extra_checks)>, secret2). * @param msg The message for which the nonce is computed. If * auth_extra_checks is set, the MD5 of some fields of the - * message will be included in the generated nonce. + * message will be included in the generated nonce. * @return 0 on success and -1 on error */ int calc_nonce(char* nonce, int *nonce_len, int cfg, int since, int expires,

1 0

git:master:e8bdf2b9: pkg: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: e8bdf2b99de1ecfe8f276e2d9bed54e01588210b URL: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 pkg: Fix typos --- Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e… Patch: https://github.com/kamailio/kamailio/commit/e8bdf2b99de1ecfe8f276e2d9bed54e…

1 0

git:master:5dd8f0a6: core: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5dd8f0a6ff30fd3aa917a98b006106bef61506e5 URL: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 core: Fix typos --- Modified: src/core/atomic/atomic_mips2.h Modified: src/core/dns_cache.c Modified: src/core/forward.c Modified: src/core/resolve.c Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b… Patch: https://github.com/kamailio/kamailio/commit/5dd8f0a6ff30fd3aa917a98b006106b…

1 0

git:master:4b2b8925: lib: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 4b2b8925c2c8f195f135ff262f7b45601b111b0d URL: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 lib: Fix typos --- Modified: src/lib/cds/dstring.h Modified: src/lib/srdb1/schema/uid_credentials.xml Modified: src/lib/srdb2/db_cmd.c Modified: src/lib/srdb2/schema/credentials.xml --- Diff: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… Patch: https://github.com/kamailio/kamailio/commit/4b2b8925c2c8f195f135ff262f7b456… --- diff --git a/src/lib/cds/dstring.h b/src/lib/cds/dstring.h index 039ed2b099..5dc2de5c91 100644 --- a/src/lib/cds/dstring.h +++ b/src/lib/cds/dstring.h @@ -77,7 +77,7 @@ typedef struct _dstring_t { /** predefined buffer size */ int buff_size; - /** a operation on this string was unsuccesfull -> + /** a operation on this string was unsuccessful -> * all other operations will produce error */ int error; } dstring_t; diff --git a/src/lib/srdb1/schema/uid_credentials.xml b/src/lib/srdb1/schema/uid_credentials.xml index 8391e28e1c..d0089693e0 100644 --- a/src/lib/srdb1/schema/uid_credentials.xml +++ b/src/lib/srdb1/schema/uid_credentials.xml @@ -16,7 +16,7 @@ users identified by uid. Credentials can be used in digest authentication in SIP and/or authentication in SERWeb. In most situations credentials for digest authentication and SERWeb authentication are same. There are cases, - however, where seperate credentials for SERWeb and separate credentials + however, where separate credentials for SERWeb and separate credentials for digest authentication may be needed. One such example are setups where subscribers get HW user agents with locked configuration and thay do not know the password and are not allowed to change it. If they should be able diff --git a/src/lib/srdb2/db_cmd.c b/src/lib/srdb2/db_cmd.c index 0adeca646a..691b5f2999 100644 --- a/src/lib/srdb2/db_cmd.c +++ b/src/lib/srdb2/db_cmd.c @@ -73,8 +73,8 @@ db_cmd_t* db_cmd(enum db_cmd_type type, db_ctx_t* ctx, char* table, } /* FIXME: This should be redesigned so that we do not need to connect - * connections in context before comands are created, this takes splitting - * the command initializatio sequence in two steps, one would be creating + * connections in context before commands are created, this takes splitting + * the command initialization sequence in two steps, one would be creating * all the data structures and the second would be checking corresponding * fields and tables on the server. */ diff --git a/src/lib/srdb2/schema/credentials.xml b/src/lib/srdb2/schema/credentials.xml index 8bc7809fbf..a6c3ccadfb 100644 --- a/src/lib/srdb2/schema/credentials.xml +++ b/src/lib/srdb2/schema/credentials.xml @@ -15,7 +15,7 @@ users identified by uid. Credentials can be used in digest authentication in SIP and/or authentication in SERWeb. In most situations credentials for digest authentication and SERWeb authentication are same. There are cases, - however, where seperate credentials for SERWeb and separate credentials + however, where separate credentials for SERWeb and separate credentials for digest authentication may be needed. One such example are setups where subscribers get HW user agents with locked configuration and thay do not know the password and are not allowed to change it. If they should be able

1 0

git:master:5497d157: doc: Fix typos
by Henning Westerholt 08 May '22

08 May '22

Module: kamailio Branch: master Commit: 5497d15766d25625b4704a3bd3e884ef2f1149da URL: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-08T17:30:14+02:00 doc: Fix typos --- Modified: doc/misc/NEWS Modified: doc/tutorials/locking.txt --- Diff: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… Patch: https://github.com/kamailio/kamailio/commit/5497d15766d25625b4704a3bd3e884e… --- diff --git a/doc/misc/NEWS b/doc/misc/NEWS index 9b62dd39c1..09b63a72b4 100644 --- a/doc/misc/NEWS +++ b/doc/misc/NEWS @@ -338,7 +338,7 @@ modules: the retransmissions which would otherwise be challenged). The major advantage is greatly enhanced security (extremely small probability of - a succesfull replay attack) combine with support + a successful replay attack) combine with support for cached credentials (if the UAs do support qop and auth) - nc_array_size - size of the array used for storing diff --git a/doc/tutorials/locking.txt b/doc/tutorials/locking.txt index 7507a5d002..3ff12f6c85 100644 --- a/doc/tutorials/locking.txt +++ b/doc/tutorials/locking.txt @@ -109,7 +109,7 @@ Locking & unlocking: void lock_get(gen_lock_t* lock); - lock (mutex down) void lock_release(gen_lock_t* lock); - unlock (mutex up) int lock_try(gen_lock_t* lock); - tries to lock and returns 0 - if succesfull, -1 if not (this is + if successful, -1 if not (this is a non-blocking lock_get()) @@ -164,7 +164,7 @@ Locking & unlocking: void lock_set_get(lock_set_t* s, int i); void lock_set_release(lock_set_t* s, int i); int lock_set_try(lock_set_t* s, int i); - tries to lock the i-th lock - from the set. If succesfull + from the set. If successful returns 0, if not -1. Example:

1 0

git:master:543cd8f8: ipops: add dns container in dns_update_pv() if not created before
by Daniel-Constantin Mierla 06 May '22

06 May '22

Module: kamailio Branch: master Commit: 543cd8f897bc43d5fe1eb4c562d8351b32778209 URL: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-06T13:50:13+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 --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… Patch: https://github.com/kamailio/kamailio/commit/543cd8f897bc43d5fe1eb4c562d8351… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 1afc806541..9ee6f5879a 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -373,7 +373,7 @@ int dns_update_pv(str *hostname, str *name) return -2; } - dr = sr_dns_get_item(name); + dr = sr_dns_add_item(name); if(dr==NULL) { LM_DBG("container not found: %s\n", name->s);

1 0

git:master:0f9a833f: ipops: warning when too many dns containers are created
by Daniel-Constantin Mierla 06 May '22

06 May '22

Module: kamailio Branch: master Commit: 0f9a833fcc7cbc306a5d47413f6449ccc5a37f59 URL: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-06T12:46:28+02:00 ipops: warning when too many dns containers are created --- Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… Patch: https://github.com/kamailio/kamailio/commit/0f9a833fcc7cbc306a5d47413f6449c… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 6e9d86b5a6..1afc806541 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -95,6 +95,7 @@ sr_dns_item_t *sr_dns_add_item(str *name) { sr_dns_item_t *it = NULL; unsigned int hashid = 0; + int n = 0; hashid = get_hash1_raw(name->s, name->len); @@ -105,7 +106,13 @@ sr_dns_item_t *sr_dns_add_item(str *name) && strncmp(it->name.s, name->s, name->len)==0) return it; it = it->next; + n++; } + if(n > 20) { + LM_WARN("too many dns containers - adding nunmber %d - can fill memory\n", + n); + } + /* add new */ it = (sr_dns_item_t*)pkg_malloc(sizeof(sr_dns_item_t)); if(it==NULL)

1 0

Re: [sr-dev] sr-dev Digest, Vol 162, Issue 61
by Luis Azedo 06 May '22

06 May '22

Hello, seeing some weirdness in kamailio logs while testing kamailio under docker/kubernetes and logging to stderr, not sure if its related to kamailio or the infrastructure itself. running in 8 core host, it looks like the write to stderr has some race condition if that's even possible. the breaks happen with different processes and i wonder if the LOG_FX and DPRINT_NON_CRIT macros are responsible for that. it looks like 2 different processes could evaluate to true and try to write to stderr at same time. two examples real output 116(354) INFO: 2022-04-28T18:08:14.476102048Z 3ebe6ff3-1799-4798-baa3-a109df32711d registrar-role.cfg:745 (route_to_external_aor) 117(355) INFO: 2022-04-28T18:08:14.473375226Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:305 (log_request) to sip:1117@1.sip-stress.com 117(355) INFO: 2022-04-28T18:08:14.476592352Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:324 (classify_source) end - routing to contact sip:1104@10.23.0.2:9181 originated from internal sources should be 116(354) INFO: 2022-04-28T18:08:14.476102048Z 3ebe6ff3-1799-4798-baa3-a109df32711d registrar-role.cfg:745 (route_to_external_aor) end - routing to contact sip:1104@10.23.0.2:9181 117(355) INFO: 2022-04-28T18:08:14.473375226Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:305 (log_request) to sip:1117@1.sip-stress.com 117(355) INFO: 2022-04-28T18:08:14.476592352Z 5f2567bf-25bb-4cb1-a306-dc28711d9fcb default.cfg:324 (classify_source) originated from internal sources second example real output 71(309) INFO: 2022-04-28T18:08:14.514892167Z cid-10440-3(a)10.21.0.1 default.cfg:304 (log_request) 116(354) INFO: 2022-04-28T18:08:14.521506921Z cid-10440-26(a)10.21.0.1 default.cfg:751 (internal_reply) 200 OK from sip:1002@1.sip-stress.com should be 71(309) INFO: 2022-04-28T18:08:14.514892167Z cid-10440-3(a)10.21.0.1 default.cfg:304 (log_request) from sip:1002@1.sip-stress.com 116(354) INFO: 2022-04-28T18:08:14.521506921Z cid-10440-26(a)10.21.0.1 default.cfg:751 (internal_reply) 200 OK Any hints/thoughts ? should we try to have a better way to handle this inb dprint.c/dprint.h ? Thanks

1 1

[kamailio/kamailio] LCR function from_gw (Issue #3077)
by Antoineb2s 06 May '22

06 May '22

Hi, Kamailio 5.5.4 from deb packages I tried to use the lcr function from_gw(lcr_id[, ip_addr, proto]) I've declared several gws with different lcr_id Unfortunately from_gw doesn't work with lcr_ids > 1 For example : if (from_gw(2,$si,1)) { .... } ... ki_from_gw(): invalid lcr_id parameter value 2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3077 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3077(a)github.com>

3 2

[kamailio/kamailio] htable Module Crash in Kamailio 5.5 (Issue #3082)
by surabhigarg 06 May '22

06 May '22

**Issue Description:** Kamailio is running with htable module having following parameter configuration: `modparam("htable", "htable", "flags=>size=6;dbtable=htable;autoexpire=0;dbmode=1") ` So, If there is an error in kamailio cfg then crash is observed in htable module. Here, I believe when kamailio goes to sync in memory htable content to the DB it crashes. **Troubleshooting** with dbmode=0 crash is not observed. **Steps to Reproduce** 1. Add entries in htable(DB) of mariadb. 2. Intentionally add some error in kamailio.cfg (i.e. remove colon at the end of any line) 3. start kamailio 4. kamailio wont come up as there is an error in kamailio.cfg 5. And while kamailio is shutting down there is a crash in htable 6. Now, check entries in htable(DB)of mariadb which gets empty **Kamailio Cfg** ``` modparam("htable", "htable", "flags=>size=6;dbtable=htable;autoexpire=0;dbmode=1") modparam("htable", "db_url", DBURL) # HTable Init event_route[htable:mod-init] { $sht(flags=>disable_sip_message_processing) = 0; xlog("L_INFO", "Init: disable_sip_message_processing $sht(flags=>disable_sip_message_processing)\n"); } ``` **Debugging Data:** ``` $ gdb /usr/local/kamailio-5.5/sbin/kamailio /tmp/core.kamailio.103011.N1VL-PA-SIP01.1649823318 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-120.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/kamailio-5.5/sbin/kamailio...done. warning: exec file is newer than core file. [New LWP 103011] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/kamailio-5.5/sbin/kamailio -D -P /run/kamailio/kamailio.pid -f /usr/'. Program terminated with signal 11, Segmentation fault. #0 0x00007f5b54995755 in atomic_get (v=0x14) at ../../core/mem/../atomic/atomic_common.h:66 66 return atomic_get_int(&(v->val)); Missing separate debuginfos, use: debuginfo-install glibc-2.17-324.el7_9.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-50.el7.x86_64 libcom_err-1.42.9-19.el7.x86_64 libgcc-4.8.5-44.el7.x86_64 libselinux-2.5-15.el7.x86_64 libstdc++-4.8.5-44.el7.x86_64 mariadb-libs-5.5.68-1.el7.x86_64 openssl-libs-1.0.2k-21.el7_9.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-19.el7_9.x86_64 (gdb) bt full #0 0x00007f5b54995755 in atomic_get (v=0x14) at ../../core/mem/../atomic/atomic_common.h:66 No locals. #1 0x00007f5b54996d51 in ht_slot_lock (ht=0x7f5b504de738, idx=0) at ht_api.c:153 mypid = 103011 #2 0x00007f5b5498e3fb in ht_db_save_table (ht=0x7f5b504de738, dbtable=0x7f5b504de750) at ht_db.c:577 db_cols = {0x7f5b54bd83f0 <ht_db_name_column>, 0x7f5b54bd8400 <ht_db_ktype_column>, 0x7f5b54bd8410 <ht_db_vtype_column>, 0x7f5b54bd8420 <ht_db_value_column>, 0x7f5b54bd8430 <ht_db_expires_column>} db_vals = {{type = 8527368, nul = 0, free = 6, val = {int_val = -874111776, ll_val = 140723729341664, double_val = 6.9526760222378001e-310, time_val = 140723729341664, string_val = 0x7ffccbe61ce0 "\300\035\346\313\374\177", str_val = {s = 0x7ffccbe61ce0 "\300\035\346\313\374\177", len = 1532402903}, blob_val = { s = 0x7ffccbe61ce0 "\300\035\346\313\374\177", len = 1532402903}, bitmap_val = 3420855520, uint_val = 3420855520, ull_val = 140723729341664}}, { type = 1532380141, nul = 32603, free = 6, val = {int_val = 0, ll_val = 0, double_val = 0, time_val = 0, string_val = 0x0, str_val = {s = 0x0, len = 0}, blob_val = { s = 0x0, len = 0}, bitmap_val = 0, uint_val = 0, ull_val = 0}}, {type = DB1_INT, nul = 0, free = 1535278736, val = {int_val = -874111552, ll_val = 140723729341888, double_val = 6.9526760222488671e-310, time_val = 140723729341888, string_val = 0x7ffccbe61dc0 "\260\036\346\313\374\177", str_val = { s = 0x7ffccbe61dc0 "\260\036\346\313\374\177", len = 1419312224}, blob_val = {s = 0x7ffccbe61dc0 "\260\036\346\313\374\177", len = 1419312224}, bitmap_val = 3420855744, uint_val = 3420855744, ull_val = 140723729341888}}, {type = 1532429419, nul = 32603, free = 48, val = {int_val = -874111488, ll_val = 140723729341952, double_val = 6.9526760222520291e-310, time_val = 140723729341952, string_val = 0x7ffccbe61e00 "\260\036\346\313\374\177", str_val = { s = 0x7ffccbe61e00 "\260\036\346\313\374\177", len = -874111728}, blob_val = {s = 0x7ffccbe61e00 "\260\036\346\313\374\177", len = -874111728}, bitmap_val = 3420855808, uint_val = 3420855808, ull_val = 140723729341952}}, {type = 1544071712, nul = 32603, free = 8527368, val = {int_val = 8527368, ll_val = 8527368, double_val = 4.2130795782459789e-317, time_val = 8527368, string_val = 0x821e08 "DEBUG", str_val = {s = 0x821e08 "DEBUG", len = 0}, blob_val = { s = 0x821e08 "DEBUG", len = 0}, bitmap_val = 8527368, uint_val = 8527368, ull_val = 8527368}}} it = 0x0 tmp = {s = 0x7f5b549cdfcb "lid parameters\n", len = 1544071712} i = 0 now = 1649823318 ncols = 3 __FUNCTION__ = "ht_db_save_table" #3 0x00007f5b549a3c7d in ht_db_sync_tables () at ht_api.c:1078 ht = 0x7f5b504de738 __FUNCTION__ = "ht_db_sync_tables" #4 0x00007f5b549ac4cc in destroy () at htable.c:321 No locals. #5 0x0000000000590523 in destroy_modules () at core/sr_module.c:839 t = 0x7f5b5b83bd08 foo = 0x7f5b5b83b520 __FUNCTION__ = "destroy_modules" #6 0x000000000041d7da in cleanup (show_status=0) at main.c:575 memlog = 0 __FUNCTION__ = "cleanup" #7 0x000000000041f0b5 in shutdown_children (sig=15, show_status=0) at main.c:718 __FUNCTION__ = "shutdown_children" #8 0x0000000000436825 in main (argc=12, argv=0x7ffccbe62688) at main.c:3068 cfg_stream = 0xba2050 c = -1 r = 0 ---Type <return> to continue, or q <return> to quit--- tmp = 0x7ffccbe6466c "" tmp_len = 1408 port = 896 proto = 32603 ahost = 0x0 aport = 0 options = 0x7df0f8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 513568880 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7ffccbe62540 p = 0xf0b5ff <Address 0xf0b5ff out of bounds> st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = { tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 392 times>... option_index = 0 long_options = {{name = 0x7e150f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7dc584 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7e1514 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7e151a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7e1520 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7e1529 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7e1533 "server-id", has_arg = 1, flag = 0x0, val = 1028}, { name = 0x7e153d "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7e1548 "modparam", has_arg = 1, flag = 0x0, val = 1030}, { name = 0x7e1551 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7e155c "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x7e1562 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x7e156c "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) ``` **Additional Information** - Kamailio Version: ``` [root@N1VL-PA-SIP01 kamailio]# /usr/local/kamailio-5.5/sbin/kamailio -V version: kamailio 5.5.2 (x86_64/linux) e5f5a8 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e5f5a8 compiled on 19:07:54 Apr 12 2022 with gcc 4.8.5 ``` - Operating System: ``` $ cat /etc/os-release NAME="Red Hat Enterprise Linux Server" VERSION="7.9 (Maipo)" ID="rhel" ID_LIKE="fedora" VARIANT="Server" VARIANT_ID="server" VERSION_ID="7.9" PRETTY_NAME="Red Hat Enterprise Linux Server 7.9 (Maipo)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:redhat:enterprise_linux:7.9:GA:server" HOME_URL="https://www.redhat.com/" BUG_REPORT_URL="https://bugzilla.redhat.com/" REDHAT_BUGZILLA_PRODUCT="Red Hat Enterprise Linux 7" REDHAT_BUGZILLA_PRODUCT_VERSION=7.9 REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux" REDHAT_SUPPORT_PRODUCT_VERSION="7.9" ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3082 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3082(a)github.com>

3 5

git:master:33228bba: db_berkeley: reset lkey to avoid double free
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 33228bba33a6ea2e2d9a7acd9a240929223b9d39 URL: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T19:52:11+02:00 db_berkeley: reset lkey to avoid double free --- Modified: src/modules/db_berkeley/db_berkeley.c --- Diff: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… Patch: https://github.com/kamailio/kamailio/commit/33228bba33a6ea2e2d9a7acd9a24092… --- diff --git a/src/modules/db_berkeley/db_berkeley.c b/src/modules/db_berkeley/db_berkeley.c index 80c9aefac0..a8fe812c50 100644 --- a/src/modules/db_berkeley/db_berkeley.c +++ b/src/modules/db_berkeley/db_berkeley.c @@ -1055,8 +1055,10 @@ int bdb_update(db1_con_t *_con, db_key_t *_k, db_op_t *_op, db_val_t *_v, goto cleanup; } - if(lkey) + if(lkey) { pkg_free(lkey); + lkey = NULL; + } key.data = kbuf; key.ulen = MAX_ROW_SIZE;

1 0

git:5.6:532cef75: pkg/kamailio/deb: version set 5.6.0~rc0 [skip ci]
by Victor Seva 05 May '22

05 May '22

Module: kamailio Branch: 5.6 Commit: 532cef75a2fda7725e869776fe8faa83ded33dd3 URL: https://github.com/kamailio/kamailio/commit/532cef75a2fda7725e869776fe8faa8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-05T12:53:05+02:00 pkg/kamailio/deb: version set 5.6.0~rc0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/532cef75a2fda7725e869776fe8faa8… Patch: https://github.com/kamailio/kamailio/commit/532cef75a2fda7725e869776fe8faa8…

1 0

git:master:e310166a: pkg/kamailio/deb: version set 5.7.0~dev0 [skip ci]
by Victor Seva 05 May '22

05 May '22

Module: kamailio Branch: master Commit: e310166a5c0c7d419e036315c1d105278db51e58 URL: https://github.com/kamailio/kamailio/commit/e310166a5c0c7d419e036315c1d1052… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-05-05T12:50:41+02:00 pkg/kamailio/deb: version set 5.7.0~dev0 [skip ci] --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bookworm/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/e310166a5c0c7d419e036315c1d1052… Patch: https://github.com/kamailio/kamailio/commit/e310166a5c0c7d419e036315c1d1052…

1 0

Development is open for future release of v5.7.x series
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the branch 5.6 was created, therefore the master branch is open for adding new features, to be part of future release series v5.7.x (or whatever version is decided for next series). Any bug fix committed to master that applies to 5.6.x or older stable branches should be backported as usual with "git cherry-pick -x ..." to appropriate branches like 5.6 or 5.5. Expect that v5.6.0 will be released in a few weeks from now. Based on the workflow used during the past years, the next future release v5.7.0 should be out after another 6-10 months of development, plus 1-2 months of testing, so sometime by end of 2022 or in the first part of 2023. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

Branch 5.6 has been created
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the branch 5.6 has been created, to be used for releasing v5.6.x series. To check out this branch, the following commands can be used: git clone https://github.com/kamailio/kamailio kamailio-5.6 cd kamailio-5.6 git checkout -b 5.6 origin/5.6 Pushing commits in this branch: git push origin 5.6:5.6 Note that 5.6 is an official stable branch, so only bug fixes, missing kemi exports (discuss on sr-dev if not sure) or improvements to documentation or helper tools can be pushed to this branch. As usual, if there is a bug fixed, commit and push first to master branch and then cherry pick to 5.5 branch: git cherry-pick -x COMMITID In few weeks, the first release from branch 5.6 will be out, respectively Kamailio v5.6.0. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 0

git:master:39431b8f: Makefile.defs: version set to 5.7.0-dev0
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 39431b8fd94f49e2ae5ee61109bf8e329a1c7c60 URL: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T12:11:31+02:00 Makefile.defs: version set to 5.7.0-dev0 - master branch is open for new features to be part of future release series 5.7.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… Patch: https://github.com/kamailio/kamailio/commit/39431b8fd94f49e2ae5ee61109bf8e3… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index c119502d4a..c155889688 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 6 +PATCHLEVEL = 7 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:6bd109d0: Makefile.defs: version set to 5.6.0-pre2
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: 6bd109d0230369514f611869fd3e321634bf6e4a URL: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T11:40:17+02:00 Makefile.defs: version set to 5.6.0-pre2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… Patch: https://github.com/kamailio/kamailio/commit/6bd109d0230369514f611869fd3e321… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 41c7b31652..c119502d4a 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:f1194f44: pv: check parameters and fix log message for invalid values for {s.fmtline...}
by Daniel-Constantin Mierla 05 May '22

05 May '22

Module: kamailio Branch: master Commit: f1194f44532f179c016269f93c44b755d2594c1d URL: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T11:38:41+02:00 pv: check parameters and fix log message for invalid values for {s.fmtline...} --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… Patch: https://github.com/kamailio/kamailio/commit/f1194f44532f179c016269f93c44b75… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 5f45fa8e66..a2b546d02a 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1476,14 +1476,14 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(pv_get_spec_value(msg, (pv_spec_p)tp->next->v.data, &v)!=0 || (!(v.flags&PV_VAL_INT))) { - LM_ERR("fmt cannot get p2 (cfg line: %d)\n", + LM_ERR("fmtline cannot get p2 (cfg line: %d)\n", get_cfg_crt_line()); return -1; } m = v.ri; } - if(n<0 || m<0) { - LM_ERR("substr negative offset (cfg line: %d)\n", + if(n<=0 || m<0) { + LM_ERR("fmtline with invalid parameters (cfg line: %d)\n", get_cfg_crt_line()); return -1; }

1 0

Development for v5.6.x is frozen
by Daniel-Constantin Mierla 05 May '22

05 May '22

Hello, the formal notification that the development for the next major version 5.6.0 is now frozen. The focus has to be on testing the master branch. Also, the master branch should not get commits with new features till the branch 5.6 is created, expected to happen in 2-4 weeks, a matter of how testing goes on. Meanwhile, the commits with new features in the C code can be pushed to personal branches, new pull requests can still be done, but they will be merged after branching 5.6. Can still be done commits with documentation improvements, enhancements to related tools (e.g., kamctl, kamcmd), merging exiting pull requests at this moment, exporting missing KEMI functions and completing the functionality of the new modules added for 5.6. Once the branch 5.6 is created, new features can be pushed again to master branch as usual. From that moment, the v5.6.0 should be out very soon, time used for further testing but also preparing the release of packages. If someone is not sure if a commit brings a new feature, just make a pull request and it can be discussed there on github portal or via sr-dev mailing list. A summary of what is new in upcoming 5.6 is going to be built at: * https://www.kamailio.org/wiki/features/new-in-5.6.x Upgrade guidelines will be collected at: * https://www.kamailio.org/wiki/install/upgrade/5.5.x-to-5.6.0 Everyone is more than welcome to contribute to the above wiki pages, especially to the upgrade guidelines, to help everyone else during the migration process from v5.5.x to 5.6.x. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 2

git:5.5:9d039b60: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 May '22

05 May '22

Module: kamailio Branch: 5.5 Commit: 9d039b6023dc7c0bfb48509fc47f830eaeede90f URL: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-05T09:31:59+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/cfgutils/README --- Diff: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… Patch: https://github.com/kamailio/kamailio/commit/9d039b6023dc7c0bfb48509fc47f830… --- diff --git a/src/modules/auth/README b/src/modules/auth/README index c0badc4115..25c448901d 100644 --- a/src/modules/auth/README +++ b/src/modules/auth/README @@ -143,7 +143,8 @@ Chapter 1. Admin Guide 2. Dependencies - The module does not depend on any other module. + The following modules must be loaded before this module: + * sl - stateless reply. 3. Parameters diff --git a/src/modules/cfgutils/README b/src/modules/cfgutils/README index 3d46af3ba3..890952c7c5 100644 --- a/src/modules/cfgutils/README +++ b/src/modules/cfgutils/README @@ -757,11 +757,11 @@ $ kamcmd cfgutils.get_gflags Example 1.34. RANDOM pseudo-variable usage ... if (rand_event()) { - $avp(i:10) = ($RANDOM / 16777216); # 2^24 - if ($avp(i:10) < 10) { - $avp(i:10) = 10; + $var(value) = ($RANDOM / 16777216); # 2^24 + if ($var(value) < 10) { + $var(value) = 10; } - append_to_reply("Retry-After: $avp(i:10)\n"); + append_to_reply("Retry-After: $var(value)\n"); sl_send_reply("503", "Try later"); exit; };

1 0

git: new commits in branch 5.5
by Daniel-Constantin Mierla 05 May '22

05 May '22

- URL: https://github.com/kamailio/kamailio/commit/8614efb544374945a45b755586d9a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:44:10+02:00 blst: docs - small formatting updates (cherry picked from commit 415f20804e423b503d5e0d1743e28c9f509f9c21) - URL: https://github.com/kamailio/kamailio/commit/ddcc1a24fc6b4323de09ee30c4dc64d… Author: Kristiyan Peychev <kristiyan.peychev(a)flolive.net> Date: 2022-05-05T08:45:22+02:00 cdp: increase the amount of avps allocated when reading AVP_Vendor_Specific_Application_Id (cherry picked from commit 62f7be2281f5dd91a5668c4b84e52a7d7169e21f) - URL: https://github.com/kamailio/kamailio/commit/fad03e0af24629b5dfdd835d251b350… Author: frederic <frederic.gaisnon(a)mmtt.fr> Date: 2022-05-05T08:47:31+02:00 topos: handle BYE sent by callee during non connected call with provitional response sent by callee (INVITE,180 and BYE from callee instead CANCEL) (cherry picked from commit e1974977a3e604996b752566d187b77da5072999) - URL: https://github.com/kamailio/kamailio/commit/d4a69b1b4878c808631fca078a5980c… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2022-05-05T08:47:59+02:00 smsops: Fix ucs2-to-utf8 for Accent chars (cherry picked from commit f9f16a6c700a7378fc30f6f9c0a767438fc638b9) - URL: https://github.com/kamailio/kamailio/commit/c30312a4f7e4bdacd777c5df2adfe85… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:48:19+02:00 siptrace: add X-Siptrace headers when configured core callback mode and SIP URI traffic mirroring - Added X-Siptrace headers in core callback mode for SIP URI traffic duplication, headers also available in event route for filtering purporses. (cherry picked from commit 57b1d5375927b987b162fcf0e2c99a39b717bd65) - URL: https://github.com/kamailio/kamailio/commit/fc454a5c2a9c83732ed11df7f42cb98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:38+02:00 core: parse sdp - detect multipart invalid format (cherry picked from commit 7076904d0f0980d6bfa0814e3b1a8c61ee0acecc) - URL: https://github.com/kamailio/kamailio/commit/afefd474c9571f7c0282823819335d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:49:49+02:00 core: parse sdp - removed redundant check (cherry picked from commit 355c02106c95400c44833a89aeea68c61ba2f200) - URL: https://github.com/kamailio/kamailio/commit/46eaf304de272134579519740f589dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:01+02:00 sanity: use dedicated functions for parsing From/To URIs - updates to parsing Contact headers (cherry picked from commit 5c99d7f87ed94cd52c6ab74d46f511447b3db2b9) - URL: https://github.com/kamailio/kamailio/commit/0947dde559a60afc52fb46c9dbcd123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:21+02:00 core: parser - helper functions to parse all record-/route headers (cherry picked from commit 22b8ecc24442dce775600dfb186a83bc947fd4ca) - URL: https://github.com/kamailio/kamailio/commit/d74d044f54d49cd4c80f9ae75fbd025… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:50:44+02:00 dispatcher: fix ds_reload() return logic - GH #3054 (cherry picked from commit 30079910bbb33b430621f188beae40c71592bcba) - URL: https://github.com/kamailio/kamailio/commit/4213ed97695dac97505422a8a9925c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:02+02:00 core: parse uri - detect empty user when @ is found (cherry picked from commit 0c101ffe713603e812759da6d396e0451cf13ba1) - URL: https://github.com/kamailio/kamailio/commit/140abc77f33861952c750e7013767b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:15+02:00 sipcapture: init buffers content (cherry picked from commit 9292b9f5daacfa5340b5fe1a5f02469a7e597d9b) - URL: https://github.com/kamailio/kamailio/commit/81b93c0858cf7ccc357b3d623336d79… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:27+02:00 dmq: init peer structures (cherry picked from commit 0204232ba1f229edb9c7e0080e98e9d3b2500672) - URL: https://github.com/kamailio/kamailio/commit/44295fa538e0d0b88208264a516d15a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:42+02:00 sipcapture: more init buffers content (cherry picked from commit 0b684a5d9a2f5d17e64cb8cb5f4b53b06f180f06) - URL: https://github.com/kamailio/kamailio/commit/c16044f47def23c4d43fbc9b38ffc56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:51:58+02:00 pua_reginfo: init uri buffer (cherry picked from commit 692d15ce9bcc329fff55060dcdc8e5161f12c30e) - URL: https://github.com/kamailio/kamailio/commit/b16a4e5038c30a4fdd662ce1f080df9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:12+02:00 core: parse uri - sanity check for user part (cherry picked from commit eda4b3c51ce12d4fe052b7e9ad40be1ef6e56444) - URL: https://github.com/kamailio/kamailio/commit/f6995deb6c7a03542ca381b30279f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:52:38+02:00 core: parse - fix typo in comment of previous commit (cherry picked from commit 8b20e6045dbebdb784a4e8f66d81fc79c0a17304) - URL: https://github.com/kamailio/kamailio/commit/5c65d50469dbffb3ce021ff2db2af61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:00+02:00 core: parser digest - warn if the header type is not set properly (cherry picked from commit 67e0fa5e53ef5d4dd9802e3027b2bc7ff6dcb671) - URL: https://github.com/kamailio/kamailio/commit/5b387fc146db587b01b961e1d07afe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:18+02:00 core: parser - catch special header types for get_hdr() (cherry picked from commit f9a38d6b621a2c3966a3c85dce6fdd2e6bb8d431) - URL: https://github.com/kamailio/kamailio/commit/cd3f1f8fe6ef1836ac2c8a43731dcf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:42+02:00 seas: check for header type value for flags comparison (cherry picked from commit e513d1cc549fea43eebc5fc504bb01270adbc10e) - URL: https://github.com/kamailio/kamailio/commit/841baf0fc851b1cd180da3c5e5bac54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:53:55+02:00 db_text: reworked the checks for database and table names (cherry picked from commit d4af1304778c10213cb1f98e23938c6c4b912723) - URL: https://github.com/kamailio/kamailio/commit/071fba8cc700d99b62aba59bc768681… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:32+02:00 db_redis: init allocated structure (cherry picked from commit b8c4d8b8d0f06267f2bc1a760307345fd06745ce) - URL: https://github.com/kamailio/kamailio/commit/9083eb3befc2a50df12b57ff3e1098a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:43+02:00 core: 0-terminate string for very long local network interface names (cherry picked from commit 476d763d8ee504b71c13063ca002ecfe158da94e) - URL: https://github.com/kamailio/kamailio/commit/ddc343f3a89faeacd85ae1374594e28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:55:53+02:00 db_berkeley: covert blob values (cherry picked from commit dad443172628c3736b057fa24343c265ed3827b2) - URL: https://github.com/kamailio/kamailio/commit/22fd93ec58abbbe4a850343b85082f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:56:02+02:00 core: parse uri - extra check when user part is missing before @ (cherry picked from commit b32a9caf4797370a4704b5f94d2d704b6e52fdef) - URL: https://github.com/kamailio/kamailio/commit/08eeb04d40a3a66a139fd60df153724… Author: Sergey Safarov <s.safarov(a)gmail.com> Date: 2022-05-05T08:57:03+02:00 utils: fixed sinitiser error [root@localhost]# kamcmd cfg.seti param_group param_name value ================================================================= ==2409977==ERROR: LeakSanitizer: detected memory leaks Direct leak of 38 byte(s) in 1 object(s) allocated from: #0 0xffff98c250af in malloc (/lib64/libasan.so.5+0xd50af) #1 0x41549f in parse_listen_id /root/kamailio/utils/kamcmd/parse_listen_id.c:133 #2 0x4144fb in main /root/kamailio/utils/kamcmd/kamcmd.c:2075 #3 0xffff97dc0de3 in __libc_start_main (/lib64/libc.so.6+0x20de3) #4 0x40260b (/usr/local/sbin/kamcmd+0x40260b) (cherry picked from commit d28ca884548b0f24a618ed9cbdc8e1b9538f2574) - URL: https://github.com/kamailio/kamailio/commit/d4b2b095e6da139d886ac71d3aae1e7… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Date: 2022-05-05T08:57:28+02:00 siptrace: fix pkg memory leak when module configured with core callbacks - Correctly freeng pkg memory in core callbacks when body modifications take place with X-Siptrace headers, also fix potential pkg_free with not dynamicaly allocated objects. (cherry picked from commit fc50ce1dbd31bbd28a11d672ed9bdbe9bd4ae5d0) - URL: https://github.com/kamailio/kamailio/commit/963842bc6afec81ef3d8ba8c7d0e9b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T08:59:49+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 (cherry picked from commit 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af) - URL: https://github.com/kamailio/kamailio/commit/beb501f3ac2dd6095b0184c60f9fe41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:00:40+02:00 permissions: return ret variable set inside double_fixup() (cherry picked from commit e272eea0229678b4446a3907b7360c61c273caa7) - URL: https://github.com/kamailio/kamailio/commit/25b54ae9a62d6877f74356fedf0325b… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2022-05-05T09:02:16+02:00 auth: Fix missing dependency in docs (cherry picked from commit dd15436e8697f70df6ef9d188da36f70e7116a74) - URL: https://github.com/kamailio/kamailio/commit/4be7e2573750c4bccef4e74eafd41bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:01+02:00 htable: reset entries field if hash table initialization fails (cherry picked from commit d542cb89afb1a34cba35cbcf0f40315581fbb767) - URL: https://github.com/kamailio/kamailio/commit/02b0340f8dcfc172d5f4c493bf97a60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:09+02:00 htable: track when records were successfully loaded from database - write back only in such case (cherry picked from commit b1fa63b1547fc5af6cc1e97db42ea76db1bf927b) - URL: https://github.com/kamailio/kamailio/commit/b8ad92740a35df43aba201e116641df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:03:22+02:00 htable: check if entries are initialized before sync'ing to db (cherry picked from commit 9a8974a80b8ce5ffc9166e81f43f8581777cd48f) - URL: https://github.com/kamailio/kamailio/commit/ccf116505f1784b635dc1e9e1f5e4e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:04:55+02:00 xmlops: coherent formatting (cherry picked from commit 098955e23289b82db40d5cef76ee03bf09e8a0da) - URL: https://github.com/kamailio/kamailio/commit/d6d73e3bb7d3fa1a07d816a136316f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:04+02:00 topos: use direction for loading invite record for other early dialog requests - GH #3090 (cherry picked from commit ceb688b3d364bb7b8d9f52b7238d560cb4e30b3d) - URL: https://github.com/kamailio/kamailio/commit/170126fb80bf93595a5d3e3b2f56c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:05:25+02:00 topos: restore attributes based on direction for early dialog requests - GH #3090 (cherry picked from commit c309122864eaa2bfa58253290bed49084ccc9302) - URL: https://github.com/kamailio/kamailio/commit/58a02618cec102455e35ad3dfbddf93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:06:53+02:00 core: mem/tlsf - handle return codes during memory pool init (cherry picked from commit ef62bfb27514dc7ec3b603bee661cfac18c4fe93) - URL: https://github.com/kamailio/kamailio/commit/fef9c3406c2f070bf25013997912124… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:07:04+02:00 rls: free resources in case of errors (cherry picked from commit 72443722d7fda4289390ef8bc20ad91990b895a7) - URL: https://github.com/kamailio/kamailio/commit/3b8f91d241ccf965c08bdb6ad560cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:02+02:00 topos: catch INFO requests during early dialog phase (cherry picked from commit 67da7301f1eb74b6fff9e6e73b43f08dbc9c53bf) - URL: https://github.com/kamailio/kamailio/commit/0cc8bbad9fab44c387535b09fc51944… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:15+02:00 rls: safety check for dialog structur (cherry picked from commit b5aae4f5afd07db114c3ff7712b484f743663b26) - URL: https://github.com/kamailio/kamailio/commit/397b5c1c7f5c4e8743dbfcf851dede1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:08:28+02:00 xcap_client: init structure (cherry picked from commit cfb50124e67b68552520e418a20ad2dfec96117b) - URL: https://github.com/kamailio/kamailio/commit/c7d8f24f2237c03e493ddfe0fbb806b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:02+02:00 lrkproxy: init value for compiler warning (cherry picked from commit 9fd0cae960b0795a5e511c37f768f0962b7a15c1) - URL: https://github.com/kamailio/kamailio/commit/05e2b31ff419176cbc8be4f848c940f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:14+02:00 sms: use unsigned int for bit shifting for compiler warnings (cherry picked from commit cacae7fc5db5418a67d543995273280d57f027c6) - URL: https://github.com/kamailio/kamailio/commit/1d39dc57cda8fbb169a3848c5e4dba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:09:37+02:00 presence_xml: free uri for http xcap auth (cherry picked from commit eba6c7d78088cde411f5cd1b7730ba458e62a69e) - URL: https://github.com/kamailio/kamailio/commit/a830c48802edeb0284dbfb7e554b39d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:22+02:00 core: main - check the debug cli param value (cherry picked from commit dfc407c4009acbd6e05ecfaf4e727b0636ab92a4) - URL: https://github.com/kamailio/kamailio/commit/a03721b4e0b9251b11dd2dcabbdce3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:41+02:00 core: modparam - safety check for str s pointer - deal with the case of argument with 'nonnull' attribute passed null (cherry picked from commit 69c004eec161c14d957f9e4011aeff4163af858d) - URL: https://github.com/kamailio/kamailio/commit/eac307296fafeb96047a4359f3d36de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:10:52+02:00 snmpstats: use same type as the pointer for sizeof (cherry picked from commit 3de5a781a3d0333352ab72c6b790f472f393df2b) - URL: https://github.com/kamailio/kamailio/commit/db3fb40e3b8e1b12ad6a0faf7274abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:03+02:00 cdp: use same data type for size computing as pointer type (cherry picked from commit 47169b6774759131e9e535f2b9d358772b777b9c) - URL: https://github.com/kamailio/kamailio/commit/bb63c1212ba8ce1d2ea6d07c007c7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:11:51+02:00 snmpstats: fix allocator sizeof operand mismatch (cherry picked from commit 0c99fed48403e2cc4f24441901b81b7c51411511) - URL: https://github.com/kamailio/kamailio/commit/3bccd877acbc03b136186fd45bc98ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:12:03+02:00 msilo: skip invalid stored records (cherry picked from commit e5efcbdd7be9897cf169b28a7a52c45bff24cac3) - URL: https://github.com/kamailio/kamailio/commit/2b3e09d781a157629c5f9bdb809f7c4… Author: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-05T09:12:16+02:00 cfgutils: improve example for $RANDOM (cherry picked from commit 79b2e4b00ebf7a7cdf0ed3b9c4ab7f0176d78686) - URL: https://github.com/kamailio/kamailio/commit/a05a2f01bcc85ee1f5d9db707d289e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:19+02:00 lcr: init variable for fixing warning report (cherry picked from commit 7f359ca152e87ec72c6dd39fe09885bae630e36f) - URL: https://github.com/kamailio/kamailio/commit/17d9e99b6f3826cbad59e01dbbc1ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:30+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers (cherry picked from commit 159224b254d9a67104c60fedab46a1b78cf19a83) - URL: https://github.com/kamailio/kamailio/commit/12ca7d43a262ef7a654933db65cde78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:42+02:00 tm: relocated defines not useful in the header file (cherry picked from commit 27b6c641b5d941503f974fea05af506972ac2ab5) - URL: https://github.com/kamailio/kamailio/commit/d5d2105b82503f747ed82803c0dab5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:13:52+02:00 presence: rename local variable that conflicts with tm define (cherry picked from commit 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d) - URL: https://github.com/kamailio/kamailio/commit/259448fe45346eeb201d441a6cde471… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:06+02:00 cdp: close socket in case of error (cherry picked from commit 993c036bb185f6053a3a2f0486be30398918a87c) - URL: https://github.com/kamailio/kamailio/commit/34d83298f0dfa79e228bdb5998b3c2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:17+02:00 sanity: fix sanity_reply function name for config exports (cherry picked from commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043) - URL: https://github.com/kamailio/kamailio/commit/cbb86fe6451c4ed323a394ce6691f08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:34+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. (cherry picked from commit d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe) - URL: https://github.com/kamailio/kamailio/commit/89c917534b76d936993ce1b590df6fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-05T09:14:46+02:00 sanity: fix sanity_reply() function name for config exports (cherry picked from commit 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0)

1 0

git:master:d9e0e371: Revert "sanity: fix sanity_reply function name for config exports"
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: d9e0e3716cd85a4fae4587e7bf8dc6967cf19ebe URL: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:08+02:00 Revert "sanity: fix sanity_reply function name for config exports" This reverts commit eeefe7dcc2af90e7def8f1698e8f79d0dd020043. --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… Patch: https://github.com/kamailio/kamailio/commit/d9e0e3716cd85a4fae4587e7bf8dc69… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 5dc0cabfb7..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index fab02c0e62..3a026f1f93 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,7 +36,6 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { - long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 832a0c2308..3f813bb021 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:7c52c05b: sanity: fix sanity_reply() function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 7c52c05b09abdf2cf754cc02f3a1ea0855cdedd0 URL: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:33:47+02:00 sanity: fix sanity_reply() function name for config exports --- Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… Patch: https://github.com/kamailio/kamailio/commit/7c52c05b09abdf2cf754cc02f3a1ea0… --- diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:eeefe7dc: sanity: fix sanity_reply function name for config exports
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: eeefe7dcc2af90e7def8f1698e8f79d0dd020043 URL: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T16:25:03+02:00 sanity: fix sanity_reply function name for config exports --- Modified: src/lib/srdb1/db.c Modified: src/lib/srdb1/db_con.h Modified: src/modules/sanity/sanity_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… Patch: https://github.com/kamailio/kamailio/commit/eeefe7dcc2af90e7def8f1698e8f79d… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index 54b66d330b..5dc0cabfb7 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2003 FhG Fokus * Copyright (C) 2007-2008 1&1 Internet AG - * + * * This file is part of Kamailio, a free SIP server. * * Kamailio is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -294,7 +294,7 @@ db1_con_t* db_do_init2(const str* url, void* (*new_connection)(), db_pooling_t p LM_ERR("The configured db_url is too long\n"); return 0; } - + /* this is the root memory for this database connection. */ res = (db1_con_t*)pkg_malloc(con_size); if (!res) { diff --git a/src/lib/srdb1/db_con.h b/src/lib/srdb1/db_con.h index 3a026f1f93..fab02c0e62 100644 --- a/src/lib/srdb1/db_con.h +++ b/src/lib/srdb1/db_con.h @@ -14,8 +14,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -36,6 +36,7 @@ * are used as a connection handle from modules uses the db API. */ typedef struct { + long cpid; /*!< connection process id */ const str* table; /*!< Default table that should be used */ const char *tquote; /*!< Char to quote special tokens (table/column names) */ unsigned long tail; /*!< Variable length tail, database module specific */ diff --git a/src/modules/sanity/sanity_mod.c b/src/modules/sanity/sanity_mod.c index 3f813bb021..832a0c2308 100644 --- a/src/modules/sanity/sanity_mod.c +++ b/src/modules/sanity/sanity_mod.c @@ -60,7 +60,7 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|ONREPLY_ROUTE}, {"sanity_check", (cmd_function)w_sanity_check, 2, fixup_igp_igp, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, - {"sanity_check", (cmd_function)w_sanity_reply, 0, 0, 0, + {"sanity_reply", (cmd_function)w_sanity_reply, 0, 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"bind_sanity", (cmd_function)bind_sanity, 0, 0, 0, 0 }, {0, 0, 0, 0, 0, 0}

1 0

git:master:993c036b: cdp: close socket in case of error
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 993c036bb185f6053a3a2f0486be30398918a87c URL: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T14:55:01+02:00 cdp: close socket in case of error --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… Patch: https://github.com/kamailio/kamailio/commit/993c036bb185f6053a3a2f0486be303… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0bff4131d3..692cc363ae 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,7 +844,7 @@ int receive_loop(peer *original_peer) */ int peer_connect(peer *p) { - int sock; + int sock = -1; int tmp = 0; unsigned int option = 1; @@ -922,17 +922,20 @@ int peer_connect(peer *p) if (valopt) { LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(valopt)); close(sock); + sock = -1; continue; } }else{ LM_ERR("peer_connect(): Timeout or error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } } }else{ LM_ERR("peer_connect(): Error opening connection to to %s port %s >%s\n",host,serv,strerror(errno)); close(sock); + sock = -1; continue; } @@ -956,7 +959,6 @@ int peer_connect(peer *p) if (!send_fd(p->fd_exchange_pipe,sock,p)){ LM_ERR("peer_connect(): [%.*s] Error sending fd to respective receiver\n",p->fqdn.len,p->fqdn.s); - close(sock); goto error; } @@ -967,6 +969,7 @@ int peer_connect(peer *p) error: if (res) freeaddrinfo(res); if (sainfo) freeaddrinfo(sainfo); + if (sock!=-1) close(sock); return -1; }

1 0

git:master:b1eb0928: ims_ipsec_pcscf: safety check for pcontact search result
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: b1eb0928f8e68a697eccda3e75504eb2263cb95b URL: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T10:02:18+02:00 ims_ipsec_pcscf: safety check for pcontact search result --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… Patch: https://github.com/kamailio/kamailio/commit/b1eb0928f8e68a697eccda3e75504eb… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 5013087c02..0651d4226f 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -667,7 +667,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -810,7 +810,8 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, _cflags & IPSEC_REVERSE_SEARCH) != 0 + || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; } @@ -967,7 +968,7 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) ul.lock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); - if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0) { + if (ul.get_pcontact(d, &ci, &pcontact, 0) != 0 || pcontact==NULL) { LM_ERR("Contact doesn't exist\n"); goto cleanup; }

1 0

git:master:5cac8b4e: ims_ipsec_pcscf: clean local parsed tm uas request headers
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 5cac8b4e99399ae3db4fb281fc084f73d8e8307f URL: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:57:53+02:00 ims_ipsec_pcscf: clean local parsed tm uas request headers --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… Patch: https://github.com/kamailio/kamailio/commit/5cac8b4e99399ae3db4fb281fc084f7… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index f8672a592a..5013087c02 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -140,7 +140,7 @@ static str get_www_auth_param(const char* param_name, str www_auth) return val; } -static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) +static int fill_contact(struct pcontact_info* ci, struct sip_msg* m, tm_cell_t *t) { contact_body_t* cb = NULL; struct via_body* vb = NULL; @@ -244,7 +244,6 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) } } else if(m->first_line.type == SIP_REPLY) { - struct cell *t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); return -1; @@ -651,9 +650,13 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) pcontact_t* pcontact = NULL; struct pcontact_info ci; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } // Find the contact - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -681,7 +684,7 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) } // Get request from reply - struct cell *t = tmb.t_gett(); + if (!t) t = tmb.t_gett(); if (!t || t == (void*) -1) { LM_ERR("Reply without transaction\n"); goto cleanup; @@ -765,6 +768,9 @@ int ipsec_create(struct sip_msg* m, udomain_t* d, int _cflags) // Do not free str* sec_header! It will be freed in data_lump.c -> free_lump() ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -778,11 +784,12 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) unsigned short dst_port = 0; unsigned short src_port = 0; ip_addr_t via_host; - struct sip_msg* req = NULL; + struct cell *t = NULL; + if(m->first_line.type == SIP_REPLY) { // Get request from reply - struct cell *t = tmb.t_gett(); + t = tmb.t_gett(); if (!t) { LM_ERR("Error getting transaction\n"); return ret; @@ -796,7 +803,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // // Find the contact // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -864,7 +871,7 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) // for Request sends from P-CSCF client port src_port = s->port_pc; - + // for Request sends to UE server port dst_port = s->port_us; } @@ -934,6 +941,9 @@ int ipsec_forward(struct sip_msg* m, udomain_t* d, int _cflags) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; } @@ -943,11 +953,14 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) struct pcontact_info ci; pcontact_t* pcontact = NULL; int ret = IPSEC_CMD_FAIL; // FAIL by default + tm_cell_t *t = NULL; + + if(m->first_line.type == SIP_REPLY) { + t = tmb.t_gett(); + } - // // Find the contact - // - if(fill_contact(&ci, m) != 0) { + if(fill_contact(&ci, m, t) != 0) { LM_ERR("Error filling in contact data\n"); return ret; } @@ -978,6 +991,9 @@ int ipsec_destroy(struct sip_msg* m, udomain_t* d) cleanup: ul.unlock_udomain(d, &ci.via_host, ci.via_port, ci.via_prot); pkg_free(ci.received_host.s); + if(t) { + tmb.t_uas_request_clean_parsed(t); + } return ret; }

1 0

git:master:8e69474a: presence: rename local variable that conflicts with tm define
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 8e69474ab7fd23ebd03bd193387f7e9fe8e1346d URL: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:05:03+02:00 presence: rename local variable that conflicts with tm define --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… Patch: https://github.com/kamailio/kamailio/commit/8e69474ab7fd23ebd03bd193387f7e9… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index b53528ce80..64c13a5f09 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -1303,7 +1303,7 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, str rec_route = {0, 0}; int rt = 0; contact_body_t *b; - struct to_body *pto, TO = {0}, *pfrom = NULL; + struct to_body *pto, tob = {0}, *pfrom = NULL; uint32_t lexpire; str rtag_value; struct sip_uri uri; @@ -1352,12 +1352,12 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, LM_DBG("'To' header ALREADY PARSED: <%.*s>\n", pto->uri.len, pto->uri.s); } else { - parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &TO); - if(TO.uri.len <= 0) { + parse_to(msg->to->body.s, msg->to->body.s + msg->to->body.len + 1, &tob); + if(tob.uri.len <= 0) { LM_DBG("'To' header NOT parsed\n"); goto error; } - pto = &TO; + pto = &tob; } if(pto->parsed_uri.user.s && pto->parsed_uri.host.s @@ -1509,11 +1509,11 @@ int extract_sdialog_info_ex(subs_t *subs, struct sip_msg *msg, uint32_t miexp, } getbflagsval(0, &subs->flags); - free_to_params(&TO); + free_to_params(&tob); return 0; error: - free_to_params(&TO); + free_to_params(&tob); return -1; }

1 0

git:master:159224b2: tm: function to clean local parsed headers and body for uas request
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 159224b254d9a67104c60fedab46a1b78cf19a83 URL: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T08:56:14+02:00 tm: function to clean local parsed headers and body for uas request - some modules use t->uas.request for getting attributes of the transaction request when processing the response, which may result in pointers to private memory being stored in the shared memory, causing crashes when other processes try to use the pointers --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… Patch: https://github.com/kamailio/kamailio/commit/159224b254d9a67104c60fedab46a1b… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 27aaef9b5f..ad9c8ae903 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1776,3 +1776,37 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, return NULL; } +/** + * + */ +void t_uas_request_clean_parsed(tm_cell_t *t) +{ + struct hdr_field *hdr; + void *mstart; + void *mend; + + if (!t || !t->uas.request) { + return; + } + + mstart = t->uas.request; + mend = t->uas.end_request; + + /* free header's parsed structures that were added by failure handlers */ + for (hdr=t->uas.request->headers; hdr; hdr=hdr->next ) { + if (hdr->parsed && hdr_allocs_parse(hdr) + && (hdr->parsed<mstart || hdr->parsed>=mend)) { + /* header parsed filed doesn't point inside fake memory + * chunck -> it was added by failure funcs.-> free it as pkg */ + LM_DBG("removing hdr->parsed %d\n", hdr->type); + clean_hdr_field(hdr); + hdr->parsed = 0; + } + } + /* free parsed body added by failure handlers */ + if (t->uas.request->body) { + if(t->uas.request->body->free) + t->uas.request->body->free(&t->uas.request->body); + t->uas.request->body = 0; + } +} diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index 46969e0d69..e22bb0e1de 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -28,7 +28,6 @@ #include "h_table.h" #include "t_reply.h" - #define CSEQ "CSeq: " #define CSEQ_LEN (sizeof(CSEQ)-1) #define TO "To: " @@ -45,7 +44,6 @@ #define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF #define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -92,4 +90,7 @@ int t_calc_branch(struct cell *t, char* print_callid_mini(char* target, str callid); char* print_cseq_mini(char* target, str* cseq, str* method); +typedef void (*t_uas_request_clean_parsed_f)(tm_cell_t *t); +void t_uas_request_clean_parsed(tm_cell_t *t); + #endif diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index 65515a3a28..8635b90eae 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -139,6 +139,7 @@ int load_tm( struct tm_binds *tmb) tmb->t_next_contacts = t_next_contacts; tmb->set_fr = t_set_fr; tmb->t_release_transaction = t_release_transaction; + tmb->t_uas_request_clean_parsed = t_uas_request_clean_parsed; return 1; } diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 8190ee977c..4695a8f7e1 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -38,6 +38,7 @@ #include "t_append_branches.h" #include "t_stats.h" #include "t_serial.h" +#include "t_msgbuilder.h" /* export not usable from scripts */ #define NO_SCRIPT -1 @@ -122,6 +123,7 @@ struct tm_binds { cmd_function t_next_contacts; tset_fr_f set_fr; trelease_t t_release_transaction; + t_uas_request_clean_parsed_f t_uas_request_clean_parsed; }; typedef struct tm_binds tm_api_t;

1 0

git:master:27b6c641: tm: relocated defines not useful in the header file
by Daniel-Constantin Mierla 04 May '22

04 May '22

Module: kamailio Branch: master Commit: 27b6c641b5d941503f974fea05af506972ac2ab5 URL: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-04T09:00:55+02:00 tm: relocated defines not useful in the header file --- Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_msgbuilder.h --- Diff: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… Patch: https://github.com/kamailio/kamailio/commit/27b6c641b5d941503f974fea05af506… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ad9c8ae903..08e50a8ea9 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -46,6 +46,22 @@ #endif +#define CSEQ "CSeq: " +#define CSEQ_LEN (sizeof(CSEQ)-1) +#define TO "To: " +#define TO_LEN (sizeof(TO)-1) +#define CALLID "Call-ID: " +#define CALLID_LEN (sizeof(CALLID)-1) +#define FROM "From: " +#define FROM_LEN (sizeof(FROM)-1) +#define FROMTAG ";tag=" +#define FROMTAG_LEN (sizeof(FROMTAG)-1) +#define TOTAG ";tag=" +#define TOTAG_LEN (sizeof(TOTAG)-1) +#define MAXFWD_VALUE "70" +#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF +#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) + /* convenience macros */ #define memapp(_d,_s,_len) \ do{\ diff --git a/src/modules/tm/t_msgbuilder.h b/src/modules/tm/t_msgbuilder.h index e22bb0e1de..a97c1f9451 100644 --- a/src/modules/tm/t_msgbuilder.h +++ b/src/modules/tm/t_msgbuilder.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -28,22 +28,6 @@ #include "h_table.h" #include "t_reply.h" -#define CSEQ "CSeq: " -#define CSEQ_LEN (sizeof(CSEQ)-1) -#define TO "To: " -#define TO_LEN (sizeof(TO)-1) -#define CALLID "Call-ID: " -#define CALLID_LEN (sizeof(CALLID)-1) -#define FROM "From: " -#define FROM_LEN (sizeof(FROM)-1) -#define FROMTAG ";tag=" -#define FROMTAG_LEN (sizeof(FROMTAG)-1) -#define TOTAG ";tag=" -#define TOTAG_LEN (sizeof(TOTAG)-1) -#define MAXFWD_VALUE "70" -#define MAXFWD_HEADER "Max-Forwards: " MAXFWD_VALUE CRLF -#define MAXFWD_HEADER_LEN (sizeof(MAXFWD_HEADER) - 1) - char *build_local(struct cell *Trans, unsigned int branch, unsigned int *len, char *method, int method_len, str *to , struct cancel_reason* reason @@ -55,7 +39,7 @@ char *build_local_reparse(struct cell *Trans, unsigned int branch, ); char *build_uac_request( str msg_type, str dst, str from, - str fromtag, int cseq, str callid, str headers, + str fromtag, int cseq, str callid, str headers, str body, int branch, struct cell *t, unsigned int *len); @@ -71,7 +55,7 @@ char *build_uac_cancel(str *headers,str *body,struct cell *cancelledT, * request should be send. The function is used by tm when it generates * local ACK to 200 OK (on behalf of applications using uac */ -char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, +char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, unsigned int branch, str *hdrs, str *body, unsigned int *len, struct dest_info* dst); @@ -79,8 +63,8 @@ char *build_dlg_ack(struct sip_msg* rpl, struct cell *Trans, /* * Create a request */ -char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, - struct cell *t, int* len, struct dest_info* dst); +char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, int branch, + struct cell *t, int* len, struct dest_info* dst); int t_calc_branch(struct cell *t,

1 0

db_redis shared tcp connection issue
by Andrew Pogrebennyk 04 May '22

04 May '22

Dear community, I've been looking at some weirdness in db_redis behavior when it returns the responses to the queries made by tcp processes in mixed order. Tested this on various kamailio 5.3 and 5.4 (sipwise spce) and they are showing interesting pattern. After restart of kamailio I ran lsof to enumerate all the sockets open in kamailio children. There is a connection to db port 6379 which is held by multiple processes at the same time. > for i in $(ps auxww | grep kamailio.proxy | grep -v grep | awk '{print > $2}'); do echo "print file descriptors of $i" && sudo lsof -p $i | grep > 6379; done > redis_conn.txt ...i see that lsof lists tcp client socket to redis server with same source TCP port and same inode number in several processes: 14199, "TIMER NH", 14200, "ctl handler", 14205, "Dialog Clean Timer", 14206, "JSONRPCS FIFO", 14210, "JSONRPCS DATAGRAM", 14213, "tcp receiver (generic) child=0", 14214, "tcp receiver (generic) child=1", 14215, "tcp receiver (generic) child=2", 14220, "tcp receiver (generic) child=3", 14224, "tcp receiver (generic) child=4", 14225, "tcp main process" The UDP processes are safe (and some timer ones too), because in that lsof they have unique TCP client port. That's giving me a lot of headache because UA registrations received by any of the TCP workers (or IPSec ones for that matter) are randomly failing, because if two processes made same query to DB in parallel it is appearing on the wire with same TCP source port and replies can be mixed up. This can be some bug in usage of hiredis, impacting all users of db_redis module. Is there any relation to the way kamailio is working its TCP workers, where maybe tcp workers are forked from the main attendant processes after having opened the DB connection? P.S. Why I have the above hypothesis: when I log redis queries with redis-cli monitor at startup of kamailio, I see only that srem_key_lua is executed against redis in runtime only once from that source port, but then this connection is shared across multiple processes. Regards, Andrew

3 8

git:master:7f359ca1: lcr: init variable for fixing warning report
by Daniel-Constantin Mierla 03 May '22

03 May '22

Module: kamailio Branch: master Commit: 7f359ca152e87ec72c6dd39fe09885bae630e36f URL: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-03T20:59:49+02:00 lcr: init variable for fixing warning report --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… Patch: https://github.com/kamailio/kamailio/commit/7f359ca152e87ec72c6dd39fe09885b… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 9647dde044..6f5eafdb22 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -1939,7 +1939,7 @@ static inline int decode_avp_value(char *value, unsigned int *gw_index, struct ip_addr *addr, str *hostname, str *port, str *params, str *transport, unsigned int *flags, unsigned int *rule_id) { - unsigned int u; + unsigned int u = 0; str s; char *sep; struct ip_addr *ip;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev