sr-dev June 2022

sr-dev@lists.kamailio.org

20 participants
280 discussions

git:5.6:82edf7a4: acc: Fix reason code for locally generated replies. (#3137)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 82edf7a447a770f1cd2c97a05ad128255898586a URL: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… Author: Frits Wiersma <cfwiersma(a)solcon.nl> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:09:09+02:00 acc: Fix reason code for locally generated replies. (#3137) * acc: Fix reason code for locally generated replies. - Use heap memory for the reason code instead of the stack memory. - See issue #2981 * acc: Remove code which was commented out. - Code was commented out in the previous pull request. (#3137). - This has now been corrected. (cherry picked from commit e74cb2371ab879874a8981818139024f1c2beb9e) --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… Patch: https://github.com/kamailio/kamailio/commit/82edf7a447a770f1cd2c97a05ad1282… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index e045b8c95ac..169a4222fbf 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -93,25 +93,20 @@ void env_set_totag(struct cell *t, struct sip_msg *reply) tmb.t_get_reply_totag(t->uas.request, &acc_env.to_tag); } -int env_set_reason(struct sip_msg *reply, str *buff) { - int i; - char *p; +int env_set_reason(struct sip_msg *reply, str *buff, int code) { + if (reply!=FAKED_REPLY || !buff || !buff->s || buff->len < 20) return 0; if (strncmp(buff->s, "SIP/2.0 ", 8) != 0) { LM_ERR("not a SIP reply\n"); return 0; } - p = buff->s + 12; - for (i=12;i<buff->len;i++) { - if (*p == '\r' || *p == '\n') { - acc_env.reason.s = buff->s+12; - acc_env.reason.len = i-12; - LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); - return 1; - } - p++; - } + + /* Set the reason to a pointer in heap memory. It will contain the last seen FAKED_REPLY */ + acc_env.reason.s = error_text(code); + acc_env.reason.len = strlen(acc_env.reason.s); + LM_DBG("reason[%.*s]\n", acc_env.reason.len, acc_env.reason.s); + return 0; } @@ -139,7 +134,8 @@ static inline void env_set_code_status( int code, struct sip_msg *reply) acc_env.code_s.s = int2bstr((unsigned long)code, code_buf, &acc_env.code_s.len); /* reason */ - if (acc_env.reason.len == 0) { /* already extracted in case of locally generated replies */ + /* In case of an ACK the reply == NULL, but the reason must be set when report_ack is 1 */ + if (acc_env.reason.len == 0 || reply==NULL) { /* already extracted in case of locally generated replies */ acc_env.reason.s = error_text(code); acc_env.reason.len = strlen(acc_env.reason.s); } @@ -719,7 +715,7 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) LM_DBG("acc callback called for t(%p) event type %d, reply code %d\n", t, type, ps->code); if (type&TMCB_RESPONSE_OUT) { - env_set_reason(ps->rpl, &ps->send_buf); + env_set_reason(ps->rpl, &ps->send_buf, ps->code); acc_onreply( t, ps->req, ps->rpl, ps->code); } else if (type&TMCB_E2EACK_IN) { acc_onack( t, t->uas.request, ps->req, ps->code);

1 year, 11 months

git:5.6:45c3b1b6: topos: don't insert contact header for 4xx replies

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 45c3b1b6cd97b610ca3bd8753df44e14ec780b22 URL: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:08:52+02:00 topos: don't insert contact header for 4xx replies unless original msg has contact (cherry picked from commit f49f14a87606314e98a253ee29b1624ae814dccf) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… Patch: https://github.com/kamailio/kamailio/commit/45c3b1b6cd97b610ca3bd8753df44e1… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index c01dde7b3f..a3f123b593 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1167,6 +1167,11 @@ int tps_response_sent(sip_msg_t *msg) && msg->contact==NULL) { contact_keep = 1; } + if(contact_keep==0 && msg->first_line.u.reply.statuscode>=400 + && msg->first_line.u.reply.statuscode<500 + && msg->contact==NULL) { + contact_keep = 1; + } if(contact_keep==0) { tps_remove_headers(msg, HDR_CONTACT_T); if(direction==TPS_DIR_DOWNSTREAM) {

1 year, 11 months

git:5.6:8137b8da: topos: skip adding contact header for BYE, CANCEL, PRACK

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 8137b8da1a36e54787957ab3d4ee66ca49a4b5ee URL: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T11:08:25+02:00 topos: skip adding contact header for BYE, CANCEL, PRACK - GH #3149 (cherry picked from commit 414c7dd608584df18f871b42e05f401e21ba775d) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… Patch: https://github.com/kamailio/kamailio/commit/8137b8da1a36e54787957ab3d4ee66c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 83d5f5fddff..c01dde7b3f1 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -46,6 +46,8 @@ #include "tps_msg.h" #include "tps_storage.h" +#define TPS_METHODS_NOCONTACT (METHOD_CANCEL|METHOD_BYE|METHOD_PRACK) + extern int _tps_param_mask_callid; extern int _tps_contact_mode; extern str _tps_cparam_name; @@ -582,6 +584,10 @@ int tps_reinsert_contact(sip_msg_t *msg, tps_data_t *ptsd, str *hbody) { str hname = str_init("Contact"); + if (get_cseq(msg)->method_id & TPS_METHODS_NOCONTACT) { + return 0; + } + if(tps_add_headers(msg, &hname, hbody, 0)<0) { return -1; }

1 year, 11 months

git:master:06679174: topos_redis: use tag based on direction for early dialog transaction record loading

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06679174fc3d9cc6a18bc3edc7f2fb985c50d27b URL: https://github.com/kamailio/kamailio/commit/06679174fc3d9cc6a18bc3edc7f2fb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T10:50:08+02:00 topos_redis: use tag based on direction for early dialog transaction record loading - GH #3112 --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/06679174fc3d9cc6a18bc3edc7f2fb9… Patch: https://github.com/kamailio/kamailio/commit/06679174fc3d9cc6a18bc3edc7f2fb9… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 456d54ebee5..a1d6c85d016 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -54,6 +54,11 @@ static str _tps_redis_dprefix = str_init("d:z:"); static char _tps_redis_cbuf[TPS_REDIS_DATA_SIZE]; +static str _tps_redis_empty = str_init(""); + +#define TPS_REDIS_STRZ(_s) ((_s).s)?(_s):(_tps_redis_empty) + + /** * storage keys */ @@ -594,6 +599,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat str skey = STR_NULL; str sval = STR_NULL; str xuuid = str_init(""); + str xtag = str_init(""); str smethod = str_init("INVITE"); if(msg==NULL || md==NULL || sd==NULL) @@ -615,6 +621,11 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat memset(argvlen, 0, TPS_REDIS_NR_KEYS * sizeof(size_t)); argc = 0; + if(md->direction==TPS_DIR_DOWNSTREAM) { + xtag = TPS_REDIS_STRZ(md->b_tag); + } else { + xtag = TPS_REDIS_STRZ(md->a_tag); + } if(md->a_uuid.len>1) { xuuid.s = md->a_uuid.s + 1; xuuid.len = md->a_uuid.len - 1; @@ -641,7 +652,7 @@ int tps_redis_load_initial_method_branch(sip_msg_t *msg, tps_data_t *md, tps_dat _tps_redis_bprefix.len, _tps_redis_bprefix.s, smethod.len, smethod.s, md->a_callid.len, md->a_callid.s, - md->b_tag.len, md->b_tag.s, + xtag.len, xtag.s, xuuid.len, xuuid.s); if(rkey.len<0 || rkey.len>=TPS_REDIS_DATA_SIZE) { LM_ERR("error or insufficient buffer size: %d\n", rkey.len);

1 year, 11 months

git:master:26ef622f: dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog

by Carsten Bock

Module: kamailio Branch: master Commit: 26ef622ff3621c8a82c1c3560a32e8d735e30c4e URL: https://github.com/kamailio/kamailio/commit/26ef622ff3621c8a82c1c3560a32e8d… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2022-04-27T11:33:31+02:00 dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog - This change adds the capability to termiante a dialog in early stage by either sending a SIP response to the A-Party or by sending a CANCEL to the B-Party - This change adds a function to send a request in-dialog from script (e.g. send INFO to a party to provide additional information or for example UPDATE a Media-Session in early stage, when certain conditions are met --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/dlg_req_within.h Modified: src/modules/dialog/doc/dialog.xml Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/26ef622ff3621c8a82c1c3560a32e8d… Patch: https://github.com/kamailio/kamailio/commit/26ef622ff3621c8a82c1c3560a32e8d…

1 year, 11 months

[kamailio/kamailio] kamctl - maintenance for dbtextdb.py tool (#2469)

by Daniel-Constantin Mierla

**kamctl** include a python tool that is parsing SQL statements to do operations over the **db_text** files, for the common db operations (e.g., insert, delete). It is located at: * https://github.com/kamailio/kamailio/tree/master/utils/kamctl/dbtextdb The tool was contributed long time ago and not kept up to date, being known not to work with Python3 (e.g., #2464). This issue is created to see if someone has the interest to pick up the maintenance of this tool, if not it will be removed from kamctl. Note that db_text works with text files, so it is not necessary to have a tool for managing the content of these files, they can be simply updated with any text editor. -- 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/2469

1 year, 11 months

git:master:6aa1a84c: kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str'

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6aa1a84c6e37e0d6d5a725d43636debeaf5fa3b4 URL: https://github.com/kamailio/kamailio/commit/6aa1a84c6e37e0d6d5a725d43636deb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T08:19:56+02:00 kamctl/dbtextdb: solve TypeError: a bytes-like object is required, not 'str' - GH #2469 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/6aa1a84c6e37e0d6d5a725d43636deb… Patch: https://github.com/kamailio/kamailio/commit/6aa1a84c6e37e0d6d5a725d43636deb… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 581496c309d..0efe419026c 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -1135,7 +1135,7 @@ def WriteTempTable(self): else: header = '%s)' % header - self.temp_file.write(header.strip() + '\n') + self.temp_file.write((header.strip() + '\n').encode()) # write data for row in self.data: @@ -1143,7 +1143,7 @@ def WriteTempTable(self): for col in columns: row_str = '%s:%s' % (row_str, row[col]) - self.temp_file.write(row_str[1:] + '\n') + self.temp_file.write((row_str[1:] + '\n').encode()) self.temp_file.flush()

1 year, 11 months

git:master:4fcb2e5e: modules: readme files regenerated - dialog ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 4fcb2e5e41f45dc7fb049141678d91ae9525a76b URL: https://github.com/kamailio/kamailio/commit/4fcb2e5e41f45dc7fb049141678d91a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-06-24T08:16:15+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/4fcb2e5e41f45dc7fb049141678d91a… Patch: https://github.com/kamailio/kamailio/commit/4fcb2e5e41f45dc7fb049141678d91a…

1 year, 11 months

git:master:03dc7642: Revert "Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog""

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 03dc76428f4cbd1c023289851ceb6218ea535f29 URL: https://github.com/kamailio/kamailio/commit/03dc76428f4cbd1c023289851ceb621… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-06-24T08:11:02+02:00 Revert "Revert "dialog: Terminate dialogs in Early stage and add functionality to send messages within a dialog"" This reverts commit 1465a9b6e9fda36617b7b198ae051f0957803550. --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.h Modified: src/modules/dialog/dlg_req_within.c Modified: src/modules/dialog/dlg_req_within.h Modified: src/modules/dialog/doc/dialog.xml Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/03dc76428f4cbd1c023289851ceb621… Patch: https://github.com/kamailio/kamailio/commit/03dc76428f4cbd1c023289851ceb621…

1 year, 11 months

[kamailio/kamailio] [kamctl] Dispatcher operations in a case of db_text are mostly incorrect (#2464)

by Igor Olhovskiy

### Description On creating dispatcher with `kamctl` in the case of `db_text` it fails ### Troubleshooting #### Reproduction Point `kamctlrc` to DB_TEXT. Run `kamctl dispatcher add 1 sip:asterisk_2:5060 1 3` Run 'kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 'prefix=123' 'test1'' Run 'kamctl dispatcher show' Run 'kamctl dispatcher reload' #### Debugging Data ``` # kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 attrs cannot be empty or null -e \E[37;31mERROR: dispatcher - SQL Error ``` ``` # kamctl dispatcher add 1 sip:asterisk_2:5060 1 3 'prefix=123' 'test1' Traceback (most recent call last): File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1243, in <module> main(sys.argv) File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1230, in main dataset = conn.Execute(' '.join(argv[1:])) File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 423, in Execute self.WriteTempTable() File "/usr/lib/x86_64-linux-gnu/kamailio//kamctl/dbtextdb/dbtextdb.py", line 1138, in WriteTempTable self.temp_file.write(header.strip() + '\n') File "/usr/lib/python3.7/tempfile.py", line 620, in func_wrapper return func(*args, **kwargs) TypeError: a bytes-like object is required, not 'str' -e \E[37;31mERROR: dispatcher - SQL Error ``` dump is showing active dispatchers, show - is not. ``` # kamctl dispatcher dump { "jsonrpc": "2.0", "result": { "NRSETS": 1, "RECORDS": [{ "SET": { "ID": 1, "TARGETS": [{ "DEST": { "URI": "sip:asterisk_2:5060", "FLAGS": "AP", "PRIORITY": 0 } }] } }] }, "id": 124 } root@e529c8cb4f62:/# kamctl dispatcher show -e dispatcher gateways ``` No result on reload ``` # kamctl dispatcher reload { "jsonrpc": "2.0", "result": { }, "id": 160 } ``` ### Possible Solutions I've tried to add data to the table manually, but here I got another issue. But on Kamailio load, the only first dispatcher is processed. Will add another issue on this. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /# kamailio -v version: kamailio 5.4.1 (x86_64/linux) 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_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**: Debian 10/Docker ``` # uname -a Linux 9b7efa852274 5.3.18-lp152.36-default #1 SMP Tue Aug 18 17:09:44 UTC 2020 (885251f) x86_64 GNU/Linux ``` -- 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/2464

1 year, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2022