sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
278 discussions

[kamailio/kamailio] 5.5 (PR #3244)
by Atanas Bakalov 19 Sep '22

19 Sep '22

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description rx_aar: unreference dialog in case of aar update release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3244 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update (#3104) * ims_qos: fix compilation warning -- File Changes -- M src/modules/ims_qos/rx_aar.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3244.patch https://github.com/kamailio/kamailio/pull/3244.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3244 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3244(a)github.com>

2 2

git:5.5:32bd4d53: ims_qos: fix compilation warning
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 32bd4d5370b9342d2df09269087b47d94e7f4ca5 URL: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 ims_qos: fix compilation warning (cherry picked from commit bd4cc486879616d502362dd464b04d7d3c2865c4) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Patch: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 148224b4cc..efe3ffdf8b 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

1 0

git:5.5:45ef2fab: rx_aar: unreference dialog in case of aar update (#3104)
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.5 Commit: 45ef2fab63eaae18c4a0e41ffc0487829105b481 URL: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> (cherry picked from commit ab8cb43c83f8c9528e45a5b57fbb1440360f201e) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Patch: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 6a2d60c9012..148224b4cce 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -177,6 +177,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

[kamailio/kamailio] rx_aar: unreference dialog in case of aar update (#3104) (PR #3245)
by Atanas Bakalov 19 Sep '22

19 Sep '22

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description rx_aar: unreference dialog in case of aar update release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3245 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update (#3104) -- File Changes -- M src/modules/ims_qos/rx_aar.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3245.patch https://github.com/kamailio/kamailio/pull/3245.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3245 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3245(a)github.com>

2 2

git:5.6:a290ab58: rx_aar: unreference dialog in case of aar update (#3104)
by Daniel-Constantin Mierla 19 Sep '22

19 Sep '22

Module: kamailio Branch: 5.6 Commit: a290ab58f81d540d3613bcd536d7e411b29e2e9c URL: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:04+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> (cherry picked from commit ab8cb43c83f8c9528e45a5b57fbb1440360f201e) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… Patch: https://github.com/kamailio/kamailio/commit/a290ab58f81d540d3613bcd536d7e41… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 9ebca2ecf1e..da4a0e42dd7 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -181,6 +181,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

1 0

git:5.5:cef41599: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: 5.5 Commit: cef415993b5763278f1ce13f839b615daa7f18c8 URL: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-18T22:33:57Z dispatcher: fix alog13 gateway selections (cherry picked from commit d56d65b8daac072a4726d9124072151d0d3fbb79) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615… Patch: https://github.com/kamailio/kamailio/commit/cef415993b5763278f1ce13f839b615…

1 0

git:5.6:a4472c08: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: 5.6 Commit: a4472c083cc0b79fb449412425169aa3f3d2c875 URL: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-18T22:33:38Z dispatcher: fix alog13 gateway selections (cherry picked from commit d56d65b8daac072a4726d9124072151d0d3fbb79) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa… Patch: https://github.com/kamailio/kamailio/commit/a4472c083cc0b79fb449412425169aa…

1 0

[kamailio/kamailio] dispatcher: fix alog13 gateway selections (PR #3232)
by Julien Chavanton 18 Sep '22

18 Sep '22

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I found how the indexes could get mixed up between the call to ds_sorted_by_priority() and ds_manage_routes_fill_reordered_xavp() resulting in invalid gateway list selection. ``` // TEST logs I made some tests with 3 and 6 gateways, disabling one and then two. Some test data : INSERT INTO dispatcher VALUES(1,1,'sip:[192.168.0.1:5060](http://192.168.0.1:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(2,1,'sip:[192.168.0.2:5060](http://192.168.0.2:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(3,1,'sip:[192.168.0.3:5060](http://192.168.0.3:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(4,1,'sip:[192.168.0.4:5060](http://192.168.0.4:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(5,1,'sip:[192.168.0.5:5060](http://192.168.0.5:5060/)',0,12,'',''); INSERT INTO dispatcher VALUES(6,1,'sip:[192.168.0.6:5060](http://192.168.0.6:5060/)',0,12,'',''); Then disabling 2 gateways : dispatcher.set_state i 1 sip:[192.168.0.1:5060](http://192.168.0.1:5060/) dispatcher.set_state i 1 sip:[192.168.0.3:5060](http://192.168.0.3:5060/) // ----------------- Routing Logic ----------------- // route { xinfo("[MAIN][$rm][$ci]from[$fU]to[$tU]ruri[$ru]Rp[$Rp]Ri[$Ri]\n"); if (!ds_select_dst("1","13", "-1")) { xinfo("[MAIN] no gateway available !\n"); } while (defined $xavp(_dsdst_)) { xinfo("[MAIN] URI : $xavp(_dsdst_=>uri) \n"); pv_unset("$xavp(_dsdst_)"); } return; } // Logs showing the gateways returned. 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][0]idx[1]uri[sip:[192.168.0.5:5060](http://192.168.0.5:5060/)]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][1]idx[2]uri[sip:192.168.0.4:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2270]: ds_manage_route_algo13(): [inactive][2]idx[-1]uri[sip:192.168.0.3:5060]priority[12]latency[0ms]flag[1] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][3]idx[4]uri[sip:192.168.0.2:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2270]: ds_manage_route_algo13(): [inactive][4]idx[-1]uri[sip:192.168.0.1:5060]priority[12]latency[0ms]flag[1] 0(398491) DEBUG: dispatcher [dispatch.c:2263]: ds_manage_route_algo13(): [active][5]idx[0]uri[sip:192.168.0.6:5060]priority[12-0=12]latency[0ms]flag[0] 0(398491) DEBUG: dispatcher [dispatch.c:2128]: ds_manage_routes_fill_reordered_xavp(): [4|sip:192.168.0.3:5060|idx:-1]skipped 1 || 1 0(398491) DEBUG: dispatcher [dispatch.c:2128]: ds_manage_routes_fill_reordered_xavp(): [5|sip:192.168.0.1:5060|idx:-1]skipped 1 || 1 0(398491) DEBUG: dispatcher [dispatch.c:2300]: ds_manage_route_algo13(): priority[12]gateway_selected[1]next_index[2] 0(398491) DEBUG: dispatcher [dispatch.c:2465]: ds_manage_routes(): using alg [13] hash [1] 0(398491) DEBUG: dispatcher [dispatch.c:2512]: ds_manage_routes(): selected [13-1-0/1] <sip:[192.168.0.5:5060](http://192.168.0.5:5060/)> 0(398491) DEBUG: dispatcher [dispatch.c:2107]: ds_select_dst_limit(): selected target destinations: 4 0(398491) INFO: <script>: [MAIN][sip:[192.168.0.5:5060](http://192.168.0.5:5060/)] 0(398491) INFO: <script>: [MAIN] URI : sip:192.168.0.5:5060 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.4:5060](http://192.168.0.4:5060/) 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.2:5060](http://192.168.0.2:5060/) 0(398491) INFO: <script>: [MAIN] URI : sip:[192.168.0.6:5060](http://192.168.0.6:5060/) ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3232 -- Commit Summary -- * dispatcher: fix alog13 gateway selections -- File Changes -- M src/modules/dispatcher/dispatch.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3232.patch https://github.com/kamailio/kamailio/pull/3232.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3232 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3232(a)github.com>

2 4

git:master:d56d65b8: dispatcher: fix alog13 gateway selections
by Henning Westerholt 18 Sep '22

18 Sep '22

Module: kamailio Branch: master Commit: d56d65b8daac072a4726d9124072151d0d3fbb79 URL: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151… Author: Julien Chavanton <jchavanton(a)subspace.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-09-19T00:28:39+02:00 dispatcher: fix alog13 gateway selections --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151… Patch: https://github.com/kamailio/kamailio/commit/d56d65b8daac072a4726d9124072151…

1 0

git:master:51829652: dmq_usrloc: safety checks for sock field
by Daniel-Constantin Mierla 18 Sep '22

18 Sep '22

Module: kamailio Branch: master Commit: 518296523db0c1735c3234d77d6af312f5c9babb URL: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-18T20:09:53+02:00 dmq_usrloc: safety checks for sock field - GH #3243 --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af31… Patch: https://github.com/kamailio/kamailio/commit/518296523db0c1735c3234d77d6af31… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 728c3c53cbf..0d6457d7e2d 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -681,7 +681,7 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node jdoc_contact_group.size += ptr->c.len; srjson_AddStrToObject(jdoc, jdoc_contact, "received", ptr->received.s, ptr->received.len); jdoc_contact_group.size += ptr->received.len; - if (_dmq_usrloc_replicate_socket_info==1) { + if (_dmq_usrloc_replicate_socket_info==1 && ptr->sock!=NULL && ptr->sock->sock_str.s!=NULL) { srjson_AddStrToObject(jdoc, jdoc_contact, "sock", ptr->sock->sock_str.s, ptr->sock->sock_str.len); jdoc_contact_group.size += ptr->sock->sock_str.len; } @@ -709,8 +709,8 @@ int usrloc_dmq_send_multi_contact(ucontact_t* ptr, str aor, int action, dmq_node jdoc_contact_group.size += snprintf(NULL,0,"%u", ptr->methods); srjson_AddNumberToObject(jdoc, jdoc_contact, "reg_id", ptr->reg_id); jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->reg_id); - srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id", ptr->server_id); - jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id); + srjson_AddNumberToObject(jdoc, jdoc_contact, "server_id", ptr->server_id); + jdoc_contact_group.size += snprintf(NULL,0,"%d", ptr->server_id); char idx[5]; jdoc_contact_group.count++;

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022