sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:07877fe6: tmx: use t_find() for pv_get_tm_reply_reason()
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 07877fe6686139032d4d2f85b5f119b2cdf93cf6 URL: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:36:53+02:00 tmx: use t_find() for pv_get_tm_reply_reason() --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… Patch: https://github.com/kamailio/kamailio/commit/07877fe6686139032d4d2f85b5f119b… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 3e977c98777..2fac9605a81 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -246,7 +246,7 @@ int pv_t_update_inv(struct sip_msg *msg) return 1; } - if (_pv_tinv.label == t->label && _pv_tinv.index == t->hash_index) + if (_pv_tinv.label == t->label && _pv_tinv.index == t->hash_index) goto done; /* make a copy */ @@ -569,23 +569,26 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, { struct cell *t; struct sip_msg *reply; - int branch; + int branch = -1; + int vref = 0; if(msg==NULL || res==NULL) return -1; /* first get the transaction */ - if (_tmx_tmb.t_check( msg , 0 )==-1) return -1; - if ( (t=_tmx_tmb.t_gett())==0) { + t = _tmx_tmb.t_find(msg, &branch, &vref); + if (t==T_NULL_CELL || t==T_UNDEFINED) { /* no T */ return pv_get_strempty(msg, param, res); } else { switch (get_route_type()) { case CORE_ONREPLY_ROUTE: - /* t_check() above has the side effect of setting T and - REFerencing T => we must unref and unset it for the - main/core onreply_route. */ - _tmx_tmb.t_unref(msg); + if(vref) { + /* t_find() above has the side effect of setting T and + REFerencing T => we must unref and unset it for the + main/core onreply_route. */ + _tmx_tmb.t_unref(msg); + } /* no break */ case TM_ONREPLY_ROUTE: /* use the reason of the current reply */

1 0

[kamailio/kamailio] added rtpengine to comment (PR #3227)
by Andrew Webster 30 Aug '22

30 Aug '22

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3227 -- Commit Summary -- * added rtpengine to comment -- File Changes -- M etc/kamailio.cfg (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3227.patch https://github.com/kamailio/kamailio/pull/3227.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3227 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3227(a)github.com>

2 3

git:master:887ea442: etc/kamailio.cfg: comment for route[NATMANAGE] made generic
by Daniel-Constantin Mierla 30 Aug '22

30 Aug '22

Module: kamailio Branch: master Commit: 887ea4420f2a11e9d26c031c8c75e897b0fd8072 URL: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T09:07:58+02:00 etc/kamailio.cfg: comment for route[NATMANAGE] made generic --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… Patch: https://github.com/kamailio/kamailio/commit/887ea4420f2a11e9d26c031c8c75e89… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 11a91100ce..3915f3e719 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -854,7 +854,7 @@ route[NATDETECT] { return; } -# RTPProxy control and signaling updates for NAT traversal +# RTP relaying management and signaling updates for NAT traversal route[NATMANAGE] { #!ifdef WITH_NAT if (is_request()) {

1 0

git:master:836d122a: pv_headers: use tm.t_find API
by Victor Seva 29 Aug '22

29 Aug '22

Module: kamailio Branch: master Commit: 836d122af8575c66651232f3ad25bad085bfb972 URL: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:59:44+02:00 pv_headers: use tm.t_find API --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… Patch: https://github.com/kamailio/kamailio/commit/836d122af8575c66651232f3ad25bad… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index e555e0265bb..7da426c184f 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -526,6 +526,7 @@ int handle_msg_branch_cb(struct sip_msg *msg, unsigned int flags, void *cb) int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) { + int vref = 0; tm_cell_t *t = NULL; sr_xavp_t **backup_xavis = NULL; sr_xavp_t **list = NULL; @@ -534,18 +535,12 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) return 1; LM_DBG("msg:%p previous branch:%d\n", msg, _branch); - if(tmb.t_check(msg, &_branch) == -1) { - LM_ERR("failed find UAC branch\n"); - } else { - t = tmb.t_gett(); - if(t == NULL || t == T_UNDEFINED) { - LM_DBG("cannot lookup the transaction\n"); - } else { - LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t, - _branch, &t->xavis_list, t->nr_of_outgoings); - list = &t->xavis_list; - backup_xavis = xavi_set_list(&t->xavis_list); - } + t = tmb.t_find(msg, &_branch, &vref); + if(t != NULL && t != T_UNDEFINED) { + LM_DBG("T:%p t_check-branch:%d xavi_list:%p branches:%d\n", t, + _branch, &t->xavis_list, t->nr_of_outgoings); + list = &t->xavis_list; + backup_xavis = xavi_set_list(&t->xavis_list); } pvh_get_branch_index(msg, &_branch); @@ -560,7 +555,7 @@ int handle_msg_reply_cb(struct sip_msg *msg, unsigned int flags, void *cb) xavi_set_list(backup_xavis); LM_DBG("restored backup_xavis:%p\n", *backup_xavis); } - if(t) { + if(t && vref) { tmb.unref_cell(t); LM_DBG("T:%p unref\n", t); }

1 0

git:master:7a53ac8e: pkg/kamailio/deb: sync dirs contents [skip ci]
by Victor Seva 28 Aug '22

28 Aug '22

Module: kamailio Branch: master Commit: 7a53ac8e8d92dbb375378b49562a7842055d7fb3 URL: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:44:13+02:00 pkg/kamailio/deb: sync dirs contents [skip ci] --- Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bookworm/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jammy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784… Patch: https://github.com/kamailio/kamailio/commit/7a53ac8e8d92dbb375378b49562a784…

1 0

git:master:46d03563: pkg/kamailio/deb: version set 5.7.0~dev1 [skip ci]
by Victor Seva 28 Aug '22

28 Aug '22

Module: kamailio Branch: master Commit: 46d0356386bcf2a70671fd73979ef97bd5528d74 URL: https://github.com/kamailio/kamailio/commit/46d0356386bcf2a70671fd73979ef97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-08-28T22:44:25+02:00 pkg/kamailio/deb: version set 5.7.0~dev1 [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/jammy/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/46d0356386bcf2a70671fd73979ef97… Patch: https://github.com/kamailio/kamailio/commit/46d0356386bcf2a70671fd73979ef97…

1 0

[kamailio/kamailio] Ability to reload location attributes at runtime (#2299)
by Sergiu Pojoga 26 Aug '22

26 Aug '22

### Description Looking for a mechanism to reload Location attributes at runtime. Having both registered and permanent Contacts under AoR, with Attributes from `usrloc` to be used for various routing decisions. This is about attributes of permanent Contacts. Registered ones have `xavp_contact` of `usrloc` to store attributes during registration. **Problem:** Only way to make it work is: 1. adding a permanent Contact using `rpc ul.add` 2. assigning attributes in DB `location_attr` per RUID (can't find an rpc function for attributes) 3. restart Kamailio modparam("usrloc", "db_mode", 1) modparam("usrloc", "db_load", 1) This however is far from ideal, having to restart Kamailio for every change in attributes of a Contact. ### Expected behavior #### Actual observed behavior #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.3.3 (x86_64/linux) 44ccb9 * **Operating System**:  ``` (paste your output here) ``` -- 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/2299

3 8

[kamailio/kamailio] dialog: not able to set the hangup_reason , when we hangup calls using xmlrpc. (#1737)
by Surendra Tiwari 26 Aug '22

26 Aug '22

### Description We are using xmlrpc to terminate the calls once customer balance reaches to zero. call got terminated but we will not be able to set the dialog variable related to hangup_reason. There should be a way during dlg.terminate_dlg xmlrpc request that if i mention the some parameter then it should set before sending bye to callee and caller.  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-4-160:/etc/kamailio# kamailio -version version: kamailio 5.1.4 (x86_64/linux) 6ebfda flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 6ebfda compiled on 11:48:26 Sep 7 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-4-160:/etc/kamailio# lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 14.04.5 LTS Release: 14.04 Codename: trusty root@ip-172-31-4-160:/etc/kamailio# uname -a Linux ip-172-31-4-160 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 x86_64 x86_64 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/1737

2 5

[kamailio/kamailio] keep new features in a file in the repository (#668)
by Victor Seva 26 Aug '22

26 Aug '22

This will allow us to point https://www.kamailio.org/wiki/features/new-in-devel to the file and "force" developers to update that file with the new features when they are introduced in the repository Remaining developers to upgrade the wiki seems pointless and anyone can create a PR for changes --- 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/668

4 4

[kamailio/kamailio] kazoo: consuming of events fails if message has no body (#1837)
by mihovilkolaric 26 Aug '22

26 Aug '22

### Description Consuming messages without message body fails due to a JSON parsing error: ``` ERROR: kazoo [kz_json.c:287]: kz_json_parse(): Error parsing json: unexpected end of data ERROR: kazoo [kz_json.c:288]: kz_json_parse(): ERROR: kazoo [kz_amqp.c:2960]: kz_amqp_send_worker_event(): error parsing json body ``` This makes it unable to consume messages from RabbitMQ's event exchange plugin ( https://www.rabbitmq.com/event-exchange.html ), as the documentatin states: **"The message body is always blank."** ### Possible Solutions As a possible fix I tried following change in kz_amqp.c: ``` void kz_amqp_send_worker_event(kz_amqp_server_ptr server_ptr, amqp_envelope_t* envelope, kz_amqp_bind_ptr bind) { char buffer[100]; kz_amqp_cmd_ptr cmd = NULL; kz_amqp_consumer_delivery_ptr ptr = NULL; json_obj_ptr json_obj = NULL; json_object* JObj = NULL; str* message_id = NULL; int idx = envelope->channel-1; int worker = 0; int _kz_server_id = server_ptr->id; int msg_size = envelope->message.body.len; //begin of changes int routingkey_size = envelope->routing_key.len; if (msg_size == 0 && routingkey_size > 0 ) { char *routingkey_data = pkg_malloc(routingkey_size + 1); memset(routingkey_data, 0, routingkey_size + 1); memcpy(routingkey_data, (char*)envelope->routing_key.bytes, routingkey_size); LM_DBG("Message size: %d\n", msg_size); LM_DBG("Routing Key: %s\n", routingkey_data); char *pos = strchr(routingkey_data,'.'); while (pos){ *pos = '_'; pos = strchr(pos,'.'); } LM_DBG("New Routing Key: %s\n", routingkey_data); sprintf(buffer, "kazoo:%s", routingkey_data); if(kz_amqp_consumer_fire_event(buffer) != 0) { LM_ERR("kazoo:%s not found", routingkey_data); } pkg_free(routingkey_data); return; } char *json_data = pkg_malloc(msg_size + 1); if(!json_data) { LM_ERR("no more package memory available. needed %d\n", msg_size + 1); return; } char *json_data = pkg_malloc(msg_size + 1); //end of changes if(!json_data) { LM_ERR("no more package memory available. needed %d\n", msg_size + 1); return; } ``` The change is rather simple: If there is no message-body supplied, the event-route _kazoo:<binding_key>_ is called (after replacing any '.' with '_' in the routing_key). -- 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/1837

3 6

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev