sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
246 discussions

[kamailio/kamailio] Segmentation fault in rpc_mod_print function while shutting down server. (#2433)
by Andrey Deykunov 09 Sep '20

09 Sep '20

### Description We have segfault in Kamailio v5.3.1 installed on Debain 9.x 64 bit occured while kamailio was shutting down while our script tryed to get metric using kamcmd utility at the same time. ### Troubleshooting No troubleshooting was done, since it happened on a production server. We simply restarted the server. #### Reproduction The problem periodically happens on production servers during restart. Kamailio crashes when one of our scripts tried getting statistics about websocket and tls modules using kamcmd during server restart. As I see in core dump, shared memory was already freed when rpc_mod_print called in the child process. #### Debugging Data  ``` core.kamailio.17684 /var/lib/ums/sbin/kamailio GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 17684] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #1 0x00007ff4d6ddb2f5 in rpc_mod_print (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", stats=0x1f2f180, flag=2) at mod_stats.c:117 #2 0x00007ff4d6ddb0eb in rpc_mod_print_one (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", pkg_stats=0x1f2d9c0, shm_stats=0x1f2f180, flag=2) at mod_stats.c:159 #3 0x00007ff4d6ddaee1 in rpc_mod_mem_stats_mode (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, fmode=0) at mod_stats.c:239 #4 0x00007ff4d6dda84f in rpc_mod_mem_stats (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658) at mod_stats.c:251 #5 0x00007ff4d64bfc80 in process_rpc_req (buf=0x1f140a4 "\241\003\026t\256\214=\221\nmod.stats", size=29, bytes_needed=0x7fff11cd5aa0, sh=0x7fff11cd5a10, saved_state=0x1f240a8) at binrpc_run.c:678 #6 0x00007ff4d64ad72f in handle_stream_read (s_c=0x1f14070, idx=-1) at io_listener.c:511 #7 0x00007ff4d64a9121 in handle_io (fm=0x7ff55a4e4ae0, events=1, idx=-1) at io_listener.c:706 #8 0x00007ff4d64a793a in io_wait_loop_epoll (h=0x7ff4d66f0348 <io_h>, t=10, repeat=0) at ./../../core/io_wait.h:1062 #9 0x00007ff4d649b62c in io_listen_loop (fd_no=2, cs_lst=0x1e28940) at io_listener.c:281 #10 0x00007ff4d64d172c in mod_child (rank=0) at ctl.c:338 #11 0x0000000000638c14 in init_mod_child (m=0x7ff55a3634b0, rank=0) at core/sr_module.c:780 #12 0x000000000063862d in init_mod_child (m=0x7ff55a363b78, rank=0) at core/sr_module.c:776 #13 0x000000000063862d in init_mod_child (m=0x7ff55a364018, rank=0) at core/sr_module.c:776 #14 0x000000000063862d in init_mod_child (m=0x7ff55a364528, rank=0) at core/sr_module.c:776 #15 0x000000000063862d in init_mod_child (m=0x7ff55a3649c8, rank=0) at core/sr_module.c:776 #16 0x000000000063862d in init_mod_child (m=0x7ff55a365140, rank=0) at core/sr_module.c:776 #17 0x000000000063862d in init_mod_child (m=0x7ff55a3657b0, rank=0) at core/sr_module.c:776 #18 0x000000000063862d in init_mod_child (m=0x7ff55a365c38, rank=0) at core/sr_module.c:776 #19 0x00000000006385b2 in init_child (rank=0) at core/sr_module.c:825 #20 0x000000000043140c in main_loop () at main.c:1753 #21 0x000000000043df6f in main (argc=9, argv=0x7fff11cd9dd8) at main.c:2802 ``` #### Log Messages No any useful logs available. #### SIP Traffic No SIP traffic available. ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.1 (x86_64/linux) 283e46 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_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: 283e46 compiled on 14:23:37 Jul 28 2020 with clang 9.0 ``` * **Operating System**:  ``` Linux devhpbx005-1.vx 4.9.0-12-amd64 #1 SMP Debian 4.9.210-1 (2020-01-20) 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/2433

2 14

Releasing Kamailio v5.4.1
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Hello, I am considering to release Kamailio v5.4.1 as the first patch release in the 5.4 series, likely to be done next week, on the 1st of September, 2020. There are a few issues reported on the tracker, hopefully they will be tackled till then. If you are aware of something else not working as expected, report them to issue tracker asap to give a better chance to be fixed till the release day. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 2

Kamailio World Online Event - Schedule and access details
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Hello, the schedule for Kamailio World Updates has been published - it is an online event happening this week, on Wed-Thu, Sep 2-3, 2020, from 13:00UTC to 17:00UTC, more details are available at: * https://www.kamailioworld.com/k08-online/ The agenda includes presentations, live demos and open discussion sessions, as well as an online party to celebrate 19 years of development for Kamailio project. Being shorter than the usual Kamailio World, the event has an obvious focus on Kamailio only, with sessions about what is new in Kamailio ecosystem. The sessions are done live, in a self-hosted Jitsi Meet video conferencing room (hosting sponsored by lod.com), with live streaming to YouTube KamailioWorld channel: * https://www.youtube.com/c/KamailioWorld/ If streaming goes without problems, the recordings of presentations and live demos will be made available on YouTube channel after the event. If you want to join the video conferencing room, be sure you are muted and with video turned off, in order not to disturb the sessions with unexpected noise. Un-mute/turn video on only when you want to participate in a discussion. Asking questions and text discussions can be done on our self hosted Matrix server, in the room "kamailio" (full room id: #kamailio:matrix.kamailio.dev): * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev The server is federated, so if you have a Matrix account on another server, you can join easily. During the event, we will allow guests to join the room, so it is not really required to have a Matrix account. Should anyone have issues joining the chat room during the event, reply on sr-users and we will try to assist you. As an alternative for posting questions, I will keep an eye on YouTube comments during the live streaming and try to pass them to the speaker, if something pops up there. The last session on the 2nd day is the online celebration party for 19 years of development for Kamailio project. Grab a drink, prepare your birthday speech and say it live, tell an interesting story about your experiences in RTC or just enjoy open discussions with the other participants! It is the first time we are experimenting with a live online event, testing looked good so far and we hope everything will run smooth during the sessions! Anyhow, I am confident everyone will enjoy the event and be able to (re-)connect with people from Kamailio community, no matter where they are located around the world! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:b1ce252f: keepalive: removed function name from log messages
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: 5.4 Commit: b1ce252f8090f66de290cec95dbb6e1762ee6bdf URL: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T12:16:05+02:00 keepalive: removed function name from log messages (cherry picked from commit 17d6a88090e2a67f5c0b06e6aae76d629595b37e) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… Patch: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 36cf81aef1..00f40c46bf 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -61,7 +61,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest = (ka_dest_t *)param; - LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + LM_DBG("dest: %.*s\n", ka_dest->uri.len, ka_dest->uri.s); if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { return (ticks_t)(0); /* stops the timer */ @@ -104,7 +104,7 @@ static void ka_options_callback( uri.s = t->to.s + 5; uri.len = t->to.len - 8; - LM_DBG("OPTIONS-Request was finished with code %d (to %.*s)\n", ps->code, + LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s); @@ -149,7 +149,7 @@ static void ka_run_route(sip_msg_t *msg, str *uri, char *route) return; } - LM_DBG("ka_run_route event_route[%s]\n", route); + LM_DBG("run event_route[%s]\n", route); rt = route_get(&event_rt, route); if(rt < 0 || event_rt.rlist[rt] == NULL) {

1 0

git:master:17d6a880: keepalive: removed function name from log messages
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: master Commit: 17d6a88090e2a67f5c0b06e6aae76d629595b37e URL: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T12:15:00+02:00 keepalive: removed function name from log messages --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… Patch: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 36cf81aef1..00f40c46bf 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -61,7 +61,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest = (ka_dest_t *)param; - LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + LM_DBG("dest: %.*s\n", ka_dest->uri.len, ka_dest->uri.s); if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { return (ticks_t)(0); /* stops the timer */ @@ -104,7 +104,7 @@ static void ka_options_callback( uri.s = t->to.s + 5; uri.len = t->to.len - 8; - LM_DBG("OPTIONS-Request was finished with code %d (to %.*s)\n", ps->code, + LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s); @@ -149,7 +149,7 @@ static void ka_run_route(sip_msg_t *msg, str *uri, char *route) return; } - LM_DBG("ka_run_route event_route[%s]\n", route); + LM_DBG("run event_route[%s]\n", route); rt = route_get(&event_rt, route); if(rt < 0 || event_rt.rlist[rt] == NULL) {

1 0

git:master:8aeaee0f: pv: new transformation {uri.saor}
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: master Commit: 8aeaee0fda4013e1fe0477ce1dcb31738dc18aea URL: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T09:37:45+02:00 pv: new transformation {uri.saor} - return sip aor (sip:[user@]domain) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… Patch: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 91e9bca516..4de9849165 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1409,6 +1409,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; case TR_URI_DURI: + case TR_URI_SAOR: case TR_URI_SURI: if(_tr_uri.len >= TR_BUFFER_SIZE) { LM_WARN("uri too long [%.*s] (%d)\n", @@ -1436,7 +1437,8 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; sv.len++; - if(subtype == TR_URI_SURI && _tr_parsed_uri.user.len > 0) { + if((_tr_parsed_uri.user.len > 0) + && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len); sv.len += _tr_parsed_uri.user.len; @@ -1448,19 +1450,21 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_parsed_uri.host.len); sv.len += _tr_parsed_uri.host.len; } - if(_tr_parsed_uri.port.len > 0) { - sv.s[sv.len] = ':'; - sv.len++; - memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, - _tr_parsed_uri.port.len); - sv.len += _tr_parsed_uri.port.len; - } - if(_tr_parsed_uri.transport_val.len > 0) { - memcpy(sv.s + sv.len, ";transport=", 11); - sv.len += 11; - memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, - _tr_parsed_uri.transport_val.len); - sv.len += _tr_parsed_uri.transport_val.len; + if(subtype != TR_URI_SAOR) { + if(_tr_parsed_uri.port.len > 0) { + sv.s[sv.len] = ':'; + sv.len++; + memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, + _tr_parsed_uri.port.len); + sv.len += _tr_parsed_uri.port.len; + } + if(_tr_parsed_uri.transport_val.len > 0) { + memcpy(sv.s + sv.len, ";transport=", 11); + sv.len += 11; + memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, + _tr_parsed_uri.transport_val.len); + sv.len += _tr_parsed_uri.transport_val.len; + } } sv.s[sv.len] = '\0'; val->rs = sv; @@ -2845,6 +2849,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "port", 4)==0) { t->subtype = TR_URI_PORT; goto done; + } else if(name.len==4 && strncasecmp(name.s, "saor", 4)==0) { + t->subtype = TR_URI_SAOR; + goto done; } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { t->subtype = TR_URI_SURI; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index d15df89057..c587464bed 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,8 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_DURI, TR_URI_SURI + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SAOR, TR_URI_DURI, + TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

git:5.4:e9baba91: tls: proper ifdef on libssl version for tls_init_locks()
by Daniel-Constantin Mierla 30 Aug '20

30 Aug '20

Module: kamailio Branch: 5.4 Commit: e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79 URL: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-30T18:05:43+02:00 tls: proper ifdef on libssl version for tls_init_locks() - avoid compile warning on unused label (cherry picked from commit 60bd3aa284a5d9eb117a9763aa590aecf276ba16) --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… Patch: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..21078e82d9 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ +/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,10 +185,13 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error: tls_destroy_locks(); return -1; + +#else + return 0; +#endif }

1 0

git:master:60bd3aa2: tls: proper ifdef on libssl version for tls_init_locks()
by Daniel-Constantin Mierla 30 Aug '20

30 Aug '20

Module: kamailio Branch: master Commit: 60bd3aa284a5d9eb117a9763aa590aecf276ba16 URL: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-30T18:04:04+02:00 tls: proper ifdef on libssl version for tls_init_locks() - avoid compile warning on unused label --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… Patch: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..21078e82d9 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ +/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,10 +185,13 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error: tls_destroy_locks(); return -1; + +#else + return 0; +#endif }

1 0

git:master:564940f5: pv: new transformation {uri.duri}
by Daniel-Constantin Mierla 29 Aug '20

29 Aug '20

Module: kamailio Branch: master Commit: 564940f5ef923df7935a7b737a70e25c0d5f6a7b URL: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-29T19:45:20+02:00 pv: new transformation {uri.duri} - return uri needed for destination address (e.g., sip:host:port;transport=tcp) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… Patch: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index b9eb291b99..91e9bca516 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1408,6 +1408,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_URI_PASSWD: val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; + case TR_URI_DURI: case TR_URI_SURI: if(_tr_uri.len >= TR_BUFFER_SIZE) { LM_WARN("uri too long [%.*s] (%d)\n", @@ -1435,7 +1436,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; sv.len++; - if(_tr_parsed_uri.user.len > 0) { + if(subtype == TR_URI_SURI && _tr_parsed_uri.user.len > 0) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len); sv.len += _tr_parsed_uri.user.len; @@ -2847,6 +2848,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { t->subtype = TR_URI_SURI; goto done; + } else if(name.len==4 && strncasecmp(name.s, "duri", 4)==0) { + t->subtype = TR_URI_DURI; + goto done; } else if(name.len==6 && strncasecmp(name.s, "params", 6)==0) { t->subtype = TR_URI_PARAMS; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index bf4c922243..d15df89057 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SURI + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_DURI, TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

git:master:4a3ad2bf: pv: new transformation {uri.suri}
by Daniel-Constantin Mierla 28 Aug '20

28 Aug '20

Module: kamailio Branch: master Commit: 4a3ad2bf58d6c18f522bb73330030403a50cafbf URL: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-28T20:42:15+02:00 pv: new transformation {uri.suri} - get the simple routing uri - keep only transport parameter, if exists --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… Patch: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index d07e55e719..b9eb291b99 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1408,6 +1408,62 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_URI_PASSWD: val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; + case TR_URI_SURI: + if(_tr_uri.len >= TR_BUFFER_SIZE) { + LM_WARN("uri too long [%.*s] (%d)\n", + _tr_uri.len, _tr_uri.s, _tr_uri.len); + val->rs = _tr_empty; + break; + } + + tr_set_crt_buffer(); + sv.s = _tr_uri.s; + sv.len = 0; + while(sv.len<_tr_uri.len) { + if(_tr_uri.s[sv.len]==':') { + break; + } + sv.len++; + } + if(_tr_uri.s[sv.len]!=':') { + LM_WARN("uri schema not found [%.*s] (%d)\n", + _tr_uri.len, _tr_uri.s, _tr_uri.len); + val->rs = _tr_empty; + break; + } + sv.len++; + memcpy(_tr_buffer, sv.s, sv.len); + sv.s = _tr_buffer; + sv.len++; + if(_tr_parsed_uri.user.len > 0) { + memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, + _tr_parsed_uri.user.len); + sv.len += _tr_parsed_uri.user.len; + sv.s[sv.len] = '@'; + sv.len++; + } + if(_tr_parsed_uri.host.len > 0) { + memcpy(sv.s + sv.len, _tr_parsed_uri.host.s, + _tr_parsed_uri.host.len); + sv.len += _tr_parsed_uri.host.len; + } + if(_tr_parsed_uri.port.len > 0) { + sv.s[sv.len] = ':'; + sv.len++; + memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, + _tr_parsed_uri.port.len); + sv.len += _tr_parsed_uri.port.len; + } + if(_tr_parsed_uri.transport_val.len > 0) { + memcpy(sv.s + sv.len, ";transport=", 11); + sv.len += 11; + memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, + _tr_parsed_uri.transport_val.len); + sv.len += _tr_parsed_uri.transport_val.len; + } + sv.s[sv.len] = '\0'; + val->rs = sv; + break; case TR_URI_PORT: val->flags |= PV_TYPE_INT|PV_VAL_INT; val->rs = (_tr_parsed_uri.port.s)?_tr_parsed_uri.port:_tr_empty; @@ -2788,6 +2844,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "port", 4)==0) { t->subtype = TR_URI_PORT; goto done; + } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { + t->subtype = TR_URI_SURI; + goto done; } else if(name.len==6 && strncasecmp(name.s, "params", 6)==0) { t->subtype = TR_URI_PARAMS; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 6494852246..bf4c922243 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020