sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
313 discussions

[kamailio/kamailio] lost: fixed typo (#2566)
by sergey-safarov 30 Nov '20

30 Nov '20

#### 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 Fixed type in lost module example. Param `location_type`. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2566 -- Commit Summary -- * lost: fixed typo -- File Changes -- M src/modules/lost/doc/lost_admin.xml (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2566.patch https://github.com/kamailio/kamailio/pull/2566.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/2566

2 3

git:master:60cf4502: Merge pull request #2566 from sergey-safarov/master
by GitHub 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 60cf4502bbc55b4b8d246c3967dd8cae87e95c45 URL: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-30T09:14:18+01:00 Merge pull request #2566 from sergey-safarov/master lost: fixed typo --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… Patch: https://github.com/kamailio/kamailio/commit/60cf4502bbc55b4b8d246c3967dd8ca… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index c8be8f668b..c5d4f5ad69 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -168,7 +168,7 @@ <title>Set <varname>location_type</varname> parameter</title> <programlisting format="linespecific"> ... - modparam("http_client", "location_type, "civic geodetic locationURI") + modparam("lost", "location_type, "civic geodetic locationURI") ... </programlisting> </example> @@ -228,7 +228,7 @@ $var(id) = "sip:alice@atlanta"; $var(res) = lost_held_query("heldsrv", "$var(id)" , "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)\n"); ... </programlisting>

1 0

git:master:124499c1: lost: removed extra `"` symbol in example
by Sergey Safarov 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 124499c12db185d85805e5c71d5cc4222e608b68 URL: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-29T22:54:24+03:00 lost: removed extra `"` symbol in example --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… Patch: https://github.com/kamailio/kamailio/commit/124499c12db185d85805e5c71d5cc42… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index 308b836db6..c5d4f5ad69 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -228,7 +228,7 @@ $var(id) = "sip:alice@atlanta"; $var(res) = lost_held_query("heldsrv", "$var(id)" , "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)"); ... -$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)"", "$var(err)"); +$var(res) = lost_held_query("heldsrv", "$var(pidf)", "$var(url)", "$var(err)"); xlog("L_INFO", "HELD locationRequest: Result code $var(res)\nUrl: $var(url)\n$var(pidf)\n"); ... </programlisting>

1 0

git:master:87f363f7: lost: fixed typo
by Sergey Safarov 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 87f363f7fa0bf8f1897a3d6de13a09d6ec3812b9 URL: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-29T22:44:33+03:00 lost: fixed typo --- Modified: src/modules/lost/doc/lost_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… Patch: https://github.com/kamailio/kamailio/commit/87f363f7fa0bf8f1897a3d6de13a09d… --- diff --git a/src/modules/lost/doc/lost_admin.xml b/src/modules/lost/doc/lost_admin.xml index c8be8f668b..308b836db6 100644 --- a/src/modules/lost/doc/lost_admin.xml +++ b/src/modules/lost/doc/lost_admin.xml @@ -168,7 +168,7 @@ <title>Set <varname>location_type</varname> parameter</title> <programlisting format="linespecific"> ... - modparam("http_client", "location_type, "civic geodetic locationURI") + modparam("lost", "location_type, "civic geodetic locationURI") ... </programlisting> </example>

1 0

[kamailio/kamailio] tm: KEMI expose t_relay_to_xxx protocol functions (#2563)
by aalba6675 30 Nov '20

30 Nov '20

#### 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 tm module: In KEMI let's expose t_relay_to_tcp t_relay_to_udp t_relay_to_tls to force the transport. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2563 -- Commit Summary -- * tm: KEMI expose t_relay_to_xxx protocol functions -- File Changes -- M src/modules/tm/tm.c (28) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2563.patch https://github.com/kamailio/kamailio/pull/2563.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/2563

2 5

git:master:6c18df16: Merge pull request #2563 from aalba6675/kemi-tm-proto
by GitHub 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 6c18df166379dd635bb99375ae1269b1ef8d96b2 URL: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-30T09:02:33+01:00 Merge pull request #2563 from aalba6675/kemi-tm-proto tm: KEMI expose t_relay_to_xxx protocol functions --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… Patch: https://github.com/kamailio/kamailio/commit/6c18df166379dd635bb99375ae1269b… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99c932b417..e46c3fb057 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2897,6 +2897,59 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } +/** + * + */ +static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) +{ + + int proto = PROTO_NONE; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + return _w_t_relay_to(msg, (struct proxy_l *)0, proto); +} + +/** + * + */ +static int ki_t_relay_to_proto2(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +{ + + int proto = PROTO_NONE; + struct proxy_l *proxy; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + proxy = mk_proxy(host, port, 0); + if (proxy == 0) { + LM_ERR("bad host, port provided <%s,%d>\n", + host->s, port ); + return E_BAD_ADDRESS; + } + return _w_t_relay_to(msg, proxy, proto); +} + /** * */ @@ -3226,6 +3279,16 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto"), + SR_KEMIP_INT, ki_t_relay_to_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("tm"), str_init("t_relay_to_proto2"), + SR_KEMIP_INT, ki_t_relay_to_proto2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:93b2c03e: tm: KEMI expose t_relay_to_<proto>(host, port) functions
by Anthony Alba 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 93b2c03eca373831d895f392b790b28973c8e30e URL: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2020-11-27T11:05:55+08:00 tm: KEMI expose t_relay_to_<proto>(host, port) functions --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… Patch: https://github.com/kamailio/kamailio/commit/93b2c03eca373831d895f392b790b28… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index d6bb017287..e46c3fb057 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2920,6 +2920,36 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) return _w_t_relay_to(msg, (struct proxy_l *)0, proto); } +/** + * + */ +static int ki_t_relay_to_proto2(sip_msg_t *msg, str *sproto, str *host, unsigned int port) +{ + + int proto = PROTO_NONE; + struct proxy_l *proxy; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto2 failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + proxy = mk_proxy(host, port, 0); + if (proxy == 0) { + LM_ERR("bad host, port provided <%s,%d>\n", + host->s, port ); + return E_BAD_ADDRESS; + } + return _w_t_relay_to(msg, proxy, proto); +} + /** * */ @@ -3254,6 +3284,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto2"), + SR_KEMIP_INT, ki_t_relay_to_proto2, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6520ee44: tm: KEMI expose t_relay_to_xxx protocol functions
by Anthony Alba 30 Nov '20

30 Nov '20

Module: kamailio Branch: master Commit: 6520ee4422b24ca26f6d095d30cd2a0b0ea80aa2 URL: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2020-11-26T22:52:25+08:00 tm: KEMI expose t_relay_to_xxx protocol functions In KEMI let's expose t_relay_to_tcp t_relay_to_udp t_relay_to_tls to force the transport. --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… Patch: https://github.com/kamailio/kamailio/commit/6520ee4422b24ca26f6d095d30cd2a0… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 99c932b417..d6bb017287 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2897,6 +2897,29 @@ static int ki_t_relay(sip_msg_t *msg) return _w_t_relay_to(msg, (struct proxy_l *)0, PROTO_NONE); } +/** + * + */ +static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) +{ + + int proto = PROTO_NONE; + + if (sproto != NULL && sproto->s != NULL && sproto->len == 3) { + if (strncasecmp(sproto->s, "UDP", 3) == 0) { + proto = PROTO_UDP; + } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { + proto = PROTO_TCP; + } else if (strncasecmp(sproto->s, "TLS", 3)) { + proto = PROTO_TLS; + } else { + LM_ERR("t_relay_to_proto failed, bad protocol specified <%s>\n", sproto->s); + return E_UNSPEC; + } + } + return _w_t_relay_to(msg, (struct proxy_l *)0, proto); +} + /** * */ @@ -3226,6 +3249,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_relay_to_proto"), + SR_KEMIP_INT, ki_t_relay_to_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tm"), str_init("t_get_status_code"), SR_KEMIP_INT, ki_t_get_status_code, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] nat_traversal: TCP transport support (#2564)
by sergey-safarov 28 Nov '20

28 Nov '20

### Description Typical client device located behind NAT. If the customer use TLS or TCP transport then `nat_keepalive` cannot be used. Details at [nat_traversal.c#L1389-L1391](https://github.com/kamailio/kamailio/blob/mast… In this case, the TCP session may be expired on the NAT device, and future calls to the user phone not possible. ### Expected behavior Send keep-alive messages for clients connected via TLS and TCP transport after `nat_keepalive` function call. #### Actual observed behavior Keep-alive messages do not send if phone connected via using TLS or TCP transport. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@localhost kamailio]# kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) e9624b flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e9624b compiled on 04:01:18 Nov 10 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [root@localhost kamailio]# cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="8" ``` -- 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/issues/2564

4 9

git:master:0f572ca9: pkg/kamailio/obs: packaged sworker module
by Sergey Safarov 28 Nov '20

28 Nov '20

Module: kamailio Branch: master Commit: 0f572ca97215e0a86b8f6d54d04bb3756c779889 URL: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-11-28T18:41:16+03:00 pkg/kamailio/obs: packaged sworker module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… Patch: https://github.com/kamailio/kamailio/commit/0f572ca97215e0a86b8f6d54d04bb37… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 396eeb8cc7..999422a746 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1491,6 +1491,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sst %doc %{_docdir}/kamailio/modules/README.statistics %doc %{_docdir}/kamailio/modules/README.stun +%doc %{_docdir}/kamailio/modules/README.sworker %doc %{_docdir}/kamailio/modules/README.textops %doc %{_docdir}/kamailio/modules/README.textopsx %doc %{_docdir}/kamailio/modules/README.timer @@ -1648,6 +1649,7 @@ fi %{_libdir}/kamailio/modules/sst.so %{_libdir}/kamailio/modules/statistics.so %{_libdir}/kamailio/modules/stun.so +%{_libdir}/kamailio/modules/sworker.so %{_libdir}/kamailio/modules/textops.so %{_libdir}/kamailio/modules/textopsx.so %{_libdir}/kamailio/modules/timer.so

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020