sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
279 discussions

git:master:837d7eab: tsilo: restore also the global t branch index

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 837d7eab397547a4a67158e4da719288e20a0bb4 URL: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T11:17:03+02:00 tsilo: restore also the global t branch index --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… Patch: https://github.com/kamailio/kamailio/commit/837d7eab397547a4a67158e4da71928… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 2781deffc42..fece9b40970 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -100,14 +100,16 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * struct sip_msg *orig_msg; int ret; str stable; + int orig_branch; if(contact->s!=NULL && contact->len > 0) { LM_DBG("trying to append based on specific contact <%.*s>\n", contact->len, contact->s); } - /* lookup a transaction based on its identifier (hash_index:label) */ orig_t = _tmb.t_gett(); + orig_branch = _tmb.t_gett_branch(); + /* lookup a transaction based on its identifier (hash_index:label) */ if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { LM_ERR("transaction [%u:%u] not found\n", tindex, tlabel); @@ -155,7 +157,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * /* unref the transaction which had been referred by t_lookup_ident() call. * Restore the original transaction (if any) */ if(t) _tmb.unref_cell(t); - _tmb.t_sett(orig_t, T_BR_UNDEFINED); + _tmb.t_sett(orig_t, orig_branch); return ret; }

2 years, 4 months

git:master:72234f9e: pv_headers: use t_unset() based on vref instead of resetting global t always

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 72234f9efbb5b299823b33dc4eda84a43d5f6384 URL: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:58:39+02:00 pv_headers: use t_unset() based on vref instead of resetting global t always --- Modified: src/modules/pv_headers/pv_headers.c --- Diff: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… Patch: https://github.com/kamailio/kamailio/commit/72234f9efbb5b299823b33dc4eda84a… --- diff --git a/src/modules/pv_headers/pv_headers.c b/src/modules/pv_headers/pv_headers.c index 7da426c184..b900ae5be6 100644 --- a/src/modules/pv_headers/pv_headers.c +++ b/src/modules/pv_headers/pv_headers.c @@ -555,12 +555,12 @@ 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 && vref) { - tmb.unref_cell(t); + if(t != NULL && t != T_UNDEFINED && vref != 0) { + /* t_find() above has the side effect of setting T and + REFerencing T => we must unref and unset it */ + tmb.t_unset(); LM_DBG("T:%p unref\n", t); } - tmb.t_sett(T_UNDEFINED, T_BR_UNDEFINED); - LM_DBG("reset tm\n"); return 1; }

2 years, 4 months

git:master:294a0098: tmx: use t_unset() instead of t_unref() for pv_get_tm_reply_reason()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 294a00985b2cf4a397ffc81782f9ce6e4bc1ca15 URL: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:54:53+02:00 tmx: use t_unset() instead of t_unref() for pv_get_tm_reply_reason() --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… Patch: https://github.com/kamailio/kamailio/commit/294a00985b2cf4a397ffc81782f9ce6… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 2fac9605a8..64a81e591b 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -587,7 +587,7 @@ int pv_get_tm_reply_reason(struct sip_msg *msg, pv_param_t *param, /* 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); + _tmx_tmb.t_unset(); } /* no break */ case TM_ONREPLY_ROUTE:

2 years, 4 months

git:master:f69c13a5: tm: added t_unset() intermodule API function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f69c13a587df53fb93999d81cd02dc99ab223187 URL: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-08-30T10:53:15+02:00 tm: added t_unset() intermodule API function - reset global t and branch without releasing the transaction - useful for cases when global t needs to be set in callbacks and then reset before config execution is finished --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_lookup.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… Patch: https://github.com/kamailio/kamailio/commit/f69c13a587df53fb93999d81cd02dc9… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index ad41f0de93..dd2ed6f0ae 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -167,6 +167,19 @@ struct cell* t_find(struct sip_msg *msg, int *branch, int *vref) return T; } +/** + * unref and reset T globals + */ +void t_unset(void) +{ + if(T == NULL || T == T_UNDEFINED) { + return; + } + + UNREF( T ); + set_t(T_UNDEFINED, T_BR_UNDEFINED); +} + static inline int parse_dlg( struct sip_msg *msg ) { if (parse_headers(msg, HDR_FROM_F | HDR_CSEQ_F | HDR_TO_F, 0)==-1) { diff --git a/src/modules/tm/t_lookup.h b/src/modules/tm/t_lookup.h index de65be8365..c4b5404cf8 100644 --- a/src/modules/tm/t_lookup.h +++ b/src/modules/tm/t_lookup.h @@ -71,6 +71,9 @@ struct cell *get_t(void); typedef struct cell* (*tfind_f)(struct sip_msg*, int*, int*); struct cell* t_find(struct sip_msg *msg, int *branch, int *vref); +typedef void (*tunset_f)(void); +void t_unset(void); + typedef int (*tgett_branch_f)(void); int get_t_branch(void); diff --git a/src/modules/tm/tm_load.c b/src/modules/tm/tm_load.c index c9f39b576e..d5fc6e7884 100644 --- a/src/modules/tm/tm_load.c +++ b/src/modules/tm/tm_load.c @@ -93,6 +93,7 @@ int load_tm( struct tm_binds *tmb) tmb->print_dlg = print_dlg; tmb->t_gett = get_t; tmb->t_find = t_find; + tmb->t_unset = t_unset; tmb->t_gett_branch = get_t_branch; tmb->t_sett = set_t; tmb->calculate_hooks = w_calculate_hooks; diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 1f97061d1e..130d01503a 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -72,6 +72,7 @@ struct tm_binds { print_dlg_f print_dlg; tgett_f t_gett; tfind_f t_find; + tunset_f t_unset; tgett_branch_f t_gett_branch; tsett_f t_sett; calculate_hooks_f calculate_hooks;

2 years, 4 months

git:master:07877fe6: tmx: use t_find() for pv_get_tm_reply_reason()

by Daniel-Constantin Mierla

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 */

2 years, 4 months

[kamailio/kamailio] added rtpengine to comment (PR #3227)

by Andrew Webster

#### 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 years, 4 months

git:master:887ea442: etc/kamailio.cfg: comment for route[NATMANAGE] made generic

by Daniel-Constantin Mierla

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()) {

2 years, 4 months

git:master:836d122a: pv_headers: use tm.t_find API

by Victor Seva

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); }

2 years, 4 months

git:master:46d03563: pkg/kamailio/deb: version set 5.7.0~dev1 [skip ci]

by Victor Seva

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…

2 years, 4 months

git:master:7a53ac8e: pkg/kamailio/deb: sync dirs contents [skip ci]

by Victor Seva

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…

2 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022