sr-dev October 2020

sr-dev@lists.kamailio.org

19 participants
528 discussions

Releasing Kamailio v5.3.7
by Daniel-Constantin Mierla 02 Nov '20

02 Nov '20

Hello, I am planning to release Kamailio v5.3.7 sometime next week, likely on Monday or Tuesday, this being the usual prior notice for heads up to identify issues not reported yet on bug tracker as well as the commits you are aware of that were not backported yet. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

Re: [sr-dev] [SR-Users] Confusion about TCP worker ports
by Henning Westerholt 30 Oct '20

30 Oct '20

Hi Alex, yes, this is correct. This interface used also from other modules that needs to exercise UAC like functionality. https://github.com/kamailio/kamailio/blob/master/src/modules/tm/uac.h Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com -----Original Message----- From: sr-users <sr-users-bounces(a)lists.kamailio.org> On Behalf Of Alex Balashov Sent: Friday, October 30, 2020 7:07 PM To: sr-users(a)lists.kamailio.org Subject: Re: [SR-Users] Confusion about TCP worker ports Daniel, Just to make sure I understood this: On 10/30/20 4:34 AM, Daniel-Constantin Mierla wrote: > confirming what Henning said that dispatcher is not using uac module, > not to be any doubt about that. Actually, uac modules uses some of the > TM-UAC functions as dispatcher module, but between dispatcher and uac > module is no relation, no dependency. Sockets can be enforced in > dispatcher via socket attribute (I think is also a modparam for a > global need), however see next remarks about what can happen. So, there's a common set of UAC request synthesis APIs which are actually exported by TM, but used by both dispatcher and the UAC module per se? -- Alex -- Alex Balashov | Principal | Evariste Systems LLC Tel: +1-706-510-6800 / +1-800-250-5920 (toll-free) Web: http://www.evaristesys.com/, http://www.csrpswitch.com/ _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

1 0

git:5.3:fec844e0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: fec844e0f77bb96779c8380f40d8a842ec63a571 URL: https://github.com/kamailio/kamailio/commit/fec844e0f77bb96779c8380f40d8a84… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-10-30T15:01:35+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/fec844e0f77bb96779c8380f40d8a84… Patch: https://github.com/kamailio/kamailio/commit/fec844e0f77bb96779c8380f40d8a84… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index 2a611ef564..796832b3a4 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -896,8 +896,9 @@ request_route { location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are - currently in the location database. On an error, an error message will - be sent with a short description in reason phrase. + currently in the location database. As a side effect, also branch flags + are stored in usrloc. On an error, an error message will be sent with a + short description in reason phrase. Meaning of the parameters is as follows: * domain - Logical domain within the registrar. If a database is used @@ -945,7 +946,8 @@ save("location", "0x00", "sip:test@kamailio.org"); no such contacts, -1 will be returned. If there are such contacts, Request-URI will be overwritten with the contact that has the highest q value and optionally the rest will be appended to the message - (depending on append_branches parameter value). + (depending on append_branches parameter value). As a side effect, also + branch flags are restored from usrloc. If the method_filtering option is enabled and request is initial request without to-tag, the lookup function will return only the diff --git a/src/modules/textops/README b/src/modules/textops/README index 32ed2c4d36..aafe390638 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -721,10 +721,13 @@ if (has_body("multipart/mixed")) { 4.23. append_to_reply(txt) - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + Kamailio (e.g., via sl_send_reply(...)). Meaning of the parameters is as follows: - * txt - String which may contains pseudo-variables. + * txt - String which may contains pseudo-variables. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, FAILURE_ROUTE, ERROR_ROUTE. @@ -737,12 +740,14 @@ append_to_reply("Foo: $rm at $Ts\r\n"); 4.24. append_hf(txt[, hdr]) - Appends 'txt' as header after first header field or after last 'hdr' - header field. + Appends 'txt' as header at the end of the all headers, or after last + header named 'hdr' if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be appended. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name after which the 'txt' is appended. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -756,12 +761,14 @@ append_hf("From-username: $fU\r\n", "Call-ID"); 4.25. insert_hf(txt[, hdr]) - Inserts 'txt' as header before the first header field or before first - 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before first + header named 'hdr'if the second parameter is provided. Meaning of the parameters is as follows: * txt - Header field to be inserted. The value can contain - pseudo-variables which will be replaced at run time. + pseudo-variables which will be replaced at run time. Note that the + value has to be ended with "\r\n" (end of header characters + sequence). * hdr - Header name before which the 'txt' is inserted. This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:5.3:fae5956c: dialog: update internal_get_dlg() after 0bde3ca changes
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: fae5956c5183576947ce97bb9941e2c79645eb78 URL: https://github.com/kamailio/kamailio/commit/fae5956c5183576947ce97bb9941e2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:50:14+01:00 dialog: update internal_get_dlg() after 0bde3ca changes - keep also direction value for no-totag dialog - reference and unlock only when returning, related to #2494 (cherry picked from commit 98436c73e8519e96e3d167b7610cbb58b9939885) --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/fae5956c5183576947ce97bb9941e2c… Patch: https://github.com/kamailio/kamailio/commit/fae5956c5183576947ce97bb9941e2c… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 93d35f553b..2714c439e5 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -857,7 +857,7 @@ dlg_cell_t* dlg_get_by_iuid(dlg_iuid_t *diuid) * \param ftag from tag * \param ttag to tag * \param dir direction - * \param mode let hash table slot locked or not + * \param mode let hash table slot locked or not, even when dlg is not found * \return dialog structure on success, NULL on failure */ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, @@ -867,33 +867,47 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, struct dlg_cell *dlg; struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; + unsigned int dir_no_totag = DLG_DIR_NONE; d_entry = &(d_table->entries[h_entry]); dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { - /* Check callid / fromtag / totag */ + /* check callid / fromtag / totag */ if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { - ref_dlg_unsafe(dlg, 1); - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - - /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ - if (dlg->tag[1].len == 0) { - dlg_no_totag=dlg; - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + /* if to-tag is empty continue to search in case another dialog + * is found with a matching to-tag. */ + if (dlg->tag[DLG_CALLEE_LEG].len == 0) { + dlg_no_totag = dlg; + dir_no_totag = *dir; continue; } + + ref_dlg_unsafe(dlg, 1); + if(likely(mode==0)) { + dlg_unlock( d_table, d_entry); + } LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", - callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + callid->len, callid->s, h_entry, *dir, + dlg->tag[DLG_CALLEE_LEG].len, dlg->tag[DLG_CALLEE_LEG].s); return dlg; } } - if(likely(mode==0)) dlg_unlock( d_table, d_entry); - if (dlg_no_totag) return dlg_no_totag; + if (dlg_no_totag) { + ref_dlg_unsafe(dlg_no_totag, 1); + } + if(likely(mode==0)) { + dlg_unlock(d_table, d_entry); + } + if (dlg_no_totag) { + *dir = dir_no_totag; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d no-to-tag\n", + callid->len, callid->s, h_entry, *dir); + return dlg_no_totag; + } LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0;

1 0

git:5.3:0fcfc1b3: core: parser rr - clean partially cloned fields in case of error
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 0fcfc1b3a9598cfb8e66c780fdaf453af3349b45 URL: https://github.com/kamailio/kamailio/commit/0fcfc1b3a9598cfb8e66c780fdaf453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:47:49+01:00 core: parser rr - clean partially cloned fields in case of error (cherry picked from commit e4f6c660bd75cdb9ff0855fcb511673cc8ec00c4) (cherry picked from commit e3cda7fa4e873c110ee2641f6200fad52222586a) --- Modified: src/core/parser/parse_rr.c --- Diff: https://github.com/kamailio/kamailio/commit/0fcfc1b3a9598cfb8e66c780fdaf453… Patch: https://github.com/kamailio/kamailio/commit/0fcfc1b3a9598cfb8e66c780fdaf453… --- diff --git a/src/core/parser/parse_rr.c b/src/core/parser/parse_rr.c index a089b895fc..9557bffc9b 100644 --- a/src/core/parser/parse_rr.c +++ b/src/core/parser/parse_rr.c @@ -296,7 +296,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) } else { PKG_MEM_ERROR; } - return -2; + ret = -2; + goto error; } memcpy(res, it, sizeof(rr_t)); @@ -313,7 +314,8 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) LM_ERR("Error while duplicating parameters\n"); if (_shm) shm_free(res); else pkg_free(res); - return -3; + ret = -3; + goto error; } xlate_pointers(it, res); @@ -327,6 +329,18 @@ static inline int do_duplicate_rr(rr_t** _new, rr_t* _r, int _shm) it = it->next; } return 0; + +error: + if(*_new != NULL) { + if (_shm) { + shm_free_rr(_new); + } else { + free_rr(_new); + } + *_new = NULL; + } + + return ret; }

1 0

git:5.3:675ac0d1: regex: use var to store strlen() values
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 675ac0d1afbefd56abe063a0408479b62d15a49e URL: https://github.com/kamailio/kamailio/commit/675ac0d1afbefd56abe063a0408479b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:47:36+01:00 regex: use var to store strlen() values - avoid doing it again in a few cases (cherry picked from commit 5d490d616132067a5e914302a24b964b73b229a2) (cherry picked from commit bd2204b7151261981bc6872928b7434e2ac7df2e) --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/675ac0d1afbefd56abe063a0408479b… Patch: https://github.com/kamailio/kamailio/commit/675ac0d1afbefd56abe063a0408479b… --- diff --git a/src/modules/regex/regex_mod.c b/src/modules/regex/regex_mod.c index 475c3542eb..2bc521040b 100644 --- a/src/modules/regex/regex_mod.c +++ b/src/modules/regex/regex_mod.c @@ -246,6 +246,7 @@ static int load_pcres(int action) int pcre_erroffset; int num_pcres_tmp = 0; pcre **pcres_tmp = NULL; + int llen; /* Get the lock */ lock_get(reload_lock); @@ -301,31 +302,37 @@ static int load_pcres(int action) } /* Start the regular expression with '(' */ patterns[i][0] = '('; + patterns[i][1] = '\0'; memset(line, 0, FILE_MAX_LINE); continue; } + llen = strlen(line); /* Check if the patter size is too big (aprox) */ - if (strlen(patterns[i]) + strlen(line) >= group_max_size - 4) { + if (strlen(patterns[i]) + llen >= group_max_size - 4) { LM_ERR("pattern max file exceeded\n"); fclose(f); goto err; } /* Append ')' at the end of the line */ - if (line[strlen(line) - 1] == '\n') { - line[strlen(line)] = line[strlen(line) - 1]; - line[strlen(line) - 2] = ')'; + if (line[llen - 1] == '\n') { + line[llen - 1] = ')'; + line[llen] = '\n'; + line[llen + 1] = '\0'; } else { /* This is the last char in the file and it's not \n */ - line[strlen(line)] = ')'; + line[llen] = ')'; + line[llen + 1] = '\0'; } /* Append '(' at the beginning of the line */ - memcpy(patterns[i]+strlen(patterns[i]), "(", 1); + llen = strlen(patterns[i]); + memcpy(patterns[i]+llen, "(", 1); + llen++; - /* Append the line to the current pattern */ - memcpy(patterns[i]+strlen(patterns[i]), line, strlen(line)); + /* Append the line to the current pattern (including the ending 0) */ + memcpy(patterns[i] + llen, line, strlen(line) + 1); memset(line, 0, FILE_MAX_LINE); }

1 0

git:5.3:dc582f31: textops: docs - some enhancements to basic header operations functions
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: dc582f3186e7a3fa6bce96ddb27240922da20201 URL: https://github.com/kamailio/kamailio/commit/dc582f3186e7a3fa6bce96ddb272409… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:47:25+01:00 textops: docs - some enhancements to basic header operations functions (cherry picked from commit 374f0f05bdf27ddaf5d8652560738fbfb886c43c) (cherry picked from commit 7cd88cf05f25a5a5883d936285ac51f82911e9af) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc582f3186e7a3fa6bce96ddb272409… Patch: https://github.com/kamailio/kamailio/commit/dc582f3186e7a3fa6bce96ddb272409… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index fecaa059f2..9af8394a7c 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -872,13 +872,15 @@ if (has_body("multipart/mixed")) { <function moreinfo="none">append_to_reply(txt)</function> </title> <para> - Append txt as header to the reply. + Append txt as header to the reply that is going to be generated by + &kamailio; (e.g., via sl_send_reply(...)). </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - String which may contains - pseudo-variables. + pseudo-variables. Note that the value has to be ended with "\r\n" + (end of header characters sequence). </para> </listitem> </itemizedlist> @@ -902,15 +904,16 @@ append_to_reply("Foo: $rm at $Ts\r\n"); <function moreinfo="none">append_hf(txt[, hdr])</function> </title> <para> - Appends 'txt' as header after first header field or after - last 'hdr' header field. + Appends 'txt' as header at the end of the all headers, or after + last header named 'hdr' if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be appended. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem> @@ -939,15 +942,16 @@ append_hf("From-username: $fU\r\n", "Call-ID"); <function moreinfo="none">insert_hf(txt[, hdr])</function> </title> <para> - Inserts 'txt' as header before the first header field or before - first 'hdr' header field if 'hdr' is given. + Inserts 'txt' as header before the first header field, or before + first header named 'hdr'if the second parameter is provided. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> <para><emphasis>txt</emphasis> - Header field to be inserted. The value can contain pseudo-variables which will be replaced at run - time. + time. Note that the value has to be ended with "\r\n" (end of header + characters sequence). </para> </listitem> <listitem>

1 0

git:5.3:7eadc9f4: alias_db: clang format the code
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 7eadc9f45b32181ccb00385a8520ae9ce6e627ff URL: https://github.com/kamailio/kamailio/commit/7eadc9f45b32181ccb00385a8520ae9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:47:12+01:00 alias_db: clang format the code (cherry picked from commit 3dca5cd2c7f018189b6784a7e87807df1de7589e) (cherry picked from commit aa0573d2afa3c1a0afa76b8fd1e0de952c487a01) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/7eadc9f45b32181ccb00385a8520ae9… Patch: https://github.com/kamailio/kamailio/commit/7eadc9f45b32181ccb00385a8520ae9…

1 0

git:5.3:3460b6b0: alias_db: removed history from top comments
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: 3460b6b0a35919b01a6371aa678c642730b7352a URL: https://github.com/kamailio/kamailio/commit/3460b6b0a35919b01a6371aa678c642… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:47:02+01:00 alias_db: removed history from top comments - missing copyright header (cherry picked from commit 7ae0caaffd3d6e523fd32501401213521a1881e5) (cherry picked from commit 5114cc77cb61744843ed8b535d9804fcdf61e635) --- Modified: src/modules/alias_db/alias_db.c Modified: src/modules/alias_db/alias_db.h Modified: src/modules/alias_db/alookup.c Modified: src/modules/alias_db/alookup.h Modified: src/modules/alias_db/api.h --- Diff: https://github.com/kamailio/kamailio/commit/3460b6b0a35919b01a6371aa678c642… Patch: https://github.com/kamailio/kamailio/commit/3460b6b0a35919b01a6371aa678c642…

1 0

git:5.3:c2608157: alias_db: set ending zero in a single place
by Daniel-Constantin Mierla 30 Oct '20

30 Oct '20

Module: kamailio Branch: 5.3 Commit: c2608157108fe46231269515b8bb8ddb53d82662 URL: https://github.com/kamailio/kamailio/commit/c2608157108fe46231269515b8bb8dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-30T14:46:51+01:00 alias_db: set ending zero in a single place (cherry picked from commit dc1bb5b1861de279b450ab550888dd748b77463f) (cherry picked from commit 83005d4fafd5d055e4125a83c24d1c6cd0eed058) --- Modified: src/modules/alias_db/alookup.c --- Diff: https://github.com/kamailio/kamailio/commit/c2608157108fe46231269515b8bb8dd… Patch: https://github.com/kamailio/kamailio/commit/c2608157108fe46231269515b8bb8dd… --- diff --git a/src/modules/alias_db/alookup.c b/src/modules/alias_db/alookup.c index 28dd916999..faa5f6739e 100644 --- a/src/modules/alias_db/alookup.c +++ b/src/modules/alias_db/alookup.c @@ -163,19 +163,18 @@ static int alias_db_query(struct sip_msg* _msg, str table, (char*)RES_ROWS(db_res)[i].values[1].val.str_val.s, RES_ROWS(db_res)[i].values[1].val.str_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.str_val.len; - useruri_buf[user_s.len] = '\0'; break; case DB1_BLOB: strncpy(user_s.s, (char*)RES_ROWS(db_res)[i].values[1].val.blob_val.s, RES_ROWS(db_res)[i].values[1].val.blob_val.len); user_s.len += RES_ROWS(db_res)[i].values[1].val.blob_val.len; - useruri_buf[user_s.len] = '\0'; break; default: LM_ERR("unknown type of DB user column\n"); goto err_server; } + useruri_buf[user_s.len] = '\0'; user_s.s = useruri_buf; /* set the URI */ LM_DBG("new URI [%d] is [%.*s]\n", i, user_s.len ,user_s.s );

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2020