sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

git:master:2f933b39: core: kemi - added to_TCP/TLS/SCTP/WS/WSS/WSX()
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 2f933b39410029a8dfd7ce7180a6c470e51b2452 URL: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:17:50+02:00 core: kemi - added to_TCP/TLS/SCTP/WS/WSS/WSX() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… Patch: https://github.com/kamailio/kamailio/commit/2f933b39410029a8dfd7ce7180a6c47… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 76bfdbcc29..63be6bb0fc 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1586,6 +1586,72 @@ static int sr_kemi_core_to_proto_udp(sip_msg_t *msg) return (proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_to_proto_tcp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_TCP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_tls(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_TLS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_sctp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_ws(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_wss(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_proto_wsx(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + if (proto == PROTO_WSS) { return SR_KEMI_TRUE; } + return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} /** * @@ -1976,8 +2042,33 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("to_UDP"), - SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { str_init(""), str_init("to_TCP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_tcp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_TLS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_tls, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_SCTP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_sctp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_ws, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WSS"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_wss, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_WSX"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_wsx, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:5fd35624: core: main - catch common mistakes for the arguments
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Module: kamailio Branch: master Commit: 5fd35624660cb46cd7894bfd43c7cb6259e451b3 URL: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-15T09:17:50+02:00 core: main - catch common mistakes for the arguments - print error and exit on 'kamailio start|stop|restart' --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… Patch: https://github.com/kamailio/kamailio/commit/5fd35624660cb46cd7894bfd43c7cb6… --- diff --git a/src/main.c b/src/main.c index a391f57afb..950bcd895a 100644 --- a/src/main.c +++ b/src/main.c @@ -2024,6 +2024,25 @@ int main(int argc, char** argv) {0, 0, 0, 0 } }; + if (argc > 1) { + /* checks for common wrong arguments */ + if(strcasecmp(argv[1], "start")==0) { + fprintf(stderr, "error: 'start' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + if(strcasecmp(argv[1], "stop")==0) { + fprintf(stderr, "error: 'stop' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + if(strcasecmp(argv[1], "restart")==0) { + fprintf(stderr, "error: 'restart' is not a supported argument\n"); + fprintf(stderr, "error: stopping " NAME " ...\n\n"); + exit(-1); + } + } + /*init*/ time(&up_since); creator_pid = getpid();

1 0

Releasing Kamailio v5.5.1
by Daniel-Constantin Mierla 15 Jun '21

15 Jun '21

Hello, I am considering to release Kamailio v5.5.1 sometime next week, likely on Tuesday or Wednesday (June 15 or 16, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 1

git:master:03c2ea28: pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist
by Sergey Safarov 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 03c2ea28767106333ee04c5e19ee490c010dfb58 URL: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-14T20:57:12+03:00 pkg/kamailio/obs: disabled lwsc build on CentOS 6 dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… Patch: https://github.com/kamailio/kamailio/commit/03c2ea28767106333ee04c5e19ee490… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 43ec4feb1a..8e9483bada 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -14,6 +14,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -46,6 +47,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_with lwsc %bcond_without kazoo %bcond_without memcached %bcond_with mongodb @@ -79,6 +81,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -122,6 +125,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_without kazoo %bcond_without memcached %bcond_without mongodb @@ -148,6 +152,7 @@ %bcond_without jansson %bcond_without json %bcond_without lua +%bcond_without lwsc %bcond_with kazoo %bcond_without memcached %bcond_with mongodb @@ -611,6 +616,7 @@ Lua extensions for Kamailio. %endif +%if %{with lwsc} %package lwsc Summary: Websocket client implementation to interact with external systems, similar to http client Group: %{PKGGROUP} @@ -619,6 +625,7 @@ BuildRequires: libwebsockets-devel %description lwsc Websocket client implementation to interact with external systems, similar to http client. +%endif %if %{with memcached} @@ -1138,7 +1145,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1231,7 +1240,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with lua} klua \ %endif +%if %{with lwsc} klwsc \ +%endif %if %{with memcached} kmemcached \ %endif @@ -1894,10 +1905,12 @@ fi %endif +%if %{with lwsc} %files lwsc %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.lwsc %{_libdir}/kamailio/modules/lwsc.so +%endif %if %{with memcached} %files memcached

1 0

git:master:e7a14f37: pkg/kamailio/obs: simlifid module definition for RHEL dist
by Sergey Safarov 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: e7a14f37c98e2bbfcf234165dc5dfd4121db5b5b URL: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-06-14T20:57:07+03:00 pkg/kamailio/obs: simlifid module definition for RHEL dist --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… Patch: https://github.com/kamailio/kamailio/commit/e7a14f37c98e2bbfcf234165dc5dfd4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 74912950eb..43ec4feb1a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -28,9 +28,15 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 6 +%if 0%{?rhel} == 6 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_with cnxcc %bcond_without dnssec %bcond_without evapi @@ -54,10 +60,16 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 7 +%if 0%{?rhel} == 7 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el7.centos +%endif +%if 0%{?centos_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -81,23 +93,26 @@ %bcond_without xmlrpc %endif -%if 0%{?centos_ver} == 8 || 0%{?almalinux_ver} == 8 || 0%{?rocky_ver} == 8 -%define rhel_rebuild 8 -% if 0%{?centos_ver} +%if 0%{?rhel} == 8 +%if 0%{?centos_ver} %define dist_name centos %define dist_version %{?centos} %define dist .el8.centos %endif -% if 0%{?almalinux_ver} +%if 0%{?almalinux_ver} %define dist_name centos %define dist_version %{?almalinux} %define dist .el8.almalinux %endif -% if 0%{?rocky_ver} +%if 0%{?rocky_ver} %define dist_name centos %define dist_version %{?rocky} %define dist .el8.rocky %endif +%if 0%{?centos_ver} == 0 && 0%{?almalinux_ver} == 0 && 0%{?rocky_ver} == 0 +%define dist_name rhel +%define dist_version %{?rhel} +%endif %bcond_without cnxcc %bcond_with dnssec %bcond_without evapi @@ -147,84 +162,6 @@ %bcond_without xmlrpc %endif -%if 0%{?rhel} == 6 && 0%{?centos_ver} != 6 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_with cnxcc -%bcond_without dnssec -%bcond_without evapi -%bcond_with geoip -%bcond_with http_async_client -%bcond_with ims -%bcond_with jansson -%bcond_with json -%bcond_with lua -%bcond_with kazoo -%bcond_with memcached -%bcond_with mongodb -%bcond_with perl -%bcond_with phonenum -%bcond_with python3 -%bcond_with rabbitmq -%bcond_with redis -%bcond_with ruby -%bcond_with sctp -%bcond_with websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 7 && 0%{?centos_ver} != 7 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - -%if 0%{?rhel} == 8 && 0%{?rhel_rebuild} != 8 -%define dist_name rhel -%define dist_version %{?rhel} -%bcond_without cnxcc -%bcond_with dnssec -%bcond_without evapi -%bcond_without geoip -%bcond_without http_async_client -%bcond_without ims -%bcond_without jansson -%bcond_without json -%bcond_without lua -%bcond_without kazoo -%bcond_without memcached -%bcond_without mongodb -%bcond_without perl -%bcond_without phonenum -%bcond_without python3 -%bcond_without rabbitmq -%bcond_without redis -%bcond_without ruby -%bcond_without sctp -%bcond_without websocket -%bcond_without xmlrpc -%endif - # Defining missing macros on RHEL/CentOS 6 %if 0%{?rhel} == 6 %define _rundir %{_localstatedir}/run

1 0

git:master:5c2890d9: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 5c2890d90297ef66b0216c46dd1fe12dae5ecd0e URL: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-06-14T17:01:19+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… Patch: https://github.com/kamailio/kamailio/commit/5c2890d90297ef66b0216c46dd1fe12… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index f4a43fca91..004d376fb4 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -91,7 +91,7 @@ Chapter 1. Admin Guide The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) IETF extensions for SIP (RFC8224, - RFC8588). + RFC8588), known together as STIR/SHAKEN. It exports the functions to check and generate SIP Identity header.

1 0

git:master:a59ea892: secsipid: explicit STIR/SHAKEN reference
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: a59ea8920c17aca29ffa734ca0babb107a415fde URL: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T16:56:21+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… Patch: https://github.com/kamailio/kamailio/commit/a59ea8920c17aca29ffa734ca0babb1… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 0d7147c35f..527db1aecf 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -19,7 +19,7 @@ The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + IETF extensions for SIP (RFC8224, RFC8588), known together as STIR/SHAKEN. </para> <para> It exports the functions to check and generate SIP Identity header.

1 0

[kamailio/kamailio] invalid json doc in command "kamctl ping" (#2781)
by Christoph Valentin 14 Jun '21

14 Jun '21

### Description Hello Daniel, https://lists.kamailio.org/pipermail/sr-users/2021-January/111628.html > On Mon, Jan 18, 2021 at 4:19 PM Julia Bo <juliabo at gmail.com> wrote: > > It's my mistake, I checked a different branch. Sorry. > Now I get the same result as yours. > But in jason we get the result of command execution only and no sip reply > result (that was in 4.4 : 200,408 etc..) > I see sent OPTIONS and received reply in debug, > Thank you, > Julia I have the same problem: I get no sip reply result. [root@vict2-ims3 scherney]# kamctl ping sip:node1.pcscf-1.vict-ims.net { "jsonrpc": "2.0", "result": { }, "id": 12213 } Hello, I implemented an alternative rpc command that blocks waiting for the response. Try again with latest master and let's see if works. It waits for max 80secs for the sip reply to come back (or the transaction to time out), checking every 0.1sec. Later I can make these values modparams, for now just to validate it works. Cheers, Daniel Can you please tell me, which commit it was, that I can test it at another version. Thanks! BR Theo  ### Troubleshooting #### Reproduction [root@vict2-ims3 scherney]# kamctl ping sip:node1.pcscf-1.vict-ims.net { "jsonrpc": "2.0", "result": { }, "id": 12213 }  #### Debugging Data  ```none``` #### Log Messages  ```none``` #### SIP Traffic  ```[pr0071_030.zip](https://github.com/kamailio/kamailio/files/6648588/pr0071_030.zip)``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ```version: kamailio 5.1.6 (x86_64/linux) 42b01a flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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_BLACKLIST, HAVE_RESOLV_RES 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: 42b01a compiled on 10:29:16 May 12 2021``` * **Operating System**:  ```Linux vict-ims3 3.10.0-327.10.1.el7.x86_64 #1 SMP Sat Jan 23 04:54:55 EST 2016 x86_64 x86_64 x86_64 GNU/Linux``` -- 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/2781

2 3

git:master:13e876e4: core: kemi - added KSR.to_UDP() - return true if target is over UDP
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 13e876e45ad34a9d567d41293450307816bdf107 URL: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T13:22:35+02:00 core: kemi - added KSR.to_UDP() - return true if target is over UDP - uses the R-URI/D-URI for requests (no DNS query done if transport is missing) and 2nd Via for replies --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… Patch: https://github.com/kamailio/kamailio/commit/13e876e45ad34a9d567d41293450307… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 065eba9c2c..76bfdbcc29 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1536,6 +1536,57 @@ static int sr_kemi_core_route(sip_msg_t *msg, str *route) return ret; } +/** + * + */ +static int sr_kemi_core_to_proto_helper(sip_msg_t *msg) +{ + sip_uri_t parsed_uri; + str uri; + + if(msg==NULL) { + return -1; + } + if(msg->first_line.type == SIP_REPLY) { + /* REPLY doesnt have r/d-uri - use second Via */ + if(parse_headers( msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return -1; + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return -1; + } + return (int)msg->via2->proto; + } + if (msg->dst_uri.s != NULL && msg->dst_uri.len>0) { + uri = msg->dst_uri; + } else { + if (msg->new_uri.s!=NULL && msg->new_uri.len>0) + { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } + if(parse_uri(uri.s, uri.len, &parsed_uri)!=0) { + LM_ERR("failed to parse nh uri [%.*s]\n", uri.len, uri.s); + return -1; + } + return (int)parsed_uri.proto; +} + +/** + * + */ +static int sr_kemi_core_to_proto_udp(sip_msg_t *msg) +{ + int proto; + + proto = sr_kemi_core_to_proto_helper(msg); + return (proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + + /** * */ @@ -1925,6 +1976,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("to_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_to_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_src_port"), SR_KEMIP_BOOL, sr_kemi_core_is_src_port, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:856a8ff5: core: parse_via - padding field when USE_COMP is defined
by Daniel-Constantin Mierla 14 Jun '21

14 Jun '21

Module: kamailio Branch: master Commit: 856a8ff51f329ba1fd7c2ab120349ee330aee0d2 URL: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-14T13:20:25+02:00 core: parse_via - padding field when USE_COMP is defined - align to 32bit to avoid sigbus on accessing fields by address on strict systems --- Modified: src/core/parser/parse_via.h --- Diff: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… Patch: https://github.com/kamailio/kamailio/commit/856a8ff51f329ba1fd7c2ab120349ee… --- diff --git a/src/core/parser/parse_via.h b/src/core/parser/parse_via.h index b4e99a09df..ec2b71247f 100644 --- a/src/core/parser/parse_via.h +++ b/src/core/parser/parse_via.h @@ -72,6 +72,7 @@ typedef struct via_body { unsigned short port; #ifdef USE_COMP short comp_no; + short comp_no_pad; /* padding to align to 32bit */ #endif str port_str; str params;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
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 June 2021