sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
307 discussions

git:master:403de77c: core: proper check for allocation of route_locks_size
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 403de77c079a125ac101ff2ae58e08551a12a022 URL: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T10:03:43+02:00 core: proper check for allocation of route_locks_size - regression added with relocation of code --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… Patch: https://github.com/kamailio/kamailio/commit/403de77c079a125ac101ff2ae58e085… --- diff --git a/src/core/receive.c b/src/core/receive.c index 3a2919cec2..8034ae9618 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -48,6 +48,7 @@ #include "usr_avp.h" #include "xavp.h" #include "select_buf.h" +#include "locking.h" #include "tcp_server.h" /* for tcpconn_add_alias */ #include "tcp_options.h" /* for access to tcp_accept_aliases*/ @@ -77,7 +78,7 @@ int ksr_route_locks_set_init(void) return 0; ksr_route_locks_set = rec_lock_set_alloc(ksr_route_locks_size); - if(ksr_route_locks_set) { + if(ksr_route_locks_set==NULL) { LM_ERR("failed to allocate route locks set\n"); return -1; }

1 0

git:master:94a51c88: core: main.c - show examples for use of -A for defines with values
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 94a51c887efaac2f85932922baf8e261abb8247c URL: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T09:29:55+02:00 core: main.c - show examples for use of -A for defines with values --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… Patch: https://github.com/kamailio/kamailio/commit/94a51c887efaac2f85932922baf8e26… --- diff --git a/src/main.c b/src/main.c index 6d6d390306..a97fb6dba0 100644 --- a/src/main.c +++ b/src/main.c @@ -157,7 +157,8 @@ Options:\n\ disable with no or off\n\ --alias=val Add an alias, the value has to be '[proto:]hostname[:port]'\n\ (like for 'alias' global parameter)\n\ - -A define Add config pre-processor define (e.g., -A WITH_AUTH)\n\ + -A define Add config pre-processor define (e.g., -A WITH_AUTH,\n\ + -A 'FLT_ACC=1', -A 'DEFVAL=\"str-val\"')\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\

1 0

[kamailio/kamailio] Kamailio-Master tcp request relaying problem (EAGAIN) (#1836)
by Yasin CANER 10 May '19

10 May '19

### Description Hello, Kamailio -master version couldnt relay tcp request to other sides. it gives EAGAIN error. When i test scenario on kamailio-5.2 version , it can relay. ### Troubleshooting #### Reproduction ``` route[TCPTEST]{ remove_hf("Route"); #loose_route(); if (!is_method("INVITE")) return; $du="sip: mykamailio1.test:5060;transport=tcp"; if(!t_newtran()){ xlog("L_WARN"," Couldnt create new transaction \r\n"); sl_send_reply("503", "Service not available"); exit; } if(!t_relay()){ send_reply("503", "Service not available"); exit; } exit; } ``` #### Debugging Data #### Log Messages  ``` 7(15781) DEBUG: <core> [core/tcp_main.c:1229]: tcpconn_new(): on port 5060, type 2 7(15781) DEBUG: <core> [core/tcp_main.c:1539]: tcpconn_add(): hashes: 507:2382:0, 2 7(15781) DEBUG: <core> [core/tcp_main.c:2873]: tcpconn_1st_send(): pending write on new connection 0x7fd15b5e7c98 (-1/1483 bytes written) (err: 11 - Resource temporarily unavailable) 7(15781) ERROR: <core> [core/tcp_main.c:2891]: tcpconn_1st_send(): [FD61:C23C:B3B6:0:0:0:0:5]:5060: EAGAIN and write queue full or failed for 0x7fd15b5e7c98 7(15781) DEBUG: <core> [core/tcp_main.c:3153]: tcpconn_chld_put(): destroying connection 0x7fd15b5e7c98 (2, -1) flags 0060 7(15781) ERROR: tm [../../core/forward.h:251]: msg_send_buffer(): tcp_send failed ``` #### SIP Traffic  ``` UAC: IPv6: TCP ---> Kamailio (5.2) :IPv6 :TCP ---> Client or Server IPv6:TCP ``` ### Possible Solutions  ### Additional Information ``` Kamailio master from git ``` * **Operating System**:  ``` NAME="CentOS Linux" VERSION="7 (Core)" 3.10.0-957.1.3.el7.x86_64 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1836

8 18

Re: [sr-dev] [SR-Users] Sending in-dialog requests from custom module's C code
by Henning Westerholt 10 May '19

10 May '19

Hello Ivan, this type of questions are better suited to our developer list, not the users list - adding it to CC. I haven't looked yet that deep into your previous e-mail, but have you already looked e.g. to the dialog module? This does something similar, e.g. bridging an existing dialog. It uses uac_req_t and a TM callback. You find the implementation in dlg_transfer.c, e.g. function dlg_bridge(str *from, str *to, str *op, str *bd). Cheers, Henning Am 08.05.19 um 09:26 schrieb Ivan Ribakov: Anyone with module dev experience here who had to do something similar or used tm_load.h interface for other purposes? On 7 May 2019, at 16:39, Ivan Ribakov <i.ribakov(a)zaleos.net<mailto:i.ribakov@zaleos.net>> wrote: I’m working on a custom Kamailio module where I need to send new-dialog and in-dialog requests on timer (hence I’m being forced to generate new messages from C code). So far I’ve been using modules/tm/tm_load.h defined interface to generate messages and handle callbacks. New dialog messages are sent and processed normally. To do that I’m: 1. Calling set_uac_request() to define request parameters 2. Calling tmb.t_request_outside() to send it outside any existing dialog I was able to send in-dialog requests (or so I thought) in a similar fashion, but I soon realised that responses to those requests were dropped because they couldn’t be matched against any known existing transaction. I’m attaching log messages that I believe support this theory and I’ve also observed UDP retransmissions. tm [t_lookup.c:897]: t_reply_matching(): t_reply_matching: hash 50576 label 0 branch 0 tm [t_lookup.c:990]: t_reply_matching(): no matching transaction exists tm [t_lookup.c:993]: t_reply_matching(): failure to match a transaction tm [t_lookup.c:1088]: t_check_msg(): msg (0x5abcb50) id=1 global id=1 T end=(nil) tm [t_reply.c:2195]: reply_received(): transaction not found - (branch -1) The way I’m currently generating in-dialog requests is very similar to what tmb.t_request_outside() does, the main difference being that I do the dialog setup manually, based on the call-ID, cseq and from/to tags (I’m tracking transaction identifiers separately) and then pass resulting uac_req_t to tmb.t_request_within() - https://gist.github.com/IvanRibakov/3302cb286b1f4b786d109b406f2435a2 Now, the question part - does anyone know what I’m doing wrong/missing? As I mentioned, when looking at the generated message bodies, they look ok to me (left - initial request that started the dialog, right - first in-dialog request), so I’m guessing I’m missing some Kamailio internal steps needed to register new transaction. <kamailio_indialog_req.png> SIP flow (up to the point when first UDP retransmission happens) <PastedGraphic-1.png> I apologise in advance for the bulky question and will be extremely thankful for any guidance. Regards, Ivan _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org<mailto:sr-users@lists.kamailio.org> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services

2 3

git:5.0:0bf66e01: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.0 Commit: 0bf66e01329d4cfe8810586bb3735fbb11dbb0e0 URL: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:14:31-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… Patch: https://github.com/kamailio/kamailio/commit/0bf66e01329d4cfe8810586bb3735fb… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index 66984bae5a..4a6a8a95e5 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -454,6 +460,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.0:34752a8a: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.0 Commit: 34752a8ab5beb0d71e2fddcde435b410b6825563 URL: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:14:22-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… Patch: https://github.com/kamailio/kamailio/commit/34752a8ab5beb0d71e2fddcde435b41… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index f965b22d24..2229ecd1ad 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -295,6 +295,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

git:5.1:44d1fa36: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.1 Commit: 44d1fa361c08f6e2be09f7f69bbc3d8fd10f5620 URL: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:13:36-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… Patch: https://github.com/kamailio/kamailio/commit/44d1fa361c08f6e2be09f7f69bbc3d8… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index a2d35c2406..8b88ed8074 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -453,6 +459,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.1:57a51ee1: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.1 Commit: 57a51ee115ff11459107e76bd6bc98358874473f URL: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:13:31-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… Patch: https://github.com/kamailio/kamailio/commit/57a51ee115ff11459107e76bd6bc983… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index c850501952..d6d9d73f21 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -296,6 +296,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

git:5.2:04a0a701: db_text: avoid buffer overflow for large names and/or values in db_text files
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.2 Commit: 04a0a7014a605d9d332b70f966f8afc5fec4d448 URL: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:12:47-04:00 db_text: avoid buffer overflow for large names and/or values in db_text files (cherry picked from commit 20febb28402a2e1ef3c23fda6db0825ae64affc6) --- Modified: src/modules/db_text/dbt_file.c --- Diff: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… Patch: https://github.com/kamailio/kamailio/commit/04a0a7014a605d9d332b70f966f8afc… --- diff --git a/src/modules/db_text/dbt_file.c b/src/modules/db_text/dbt_file.c index a2d35c2406..8b88ed8074 100644 --- a/src/modules/db_text/dbt_file.c +++ b/src/modules/db_text/dbt_file.c @@ -124,7 +124,7 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) return NULL; } - buf = pkg_malloc(_db_text_read_buffer_size); + buf = pkg_malloc(_db_text_read_buffer_size+1); if(!buf) { LM_ERR("error allocating read buffer, %i\n", _db_text_read_buffer_size); goto done; @@ -173,6 +173,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) if(c==EOF) goto clean; buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } colp = dbt_column_new(buf, bp); @@ -453,6 +459,12 @@ dbt_table_p dbt_load_file(const str *tbn, const str *dbn) } } buf[bp++] = c; + if (bp==_db_text_read_buffer_size) { + LM_ERR("Buffer overflow for file [%s] row=[%d] col=[%d] c=[%c]." + " Please increase 'file_buffer_size' param!\n", + path, crow+1, ccol+1, c); + goto clean; + } c = fgetc(fin); } dtval.val.str_val.s = buf;

1 0

git:5.2:5f811410: db_text: throw an error and abort instead of silently truncate tables
by Ovidiu Sas 10 May '19

10 May '19

Module: kamailio Branch: 5.2 Commit: 5f8114102fb64510b283ceba7f10a3345e632d70 URL: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-05-10T10:12:30-04:00 db_text: throw an error and abort instead of silently truncate tables (cherry picked from commit 3ed1fcdbb9247b1eb10d8d544f2a67b277bd1031) --- Modified: src/modules/db_text/dbt_base.c --- Diff: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… Patch: https://github.com/kamailio/kamailio/commit/5f8114102fb64510b283ceba7f10a33… --- diff --git a/src/modules/db_text/dbt_base.c b/src/modules/db_text/dbt_base.c index c850501952..d6d9d73f21 100644 --- a/src/modules/db_text/dbt_base.c +++ b/src/modules/db_text/dbt_base.c @@ -296,6 +296,11 @@ int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, } _drp = _drp->next; } + if (_drp && counter == _db_text_max_result_rows) + { + LM_ERR("Truncated table at [%d] rows. Please increase 'max_result_rows' param!\n", counter); + goto error; + } if (_o_l) {

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019