sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
285 discussions

[kamailio/kamailio] siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter (PR #3108)

by Dennis

Possibility to switch to other then UDP transport protocol in diplicate_uri   #### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Sometimes it's preferable to do the duplication over TCP or another transport, this little fix removes the hard-coded UDP from the diplicate_uri module parameter. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3108 -- Commit Summary -- * siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter -- File Changes -- M src/modules/siptrace/siptrace_send.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3108.patch https://github.com/kamailio/kamailio/pull/3108.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3108 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3108(a)github.com>

2 years, 7 months

git:master:2d24221e: siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2d24221e3b409a13f3724267860d8f8411ae063e URL: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-16T08:00:07+02:00 siptrace: fix hardcoded PROTO_UDP in duplicate_uri module parameter - possibility to switch to other then UDP transport protocol in diplicate_uri --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… Patch: https://github.com/kamailio/kamailio/commit/2d24221e3b409a13f3724267860d8f8… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index ed05cb0b51..a2b5390838 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -305,7 +305,7 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) if(!dst2) { /* create a temporary proxy from dst param */ - dst.proto = PROTO_UDP; + dst.proto = trace_dup_uri->proto; p = mk_proxy(&trace_dup_uri->host, (trace_dup_uri->port_no) ? trace_dup_uri->port_no : SIP_PORT, dst.proto); if(p == 0) {

2 years, 7 months

git:master:a1ea2c0d: modules: readme files regenerated - pv ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a1ea2c0d49f56154af5ba1028d7340ea3ed1ae42 URL: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-13T16:16:25+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e… Patch: https://github.com/kamailio/kamailio/commit/a1ea2c0d49f56154af5ba1028d7340e…

2 years, 7 months

git:master:1144c2e9: pv: allow xavp_push_dst() in request/branch/failure_rotue

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1144c2e9bfa99e817acff378967d689d356c216b URL: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T16:07:04+02:00 pv: allow xavp_push_dst() in request/branch/failure_rotue --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… Patch: https://github.com/kamailio/kamailio/commit/1144c2e9bfa99e817acff378967d689… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 717c8ad530..49d80286a9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -695,7 +695,7 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"xavp_push_dst", (cmd_function)w_xavp_push_dst, 1, fixup_spve_null, fixup_free_spve_null, - ANY_ROUTE}, + REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0,

2 years, 7 months

git:master:33c3f355: pv: docs for xavp_push_dst()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 33c3f35544489ca367290dbf95d4c5ab11e5adc4 URL: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T16:03:40+02:00 pv: docs for xavp_push_dst() --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… Patch: https://github.com/kamailio/kamailio/commit/33c3f35544489ca367290dbf95d4c5a… --- diff --git a/src/modules/pv/doc/pv_admin.xml b/src/modules/pv/doc/pv_admin.xml index bc36df564b..409ecaa4da 100644 --- a/src/modules/pv/doc/pv_admin.xml +++ b/src/modules/pv/doc/pv_admin.xml @@ -765,6 +765,48 @@ $xavp(n) = 20; $xavp(n) = 30; xavp_lshift("n", "1"); # results in: $xavp(n) having the list of values 20 30 10 +... + </programlisting> + </example> + </section> + <section id="pv.f.xavp_push_dst"> + <title> + <function moreinfo="none">xavp_push_dst(xname)</function> + </title> + <para> + Set destination fields from XAVP attributes. + </para> + <para> + The first parameter has to be the name of XAVP in the root list. + </para> + <para> + The parameters can be with variables. + </para> + <para> + The attributes that can be stored in the XAVP fields: + </para> + <itemizedlist> + <listitem> + <para>uri: SIP URI address to set R-URI</para> + </listitem> + <listitem> + <para>dsturi: SIP URI address to set DST-URI</para> + </listitem> + <listitem> + <para>socket: listen address to set outgoing socket</para> + </listitem> + </itemizedlist> + <para> + Function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE. + </para> + <example> + <title><function>xavp_push_dst</function> usage</title> + <programlisting format="linespecific"> +... +$xavp(dst=>uri) = "sip:alice@server.com"; +$xavp(dst[0]=>dsturi) = "sip:proxy.com"; +$xavp(dst[0]=>socket) = "udp:1.2.3.4:5060"; +xavp_push_dst("dst"); ... </programlisting> </example>

2 years, 7 months

git:master:8cb05b21: pv: xavp_push_dst(xname) function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8cb05b21a6683a569563c72eeba92f3054b4d31e URL: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T15:52:26+02:00 pv: xavp_push_dst(xname) function - push a destination from XAVP attributes --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… Patch: https://github.com/kamailio/kamailio/commit/8cb05b21a6683a569563c72eeba92f3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 907f45b2c4..717c8ad530 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -29,6 +29,7 @@ #include "../../core/mod_fix.h" #include "../../core/xavp.h" #include "../../core/kemi.h" +#include "../../core/dset.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/strutils.h" @@ -611,6 +612,7 @@ static int w_xavi_rm(sip_msg_t *msg, char *prname, char *p2); static int w_xavi_child_rm(sip_msg_t *msg, char *prname, char *pcname); static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx); +static int w_xavp_push_dst(sip_msg_t *msg, char *pxname, char *p2); int pv_xavp_copy_fixup(void** param, int param_no); int pv_evalx_fixup(void** param, int param_no); @@ -691,6 +693,9 @@ static cmd_export_t cmds[]={ {"xavp_lshift", (cmd_function)w_xavp_lshift, 2, fixup_spve_igp, fixup_free_spve_igp, ANY_ROUTE}, + {"xavp_push_dst", (cmd_function)w_xavp_push_dst, + 1, fixup_spve_null, fixup_free_spve_null, + ANY_ROUTE}, {"sbranch_set_ruri", (cmd_function)w_sbranch_set_ruri, 0, 0, 0, ANY_ROUTE }, {"sbranch_append", (cmd_function)w_sbranch_append, 0, 0, 0, @@ -943,6 +948,84 @@ static int w_xavp_lshift(sip_msg_t *msg, char *pxname, char *pidx) return ki_xavp_lshift(msg, &xname, idx); } +/** + * + */ +static int ki_xavp_push_dst(sip_msg_t *msg, str *xname) +{ + sr_xavp_t *rxavp = NULL; + sr_xavp_t *lxavp = NULL; + str fxname = STR_NULL; + socket_info_t *si; + + rxavp = xavp_get(xname, NULL); + if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { + LM_DBG("no xavp with destination attributes\n"); + return -1; + } + + /* retrieve attributes from sub list */ + rxavp = rxavp->val.v.xavp; + + STR_STATIC_SET(fxname, "uri") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + LM_DBG("xavp uri field in next destination record (%p)\n", lxavp); + if(rewrite_uri(msg, &lxavp->val.v.s) < 0) { + LM_ERR("error while setting r-uri with: %.*s\n", + lxavp->val.v.s.len, lxavp->val.v.s.s); + return -1; + } + } + + STR_STATIC_SET(fxname, "dsturi") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + LM_DBG("xavp dsturi field in next destination record (%p)\n", lxavp); + if(set_dst_uri(msg, &lxavp->val.v.s) < 0) { + LM_ERR("error while setting dst uri with: %.*s\n", + lxavp->val.v.s.len, lxavp->val.v.s.s); + return -1; + } + /* dst_uri changes, so it makes sense to re-use the current uri for + * forking */ + ruri_mark_new(); /* re-use uri for serial forking */ + } + + STR_STATIC_SET(fxname, "socket") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + si = ksr_get_socket_by_address(&lxavp->val.v.s); + if(si != NULL) { + set_force_socket(msg, si); + } + } else { + STR_STATIC_SET(fxname, "sockptr") + lxavp = xavp_get(&fxname, rxavp); + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { + LM_DBG("socket enforced in next destination record\n"); + set_force_socket(msg, lxavp->val.v.vptr); + } + } + + return 1; +} + +/** + * + */ +static int w_xavp_push_dst(sip_msg_t *msg, char *pxname, char *p2) +{ + str xname = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)pxname, &xname)<0) { + LM_ERR("failed to get the xavp name\n"); + return -1; + } + + return ki_xavp_push_dst(msg, &xname); +} + static int ki_xavu_print(sip_msg_t* msg) { xavu_print_list(NULL); @@ -3222,6 +3305,11 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_push_dst"), + SR_KEMIP_INT, ki_xavp_push_dst, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

2 years, 7 months

git:master:ae40acf6: core: socket info - function to get socket by listen or advertise

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ae40acf61a5c666db5ff9c55f2ff9b0770418a52 URL: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-13T15:51:51+02:00 core: socket info - function to get socket by listen or advertise --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… Patch: https://github.com/kamailio/kamailio/commit/ae40acf61a5c666db5ff9c55f2ff9b0… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c9dd89118d..c263f9fcb9 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -946,6 +946,19 @@ socket_info_t* ksr_get_socket_by_index(int idx) return NULL; } +socket_info_t* ksr_get_socket_by_address(str *sockstr) +{ + socket_info_t *si = NULL; + + si = ksr_get_socket_by_listen(sockstr); + + if(si!=NULL) { + return si; + } + + return ksr_get_socket_by_advertise(sockstr); +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index cbc630b9b8..134f2d47d8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -107,6 +107,7 @@ socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); socket_info_t* ksr_get_socket_by_index(int idx); +socket_info_t* ksr_get_socket_by_address(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

2 years, 7 months

[kamailio/kamailio] Failing Audio stream on Kamailio+webrtc with integration to asterisk server. (Issue #3105)

by kelvinpressone

Summary: We have a kamailio server as our sip proxy server, sip firewall with websocket and RTP engine configured on it (the Kamailio Server). But we experience one way audio, no audio, hang up after 30s, when we try making calls between internal extensions (eg extension 100 to call extension 105) and external calls (eg extension 100 to call mobile number 09056925668) as well. The call flow is as: Webrtc client<------->Kamailio1+rtpengine<-----Asterisk+rtpengine---->Kamailio2<-------->Telco Provider The asterisk communication between all three boxes is via local IP (All ports open between them). The Kamailio 1 box where we have our sip registration cache, has rtp ports and wss port open on the internet. Asterisk 18.9.0 Kamailio 5.5.3 + RTPengine 10.4.0.0 Debian 11 bullseye Kindly see attached below a diagram depicting the voip network flow and also attached are logs files for the webrtc client and server side. ![MrOpee](https://user-images.githubusercontent.com/105465203/168183786-c10a822b-402b-4666-be10-b2bc5ad98e85.png) [ServersideWebrtc-external2.txt](https://github.com/kamailio/kamailio/files/… [Clientside(webrtc2external)__III.txt](https://github.com/kamailio/kamailio/… Thank you. @rfuchs @doublec @ibc @fredposner @linuxmaniac @miconda -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3105 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3105(a)github.com>

2 years, 7 months

git:master:490eb07a: modules: readme files regenerated - registrar ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 490eb07a75567c91f20beaa4833f1df10a9cab1f URL: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-05-12T19:31:15+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df… Patch: https://github.com/kamailio/kamailio/commit/490eb07a75567c91f20beaa4833f1df…

2 years, 7 months

git:master:38365c43: registrar: docs - removed extra closing tag

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38365c43c2b627587d9aff470f371a0ec76bbba2 URL: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-12T19:23:06+02:00 registrar: docs - removed extra closing tag --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… Patch: https://github.com/kamailio/kamailio/commit/38365c43c2b627587d9aff470f371a0… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 15fcc0d1fc..d8a3c88b57 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1465,8 +1465,8 @@ lookup_branches("location"); <emphasis>ultable</emphasis> - name of the usrloc table that is used for the lookup. </para> - <listitem> </listitem> + <listitem> <para> <emphasis>uri</emphasis> - the URI to be searched in location table. </para> @@ -1508,7 +1508,6 @@ lookup_branches("location"); </para> </listitem> </itemizedlist> - </itemizedlist> </listitem> </itemizedlist> <para>

2 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022