sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
229 discussions

git:master:23589c70: pv: use macro to get port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 23589c70353af794e83d9a7a6070ba3cc1666811 URL: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:00+02:00 pv: use macro to get port based on proto --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… Patch: https://github.com/kamailio/kamailio/commit/23589c70353af794e83d9a7a6070ba3… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index 475b1cdc3e..ecce3156e7 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -704,7 +704,7 @@ int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, host = msg->via2->host; } if(port==0) { - port = (msg->via2->port)?msg->via2->port:SIP_PORT; + port = GET_SIP_PORT(msg->via2->port, msg->via2->proto); } switch(param->pvn.u.isname.name.n) {

1 0

git:master:b874f56b: core: parser - macro to get sip port based on proto
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: b874f56bcea104ce328e0cea19bc78cbf79749d6 URL: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:07:32+02:00 core: parser - macro to get sip port based on proto --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… Patch: https://github.com/kamailio/kamailio/commit/b874f56bcea104ce328e0cea19bc78c… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 61d9ac6185..1ff73a0b98 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -184,6 +184,15 @@ if ( (*tmp==(firstchar) || *tmp==((firstchar) | 32)) && \ (((m)->new_uri.s && (m)->new_uri.len) ? (&(m)->new_uri) : (&(m)->first_line.u.request.uri)) +/*! \brief + * Return the SIP port. + * - _port if _port!=0 + * - 5061 for _proto == TLS or WSS + * - 5060 for the other _proto + */ +#define GET_SIP_PORT(_port, _proto) ((_port==0)?((_proto==PROTO_TLS \ + || _proto==PROTO_WSS)?5061:5060):_port) + enum _uri_type{ERROR_URI_T=0, SIP_URI_T, SIPS_URI_T, TEL_URI_T, TELS_URI_T, URN_URI_T}; typedef enum _uri_type uri_type; enum _uri_flags{

1 0

[kamailio/kamailio] dead lock and 100% CPU ussage on shutdown (#2795)
by sergey-safarov 06 Jul '21

06 Jul '21

### Description When Kamailio child core generated, then Kamailio goes to shutdown. I observed a case when the Kamailio process shutdown process a deadlocked and not able to shutdown for a long time. #### Debugging Data ``` (gdb) bt #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 #9 0x0000000000423a90 in handle_sigs () at main.c:816 #10 0x0000000000433018 in main_loop () at main.c:1903 #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 (gdb) f 1 #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 718 sched_yield(); /* wait for it to complete */ (gdb) list 713 tl->add_line, tl->del_calls, tl->del_func, 714 tl->del_file, tl->del_line, tl->init, tl->expires_no); 715 #endif 716 return -2; /* do nothing */ 717 } 718 sched_yield(); /* wait for it to complete */ 719 goto again; 720 } 721 if ((tl->next!=0)&&(tl->prev!=0)){ 722 _timer_rm_list(tl); /* detach */ (gdb) bt full #0 0x0000ffff8645b648 in sched_yield () from /lib64/libc.so.6 No symbol table info available. #1 0x0000000000527820 in timer_del_safe (tl=0xffff841969f8) at core/timer.c:718 ret = -1 __func__ = "timer_del_safe" #2 0x0000ffff80121630 in unlink_timers (t=0xffff84196738) at timer.h:363 i = 0 #3 0x0000ffff80122488 in free_cell_helper (dead_cell=0xffff84196738, silent=1, fname=0xffff8022be70 "h_table.c", fline=466) at h_table.c:150 b = 0x0 i = 65535 rpl = 0x0 tt = 0x0 foo = 0xffff80089b00 <__func__.11765> cbs = 0x0 cbs_tmp = 0xffff83817f88 __func__ = "free_cell_helper" #4 0x0000ffff80124bac in free_hash_table () at h_table.c:466 p_cell = 0xffff84196738 tmp_cell = 0xffff80606630 i = 33128 __func__ = "free_hash_table" #5 0x0000ffff801da5c0 in tm_shutdown () at t_funcs.c:88 __func__ = "tm_shutdown" #6 0x00000000005c8e08 in destroy_modules () at core/sr_module.c:830 t = 0xffff84c44808 foo = 0xffff84c44038 __func__ = "destroy_modules" #7 0x000000000041df3c in cleanup (show_status=1) at main.c:575 memlog = 435649383 __func__ = "cleanup" #8 0x000000000041ffd4 in shutdown_children (sig=15, show_status=1) at main.c:718 __func__ = "shutdown_children" #9 0x0000000000423a90 in handle_sigs () at main.c:816 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 4403228 __func__ = "handle_sigs" #10 0x0000000000433018 in main_loop () at main.c:1903 i = 8 pid = 175104 si = 0x0 si_desc = "udp receiver child=7 sock=[2600:1f18:578:5703::c6]:5080\000\220\352Ą\377\377\000\000@\365\301\372\377\377\000\000\360\004)\205\377\377\000\000`\365\301\372\377\377\000\000p\365\301\372\377\377\000\000p\365\301\372\377\377\000\000@\365\301\372\377\377\000\000\320\377\377\377\200\377\377\377\000l\377\362g{\367\031" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #11 0x000000000043de90 in main (argc=11, argv=0xfffffac1fb18) at main.c:3053 cfg_stream = 0x177f02d0 c = -1 r = 0 tmp = 0xfffffac1fee1 "" tmp_len = 65535 port = 1 proto = 0 ahost = 0x0 aport = 0 options = 0x8ae128 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 4190370820 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xffff863c0da8 <__libc_start_main+168> "" st = {st_dev = 25, st_ino = 18103, st_mode = 16832, st_nlink = 2, st_uid = 991, st_gid = 986, st_rdev = 0, __pad1 = 0, st_size = 60, st_blksize = 65536, __pad2 = 0, st_blocks = 0, st_atim = {tv_sec = 1624774599, tv_nsec = 29999981}, st_mtim = {tv_sec = 1625138047, tv_nsec = 607511242}, st_ctim = {tv_sec = 1625138047, tv_nsec = 607511242}, __glibc_reserved = {0, 0}} tbuf = "\000\000\000\000\000\000\000\000\000\000n\206\377\377\000\000\000\000\000\000\000\000\000\000\330\375q\206\377\377", '\000' <repeats 58 times>, "x\376q\206\377\377\000\000h\376q\206\377\377\000\000\b\376q\206\377\377\000\000(\376q\206\377\377\000\000\070\376q\206\377\377\000\000\250\376q\206\377\377\000\000\270\376q\206\377\377\000\000\310\376q\206\377\377\000\000H\376q\206\377\377\000\000X\376q\206\377\377", '\000' <repeats 18 times>, "\330\375q\206\377\377", '\000' <repeats 42 times>... option_index = 12 long_options = {{name = 0x8b04e8 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x8ab520 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x8b04f0 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x8b04f8 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x8b0500 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x8b0510 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x8b0520 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x8b0530 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x8b0540 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x8b0550 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x8b0560 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x8b0568 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x8b0578 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals ret = -1 __func__ = "timer_del_safe" ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-e-3 ~]# kamailio -v version: kamailio 5.6.0-dev0 (aarch64/linux) f03900 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-NOSMP, 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: f03900 compiled on 17:17:36 Jun 26 2021 with gcc 8.4.1 ``` Used master branch with customization. * **Operating System**: ``` [root@bcf-e-3 ~]# uname -a Linux bcf-e-3.la.cal911.net 4.18.0-305.3.1.el8.aarch64 #1 SMP Tue Jun 1 16:22:50 UTC 2021 aarch64 aarch64 aarch64 GNU/Linux [root@bcf-e-3 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_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/2795

2 6

git:master:8762c56a: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 8762c56a1c78e4ba151ef9fb4290b3938c0c984f URL: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T10:01:24+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… Patch: https://github.com/kamailio/kamailio/commit/8762c56a1c78e4ba151ef9fb4290b39… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index baff8e8b32..da1da0331c 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -131,7 +131,6 @@ Sven Knoblich 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 2. Frequently Asked Questions @@ -188,7 +187,6 @@ Sven Knoblich 1.49. acc_log_request usage 1.50. acc_db_request usage 1.51. acc_db_request usage - 1.52. acc_diam_request usage Chapter 1. Admin Guide @@ -287,7 +285,6 @@ Chapter 1. Admin Guide 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 1. Overview @@ -298,9 +295,9 @@ Chapter 1. Admin Guide support for radius is enabled. There is some very early support of the Diameter protocol in the - “acc_diameter” module which will be deleted in coming releases. This - support is not up to date with the current Diameter protocols. If you - need Diameter support, please use the ims_charging module. + “acc_diameter” module, but is not up to date with the current Diameter + protocols. If you need Diameter support, please use the ims_charging + module. To account a transaction and to choose which set of backends to be used, the script writer just has to set some flags (see the module @@ -1326,7 +1323,6 @@ modparam("acc", "cdr_on_failed", 0) 7.1. acc_log_request(comment) 7.2. acc_db_request(comment, table) 7.3. acc_request(comment, table) - 7.4. acc_diam_request(comment) 7.1. acc_log_request(comment) @@ -1394,23 +1390,6 @@ acc_request("100 Received", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) $avp(reason)", "acc"); ... -7.4. acc_diam_request(comment) - - Like acc_log_request, acc_diam_request reports on a request. It reports - to the configured Diameter server. - - Meaning of the parameters is as follows: - * comment - Comment to be appended. The string can contain any number - of pseudo-variables. - - This function can be used from ANY_ROUTE. - - Example 1.52. acc_diam_request usage -... -acc_diam_request("Some comment"); -acc_diam_request("$var(code) Error: $avp(reason)"); -... - Chapter 2. Frequently Asked Questions 2.1. What happened with old log_fmt parameter

1 0

git:master:402515c9: acc: docs - removed acc_diam_request() section
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 402515c92238c3628c78a2b44ac0a05130897207 URL: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T09:59:57+02:00 acc: docs - removed acc_diam_request() section - it is now exported by acc_diameter --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… Patch: https://github.com/kamailio/kamailio/commit/402515c92238c3628c78a2b44ac0a05… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index f88d403d2b..41935c8dae 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -23,10 +23,9 @@ </para> <para> There is some very early support of the <acronym>Diameter</acronym> - protocol in the <quote>acc_diameter</quote> module which will be deleted - in coming releases. This support is not up to date with the current - Diameter protocols. If you need Diameter support, please use the - <acronym>ims_charging</acronym> module. + protocol in the <quote>acc_diameter</quote> module, but is not up to date + with the current Diameter protocols. If you need Diameter support, + please use the <acronym>ims_charging</acronym> module. </para> <para> To account a transaction and to choose which set of backends to be @@ -1555,37 +1554,6 @@ acc_request("100 Received", "acc"); acc_request("100 Received", "acc_$time(year)_$time(mon)"); acc_db_request("$var(code) $avp(reason)", "acc"); ... -</programlisting> - </example> - </section> - <section id="acc.f.acc_diam_request"> - <title> - <function moreinfo="none">acc_diam_request(comment)</function> - </title> - <para> - Like <function moreinfo="none">acc_log_request</function>, - <function moreinfo="none">acc_diam_request</function> reports on - a request. It reports to the configured Diameter server. - </para> - <para> - Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>comment</emphasis> - Comment to be appended. - The string can contain any number of pseudo-variables. - </para> - </listitem> - </itemizedlist> - <para> - This function can be used from ANY_ROUTE. - </para> - <example> - <title>acc_diam_request usage</title> - <programlisting format="linespecific"> -... -acc_diam_request("Some comment"); -acc_diam_request("$var(code) Error: $avp(reason)"); -... </programlisting> </example> </section>

1 0

systemd watchdog
by Sergey Safarov 06 Jul '21

06 Jul '21

I have observed a case when Kamaili debug module try to grab the lock on shutdown and not able to do it. As a result, the Kamailio process is stuck and not able to restart (dead lock). To resolve such a case i want to utilize systemd watchdog feature https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# To use this feature I need send sd_notify(3) with a message string of "WATCHDOG=1" from main process https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# According to systemd doc only one process to send watchdog If the $WATCHDOG_USEC environment variable is set, and the $WATCHDOG_PID variable is unset or set to the PID of the current process, the service manager expects notifications from this process. https://www.freedesktop.org/software/systemd/man/sd_watchdog_enabled.html# Additional info at https://lists.freedesktop.org/archives/systemd-devel/2018-January/040185.ht… Could you suggest how to embed this systemd call to the main process? Sergey

2 1

git:master:2df00287: core: kemi - exported KSR.to_IPv4() and KSR.to_IPv6()
by Daniel-Constantin Mierla 05 Jul '21

05 Jul '21

Module: kamailio Branch: master Commit: 2df002876fc8eb9f2b97c669469ea8a686323dfd URL: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-05T11:28:39+02:00 core: kemi - exported KSR.to_IPv4() and KSR.to_IPv6() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… Patch: https://github.com/kamailio/kamailio/commit/2df002876fc8eb9f2b97c669469ea8a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 76ace9c3d2..13428d4a43 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -34,6 +34,7 @@ #include "select_buf.h" #include "pvar.h" #include "trim.h" +#include "resolve.h" #include "mem/shm.h" #include "parser/parse_uri.h" #include "parser/parse_from.h" @@ -1653,6 +1654,88 @@ static int sr_kemi_core_to_proto_wsx(sip_msg_t *msg) return (proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_to_af_helper(sip_msg_t *msg) +{ + sip_uri_t parsed_uri; + str uri; + str host; + + 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; + } + if(msg->via2->received) { + LM_DBG("using 'received'\n"); + host = msg->via2->received->value; + } else { + LM_DBG("using via host\n"); + host = msg->via2->host; + } + } else { + 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; + } + host = parsed_uri.host; + } + + if(host.len<=0) { + return 0; + } + if(str2ip(&host)!=NULL) { + return 4; + } + if(str2ip6(&host)!=NULL) { + return 6; + } + return 0; +} + +/** + * + */ +static int sr_kemi_core_to_af_ipv4(sip_msg_t *msg) +{ + int af; + + af = sr_kemi_core_to_af_helper(msg); + if (af == 4) { return SR_KEMI_TRUE; } + return SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_to_af_ipv6(sip_msg_t *msg) +{ + int af; + + af = sr_kemi_core_to_af_helper(msg); + if (af == 6) { return SR_KEMI_TRUE; } + return SR_KEMI_FALSE; +} + /** * */ @@ -2077,6 +2160,16 @@ 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_IPv4"), + SR_KEMIP_BOOL, sr_kemi_core_to_af_ipv4, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("to_IPv6"), + SR_KEMIP_BOOL, sr_kemi_core_to_af_ipv6, + { 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

[kamailio/kamailio] tls: allow export session keys (#2785)
by sergey-safarov 05 Jul '21

05 Jul '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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 Wireshark project allows embedding session encryption keys into PCAP files. So it allows parsing encrypted packets as it was unencrypted. [More info](https://blog.didierstevens.com/2021/01/11/decrypting-tls-streams-with… I prepared a change that allows export session encryption keys. Please review PR. If ok, then I add commits with DocBook info. Kyys may be emeberd using command ``` editcap --inject-secrets tls,/var/lib/kamailio/session_keylog encrypted.pcap with_keys.pcapng ``` As prototype used https://github.com/openssl/openssl/blob/master/apps/lib/s_cb.c#L1480-L1525 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2785 -- Commit Summary -- * tls: added new session_keylog_enable and session_keylog_filename configuration params * tls: first interation of session key logger * tls: added logs output -- File Changes -- M src/modules/tls/tls_cfg.c (6) M src/modules/tls/tls_cfg.h (2) M src/modules/tls/tls_init.c (79) M src/modules/tls/tls_init.h (2) M src/modules/tls/tls_mod.c (2) M src/modules/tls/tls_rpc.c (2) M src/modules/tls/tls_server.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2785.patch https://github.com/kamailio/kamailio/pull/2785.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/2785

3 14

git:master:524d96c0: nats: added README file
by Daniel-Constantin Mierla 03 Jul '21

03 Jul '21

Module: kamailio Branch: master Commit: 524d96c050150dcb46dcf83a79dd6f2655383dff URL: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-03T11:15:38+02:00 nats: added README file --- Added: src/modules/nats/README --- Diff: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2… Patch: https://github.com/kamailio/kamailio/commit/524d96c050150dcb46dcf83a79dd6f2…

1 0

git:master:273c6241: pv: added $viaZ(attr) - get the attributes of last via header
by Daniel-Constantin Mierla 03 Jul '21

03 Jul '21

Module: kamailio Branch: master Commit: 273c6241637f663784695b073ac9e342d243b8bd URL: https://github.com/kamailio/kamailio/commit/273c6241637f663784695b073ac9e34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-03T10:54:10+02:00 pv: added $viaZ(attr) - get the attributes of last via header --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/273c6241637f663784695b073ac9e34… Patch: https://github.com/kamailio/kamailio/commit/273c6241637f663784695b073ac9e34… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 532d5209d9..41c53eaa3f 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -548,6 +548,8 @@ static pv_export_t mod_pvs[] = { pv_parse_ccp_attrs_name, 0, 0, 0}, {{"via0", (sizeof("via0")-1)}, PVT_OTHER, pv_get_via0, 0, pv_parse_via_name, 0, 0, 0}, + {{"viaZ", (sizeof("viaZ")-1)}, PVT_OTHER, pv_get_viaZ, 0, + pv_parse_via_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index d361d23781..34998b9882 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4537,7 +4537,7 @@ int pv_get_via_attr(sip_msg_t *msg, via_body_t *vb, pv_param_t *param, pv_value_t *res) { if(vb==NULL) { - LM_DBG("invalid via header\n"); + LM_DBG("null via header\n"); return pv_get_null(msg, param, res); } @@ -4594,3 +4594,29 @@ int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_via_attr(msg, msg->via1, param, res); } + +/** + * + */ +int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) +{ + hdr_field_t *hf = NULL; + via_body_t *vb = NULL; + via_body_t *vbZ = NULL; + + if (parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_DBG("failed to parse sip headers\n"); + return pv_get_null(msg, param, res); + } + + vbZ = msg->via1; + for(hf=msg->h_via1; hf!=NULL; hf=hf->next) { + if(hf->type==HDR_VIA_T) { + for(vb=(via_body_t*)hf->parsed; vb!=NULL; vb=vb->next) { + vbZ = vb; + } + } + } + + return pv_get_via_attr(msg, vbZ, param, res); +} diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 26a278c0e7..19222bc63e 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -413,6 +413,7 @@ int pv_set_ccp_attrs(struct sip_msg* msg, pv_param_t *param, int pv_parse_via_name(pv_spec_p sp, str *in); int pv_get_via0(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); +int pv_get_viaZ(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021