- sr-dev - kamailio.org

Build kamailio 5.3.1 db_mysql module with percona.
by Andrey Deykunov 07 Jul '21

07 Jul '21

Hi, We have kamailio server v. 5.3.1 with db_mysql.so built with our old mysql library 5.1.41. Now I'm trying to build it with libperconaclient20. I've tried many variants of build configuration, but every time I got errors when kamailio stops or starts, such: *2021-07-06T06:01:20.943809-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: db_mysql [km_my_con.c:139]: db_mysql_new_connection(): driver error: Lost connection to MySQL server at 'reading authorization packet', system error: 112021-07-06T06:01:20.946591-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [db.c:319]: db_do_init2(): could not add connection to the pool2021-07-06T06:01:20.947224-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: auth_db [auth_db_mod.c:159]: child_init(): unable to connect to the database2021-07-06T06:01:20.947592-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[25711]: ERROR: <core> [core/sr_module.c:806]: init_mod_child(): error while initializing module auth_db (/var/lib/ums/lib64/kamailio/modules/auth_db.so) (idx: 5 rank: 5 desc: [udpreceiver child=4 sock=64.78.52.86:5060 <http://64.78.52.86:5060>])* or *2021-07-06T06:18:43.159744-07:00 devhpbx005-1 /var/lib/ums/sbin/kamailio[30954]: CRITICAL: <core> [core/mem/q_malloc.c:150]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(0, 0)[0x7fd5c6c85bc8:0x7fd5c6c85c00]! Memory allocator was calledfrom core: db_res.c:114. Fragment marked by db_mysql: km_my_con.c:75. Exec from core/mem/q_malloc.c:391.* Is there some specific way to build kamailio with percona? Thanks, Andrey

2 1

git:master:c950c401: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: c950c40119ff81a8dacec2f4ba697ce080459a7f URL: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-07T08:01:20+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce… Patch: https://github.com/kamailio/kamailio/commit/c950c40119ff81a8dacec2f4ba697ce…

1 0

git:master:5a473493: nathelper: docs - fixed copy/paste extra tags
by Daniel-Constantin Mierla 07 Jul '21

07 Jul '21

Module: kamailio Branch: master Commit: 5a473493189acc93705c78c1966a9eae0e80fef0 URL: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-07T07:51:31+02:00 nathelper: docs - fixed copy/paste extra tags --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… Patch: https://github.com/kamailio/kamailio/commit/5a473493189acc93705c78c1966a9ea… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c6d398b218..832e324819 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -723,7 +723,6 @@ fix_nated_register(); and D-URI ($du). For replies, it compares host and port in 2nd Via with received and rport parameters. </para></listitem> - <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

git:master:77071eb1: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: 77071eb11c735cb04b4adf084808c5d46bdca20d URL: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-06T20:46:19+02:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d… Patch: https://github.com/kamailio/kamailio/commit/77071eb11c735cb04b4adf084808c5d…

1 0

git:master:fb0bb3f4: nathelper: docs for nat uac test 512
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: fb0bb3f49efe51bbab03911923b737f037b9cd44 URL: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:53:39+02:00 nathelper: docs for nat uac test 512 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… Patch: https://github.com/kamailio/kamailio/commit/fb0bb3f49efe51bbab03911923b737f… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 39e61e6856..c6d398b218 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -717,6 +717,13 @@ fix_nated_register(); from source IP address. It will work also with multiple connection address lines. </para></listitem> + <listitem><para> + <emphasis>512</emphasis> - Test if the target addresses are different + or over websocket. For requests, it compares host and port in R-URI ($rU) + and D-URI ($du). For replies, it compares host and port in 2nd Via + with received and rport parameters. + </para></listitem> + <listitem><para> </itemizedlist> <para> All flags can be bitwise combined, the test returns true if any of

1 0

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:ce95734c: nathelper: new nat test (512) based on target addresses
by Daniel-Constantin Mierla 06 Jul '21

06 Jul '21

Module: kamailio Branch: master Commit: ce95734c97e8443facf224a1833f67a78ab67d21 URL: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-06T11:08:50+02:00 nathelper: new nat test (512) based on target addresses - return true if the target proto is ws or wss - return true if the target addresses are different - for requests it compares r-uri with d-uri - for replies compares 2nd Via host and port with received and rport --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… Patch: https://github.com/kamailio/kamailio/commit/ce95734c97e8443facf224a1833f67a… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index df9a5bce2c..bdf1b7777a 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -101,6 +101,7 @@ MODULE_VERSION #define NAT_UAC_TEST_WS 0x40 #define NAT_UAC_TEST_C_PORT 0x80 #define NAT_UAC_TEST_SDP_CLINE 0x100 +#define NAT_UAC_TEST_DEST 0x200 #define DEFAULT_NATPING_STATE 1 @@ -1540,6 +1541,125 @@ static int via_1918(struct sip_msg *msg) return (is1918addr(&(msg->via1->host)) == 1) ? 1 : 0; } +/* + * test if destination address is different than R-URI/2nd Via + * - ws/wss target is true + */ +static int nh_test_destination(sip_msg_t *msg) +{ + str rhost = STR_NULL; + int rport = 0; + str dhost = STR_NULL; + int dport = 0; + sip_uri_t pduri; + ip_addr_t *rhostip = NULL; + ip_addr_t *dhostip = NULL; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) { + if(parse_headers(msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return 0; + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return -1; + } + if(msg->via2->proto==PROTO_WSS || msg->via2->proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->via2->rport && msg->via2->rport->value.s + && msg->via2->rport->value.len>0) { + if(str2sint(&msg->via2->rport->value, &dport)<0) { + LM_ERR("invalid rport value\n"); + return -1; + } + } + if(dport!=0) { + rport = GET_SIP_PORT(msg->via2->port, msg->via2->proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + } + if(!msg->via2->received) { + /* no received param - going to Via host */ + return 0; + } + dhost = msg->via2->received->value; + rhost = msg->via2->host; + } else { + if(msg->dst_uri.s==NULL || msg->dst_uri.len<=0) { + /* no destination uri - target is r-uri */ + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + if(msg->parsed_uri.proto==PROTO_WSS + || msg->parsed_uri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + return 0; + } + if(parse_uri(msg->dst_uri.s, msg->dst_uri.len, &pduri)!=0) { + LM_ERR("failed to parse dst uri [%.*s]\n", + msg->dst_uri.len, msg->dst_uri.s); + return -1; + } + if(pduri.proto==PROTO_WSS || pduri.proto==PROTO_WS) { + /* going to ws/wss */ + return 1; + } + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ + && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + dport = GET_SIP_PORT(pduri.port_no, pduri.proto); + rport = GET_SIP_PORT(msg->parsed_uri.port_no, msg->parsed_uri.proto); + if(dport != rport) { + /* ports are different */ + return 1; + } + dhost = pduri.host; + rhost = msg->parsed_uri.host; + } + if(dhost.s==NULL || dhost.len<=0) { + return 0; + } + dhostip = str2ipx(&dhost); + rhostip = str2ipx(&rhost); + if(dhostip==NULL && rhostip==NULL) { + /* both are hostnames - do str comparison */ + if(rhost.s==NULL || rhost.len<=0) { + return 0; + } + if(rhost.len != dhost.len) { + /* different in length */ + return 1; + } + if(memcmp(rhost.s, dhost.s, dhost.len)!=0) { + /* different in content */ + return 1; + } + return 0; + } + if(dhostip==NULL || rhostip==NULL) { + /* different in content */ + return 1; + } + if(ip_addr_cmp(dhostip, rhostip)) { + /* same ip addresses */ + return 0; + } + /* different ip addresses */ + return 1; +} + static int nat_uac_test(struct sip_msg *msg, int tests) { /* return true if any of the NAT-UAC tests holds */ @@ -1599,6 +1719,13 @@ static int nat_uac_test(struct sip_msg *msg, int tests) if((tests & NAT_UAC_TEST_SDP_CLINE) && (test_sdp_cline(msg) > 0)) return 1; + /** + * test if destination address is different than R-URI/2ndVia + * - ws/wss target is true + */ + if((tests & NAT_UAC_TEST_DEST) && (nh_test_destination(msg) > 0)) + return 1; + /* no test succeeded */ return -1; }

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: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

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:0a3479f7: vp: new variable $via0(attr)
by Daniel-Constantin Mierla 02 Jul '21

02 Jul '21

Module: kamailio Branch: master Commit: 0a3479f77b8dc30f872961f066188d7284415484 URL: https://github.com/kamailio/kamailio/commit/0a3479f77b8dc30f872961f066188d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-02T18:15:28+02:00 vp: new variable $via0(attr) - get the attributes of first Via --- 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/0a3479f77b8dc30f872961f066188d7… Patch: https://github.com/kamailio/kamailio/commit/0a3479f77b8dc30f872961f066188d7…

1 0

[kamailio/kamailio] Implementation of ios/android push notifications module or similar (#2793)
by droopy 02 Jul '21

02 Jul '21

Hello, As mobile applications based on kamailio are growing exponentially on Play Store and App Store, i would suggest if you could add by default the code for ios/android push notifications. I have problems mainly for incoming call (phone wakeup) on linphone iphone app, as kamailio is missing the push solution. On Android i am using Baresip and works perfect without push. Navigating on the web, i found some uncomplete or minimum tutorials to implement this. Like: https://denys-pozniak.medium.com/apple-push-notification-with-kamailio-eeca… And also some code snippets of a modification of "kamailio.cfg" to add support for ios push notifications. (see below). Could someone have this already working? Or kamailio official developers could add this by default inside source code? `# keep a record of an IPhone for 4 hours modparam("htable", "htable", "iphone_remote=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_voip=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_check=>size=10;autoexpire=14400;") modparam("htable", "htable", "vtp=>size=10;autoexpire=120;") route[REGISTRAR] { ... ... if (save("location")) { # user registered, now look at the useragent header for iPhone string if ($hdr(User-Agent)=~"LinphoneiOS.*") { $var(uri) = @contact.uri; # select the uri from contact header $var(pn-prid) = $(var(uri){uri.param,pn-prid}); # get the uri param pn-prid from the uri, i.e. 1DF26BC10F597676B xlog("!!!! - $var(pn-prid)"); $var(i) = 0; $var(n) = $(var(pn-prid){s.count,&}); while( $var(i) <= $var(n)) { $var(pn-prid_item) = $(var(pn-prid){s.select,$var(i),&}); $var(pn-prid_type) = $(var(pn-prid_item){s.select,1,:}); $var(pn-prid_token) = $(var(pn-prid_item){s.select,0,:}); if ( $var(pn-prid_type) == "remote" ) { $var(pn-prid_remote) = $(var(pn-prid_item){s.select,0,:}) ; } if ( $var(pn-prid_type) == "voip" ) { $var(pn-prid_voip) = $(var(pn-prid_item){s.select,0,:}) ; } $var(i) = $var(i) + 1; } xlog("L_INFO","iPhone PUSH tokens for user $fU - remote: $var(pn-prid_remote), voip: $var(pn-prid_voip)"); # store the values of tokens to htable with fromUser as key $sht(iphone_remote=>$fU) = $var(pn-prid_remote); $sht(iphone_voip=>$fU) = $var(pn-prid_voip); $sht(iphone_check=>$fU) = 1; if ( $sht(vtp=>id_index::$tU) != $null ) { xlog("L_INFO", "New $rm ru=$ru tu=$tu \n"); route(JOIN); } } else { # no iphone $sht(iphone_check=>$fU) = 0; } ... ... } route[LOCATION] { ... ... if (!lookup("location")) { $var(rc) = $rc; # handle PUSH notifications for iPhone # iphones should not be registered and contacts stored in database # hence lookup should fail and we need to try to push iphone first if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); route(RELAY); exit; } ... ... if (is_method("INVITE")) { setflag(FLT_ACCMISSED); # handle PUSH notifications for iPhone # in some cases, iphone does not send de-register when going to background # for these circumstances, push iphone even if it has an active registration if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); } } route(RELAY); exit; } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } else { xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>id_index::$rU) = $T(id_index); $sht(vtp=>id_label::$rU) = $T(id_label); xlog("L_INFO","[SUSPEND] htable key value [$sht(vtp=>id_index::$rU) -- $sht(vtp=>id_label::$rU)]\n"); route(SENDPUSH); exit; } } route[SENDPUSH] { #http_client_query("http://url/push.php"<http://url/push.php>, "user=$rU\r\npn-tok=$sht(tokens=>$rU)\r\n","Content-Type: text/plain", "$var(result)"); xlog("!!!!!!!!!!!!!!!!!!!!!! PUSH !!!!!!!!!!!!!!!!!!!"); xlog("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); exec_avp("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); xlog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); sl_send_reply("100", "Pushing"); } route[JOIN] { xlog("L_WARN","[JOIN] htable key value [$sht(vtp=>id_index::$tU) -- $sht(vtp=>id_label::$tU)]\n"); t_continue("$sht(vtp=>id_index::$tU)", "$sht(vtp=>id_label::$tU)", "RESUME"); $sht(vtp=>joined::$tU) = 1; } route[RESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); $sht(vtp=>id_index::$tU) = $null; $sht(vtp=>id_label::$tU) = $null; exit; } ` -- 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/2793

2 2

git:master:63f6b5a2: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 63f6b5a2c9bc86446feb3852b91384839bb701e6 URL: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-01T16:16:19+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… Patch: https://github.com/kamailio/kamailio/commit/63f6b5a2c9bc86446feb3852b913848… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 87a33aebfd..945143421c 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -36,7 +36,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, @@ -88,7 +88,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -223,7 +223,7 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4. Functions 4.1. secsipid_check_identity(keyPath) - 4.2. secsipid_check_identity(pubkeyVal) + 4.2. secsipid_check_identity_pubkey(pubkeyVal) 4.3. secsipid_check(sIdentity, keyPath) 4.4. secsipid_get_url(url, ovar) 4.5. secsipid_add_identity(origTN, destTN, attest, origID, x5u, @@ -262,7 +262,7 @@ request_route { header and payload using {s.select} and {s.decode.base64t} transformations together with jansson module. -4.2. secsipid_check_identity(pubkeyVal) +4.2. secsipid_check_identity_pubkey(pubkeyVal) Similar to secsipid_check_identity() with the public key value provided in the parameter. @@ -300,9 +300,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

1 0

git:master:22476389: secsipid: fix documentation example for secsipid_check() function
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 224763898a9a6c1d3214129ecf0b4bf07baf62f3 URL: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:09:24-04:00 secsipid: fix documentation example for secsipid_check() function --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… Patch: https://github.com/kamailio/kamailio/commit/224763898a9a6c1d3214129ecf0b4bf… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 4588868d2c..88c4e761db 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -291,9 +291,9 @@ request_route { ... request_route { ... - if(secsipid_check_identity("...", "/secsipid/$si/cert.pem")) { ... } + if(secsipid_check("...", "/secsipid/$si/cert.pem")) { ... } ... - if(secsipid_check_identity("...", "")) { ... } + if(secsipid_check("...", "")) { ... } ... } ...

1 0

git:5.5:6751ccf1: secsipid: fix documentation for secsipid_check_identity_pubkey
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: 5.5 Commit: 6751ccf10f7860098cfc080e492aa2e35107fdf2 URL: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:06:33-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey (cherry picked from commit 1e4911d8a92e9e2ff25457d76d47bee111433947) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… Patch: https://github.com/kamailio/kamailio/commit/6751ccf10f7860098cfc080e492aa2e… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 527db1aecf..52a0dfeb35 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

1 0

git:master:1e4911d8: secsipid: fix documentation for secsipid_check_identity_pubkey
by Ovidiu Sas 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 1e4911d8a92e9e2ff25457d76d47bee111433947 URL: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2021-07-01T10:04:10-04:00 secsipid: fix documentation for secsipid_check_identity_pubkey --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… Patch: https://github.com/kamailio/kamailio/commit/1e4911d8a92e9e2ff25457d76d47bee… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index cc9c6c9fdf..4588868d2c 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -239,7 +239,7 @@ request_route { </section> <section id="secsipid.f.secsipid_check_identity_pubkey"> <title> - <function moreinfo="none">secsipid_check_identity(pubkeyVal)</function> + <function moreinfo="none">secsipid_check_identity_pubkey(pubkeyVal)</function> </title> <para> Similar to secsipid_check_identity() with the public key value

1 0

git:master:879f8c4e: core: fix building quoted value for #!subsdefs
by Daniel-Constantin Mierla 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 879f8c4e52ab7f7f489107f18e2c80795c788bdd URL: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T11:17:56+02:00 core: fix building quoted value for #!subsdefs --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ppcfg.c Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… Patch: https://github.com/kamailio/kamailio/commit/879f8c4e52ab7f7f489107f18e2c807… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 45d9114c05..aabd724032 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -2049,11 +2049,12 @@ int pp_define_set(int len, char *text, int mode) pp_defines[ppos].value.len = len; pp_defines[ppos].value.s = text; - LM_DBG("### setting define ID [%.*s] value [%.*s]\n", + LM_DBG("### setting define ID [%.*s] value [%.*s] (mode: %d)\n", pp_defines[ppos].name.len, pp_defines[ppos].name.s, pp_defines[ppos].value.len, - pp_defines[ppos].value.s); + pp_defines[ppos].value.s, + mode); return 0; } diff --git a/src/core/cfg.y b/src/core/cfg.y index be0a664dce..5b205fd230 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2213,9 +2213,9 @@ event_route_stm: preprocess_stm: SUBST STRING { if(pp_subst_add($2)<0) YYERROR; } | SUBST error { yyerror("invalid subst preprocess statement"); } - | SUBSTDEF STRING { if(pp_substdef_add($2, 0)<0) YYERROR; } + | SUBSTDEF STRING { if(pp_substdef_add($2, KSR_PPDEF_NORMAL)<0) YYERROR; } | SUBSTDEF error { yyerror("invalid substdef preprocess statement"); } - | SUBSTDEFS STRING { if(pp_substdef_add($2, 1)<0) YYERROR; } + | SUBSTDEFS STRING { if(pp_substdef_add($2, KSR_PPDEF_QUOTED)<0) YYERROR; } | SUBSTDEFS error { yyerror("invalid substdefs preprocess statement"); } ; diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index 73c0a2ef3c..67391557f8 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "pvapi.h" #include "str_list.h" #include "dprint.h" @@ -149,25 +150,40 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); - if(sb==NULL) { - LM_ERR("failed to handle substdef: [%s]\n", data); - return -1; + if(mode!=KSR_PPDEF_QUOTED) { + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } else { + defvalue = newval; } - defvalue = sb->s; } } - if(pp_define_set(defvalue.len, defvalue.s, - (mode==1)?KSR_PPDEF_QUOTED:KSR_PPDEF_NORMAL)<0) { + if(mode==KSR_PPDEF_QUOTED) { + if(pv_get_buffer_size() < defvalue.len + 4) { + LM_ERR("defined value is too large\n"); + return -1; + } + newval.s = pv_get_buffer(); + newval.s[0] = '"'; + memcpy(newval.s + 1, defvalue.s, defvalue.len); + newval.s[defvalue.len + 1] = '"'; + newval.s[defvalue.len + 2] = '\0'; + newval.len = defvalue.len + 2; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; + } + if(pp_define_set(defvalue.len, defvalue.s, KSR_PPDEF_QUOTED)<0) { LM_ERR("cannot set define value\n"); goto error; } - if(mode==1) { - defvalue.s++; - defvalue.len -= 2; - *(defvalue.s-1) = c; - defvalue.s[defvalue.len] = c; - } LM_DBG("### added substdef: [%.*s]=[%.*s] (%d)\n", defname.len, defname.s, defvalue.len, defvalue.s, mode); diff --git a/src/main.c b/src/main.c index 950bcd895a..c1bf2c864f 100644 --- a/src/main.c +++ b/src/main.c @@ -2349,7 +2349,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdef parameter\n"); goto error; } - if(pp_substdef_add(optarg, 0)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_NORMAL)<0) { LM_ERR("failed to add substdef expression: %s\n", optarg); goto error; } @@ -2359,7 +2359,7 @@ int main(int argc, char** argv) fprintf(stderr, "bad substdefs parameter\n"); goto error; } - if(pp_substdef_add(optarg, 1)<0) { + if(pp_substdef_add(optarg, KSR_PPDEF_QUOTED)<0) { LM_ERR("failed to add substdefs expression: %s\n", optarg); goto error; }

1 0

[kamailio/kamailio] core on start (#2788)
by sergey-safarov 01 Jul '21

01 Jul '21

### Description coredump kamailio start ### Troubleshooting #### Debugging Data ``` (gdb) bt #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 (gdb) bt full #0 0x00007ffff7dd56b1 in __memmove_avx_unaligned_erms () from /lib64/libc.so.6 No symbol table info available. #1 0x00007ffff639d5df in pv_parse_hdr_name (sp=0x7ffff6ae4ce8, in=0x7fffffffd620) at pv_core.c:3594 s = {s = 0x7ffff6af9178 "\001", len = -156263992} p = 0x82be18 <__func__.9> "pv_init_buffer" nsp = 0x0 hdr = {type = 8368264, name = {s = 0x85 <error: Cannot access memory at address 0x85>, len = -10896}, body = {s = 0x5634f1 <pv_lookup_spec_name+910> "\205\300u<H\213EȋP\020H\213\205p\377\377\377\211\020H\213E\310H\213P\030H\213\205p\377\377\377H\211P\bH\213E\310H\213P H\213\205p\377\377\377H\211P\020H\213E\310\353\037H\213E\310H\213@PH\211E\310H\203", <incomplete sequence \310>, len = -156349208}, len = -10736, parsed = 0x1, next = 0x0} __func__ = "pv_parse_hdr_name" #2 0x00000000005658e6 in pv_parse_spec2 (in=0x7ffff6ae4cd0, e=0x7ffff6ae4ce8, silent=0) at core/pvapi.c:969 p = 0x7ffff6ae4d53 ")[0])" s = {s = 0x7ffff6ae4d4e "X-CID)[0])", len = 5} pvname = {s = 0x7ffff6ae4d4a "hdr(X-CID)[0])", len = 3} pvstate = 2 tr = 0x0 pte = 0x7ffff6500c38 n = 0 __func__ = "pv_parse_spec2" #3 0x0000000000560fcd in pv_cache_add (name=0x7fffffffd810) at core/pvapi.c:359 pvn = 0x7ffff6ae4cd0 pvid = 949637875 p = 0x0 __func__ = "pv_cache_add" #4 0x0000000000562898 in pv_spec_lookup (name=0x7fffffffd8d0, len=0x7fffffffd8cc) at core/pvapi.c:498 pvs = 0x0 tname = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} __func__ = "pv_spec_lookup" #5 0x000000000056903c in pv_parse_format (in=0x7fffffffd9d0, el=0x7ffff6ae4bb8) at core/pvapi.c:1194 p = 0x7ffff6afc668 "$(hdr(X-CID)[0])" p0 = 0xc600000001 <error: Cannot access memory at address 0xc600000001> n = 1 e = 0x7ffff6ae4c48 e0 = 0x0 s = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} len = 16 __func__ = "pv_parse_format" #6 0x000000000062e790 in fix_param (type=256, param=0x7ffff6afc4a8) at core/sr_module.c:1214 p = 0x7ffff6ae4ba8 name = {s = 0x7ffff6afc668 "$(hdr(X-CID)[0])", len = 16} s = {s = 0x1800000 <error: Cannot access memory at address 0x1800000>, len = 0} num = 32767 err = -156291736 __func__ = "fix_param" #7 0x000000000062ee08 in fix_param_types (types=256, param=0x7ffff6afc4a8) at core/sr_module.c:1336 ret = -156248399 t = 256 #8 0x000000000050de56 in fixup_spve_null (param=0x7ffff6afc4a8, param_no=1) at core/mod_fix.c:564 ret = 0 fp = 0x0 __func__ = "fixup_spve_null" #9 0x00007ffff1ae0074 in fixup_hvalue_param (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:622 No locals. #10 0x00007ffff1ae0e63 in fixup_hname_str (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:719 No locals. #11 0x00007ffff1ae89ff in append_hf_value_fixup (param=0x7ffff6afc4a8, param_no=2) at textopsx.c:1644 res = 0 __func__ = "append_hf_value_fixup" #12 0x00000000005a3abd in fix_actions (a=0x7ffff6afc430) at core/route.c:932 t = 0x7ffff6afc430 p = 0x7ffff6af8730 tmp = 0x4bbed9 <sr_event_exec+415> "\211E\374\213E\374\351/\003" tmp_p = 0x7ffff6afc668 ret = 0 i = 1 cmd = 0x7ffff6528150 s = {s = 0x7ffff6af99c8 "\001", len = -8700} he = 0x7fffffffded0 ip = {af = 25165824, len = 0, u = {addrl = {0, 140737488346496}, addr32 = {0, 0, 4294958464, 32767}, addr16 = {0, 0, 0, 0, 56704, 65535, 32767, 0}, addr = "\000\000\000\000\000\000\000\000\200\335\377\377\377\177\000"}} si = 0x7fffffffdecc lval = 0x7fffffffded4 rve = 0x7ffff6af8398 err_rve = 0x4000000 rve_type = RV_NONE err_type = 133 expected_type = RV_NONE rv = 0x7ffff6af8448 rve_param_no = 0 __func__ = "fix_actions" #13 0x000000000059f111 in fix_actions (a=0x7ffff6afc6e8) at core/route.c:723 t = 0x7ffff6afc6e8 p = 0x0 tmp = 0x6f16b7 <qm_malloc+1321> "H\203\304\020H\213E\310H\213P\030H\213E\270H\213" tmp_p = 0x7ffff6af88f0 ret = 0 i = 2 cmd = 0x7ffff652bab8 s = {s = 0x7ffff6ac87f8 "LIS_REPLY", len = 9} he = 0x7fffffffe020 ip = {af = 0, len = 0, u = {addrl = {140737274206128, 140737488347056}, addr32 = {4080818096, 32767, 4294959024, 32767}, addr16 = {22448, 62268, 32767, 0, 57264, 65535, 32767, 0}, addr = "\260W<\363\377\177\000\000\260\337\377\377\377\177\000"}} si = 0xaab32f7585fd7500 lval = 0x7ffff6ac7520 rve = 0x7ffff6afbc18 err_rve = 0x0 rve_type = RV_INT err_type = 32 expected_type = RV_NONE rv = 0x7ffff6ac91e0 rve_param_no = 0 __func__ = "fix_actions" #14 0x00000000005b0dd3 in fix_rl (rt=0x91bec0 <main_rt>) at core/route.c:2102 i = 97 ret = 0 #15 0x00000000005b0e0a in fix_rls () at core/route.c:2118 ret = 0 #16 0x0000000000438084 in main (argc=12, argv=0x7fffffffe608) at main.c:3047 cfg_stream = 0x9c02d0 c = -1 r = 0 tmp = 0x7fffffffe8bb "" tmp_len = 896 port = 896 proto = 896 ahost = 0x0 aport = 0 options = 0x7fe158 ":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 = 4231472377 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 2 n_lst = 0x0 p = 0xc2 <error: Cannot access memory at address 0xc2> st = {st_dev = 56, st_ino = 279340502, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 120, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1622741422, tv_nsec = 474562221}, st_mtim = {tv_sec = 1624650702, tv_nsec = 443892052}, st_ctim = {tv_sec = 1624650702, tv_nsec = 443892052}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\342\377\377\377\177", '\000' <repeats 11 times>, "\342\377\377\377\177", '\000' <repeats 18 times>, "\260\027\375\367\377\177\000\000\350\317\377\367\377\177\000\000\b\345\377\367\377\177\000\000\340\031\375\367\377\177\000\000\025\217\376\367\377\177\000\000$f\307\367\377\177\000\000\354K\377\367\377\177\000\000\336K\377\367\377\177\000\000\205\317c\t\000\000\000\000\300S\374\367\377\177\000\000ߏ\376\367\377\177\000\000\000\000\000\000\254\202\226\006\334P\307\367\377\177\000\000\000\000\000\000\000\000\000\000\300S\374\367\377\177\000\000\001\000\000\000\000\000\000\000@\347N\360\356\"\000\000\240\341\377\367\377\177\000\000\370\377\377\377\377\377\377\377\240\341\377\367\377\177\000\000R"... option_index = 12 long_options = {{name = 0x800836 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7fb521 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x80083b "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x800841 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x800847 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x800850 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x80085a "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x800864 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x80086f "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x800878 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x800883 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x800889 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x800893 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` ### Additional Information master on CentOS8 -- 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/2788

2 12

git:master:56d41f62: core: ppcfg - clone value for substdef
by Daniel-Constantin Mierla 01 Jul '21

01 Jul '21

Module: kamailio Branch: master Commit: 56d41f6238f39d0046c97527abcb23b8dd7924be URL: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-01T10:19:08+02:00 core: ppcfg - clone value for substdef - GH #2788 --- Modified: src/core/ppcfg.c --- Diff: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… Patch: https://github.com/kamailio/kamailio/commit/56d41f6238f39d0046c97527abcb23b… --- diff --git a/src/core/ppcfg.c b/src/core/ppcfg.c index a5aa1d3e28..73c0a2ef3c 100644 --- a/src/core/ppcfg.c +++ b/src/core/ppcfg.c @@ -30,6 +30,7 @@ #include "ut.h" #include "re.h" #include "pvar.h" +#include "str_list.h" #include "dprint.h" #include "ppcfg.h" @@ -44,6 +45,7 @@ typedef struct _pp_subst_rule { static pp_subst_rule_t *pp_subst_rules_head = NULL; static pp_subst_rule_t *pp_subst_rules_tail = NULL; static int _pp_ifdef_level = 0; +static str_list_t *_ksr_substdef_strlist = NULL; int pp_subst_add(char *data) { @@ -94,6 +96,7 @@ int pp_substdef_add(char *data, int mode) str defvalue; str newval; sip_msg_t *fmsg; + str_list_t *sb; if(pp_subst_add(data)<0) { LM_ERR("subst rule cannot be added\n"); @@ -146,7 +149,12 @@ int pp_substdef_add(char *data, int mode) if(memchr(defvalue.s, '$', defvalue.len) != NULL) { fmsg = faked_msg_get_next(); if(pv_eval_str(fmsg, &newval, &defvalue)>=0) { - defvalue = newval; + sb = str_list_block_add(&_ksr_substdef_strlist, newval.s, newval.len); + if(sb==NULL) { + LM_ERR("failed to handle substdef: [%s]\n", data); + return -1; + } + defvalue = sb->s; } } if(pp_define_set(defvalue.len, defvalue.s,

1 0

[kamailio/kamailio] nats: make sure pkg & shm memory is allocated; check pointers before freeing memory (#2792)
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

…freeing memory   #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  as per @miconda's suggestion, added memory checks You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2792 -- Commit Summary -- * nats: make sure pkg & shm memory is allocated; check pointers before freeing memory -- File Changes -- M src/modules/nats/nats_mod.c (69) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2792.patch https://github.com/kamailio/kamailio/pull/2792.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/2792

2 3

git:master:5980ca59: Merge pull request #2792 from kamailio/nats-memory-checks
by GitHub 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: 5980ca59189c01a57b6765eaaf7d883f0541590b URL: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-30T06:22:49-04:00 Merge pull request #2792 from kamailio/nats-memory-checks nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… Patch: https://github.com/kamailio/kamailio/commit/5980ca59189c01a57b6765eaaf7d883… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0';

1 0

git:master:b95b2448: nats: make sure pkg & shm memory is allocated; check pointers before freeing memory
by Emmanuel Schmidbauer 30 Jun '21

30 Jun '21

Module: kamailio Branch: master Commit: b95b2448d7e968c2bff59e1d820764defee104aa URL: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-28T07:30:40-04:00 nats: make sure pkg & shm memory is allocated; check pointers before freeing memory --- Modified: src/modules/nats/nats_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… Patch: https://github.com/kamailio/kamailio/commit/b95b2448d7e968c2bff59e1d820764d… --- diff --git a/src/modules/nats/nats_mod.c b/src/modules/nats/nats_mod.c index 34a82910f5..90f73f243c 100644 --- a/src/modules/nats/nats_mod.c +++ b/src/modules/nats/nats_mod.c @@ -245,6 +245,10 @@ int init_worker( if(s0->url != NULL && num_servers < NATS_MAX_SERVERS) { len = strlen(s0->url); sc = shm_malloc(len + 1); + if(!sc) { + LM_ERR("no shm memory left\n"); + return -1; + } strcpy(sc, s0->url); sc[len] = '\0'; worker->init_nats_servers[num_servers++] = sc; @@ -368,30 +372,38 @@ int nats_destroy_workers() nats_consumer_worker_t *worker; for(i = 0; i < _nats_proc_count; i++) { worker = &nats_workers[i]; - natsSubscription_Unsubscribe(worker->subscription); - natsSubscription_Destroy(worker->subscription); - natsConnection_Close(worker->conn); - natsConnection_Destroy(worker->conn); - natsOptions_Destroy(worker->opts); - if(worker->uvLoop != NULL) { - uv_loop_close(worker->uvLoop); - } - nats_Close(); - if(worker->subject != NULL) { - shm_free(worker->subject); - } - if(worker->queue_group != NULL) { - shm_free(worker->queue_group); - } - if(worker->on_message != NULL) { - shm_free(worker->on_message); - } - for(s = 0; s < NATS_MAX_SERVERS; s++) { - if(worker->init_nats_servers[s]) { - shm_free(worker->init_nats_servers[s]); + if(worker != NULL) { + if(worker->subscription != NULL) { + natsSubscription_Unsubscribe(worker->subscription); + natsSubscription_Destroy(worker->subscription); + } + if(worker->conn != NULL) { + natsConnection_Close(worker->conn); + natsConnection_Destroy(worker->conn); + } + if(worker->opts != NULL) { + natsOptions_Destroy(worker->opts); + } + if(worker->uvLoop != NULL) { + uv_loop_close(worker->uvLoop); + } + nats_Close(); + if(worker->subject != NULL) { + shm_free(worker->subject); } + if(worker->queue_group != NULL) { + shm_free(worker->queue_group); + } + if(worker->on_message != NULL) { + shm_free(worker->on_message); + } + for(s = 0; s < NATS_MAX_SERVERS; s++) { + if(worker->init_nats_servers[s]) { + shm_free(worker->init_nats_servers[s]); + } + } + shm_free(worker); } - shm_free(worker); } return 0; } @@ -420,6 +432,10 @@ int _init_nats_server_url_add(modparam_t type, void *val) return -1; } value = pkg_malloc(len + 1); + if(!value) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(value, url); value[len] = '\0'; if(init_nats_server_url_add(url) < 0) { @@ -434,6 +450,11 @@ int _init_nats_sub_add(modparam_t type, void *val) char *sub = (char *)val; int len = strlen(sub); char *s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } + strcpy(s, sub); s[len] = '\0'; if(init_nats_sub_add(s) < 0) { @@ -529,6 +550,10 @@ int init_nats_sub_add(char *sc) len = strlen(sc); s = pkg_malloc(len + 1); + if(!s) { + LM_ERR("no pkg memory left\n"); + return -1; + } strcpy(s, sc); s[len] = '\0';

1 0

Implementation of ios/android push notifications module or similar
by javier falbo 29 Jun '21

29 Jun '21

Hello, As mobile applications based on kamailio are growing exponentially on Play Store and App Store, i would suggest if you could add by default the code for ios/android push notifications. I have problems mainly for incoming call (phone wakeup) on linphone iphone app, as kamailio is missing the push solution. On Android i am using Baresip and works perfect without push. Navigating on the web, i found some uncomplete or minimum tutorials to implement this. Like: https://denys-pozniak.medium.com/apple-push-notification-with-kamailio-eeca… And also some code snippets of a modification of "kamailio.cfg" to add support for ios push notifications. (see below). Could someone have this already working? Or kamailio official developers could add this by default inside source code? # keep a record of an IPhone for 4 hours modparam("htable", "htable", "iphone_remote=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_voip=>size=10;autoexpire=14400;") modparam("htable", "htable", "iphone_check=>size=10;autoexpire=14400;") modparam("htable", "htable", "vtp=>size=10;autoexpire=120;") route[REGISTRAR] { ... ... if (save("location")) { # user registered, now look at the useragent header for iPhone string if ($hdr(User-Agent)=~"LinphoneiOS.*") { $var(uri) = @contact.uri; # select the uri from contact header $var(pn-prid) = $(var(uri){uri.param,pn-prid}); # get the uri param pn-prid from the uri, i.e. 1DF26BC10F597676B xlog("!!!! - $var(pn-prid)"); $var(i) = 0; $var(n) = $(var(pn-prid){s.count,&}); while( $var(i) <= $var(n)) { $var(pn-prid_item) = $(var(pn-prid){s.select,$var(i),&}); $var(pn-prid_type) = $(var(pn-prid_item){s.select,1,:}); $var(pn-prid_token) = $(var(pn-prid_item){s.select,0,:}); if ( $var(pn-prid_type) == "remote" ) { $var(pn-prid_remote) = $(var(pn-prid_item){s.select,0,:}) ; } if ( $var(pn-prid_type) == "voip" ) { $var(pn-prid_voip) = $(var(pn-prid_item){s.select,0,:}) ; } $var(i) = $var(i) + 1; } xlog("L_INFO","iPhone PUSH tokens for user $fU - remote: $var(pn-prid_remote), voip: $var(pn-prid_voip)"); # store the values of tokens to htable with fromUser as key $sht(iphone_remote=>$fU) = $var(pn-prid_remote); $sht(iphone_voip=>$fU) = $var(pn-prid_voip); $sht(iphone_check=>$fU) = 1; if ( $sht(vtp=>id_index::$tU) != $null ) { xlog("L_INFO", "New $rm ru=$ru tu=$tu \n"); route(JOIN); } } else { # no iphone $sht(iphone_check=>$fU) = 0; } ... ... } route[LOCATION] { ... ... if (!lookup("location")) { $var(rc) = $rc; # handle PUSH notifications for iPhone # iphones should not be registered and contacts stored in database # hence lookup should fail and we need to try to push iphone first if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); route(RELAY); exit; } ... ... if (is_method("INVITE")) { setflag(FLT_ACCMISSED); # handle PUSH notifications for iPhone # in some cases, iphone does not send de-register when going to background # for these circumstances, push iphone even if it has an active registration if ($sht(iphone_check=>$tU) == 1) { xlog("L_ERR", "[PUSH] The to user has already used iPhone, trying push notifications"); xlog("L_ERR", "[PUSH] No registration to try, suspending."); sl_send_reply("100", "Suspending"); route(SUSPEND); } } route(RELAY); exit; } route[SUSPEND] { if ( !t_suspend() ) { xlog("L_ERROR","[SUSPEND] failed suspending trasaction [$T(id_index):$T(id_label)]\n"); send_reply("501", "Suspending error"); exit; } else { xlog("L_INFO","[SUSPEND] suspended transaction [$T(id_index):$T(id_label)] $fU=> $rU\n"); $sht(vtp=>id_index::$rU) = $T(id_index); $sht(vtp=>id_label::$rU) = $T(id_label); xlog("L_INFO","[SUSPEND] htable key value [$sht(vtp=>id_index::$rU) -- $sht(vtp=>id_label::$rU)]\n"); route(SENDPUSH); exit; } } route[SENDPUSH] { #http_client_query("http://url/push.php"<http://url/push.php>, "user=$rU\r\npn-tok=$sht(tokens=>$rU)\r\n","Content-Type: text/plain", "$var(result)"); xlog("!!!!!!!!!!!!!!!!!!!!!! PUSH !!!!!!!!!!!!!!!!!!!"); xlog("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); exec_avp("/opt/push/push.sh $ci $sht(iphone_voip=>$tU)"); xlog("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); sl_send_reply("100", "Pushing"); } route[JOIN] { xlog("L_WARN","[JOIN] htable key value [$sht(vtp=>id_index::$tU) -- $sht(vtp=>id_label::$tU)]\n"); t_continue("$sht(vtp=>id_index::$tU)", "$sht(vtp=>id_label::$tU)", "RESUME"); $sht(vtp=>joined::$tU) = 1; } route[RESUME] { lookup("location"); xlog("L_INFO","[RESUME] rm=$rm ru=$ru du=$du \n"); t_relay(); $sht(vtp=>id_index::$tU) = $null; $sht(vtp=>id_label::$tU) = $null; exit; }

1 0

git:5.5:9dc2e9b4: core: clone modparamx evaluated values
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 9dc2e9b4e723f865fa92ed03f9c9b90473c83e94 URL: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:24+02:00 core: clone modparamx evaluated values (cherry picked from commit 68db24577dae35de1e9045f994d9a751b50ad14d) --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… Patch: https://github.com/kamailio/kamailio/commit/9dc2e9b4e723f865fa92ed03f9c9b90… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 041ce841c4..361536691d 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -31,11 +31,14 @@ #include "dprint.h" #include "fmsg.h" #include "pvar.h" +#include "str_list.h" #include "mem/mem.h" #include <sys/types.h> #include <regex.h> #include <string.h> +static str_list_t *_ksr_modparam_strlist = NULL; + static char *get_mod_param_type_str(int ptype) { if(ptype & PARAM_USE_FUNC) { @@ -190,6 +193,7 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) char* epname; pv_spec_t *pvs; pv_value_t pvv; + str_list_t *sb; emname = mname; if(strchr(mname, '$') != NULL) { @@ -197,7 +201,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = mname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + emname = sb->s.s; } } @@ -207,7 +216,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = pname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - epname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + epname = sb->s.s; } } @@ -218,8 +232,13 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = (char*)pval; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)seval.s); + (void*)sb->s.s); } else { LM_ERR("failed to evaluate parameter [%s]\n", (char*)pval); return -1; @@ -267,8 +286,14 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.len, sfmt.s); return -1; } + sb = str_list_block_add(&_ksr_modparam_strlist, pvv.rs.s, pvv.rs.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)pvv.rs.s); + (void*)sb->s.s); default: LM_ERR("invalid parameter type: %d\n", ptype); return -1;

1 0

git:5.5:abbe78ae: core: clone value for loadmodulex
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: abbe78aec28d46b74f59d14334b6e4871915ea4a URL: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:35+02:00 core: clone value for loadmodulex (cherry picked from commit e04890fe90d6e5ce879f968eb689e8616b318d54) --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… Patch: https://github.com/kamailio/kamailio/commit/abbe78aec28d46b74f59d14334b6e48… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 03f8feef81..b26fde218c 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -45,6 +45,7 @@ #include "fmsg.h" #include "async_task.h" #include "shm_init.h" +#include "str_list.h" #include "daemonize.h" #include <sys/stat.h> @@ -57,6 +58,8 @@ struct sr_module* modules=0; +static str_list_t *_ksr_loadmod_strlist = NULL; + /*We need to define this symbol on Solaris becuase libcurl relies on libnspr which looks for this symbol. If it is not defined, dynamic module loading (dlsym) fails */ @@ -656,6 +659,7 @@ int load_modulex(char* mod_path) str sfmt; sip_msg_t *fmsg; char* emod; + str_list_t *sb; emod = mod_path; if(strchr(mod_path, '$') != NULL) { @@ -663,7 +667,12 @@ int load_modulex(char* mod_path) sfmt.s = mod_path; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emod = seval.s; + sb = str_list_block_add(&_ksr_loadmod_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle load module: %s\n", mod_path); + return -1; + } + emod = sb->s.s; } }

1 0

git:5.5:459f40b5: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 459f40b52a8a6f8b2ef70a6986c686448ea572a8 URL: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:50+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names (cherry picked from commit 9429083c87b1323e31983cc71551676c199bf640) --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… Patch: https://github.com/kamailio/kamailio/commit/459f40b52a8a6f8b2ef70a6986c6864… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

1 0

git:5.5:2dbf4882: http_client: removed function names from logs
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: 2dbf48822451433f4ee8863a954a4c40da0eb2bf URL: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:42:02+02:00 http_client: removed function names from logs (cherry picked from commit 84d245fb4eda7690a89b4057301f81685a9452d8) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… Patch: https://github.com/kamailio/kamailio/commit/2dbf48822451433f4ee8863a954a4c4… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index b1bfa3bd48..0c00bb97de 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -113,7 +113,7 @@ static cfg_option_t http_client_options[] = { {"keepconnections", .f = cfg_parse_int_opt}, /* 17 */ {0}}; -/*! Count the number of connections +/*! Count the number of connections */ unsigned int curl_connection_count() { @@ -136,7 +136,7 @@ int http_connection_exists(str *name) return 1; } - LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", + LM_DBG("no success in looking for httpcon: [%.*s]\n", name->len, name->s); return 0; } @@ -149,7 +149,7 @@ curl_con_t *curl_get_connection(str *name) unsigned int conid; conid = core_case_hash(name, 0, 0); - LM_DBG("curl_get_connection looking for httpcon: [%.*s] ID %u\n", name->len, + LM_DBG("looking for httpcon: [%.*s] ID %u\n", name->len, name->s, conid); cc = _curl_con_root; @@ -160,8 +160,8 @@ curl_con_t *curl_get_connection(str *name) } cc = cc->next; } - LM_DBG("curl_get_connection no success in looking for httpcon: [%.*s]\n", - name->len, name->s); + LM_DBG("no success in looking for httpcon: [%.*s] (list: %p)\n", + name->len, name->s, _curl_con_root); return NULL; } @@ -178,7 +178,7 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) } ccp = ccp->next; } - LM_ERR("curl_get_pkg_connection no success in looking for pkg memory for " + LM_ERR("no success in looking for pkg memory for " "httpcon: [%.*s]\n", con->name.len, con->name.s); return NULL;

1 0

git:5.5:b27dc141: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: 5.5 Commit: b27dc141ccddfb3e0f77399ead8b2b158942de69 URL: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T14:41:38+02:00 http_client: check if shm is initialized in curl_parse_param() (cherry picked from commit 7741ad7979d54fb4ee1247760d8d5c3666353a96) --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… Patch: https://github.com/kamailio/kamailio/commit/b27dc141ccddfb3e0f77399ead8b2b1… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

1 0

git:master:e04890fe: core: clone value for loadmodulex
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: e04890fe90d6e5ce879f968eb689e8616b318d54 URL: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:25:30+02:00 core: clone value for loadmodulex --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… Patch: https://github.com/kamailio/kamailio/commit/e04890fe90d6e5ce879f968eb689e86… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 03f8feef81..b26fde218c 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -45,6 +45,7 @@ #include "fmsg.h" #include "async_task.h" #include "shm_init.h" +#include "str_list.h" #include "daemonize.h" #include <sys/stat.h> @@ -57,6 +58,8 @@ struct sr_module* modules=0; +static str_list_t *_ksr_loadmod_strlist = NULL; + /*We need to define this symbol on Solaris becuase libcurl relies on libnspr which looks for this symbol. If it is not defined, dynamic module loading (dlsym) fails */ @@ -656,6 +659,7 @@ int load_modulex(char* mod_path) str sfmt; sip_msg_t *fmsg; char* emod; + str_list_t *sb; emod = mod_path; if(strchr(mod_path, '$') != NULL) { @@ -663,7 +667,12 @@ int load_modulex(char* mod_path) sfmt.s = mod_path; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emod = seval.s; + sb = str_list_block_add(&_ksr_loadmod_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle load module: %s\n", mod_path); + return -1; + } + emod = sb->s.s; } }

1 0

git:master:b92b931c: core: str list - added function to insert a block string in list
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: b92b931c26c199b756fd08e9c80cc9305469fd2b URL: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:55:32+02:00 core: str list - added function to insert a block string in list --- Modified: src/core/str_list.c Modified: src/core/str_list.h --- Diff: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… Patch: https://github.com/kamailio/kamailio/commit/b92b931c26c199b756fd08e9c80cc93… --- diff --git a/src/core/str_list.c b/src/core/str_list.c index f63b4c9151..207cee5bc3 100644 --- a/src/core/str_list.c +++ b/src/core/str_list.c @@ -13,13 +13,13 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file + * @file * @brief Kamailio core :: Simple str type list and helper functions * @ingroup core * Module: @ref core @@ -32,7 +32,7 @@ /** * @brief Add a new allocated list element to an existing list - * + * * Add a new allocated list element to an existing list, the allocation is done * from the private memory pool * @param s input character @@ -43,18 +43,45 @@ */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total) { - struct str_list *new; - new = pkg_malloc(sizeof(struct str_list)); - if (!new) { + struct str_list *nv; + nv = pkg_malloc(sizeof(struct str_list)); + if (!nv) { PKG_MEM_ERROR; return 0; } - new->s.s = s; - new->s.len = len; - new->next = 0; + nv->s.s = s; + nv->s.len = len; + nv->next = 0; - (*last)->next = new; - *last = new; + (*last)->next = nv; + *last = nv; *total += len; - return new; + return nv; +} + +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len) +{ + str_list_t *nv; + nv = pkg_mallocxz(sizeof(str_list_t) + (len+1)*sizeof(char)); + if (!nv) { + PKG_MEM_ERROR; + return 0; + } + nv->s.s = (char*)nv + sizeof(str_list_t); + memcpy(nv->s.s, s, len); + nv->s.len = len; + nv->next = *head; + *head = nv; + + return nv; } diff --git a/src/core/str_list.h b/src/core/str_list.h index db3fa12887..1eac2578b0 100644 --- a/src/core/str_list.h +++ b/src/core/str_list.h @@ -51,4 +51,16 @@ typedef struct str_list { */ struct str_list *append_str_list(char *s, int len, struct str_list **last, int *total); +/** + * @brief Add a new allocated list element with cloned block value to an existing list + * + * Add a new allocated list element with cloned value in block to an existing list, + * the allocation is done from the private memory pool + * @param head existing list + * @param s input character + * @param len length of input character + * @return extended list + */ +str_list_t *str_list_block_add(str_list_t **head, char *s, int len); + #endif

1 0

git:master:68db2457: core: clone modparamx evaluated values
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 68db24577dae35de1e9045f994d9a751b50ad14d URL: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T09:18:05+02:00 core: clone modparamx evaluated values --- Modified: src/core/modparam.c --- Diff: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… Patch: https://github.com/kamailio/kamailio/commit/68db24577dae35de1e9045f994d9a75… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index 041ce841c4..361536691d 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -31,11 +31,14 @@ #include "dprint.h" #include "fmsg.h" #include "pvar.h" +#include "str_list.h" #include "mem/mem.h" #include <sys/types.h> #include <regex.h> #include <string.h> +static str_list_t *_ksr_modparam_strlist = NULL; + static char *get_mod_param_type_str(int ptype) { if(ptype & PARAM_USE_FUNC) { @@ -190,6 +193,7 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) char* epname; pv_spec_t *pvs; pv_value_t pvv; + str_list_t *sb; emname = mname; if(strchr(mname, '$') != NULL) { @@ -197,7 +201,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = mname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - emname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + emname = sb->s.s; } } @@ -207,7 +216,12 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = pname; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { - epname = seval.s; + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + epname = sb->s.s; } } @@ -218,8 +232,13 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.s = (char*)pval; sfmt.len = strlen(sfmt.s); if(pv_eval_str(fmsg, &seval, &sfmt)>=0) { + sb = str_list_block_add(&_ksr_modparam_strlist, seval.s, seval.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)seval.s); + (void*)sb->s.s); } else { LM_ERR("failed to evaluate parameter [%s]\n", (char*)pval); return -1; @@ -267,8 +286,14 @@ int modparamx_set(char* mname, char* pname, modparam_t ptype, void* pval) sfmt.len, sfmt.s); return -1; } + sb = str_list_block_add(&_ksr_modparam_strlist, pvv.rs.s, pvv.rs.len); + if(sb==NULL) { + LM_ERR("failed to handle parameter type: %d\n", ptype); + return -1; + } + return set_mod_param_regex(emname, epname, PARAM_STRING, - (void*)pvv.rs.s); + (void*)sb->s.s); default: LM_ERR("invalid parameter type: %d\n", ptype); return -1;

1 0

git:master:7741ad79: http_client: check if shm is initialized in curl_parse_param()
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 7741ad7979d54fb4ee1247760d8d5c3666353a96 URL: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T07:31:10+02:00 http_client: check if shm is initialized in curl_parse_param() --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… Patch: https://github.com/kamailio/kamailio/commit/7741ad7979d54fb4ee1247760d8d5c3… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index c71df5cd75..7df146493f 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -32,6 +32,7 @@ #include "../../core/dprint.h" #include "../../core/parser/parse_param.h" #include "../../core/usr_avp.h" +#include "../../core/shm_init.h" #include "../../core/cfg_parser.h" #include "http_client.h" #include "curlcon.h" @@ -237,6 +238,11 @@ int curl_parse_param(char *val) LM_DBG("modparam httpcon: %s\n", val); LM_DBG(" *** Default httproxy: %s\n", http_proxy.s); + if(!shm_initialized()) { + LM_ERR("shared memory was not initialized\n"); + return -1; + } + /* parse: name=>http_url*/ in.s = val; in.len = strlen(in.s);

1 0

git:master:9429083c: http_client: clone name in http connection structures
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 9429083c87b1323e31983cc71551676c199bf640 URL: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:09:22+02:00 http_client: clone name in http connection structures - use name to lookup private memory structure, hash id is not unique, can be collisions for different names --- Modified: src/modules/http_client/curlcon.c Modified: src/modules/http_client/http_client.h --- Diff: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… Patch: https://github.com/kamailio/kamailio/commit/9429083c87b1323e31983cc71551676… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index 7df146493f..b1bfa3bd48 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -172,7 +172,8 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) ccp = _curl_con_pkg_root; while(ccp) { - if(ccp->conid == con->conid) { + if(ccp->conid == con->conid && ccp->name.len == con->name.len + && strncmp(ccp->name.s, con->name.s, con->name.len) == 0) { return ccp; } ccp = ccp->next; @@ -814,8 +815,9 @@ curl_con_t *curl_init_con(str *name) cc = cc->next; } - cc = (curl_con_t *)shm_malloc(sizeof( - curl_con_t)); /* Connection structures are shared by all children processes */ + /* Connection structures are shared by all children processes */ + cc = (curl_con_t *)shm_malloc(sizeof(curl_con_t) + + (name->len + 1)*sizeof(char)); if(cc == NULL) { LM_ERR("no shm memory\n"); return NULL; @@ -823,7 +825,8 @@ curl_con_t *curl_init_con(str *name) /* Each structure is allocated in package memory so each process can write into it without any locks or such stuff */ - ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t)); + ccp = (curl_con_pkg_t *)pkg_malloc(sizeof(curl_con_pkg_t) + + (name->len + 1)*sizeof(char)); if(ccp == NULL) { /* We failed to allocate ccp, so let's free cc and quit */ shm_free(cc); @@ -831,17 +834,21 @@ curl_con_t *curl_init_con(str *name) return NULL; } - memset(cc, 0, sizeof(curl_con_t)); + memset(cc, 0, sizeof(curl_con_t) + (name->len + 1)*sizeof(char)); cc->next = _curl_con_root; cc->conid = conid; + cc->name.s = (char*)cc + sizeof(curl_con_t); + memcpy(cc->name.s, name->s, name->len); + cc->name.len = name->len; _curl_con_root = cc; - cc->name = *name; /* Put the new ccp first in line */ - memset(ccp, 0, sizeof(curl_con_pkg_t)); + memset(ccp, 0, sizeof(curl_con_pkg_t) + (name->len + 1)*sizeof(char)); ccp->next = _curl_con_pkg_root; ccp->conid = conid; - ccp->curl = NULL; + ccp->name.s = (char*)ccp + sizeof(curl_con_pkg_t); + memcpy(ccp->name.s, name->s, name->len); + ccp->name.len = name->len; _curl_con_pkg_root = ccp; LM_DBG("CURL: Added connection [%.*s]\n", name->len, name->s); diff --git a/src/modules/http_client/http_client.h b/src/modules/http_client/http_client.h index 29b451ba4d..a37bdbe4a5 100644 --- a/src/modules/http_client/http_client.h +++ b/src/modules/http_client/http_client.h @@ -93,7 +93,7 @@ enum connection_status typedef struct _curl_con { str name; /*!< Connection name */ - unsigned int conid; /*!< Connection ID */ + unsigned int conid; /*!< Connection hash ID */ enum connection_status connstate; /*!< Connection status */ str url; /*!< The URL without schema (host + base URL)*/ str schema; /*!< The URL schema */ @@ -125,7 +125,8 @@ typedef struct _curl_con /*! Per-process copy of connection object -stored in pkg memory */ typedef struct _curl_con_pkg { - unsigned int conid; /*!< Connection ID (referring to core connection id */ + str name; /*!< Connection name */ + unsigned int conid; /*!< Connection hash ID */ char redirecturl [512]; /*!< Last redirect URL - to use for $curlredirect(curlcon) pv */ unsigned int last_result; /*!< Last result of accessing this connection */

1 0

git:master:84d245fb: http_client: removed function names from logs
by Daniel-Constantin Mierla 29 Jun '21

29 Jun '21

Module: kamailio Branch: master Commit: 84d245fb4eda7690a89b4057301f81685a9452d8 URL: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-29T08:23:56+02:00 http_client: removed function names from logs --- Modified: src/modules/http_client/curlcon.c --- Diff: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… Patch: https://github.com/kamailio/kamailio/commit/84d245fb4eda7690a89b4057301f816… --- diff --git a/src/modules/http_client/curlcon.c b/src/modules/http_client/curlcon.c index b1bfa3bd48..0c00bb97de 100644 --- a/src/modules/http_client/curlcon.c +++ b/src/modules/http_client/curlcon.c @@ -113,7 +113,7 @@ static cfg_option_t http_client_options[] = { {"keepconnections", .f = cfg_parse_int_opt}, /* 17 */ {0}}; -/*! Count the number of connections +/*! Count the number of connections */ unsigned int curl_connection_count() { @@ -136,7 +136,7 @@ int http_connection_exists(str *name) return 1; } - LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", + LM_DBG("no success in looking for httpcon: [%.*s]\n", name->len, name->s); return 0; } @@ -149,7 +149,7 @@ curl_con_t *curl_get_connection(str *name) unsigned int conid; conid = core_case_hash(name, 0, 0); - LM_DBG("curl_get_connection looking for httpcon: [%.*s] ID %u\n", name->len, + LM_DBG("looking for httpcon: [%.*s] ID %u\n", name->len, name->s, conid); cc = _curl_con_root; @@ -160,8 +160,8 @@ curl_con_t *curl_get_connection(str *name) } cc = cc->next; } - LM_DBG("curl_get_connection no success in looking for httpcon: [%.*s]\n", - name->len, name->s); + LM_DBG("no success in looking for httpcon: [%.*s] (list: %p)\n", + name->len, name->s, _curl_con_root); return NULL; } @@ -178,7 +178,7 @@ curl_con_pkg_t *curl_get_pkg_connection(curl_con_t *con) } ccp = ccp->next; } - LM_ERR("curl_get_pkg_connection no success in looking for pkg memory for " + LM_ERR("no success in looking for pkg memory for " "httpcon: [%.*s]\n", con->name.len, con->name.s); return NULL;

1 0

git:master:c836bca7: Makefile.groups: added build group for nats module
by Daniel-Constantin Mierla 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: c836bca76551b76836f03a612c2a913284729622 URL: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-28T23:03:47+02:00 Makefile.groups: added build group for nats module --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… Patch: https://github.com/kamailio/kamailio/commit/c836bca76551b76836f03a612c2a913… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 42c036d670..4eea749671 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -223,6 +223,9 @@ mod_list_kafka=kafka # - modules depending on mqtt mosquitto and ev library mod_list_mqtt=mqtt +# - modules depending on nats and ev library +mod_list_nats=nats + # - modules depending on secsipid library mod_list_secsipid=secsipid secsipid_proc @@ -264,6 +267,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_phonenum) \ $(mod_list_kafka) \ $(mod_list_mqtt) \ + $(mod_list_nats) \ $(mod_list_secsipid) \ $(mod_list_jwt) \ $(mod_list_lwsc) \ @@ -497,6 +501,9 @@ module_group_kkafka=$(mod_list_kafka) # K mqtt modules module_group_kmqtt=$(mod_list_mqtt) +# K nats modules +module_group_knats=$(mod_list_nats) + # K secsipid modules module_group_ksecsipid=$(mod_list_secsipid)

1 0

[kamailio/kamailio] nats: new nats message consumer module (#2790)
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

#### 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  New Module to consume messages from NATS messaging system. Initial Features: - automatic reconnect with connected/disconnected event routes - connect to up to 10 NATS URLs - subscribe to any number of subjects - receive messages via event route You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2790 -- Commit Summary -- * nats: new nats message consumer module -- File Changes -- A src/modules/nats/Makefile (16) A src/modules/nats/doc/Makefile (4) A src/modules/nats/doc/nats.xml (42) A src/modules/nats/doc/nats_admin.xml (207) A src/modules/nats/nats_mod.c (569) A src/modules/nats/nats_mod.h (99) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2790.patch https://github.com/kamailio/kamailio/pull/2790.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/2790

7 9

git:master:6078dbf6: nats: new nats message consumer module
by Emmanuel Schmidbauer 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 6078dbf6a7aa8eac8c3c4a57d939716f232799f5 URL: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2021-06-27T07:58:58-04:00 nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716… Patch: https://github.com/kamailio/kamailio/commit/6078dbf6a7aa8eac8c3c4a57d939716…

1 0

git:master:480969f2: Merge pull request #2790 from kamailio/nats-module
by GitHub 28 Jun '21

28 Jun '21

Module: kamailio Branch: master Commit: 480969f28d2b539b31df5d4ff292c0ab95f30d17 URL: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-28T06:44:52-04:00 Merge pull request #2790 from kamailio/nats-module nats: new nats message consumer module --- Added: src/modules/nats/Makefile Added: src/modules/nats/doc/Makefile Added: src/modules/nats/doc/nats.xml Added: src/modules/nats/doc/nats_admin.xml Added: src/modules/nats/nats_mod.c Added: src/modules/nats/nats_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a… Patch: https://github.com/kamailio/kamailio/commit/480969f28d2b539b31df5d4ff292c0a…

1 0

[kamailio/kamailio] built warning (#2787)
by sergey-safarov 26 Jun '21

26 Jun '21

**defined but not used** ``` rtpproxy.c:943:1: warning: ‘rp_extract_mediaip’ defined but not used [-Wunused-function] rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) ^~~~~~~~~~~~~~~~~~ CC (gcc) [M rtpproxy.so] rtpproxy_db.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2787

2 2

git:master:14d92c0d: rtpproxy: removed unused rp_extract_mediaip()
by Daniel-Constantin Mierla 26 Jun '21

26 Jun '21

Module: kamailio Branch: master Commit: 14d92c0d7ab1229996176b131ab8edcabc3a5717 URL: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-26T07:05:29+02:00 rtpproxy: removed unused rp_extract_mediaip() - GH #2787 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… Patch: https://github.com/kamailio/kamailio/commit/14d92c0d7ab1229996176b131ab8edc… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 733ea3cec8..bd2eb5368d 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -114,7 +114,6 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0"); #define PTL_CPROTOVER "20081102" #define CPORT "22222" -static int rp_extract_mediaip(str *, str *, int *, char *); static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); @@ -939,61 +938,6 @@ isnulladdr(str *sx, int pf) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) - static int -rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line) -{ - char *cp, *cp1; - int len, nextisip; - - cp1 = NULL; - for (cp = body->s; (len = body->s + body->len - cp) > 0;) { - cp1 = ser_memmem(cp, line, len, 2); - if (cp1 == NULL || cp1[-1] == '\n' || cp1[-1] == '\r') - break; - cp = cp1 + 2; - } - if (cp1 == NULL) - return -1; - - mediaip->s = cp1 + 2; - mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - - mediaip->s; - trim_len(mediaip->len, mediaip->s, *mediaip); - - nextisip = 0; - for (cp = mediaip->s; cp < mediaip->s + mediaip->len;) { - len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; - if (nextisip == 1) { - mediaip->s = cp; - mediaip->len = len; - nextisip++; - break; - } - if (len == 3 && memcmp(cp, "IP", 2) == 0) { - switch (cp[2]) { - case '4': - nextisip = 1; - *pf = AF_INET; - break; - - case '6': - nextisip = 1; - *pf = AF_INET6; - break; - - default: - break; - } - } - cp = eat_space_end(cp + len, mediaip->s + mediaip->len); - } - if (nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n",line); - return -1; - } - return 1; -} - static int alter_mediaip(struct sip_msg *msg, str *body, str *oldip, int oldpf, str *newip, int newpf, int preserve)

1 0

[kamailio/kamailio] kazoo: different binding for private module and for current 5.4.5 (#2747)
by sergey-safarov 25 Jun '21

25 Jun '21

### Description I want to use some customization for Kamailio 5.4 branch. Before start I want to make sure 5.4.5 tag works with `kazoo-config-kamailio`. During a tests, I found the `kazoo` module not able to receive registration responses. If I replace `kazoo` module in Kamailio 5.4.5 with to the same version from `2600hz/staging` repo then all as expected. I checked RabbitMQ bindgs for both module and binding different for `kazoo` module from Kamailio 5.4.5 and from `2600hz/staging` repo. I think some commits not published in the Kamailio repo. ### Troubleshooting *binding for kazoo module from Kamailio 5.4.5* ``` root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1-23> [] exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1-11> [] exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1-10> [] exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1-5> [] exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1-18> [] exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1-13> [] exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1-16> [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1-8> [] exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1-15> [] exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1-14> [] exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1-3> [] exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1-22> [] exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1-0> [] exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1-4> [] exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1-2> [] exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1-20> [] exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1-17> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1-6> [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1-19> [] exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1-24> [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1-21> [] exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1-1> [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1-12> [] exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1-9> [] exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1-7> [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-0> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-0 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-1> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-1 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-10> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-10 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-11> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-11 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-12> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-12 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-13> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-13 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-14> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-14 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-15> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-15 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-16> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-16 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-17> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-17 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-18> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-18 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-19> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-19 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-2> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-2 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-20> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-20 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-21> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-21 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-22> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-22 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-23> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-23 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-24> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-24 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-3> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-3 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-4> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-4 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-5> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-5 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-6> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-6 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-7> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-7 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-8> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-8 [] targeted exchange kamailio(a)bcf-e-2.example.com-<1-9> queue kamailio(a)bcf-e-2.example.com-<1>-targeted-9 [] ``` *binding for kazoo module from 2600hz/staging repo* ``` [root@rmq-2 ~]# rabbitmqctl list_bindings| grep -P "bcf-e-2.la.cal911.net" | sed -e 's/la.cal911.net/example.com/g' exchange registrar-sync-bcf-e-2.example.com queue registrar-sync-bcf-e-2.example.com [] exchange registrar-flush-bcf-e-2.example.com queue registrar-flush-bcf-e-2.example.com [] exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] exchange presence-dialog-bcf-e-2.example.com queue presence-dialog-bcf-e-2.example.com [] exchange nodes-bcf-e-2.example.com queue nodes-bcf-e-2.example.com [] exchange MSG-QUEUE-bcf-e-2.example.com queue MSG-QUEUE-bcf-e-2.example.com [] exchange presence-api-bcf-e-2.example.com queue presence-api-bcf-e-2.example.com [] im exchange MSG-QUEUE-bcf-e-2.example.com queue sms.outbound.kamailio%40bcf-e-2%2Eexample%2Ecom.* [] nodes exchange nodes-bcf-e-2.example.com queue [] presence exchange presence-dialog-bcf-e-2.example.com queue dialog.*.* [] presence exchange presence-dialog-bcf-e-2.example.com queue mwi_updates.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.reset.*.* [] presence exchange presence-api-bcf-e-2.example.com queue presence.search_req.* [] presence exchange presence-dialog-bcf-e-2.example.com queue update.*.* [] registrar exchange registrar-flush-bcf-e-2.example.com queue registration.flush.* [] registrar exchange registrar-sync-bcf-e-2.example.com queue registration.sync [] targeted exchange kamailio(a)bcf-e-2.example.com-default<..> queue kamailio(a)bcf-e-2.example.com-default<..> [] ``` #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` @lazedo could you look at why the stock `kazoo` module uses the different binding. -- 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/2747

2 4

git:master:d2369fa7: pv: added {s.fmtlines, n, m} and {s.fmtlinet, n, m}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: d2369fa78c63994a35a965ffbc2b7d9a189a00df URL: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T10:58:23+02:00 pv: added {s.fmtlines,n,m} and {s.fmtlinet,n,m} - format the value in lines of n characters, adding m spaces or tabs to the start of each new line (not to first line) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9… Patch: https://github.com/kamailio/kamailio/commit/d2369fa78c63994a35a965ffbc2b7d9…

1 0

git:master:3a7f6c18: pv: added {s.rafter, x} and {s.rbefore, x}
by Daniel-Constantin Mierla 25 Jun '21

25 Jun '21

Module: kamailio Branch: master Commit: 3a7f6c18810cb307332fbf061a248252996b0464 URL: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-25T09:51:10+02:00 pv: added {s.rafter,x} and {s.rbefore,x} - similar to {s.after,x} and {s.before,x}, but searches from end of the value --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… Patch: https://github.com/kamailio/kamailio/commit/3a7f6c18810cb307332fbf061a24825… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 98cce7caa8..6a026cc9ae 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1340,6 +1340,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_BEFORE: + case TR_S_RBEFORE: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1366,11 +1367,20 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_BEFORE) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } + if(i==0) { _tr_buffer[0] = '\0'; val->rs.len = 0; @@ -1384,6 +1394,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, break; case TR_S_AFTER: + case TR_S_RAFTER: if(tp==NULL) { LM_ERR("invalid parameters (cfg line: %d)\n", @@ -1410,9 +1421,17 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, } st = v.rs; } - for(i=0; i<val->rs.len; i++) { - if(val->rs.s[i]==st.s[0]) { - break; + if(subtype==TR_S_AFTER) { + for(i=0; i<val->rs.len; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } + } + } else { + for(i=val->rs.len-1; i>=0; i++) { + if(val->rs.s[i]==st.s[0]) { + break; + } } } if(i>=val->rs.len-1) { @@ -3012,6 +3031,46 @@ char* tr_parse_string(str* in, trans_t *t) goto error; } goto done; + } else if(name.len==7 && strncasecmp(name.s, "rbefore", 7)==0) { + t->subtype = TR_S_RBEFORE; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rbefore transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rbefore transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; + } else if(name.len==6 && strncasecmp(name.s, "rafter", 6)==0) { + t->subtype = TR_S_RAFTER; + if(*p!=TR_PARAM_MARKER) + { + LM_ERR("invalid rafter transformation: %.*s!\n", + in->len, in->s); + goto error; + } + p++; + _tr_parse_sparamx(p, p0, tp, spec, ps, in, s, 1); + t->params = tp; + tp = 0; + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid rafter transformation: %.*s!!\n", + in->len, in->s); + goto error; + } + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 4b8e1ff12f..9d474cf08b 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -45,7 +45,7 @@ enum _tr_s_subtype { TR_S_UNBRACKET, TR_S_COUNT, TR_S_ENCODEBASE64T, TR_S_DECODEBASE64T, TR_S_ENCODEBASE64URL, TR_S_DECODEBASE64URL, TR_S_ENCODEBASE64URLT, TR_S_DECODEBASE64URLT, TR_S_RMWS, TR_S_BEFORE, - TR_S_AFTER + TR_S_AFTER, TR_S_RBEFORE, TR_S_RAFTER }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio/kamailio] pua_json for KEMI framework (#2783)
by Zhan Bazarov 24 Jun '21

24 Jun '21

Hello everyone, is module pua_json going to be implemented for KEMI framework? I've tried to use KSR.x.modf("pua_json_publish", "json_here") and I'm getting error ### python code ``` def ksr_xhttp_event(self, evmsg, evname): if evname == "xhttp:request": try: KSR.err("===== xhttp module triggered event: " + evname + "\n") if "/presence" in KSR.pv.get("$hu"): rb = json.loads(KSR.kx.get_body()) if rb["Event-Package"] == "message-summary": KSR.info("request received- " + rb["Call-ID"] + "update for: " + rb[ "From"] + "request body: " + json.dumps(rb) + "\n") KSR.x.modf("pua_json_publish", json.dumps(rb)); KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Entity state updated</body></html>") return 1 if "/RCP" in KSR.pv.get("$hu"): KSR.jsonrpcs.dispatch() return 1 else: KSR.xhttp.xhttp_reply(200, "OK", "text/html", "<html><body>Wrong URL</body></html>") return 1 except: KSR.err("===== unsupported " + evname + "\n") return -255 ``` #### Debugging Data ``` app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_xhttp_event(xhttp:request): Unhandled exception in the Python code: RuntimeError: self is NULL ``` * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.5 (x86_64/linux) c46342 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, 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: c46342 compiled on 14:37:00 Apr 27 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux ip-10-199-240-110 4.15.0-1057-aws #59-Ubuntu SMP Wed Dec 4 10:02:00 UTC 2019 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/2783

2 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev