sr-dev October 2023

sr-dev@lists.kamailio.org

15 participants
288 discussions

git:master:54868f83: corex: rpc corex.list_sockets prints advertise as full socket string
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 54868f83f09691a5283a0d7eb57e230e7b8a2514 URL: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T16:48:33+02:00 corex: rpc corex.list_sockets prints advertise as full socket string - new field to print socket string field also for bind address --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… Patch: https://github.com/kamailio/kamailio/commit/54868f83f09691a5283a0d7eb57e230… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8ec479528cb..fa553fbf911 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -86,12 +86,14 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) } } - if(rpc->struct_add(th, "ssssss", "port", si->port_no_str.s, "mcast", - si->flags & SI_IS_MCAST ? "yes" : "no", "mhomed", - si->flags & SI_IS_MHOMED ? "yes" : "no", "virtual", - si->flags & SI_IS_VIRTUAL ? "yes" : "no", "sockname", - si->sockname.s ? si->sockname.s : "-", "advertise", - si->useinfo.name.s ? si->useinfo.name.s : "-") + if(rpc->struct_add(th, "sssssss", "port", si->port_no_str.s, + "sockstr", si->sock_str.s ? si->sock_str.s : "-", + "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no", + "sockname", si->sockname.s ? si->sockname.s : "-", + "advertise", + si->useinfo.sock_str.s ? si->useinfo.sock_str.s : "-") < 0) { rpc->fault(ctx, 500, "Internal error attrs structure"); return; @@ -251,19 +253,19 @@ static void corex_rpc_debug(rpc_t *rpc, void *ctx) } } -/*clang-format off*/ +/* clang-format off */ rpc_export_t corex_rpc_cmds[] = { {"corex.list_sockets", corex_rpc_list_sockets, - corex_rpc_list_sockets_doc, RET_ARRAY}, + corex_rpc_list_sockets_doc, RET_ARRAY}, {"corex.list_aliases", corex_rpc_list_aliases, - corex_rpc_list_aliases_doc, RET_ARRAY}, + corex_rpc_list_aliases_doc, RET_ARRAY}, {"corex.shm_status", corex_rpc_shm_status, corex_rpc_shm_status_doc, 0}, {"corex.shm_summary", corex_rpc_shm_summary, corex_rpc_shm_summary_doc, 0}, {"corex.pkg_summary", corex_rpc_pkg_summary, corex_rpc_pkg_summary_doc, 0}, {"corex.debug", corex_rpc_debug, corex_rpc_debug_doc, 0}, {0, 0, 0, 0} }; -/*clang-format on*/ +/* clang-format on */ /** * register RPC commands

1 0

git:master:54d8cce2: core: use advertised proto to build advertised sock string
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 54d8cce28a5c4cbd944d39b1523571fbb5776baa URL: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T16:39:08+02:00 core: use advertised proto to build advertised sock string --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… Patch: https://github.com/kamailio/kamailio/commit/54d8cce28a5c4cbd944d39b1523571f… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index ae2ee6f20a4..230eab02ff5 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -456,7 +456,11 @@ int socketinfo2str(char *s, int *len, struct socket_info *si, int mode) str proto; int l; - proto.s = get_valid_proto_name(si->proto); + if(si->useinfo.proto != PROTO_NONE) { + proto.s = get_valid_proto_name(si->useinfo.proto); + } else { + proto.s = get_valid_proto_name(si->proto); + } proto.len = strlen(proto.s); if(mode == 1)

1 0

git:master:b6148ef1: corex: rpc corex.list_sockets use now lowercase for field names
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: b6148ef161a8652b398080ec136e207fb6ee3b1a URL: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T15:53:39+02:00 corex: rpc corex.list_sockets use now lowercase for field names --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… Patch: https://github.com/kamailio/kamailio/commit/b6148ef161a8652b398080ec136e207… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8a57a6a7a38..8ec479528cb 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -61,15 +61,15 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) return; } - if(rpc->struct_add(th, "sss{", "AF", get_af_name(proto), "PROTO", - get_valid_proto_name(proto), "NAME", si->name.s, - "ADDRLIST", &ih) + if(rpc->struct_add(th, "sss{", "af", get_af_name(proto), "proto", + get_valid_proto_name(proto), "name", si->name.s, + "addrlist", &ih) < 0) { rpc->fault(ctx, 500, "Internal error address list structure"); return; } - if(rpc->struct_add(ih, "s", "ADDR", si->address_str.s) < 0) { + if(rpc->struct_add(ih, "s", "addr", si->address_str.s) < 0) { rpc->fault(ctx, 500, "Internal error address structure"); return; } @@ -77,7 +77,7 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) if(si->addr_info_lst) { for(ai = si->addr_info_lst; ai; ai = ai->next) { - if(rpc->struct_add(ih, "s", "ADDR", ai->address_str.s) + if(rpc->struct_add(ih, "s", "addr", ai->address_str.s) < 0) { rpc->fault(ctx, 500, "Internal error extra address structure"); @@ -86,11 +86,11 @@ static void corex_rpc_list_sockets(rpc_t *rpc, void *ctx) } } - if(rpc->struct_add(th, "ssssss", "PORT", si->port_no_str.s, "MCAST", - si->flags & SI_IS_MCAST ? "yes" : "no", "MHOMED", - si->flags & SI_IS_MHOMED ? "yes" : "no", "VIRTUAL", - si->flags & SI_IS_VIRTUAL ? "yes" : "no", "SOCKNAME", - si->sockname.s ? si->sockname.s : "-", "ADVERTISE", + if(rpc->struct_add(th, "ssssss", "port", si->port_no_str.s, "mcast", + si->flags & SI_IS_MCAST ? "yes" : "no", "mhomed", + si->flags & SI_IS_MHOMED ? "yes" : "no", "virtual", + si->flags & SI_IS_VIRTUAL ? "yes" : "no", "sockname", + si->sockname.s ? si->sockname.s : "-", "advertise", si->useinfo.name.s ? si->useinfo.name.s : "-") < 0) { rpc->fault(ctx, 500, "Internal error attrs structure");

1 0

git:master:e5c145f6: corex: rpc corex.list_aliases use now lowercase for field names
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: e5c145f69508658a692be9be219f466ee2aca5d9 URL: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T14:55:53+02:00 corex: rpc corex.list_aliases use now lowercase for field names - better coherence with the other rpc commands --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… Patch: https://github.com/kamailio/kamailio/commit/e5c145f69508658a692be9be219f466… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index b6e959c88d3..8a57a6a7a38 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -121,8 +121,8 @@ static void corex_rpc_list_aliases(rpc_t *rpc, void *ctx) rpc->fault(ctx, 500, "Internal error alias structure"); return; } - if(rpc->struct_add(th, "sSd", "PROTO", get_valid_proto_name(a->proto), - "ADDR", &a->alias, "PORT", a->port) + if(rpc->struct_add(th, "sSd", "proto", get_valid_proto_name(a->proto), + "addr", &a->alias, "port", a->port) < 0) { rpc->fault(ctx, 500, "Internal error alias attributes"); return;

1 0

git:master:c2e8baad: core: allow proto in advertise for a couple of listen variants
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: c2e8baad3b39b2e5871c0cdc796b3be48462c2a9 URL: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T14:51:17+02:00 core: allow proto in advertise for a couple of listen variants --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… Patch: https://github.com/kamailio/kamailio/commit/c2e8baad3b39b2e5871c0cdc796b3be… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index c8ca68f4cca..98effbd9b75 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1665,6 +1665,19 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + if (add_listen_advertise_iface( lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER VIRTUAL { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { lst_tmp->flags |= SI_IS_VIRTUAL; @@ -1692,6 +1705,19 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, $11, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id COLON NUMBER STRNAME STRING VIRTUAL { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { lst_tmp->flags |= SI_IS_VIRTUAL; @@ -1706,6 +1732,20 @@ assign_stm: } free_socket_id_lst($3); } + | LISTEN EQUAL id_lst ADVERTISE proto COLON listen_id COLON NUMBER STRNAME STRING VIRTUAL { + for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { + lst_tmp->flags |= SI_IS_VIRTUAL; + if (add_listen_advertise_iface_name(lst_tmp->addr_lst->name, + lst_tmp->addr_lst->next, + lst_tmp->port, lst_tmp->proto, + $5, $7, $9, $11, + lst_tmp->flags)!=0) { + LM_CRIT("cfg. parser: failed to add listen address\n"); + break; + } + } + free_socket_id_lst($3); + } | LISTEN EQUAL id_lst ADVERTISE listen_id { for(lst_tmp=$3; lst_tmp; lst_tmp=lst_tmp->next) { if (add_listen_advertise_iface( lst_tmp->addr_lst->name,

1 0

git:master:fe8eafd3: tls: include file to fix warning about tls_openssl_clear_errors()
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: fe8eafd31327c14e7b081cd8f4a6532953e0a1c6 URL: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T10:34:21+02:00 tls: include file to fix warning about tls_openssl_clear_errors() --- Modified: src/modules/tls/tls_ct_wrq.c --- Diff: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… Patch: https://github.com/kamailio/kamailio/commit/fe8eafd31327c14e7b081cd8f4a6532… --- diff --git a/src/modules/tls/tls_ct_wrq.c b/src/modules/tls/tls_ct_wrq.c index 53346f0eee6..f407e33f29f 100644 --- a/src/modules/tls/tls_ct_wrq.c +++ b/src/modules/tls/tls_ct_wrq.c @@ -28,6 +28,7 @@ #include "tls_ct_wrq.h" #include "tls_cfg.h" #include "tls_server.h" +#include "tls_util.h" #include "../../core/atomic_ops.h" #include "../../core/mem/shm_mem.h" #include <openssl/err.h>

1 0

git:master:91eca5aa: core: print advertised proto on startup
by Daniel-Constantin Mierla 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 91eca5aaa20f7b22488b14fdf89127daaeea47d3 URL: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-10-20T10:30:58+02:00 core: print advertised proto on startup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… Patch: https://github.com/kamailio/kamailio/commit/91eca5aaa20f7b22488b14fdf89127d… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index c67a09b2a6b..ae2ee6f20a4 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -2424,8 +2424,9 @@ void print_all_socket_lists() printf(" name %s", si->sockname.s); } if(si->useinfo.name.s) { - printf(" advertise %s:%d", si->useinfo.name.s, - si->useinfo.port_no); + printf(" advertise %s:%s:%d", + get_valid_proto_name(si->useinfo.proto), + si->useinfo.name.s, si->useinfo.port_no); } printf("\n"); }

1 0

git:master:91c31a8e: modules: readme files regenerated - rtpproxy ... [skip ci]
by Kamailio Dev 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 91c31a8e406b84ef026def7fcec0d429356e424d URL: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-10-20T10:02:17+02:00 modules: readme files regenerated - rtpproxy ... [skip ci] --- Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42… Patch: https://github.com/kamailio/kamailio/commit/91c31a8e406b84ef026def7fcec0d42…

1 0

[kamailio/kamailio] Make timeout mechanism useful by adding support for supplying timeout tag (PR #3598)
by Maksym Sobolyev 20 Oct '23

20 Oct '23

#### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The timeout_socket feature has been added in 2010, but from the look of it it has been designed for the "ngcp-mediaproxy-ng" and never worked with the real RTPProxy. As such both the documentation and the code needs to be adjusted to make it actually useful with the RTPProxy. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3598 -- Commit Summary -- * Make timeout notification useable by allowing a notify tag to * Update rtpproxy module documentation: -- File Changes -- M src/modules/rtpproxy/doc/rtpproxy.xml (2) M src/modules/rtpproxy/doc/rtpproxy_admin.xml (38) M src/modules/rtpproxy/rtpproxy.c (53) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3598.patch https://github.com/kamailio/kamailio/pull/3598.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3598 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3598(a)github.com>

3 7

git:master:190ef9a5: rtpproxy: Update rtpproxy module documentation.
by Victor Seva 20 Oct '23

20 Oct '23

Module: kamailio Branch: master Commit: 190ef9a54df33b4d053a4225e9d6257e0a045008 URL: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… Author: Maksym Sobolyev <sobomax(a)sippysoft.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-10-20T09:57:47+02:00 rtpproxy: Update rtpproxy module documentation. o Correct description of the timeout_socket; o Document timeout_tag_pv; o Update (c); o Remove reference to the ngcp-mediaproxy-ng which does not exist anymore. --- Modified: src/modules/rtpproxy/doc/rtpproxy.xml Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… Patch: https://github.com/kamailio/kamailio/commit/190ef9a54df33b4d053a4225e9d6257… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy.xml b/src/modules/rtpproxy/doc/rtpproxy.xml index 94886eaf404..ee1fdad9fc8 100644 --- a/src/modules/rtpproxy/doc/rtpproxy.xml +++ b/src/modules/rtpproxy/doc/rtpproxy.xml @@ -67,7 +67,7 @@ </editor> </authorgroup> <copyright> - <year>2003-2008</year> + <year>2003-2023</year> <holder>Sippy Software, Inc.</holder> </copyright> <copyright> diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 79a85edad70..b04baa5e3dc 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -18,11 +18,7 @@ <title>Overview</title> <para> This is a module that enables media streams to be proxied - via an rtpproxy. Rtpproxies know to work with this module - are Sippy RTPproxy <ulink url="http://www.rtpproxy.org"></ulink> - and ngcp-rtpproxy-ng - <ulink url="http://deb.sipwise.com/spce/2.6/pool/main/n/ngcp-mediaproxy-ng"></ulink>. - Some features of the rtpproxy module apply only to one of the two rtpproxies. + via the Sippy RTPproxy <ulink url="http://www.rtpproxy.org"></ulink>. </para> </section> @@ -235,7 +231,37 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") <title>Set <varname>timeout_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("rtpproxy", "timeout_socket", "xmlrpc:http://127.0.0.1:8000/RPC2") +modparam("rtpproxy", "timeout_socket", "tcp:127.0.0.1:8000") +... +</programlisting> + </example> + </section> + <section id="rtpproxy.p.timeout_tag_pv"> + <title><varname>timeout_tag_pv</varname> (string)</title> + <para> + The parameter devines the AVP of the string to be provided to the + RTP-Proxy. + </para> + <para> + The content of the AVP must be a valid URL-encoded string with + no spaces. + It will be decoded and send by the RTP proxy to the timeout socket if the + media timeout has happened. + </para> + <para> + This parameter is required in order for the timeout notification + mechanism to work properly. + </para> + <para> + <emphasis> + Default value is <quote></quote> (nothing). + </emphasis> + </para> + <example> + <title>Set <varname>timeout_tag_pv</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpproxy", "timeout_tag_pv", "$avp(rtpp_ntag)") ... </programlisting> </example>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2023