sr-dev April 2020

sr-dev@lists.kamailio.org

33 participants
420 discussions

git:master:507f4cfb: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 507f4cfbdaf634abf6414067ff889e1c569334a4 URL: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-09T05:16:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… Patch: https://github.com/kamailio/kamailio/commit/507f4cfbdaf634abf6414067ff889e1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 43a81807a1..8621ba903c 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -28,6 +28,10 @@ Julien Chavanton <jchavanton(a)gmail.com> +Federico Cabiddu + + <federico.cabiddu(a)gmail.com> + Copyright © 2004 FhG FOKUS Copyright © 2005 Voice Sistem @@ -39,6 +43,8 @@ Julien Chavanton Copyright © 2015 Alessandro Arrichiello, Hewlett Packard Copyright © 2017, 2018 Julien chavanton, Flowroute + + Copyright © 2020 Federico Cabiddu, Libon __________________________________________________________________ Table of Contents @@ -1137,6 +1143,7 @@ DEST: { RWEIGHT: 50 SOCKET: SOCKNAME: + OBPROXY: } LATENCY: { AVG: 20.104000 @@ -1634,6 +1641,8 @@ kamcmd dispatcher.remove 3 sip:127.0.0.1:5075;transport=udp keepalives and has priority over 'socket' attribute. * 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter. + * 'obproxy' - SIP URI of outbound proxy to be used when sending + pings. It overwrites the general ds_outbound_proxy parameter. 6.1.2. File Format

4 years, 4 months

[kamailio/kamailio] dialog: add dialog init, start end end timestamps to the output of dl… (#2279)

by Federico Cabiddu

…g.briefing   #### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 IN some scenarios I found useful to have the timestamps (init, start, end) of the dialog as output of the dlg.briefing command. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2279 -- Commit Summary -- * dialog: add dialog init, start end end timestamps to the output of dlg.briefing -- File Changes -- M src/modules/dialog/dialog.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2279.patch https://github.com/kamailio/kamailio/pull/2279.diff -- 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/pull/2279

4 years, 4 months

git:master:84a4d8d2: Merge pull request #2279 from kamailio/grumvalski/dlg_briefing_ext

by GitHub

Module: kamailio Branch: master Commit: 84a4d8d266d7642e588f39fa1632fa46e6b47b42 URL: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-09T05:14:47+02:00 Merge pull request #2279 from kamailio/grumvalski/dlg_briefing_ext dialog: add dialog init, start end end timestamps to the output of dlâ¦ --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… Patch: https://github.com/kamailio/kamailio/commit/84a4d8d266d7642e588f39fa1632fa4… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5dd941e7d0..962fceeb52 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3075,7 +3075,7 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSd", + if(rpc->struct_add(h, "ddSSSSSdddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "from_uri", &dlg->from_uri, @@ -3083,6 +3083,9 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) "call-id", &dlg->callid, "from_tag", &dlg->tag[DLG_CALLER_LEG], "to_tag", &dlg->tag[DLG_CALLER_LEG], + "init_ts", dlg->init_ts, + "start_ts", dlg->start_ts, + "end_ts", dlg->end_ts, "state", dlg->state) < 0) { rpc->fault(c, 500, "Failed to add fields"); return;

4 years, 4 months

git:master:0eb265e6: dialog: add dialog init, start and end timestamps to the output of dlg.briefing

by Federico Cabiddu

Module: kamailio Branch: master Commit: 0eb265e6c6ee78ab3f8735ddc44fc8616ae41066 URL: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-08T16:05:37+02:00 dialog: add dialog init, start and end timestamps to the output of dlg.briefing --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… Patch: https://github.com/kamailio/kamailio/commit/0eb265e6c6ee78ab3f8735ddc44fc86… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5dd941e7d0..962fceeb52 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3075,7 +3075,7 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) rpc->fault(c, 500, "Failed to create the structure"); return; } - if(rpc->struct_add(h, "ddSSSSSd", + if(rpc->struct_add(h, "ddSSSSSdddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, "from_uri", &dlg->from_uri, @@ -3083,6 +3083,9 @@ static void rpc_dlg_briefing(rpc_t *rpc, void *c) "call-id", &dlg->callid, "from_tag", &dlg->tag[DLG_CALLER_LEG], "to_tag", &dlg->tag[DLG_CALLER_LEG], + "init_ts", dlg->init_ts, + "start_ts", dlg->start_ts, + "end_ts", dlg->end_ts, "state", dlg->state) < 0) { rpc->fault(c, 500, "Failed to add fields"); return;

4 years, 4 months

[kamailio/kamailio] Grumvalski/ds outbound proxy (#2275)

by Federico Cabiddu

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] 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 This PR add a new attr, "obproxy", to the gateways' attrs, allowing to specify the outbound proxy used for sending pings per gateway. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2275 -- Commit Summary -- * dispatcher: add new gateway attr "obproxy" * dispatcher: docs for obproxy attr -- File Changes -- M src/modules/dispatcher/dispatch.c (16) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (6) M src/modules/dispatcher/doc/dispatcher.xml (9) M src/modules/dispatcher/doc/dispatcher_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2275.patch https://github.com/kamailio/kamailio/pull/2275.diff -- 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/pull/2275

4 years, 4 months

git:master:541d1bdf: Merge pull request #2275 from kamailio/grumvalski/ds_outbound_proxy

by GitHub

Module: kamailio Branch: master Commit: 541d1bdfaf0bf28114f556be61eb434597ed894a URL: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-09T05:12:58+02:00 Merge pull request #2275 from kamailio/grumvalski/ds_outbound_proxy Grumvalski/ds outbound proxy --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434… Patch: https://github.com/kamailio/kamailio/commit/541d1bdfaf0bf28114f556be61eb434…

4 years, 4 months

git:master:8fa5e4f5: dispatcher: docs for obproxy attr

by Federico Cabiddu

Module: kamailio Branch: master Commit: 8fa5e4f572a1ffe7efeb88cf8b80c1337f74741f URL: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-07T15:18:34+02:00 dispatcher: docs for obproxy attr --- Modified: src/modules/dispatcher/doc/dispatcher.xml Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… Patch: https://github.com/kamailio/kamailio/commit/8fa5e4f572a1ffe7efeb88cf8b80c13… --- diff --git a/src/modules/dispatcher/doc/dispatcher.xml b/src/modules/dispatcher/doc/dispatcher.xml index 8502aec0a3..b64151dd44 100644 --- a/src/modules/dispatcher/doc/dispatcher.xml +++ b/src/modules/dispatcher/doc/dispatcher.xml @@ -59,6 +59,11 @@ <surname>Chavanton</surname> <email>jchavanton(a)gmail.com</email> </editor> + <editor> + <firstname>Federico</firstname> + <surname>Cabiddu</surname> + <email>federico.cabiddu(a)gmail.com</email> + </editor> </authorgroup> <copyright> <year>2004</year> @@ -84,6 +89,10 @@ <year>2017, 2018</year> <holder>Julien chavanton, Flowroute</holder> </copyright> + <copyright> + <year>2020</year> + <holder>Federico Cabiddu, Libon</holder> + </copyright> </bookinfo> <toc></toc> diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index ae8102b355..30cd6a5ec1 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1316,6 +1316,7 @@ DEST: { RWEIGHT: 50 SOCKET: SOCKNAME: + OBPROXY: } LATENCY: { AVG: 20.104000 @@ -2055,6 +2056,10 @@ DEST: { 'ping_from' - used to set the From URI in OPTIONS keepalives. It overwrites the general ds_ping_from parameter. </listitem> + <listitem> + 'obproxy' - SIP URI of outbound proxy to be used when sending pings. + It overwrites the general ds_outbound_proxy parameter. + </listitem> </itemizedlist> </para> </section>

4 years, 4 months

git:master:74ef108f: dispatcher: add new gateway attr "obproxy"

by Federico Cabiddu

Module: kamailio Branch: master Commit: 74ef108fe0371bd261acc42291d7adbba357f769 URL: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-07T15:07:44+02:00 dispatcher: add new gateway attr "obproxy" --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… Patch: https://github.com/kamailio/kamailio/commit/74ef108fe0371bd261acc42291d7adb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b62d4c86de..6ded012085 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -324,6 +324,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else if(pit->name.len == 9 && strncasecmp(pit->name.s, "ping_from", 9) == 0) { dest->attrs.ping_from = pit->body; + } else if(pit->name.len == 7 + && strncasecmp(pit->name.s, "obproxy", 7) == 0) { + dest->attrs.obproxy = pit->body; } } if(params_list) @@ -3295,6 +3298,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + str obproxy; if(!node) return; @@ -3342,10 +3346,20 @@ void ds_ping_set(ds_set_t *node) LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); } + if(node->dlist[j].attrs.obproxy.s != NULL + && node->dlist[j].attrs.obproxy.len > 0) { + obproxy = node->dlist[j].attrs.obproxy; + LM_DBG("outbound proxy: %.*s\n", obproxy.len, obproxy.s); + } + else { + obproxy = ds_outbound_proxy; + LM_DBG("Default outbound proxy: %.*s\n", ds_outbound_proxy.len, ds_outbound_proxy.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ping_from, &ds_outbound_proxy) + &ping_from, &obproxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e067d30478..6c167a9551 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -188,6 +188,7 @@ typedef struct _ds_attrs { int rweight; int congestion_control; str ping_from; + str obproxy; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 06e96da61a..6ac01bbd2a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1573,7 +1573,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSS", + if(rpc->struct_add(wh, "SSdddSSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) : &data, @@ -1583,7 +1583,9 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) "SOCKET", (node->dlist[j].attrs.socket.s) ? &(node->dlist[j].attrs.socket) : &data, "SOCKNAME", (node->dlist[j].attrs.sockname.s) - ? &(node->dlist[j].attrs.sockname) : &data) + ? &(node->dlist[j].attrs.sockname) : &data, + "OBPROXY", (node->dlist[j].attrs.obproxy.s) + ? &(node->dlist[j].attrs.obproxy) : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

4 years, 4 months

[kamailio/kamailio] siptrace: safety check for transaction when checking ACK (#2278)

by Federico Cabiddu

#### 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 Testing with moderate load I had a crash in siptrace, in the newly added check for ACK for negative replies. Analyzing the core, the crash was caused by the invite transaction being 0x0 when t_gett is called after t_lookup_request. I was not able to reproduce it (how can t_lookup_request return 1 and then the transaction being 0x0?), but I've added a check to avoid crashing. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2278 -- Commit Summary -- * siptrace: safety check for transaction when checking ACK -- File Changes -- M src/modules/siptrace/siptrace.c (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2278.patch https://github.com/kamailio/kamailio/pull/2278.diff -- 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/pull/2278

4 years, 4 months

git:master:0b3a669c: Merge pull request #2278 from kamailio/grumvalski/siptrace_ack_fix

by GitHub

Module: kamailio Branch: master Commit: 0b3a669ca5d151dee4a825a24c8c5705af4ef34c URL: https://github.com/kamailio/kamailio/commit/0b3a669ca5d151dee4a825a24c8c570… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-09T05:11:06+02:00 Merge pull request #2278 from kamailio/grumvalski/siptrace_ack_fix siptrace: safety check for transaction when checking ACK --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0b3a669ca5d151dee4a825a24c8c570… Patch: https://github.com/kamailio/kamailio/commit/0b3a669ca5d151dee4a825a24c8c570… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 5a8d153687..dd508372d4 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -885,16 +885,18 @@ static int sip_trace_helper(sip_msg_t *msg, dest_info_t *dst, str *duri, orig_t = tmb.t_gett(); if(tmb.t_lookup_request(msg,0,&canceled)) { t_invite = tmb.t_gett(); - if (t_invite->uas.request->msg_flags & FL_SIPTRACE) { - LM_DBG("Transaction is already been traced, skipping.\n"); - ret = 1; + if (t_invite!=T_NULL_CELL) { + if (t_invite->uas.request->msg_flags & FL_SIPTRACE) { + LM_DBG("Transaction is already been traced, skipping.\n"); + ret = 1; + } + tmb.t_release_transaction( t_invite ); + tmb.t_unref(msg); } - tmb.t_release_transaction( t_invite ); - tmb.t_unref(msg); - tmb.t_sett(orig_t, T_BR_UNDEFINED); - if (ret) - return 1; } + tmb.t_sett(orig_t, T_BR_UNDEFINED); + if (ret) + return 1; } if (trace_type == SIPTRACE_DIALOG && dlgb.get_dlg == NULL) {

4 years, 4 months

← Newer
1
...
29
30
31
32
33
34
35
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2020