- sr-dev - kamailio.org

git:master:d574a210: dispatcher: added ds_is_active(group [, uri])
by Daniel-Constantin Mierla 14 Sep '21

14 Sep '21

Module: kamailio Branch: master Commit: d574a2107aa38e14c45e398721f66c5a2487c793 URL: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T10:25:46+02:00 dispatcher: added ds_is_active(group [, uri]) - check if any or a specific uri in a group is active --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5… Patch: https://github.com/kamailio/kamailio/commit/d574a2107aa38e14c45e398721f66c5…

1 0

git:master:a34463c9: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: a34463c9f5fc5faade30d36f168b10105de98ac8 URL: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-13T09:31:18+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… Patch: https://github.com/kamailio/kamailio/commit/a34463c9f5fc5faade30d36f168b101… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index a33e556545..94ab08ab3c 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -1009,6 +1009,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 AoR (user). + 0x08 - Do not apply expires_range or default_expires_range to this registration. + + 0x10 - prepare the headers for reply, used only if flag 0x02 + is set. The flags may be given in decimal or hexadecimal format. * uri (optional - flags param has to be set and can be 0 for default behavior) - SIP URI to do be used instead of To header URI. It can

1 0

git:master:3eb2608d: registrar: save() - new flag to prepare the headers for reply
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: 3eb2608d9063ce00327ff54eecfd3a2ce74a379e URL: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T09:20:48+02:00 registrar: save() - new flag to prepare the headers for reply --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/registrar.h Modified: src/modules/registrar/reply.c Modified: src/modules/registrar/reply.h Modified: src/modules/registrar/save.c --- Diff: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2… Patch: https://github.com/kamailio/kamailio/commit/3eb2608d9063ce00327ff54eecfd3a2…

1 0

git:master:eb204c0f: slack: free send_data in case of error
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: eb204c0f99247e7ee5356201a8d0d46e5808ddad URL: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T08:06:26+02:00 slack: free send_data in case of error - removed unnecessary if conditions --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… Patch: https://github.com/kamailio/kamailio/commit/eb204c0f99247e7ee5356201a8d0d46… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 7a046d387a..30ab96bed4 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -128,6 +128,7 @@ static int _curl_send(const char* uri, str *post_data) if((curl_handle=curl_easy_init())==NULL) { LM_ERR("Unable to init cURL library\n"); curl_global_cleanup(); + pkg_free(send_data); return -1; } @@ -139,18 +140,14 @@ static int _curl_send(const char* uri, str *post_data) LM_ERR("slack request send error: %s\n", curl_easy_strerror(res)); curl_easy_cleanup(curl_handle); curl_global_cleanup(); - if(send_data) { - pkg_free(send_data); - } + pkg_free(send_data); return -1; } LM_INFO("slack request sent [%d]\n", datasz); curl_easy_cleanup(curl_handle); curl_global_cleanup(); - if (send_data) { - pkg_free(send_data); - } + pkg_free(send_data); return 0; }

1 0

git:master:65e0b1a3: misctest: close file if buffer size is not enough
by Daniel-Constantin Mierla 13 Sep '21

13 Sep '21

Module: kamailio Branch: master Commit: 65e0b1a3248a1ee183864b17f719b9fd8cb9e64b URL: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-13T08:09:38+02:00 misctest: close file if buffer size is not enough --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… Patch: https://github.com/kamailio/kamailio/commit/65e0b1a3248a1ee183864b17f719b9f… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index 2b304c6b5d..2a263432d1 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -294,6 +294,7 @@ static int misctest_message_init(void) if(fsize>=BUF_SIZE-2) { LM_ERR("the file data is too big\n"); + fclose(f); return -1; }

1 0

SIGSEGV on DMQ
by Sergio Carvalho 11 Sep '21

11 Sep '21

Hi everyone, I'm trying to use the DMQ module to share the user location info across our Kamailio's cluster. But when I start the service under docker I get a segmentation fault violation. After analysing the core dump with the *LLDB* I get (if you want I can share the core dump with you using Google Drive): > (lldb) bt > * thread #1, name = 'kamailio', stop reason = signal SIGSEGV > * frame #0: 0x000000000071c63c kamailio`get_hdr_field(buf="", end="", > hdr=0x0000000000000000) at msg_parser.c:144:5 > frame #1: 0x0000000000575b02 > kamailio`resolve_select(s=0x00007ffd470c6da0) at select.c:384:3 > frame #2: 0x00007fbbd7637fb9 > frame #3: 0x00000000005ad785 > kamailio`clen_builder(msg=0x00007fbbd7f6e008, clen_len=0x0000000000000000, > diff=0, body_only=0) at msg_translator.c:451:3 > frame #4: 0x0000000000439aa7 > kamailio`_dns_hash_find(name=0x00007fbbd7f6e498, type=32765, > h=0x0000000000000000, err=0x0000000000000000) at dns_cache.c:551:4 > frame #5: 0x0000000000440cb2 > kamailio`dns_cache_do_request(name=0x0000000000000000, type=0) at > dns_cache.c:1767:3 > frame #6: 0x000000000043f8f6 > kamailio`dns_cache_mk_rd_entry(name=0x0000000000000000, type=0, > rd_lst=0x0000000000000000) at dns_cache.c:1226:7 > frame #7: 0x000000000046501e > kamailio`print_action(t=0x0000000000000000) at route_struct.c:467:4 > frame #8: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #9: 0x0000000000462047 > kamailio`print_action(t=0x0000000000000000) at route_struct.c:392:4 > frame #10: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #11: 0x00000000004654dc > kamailio`print_action(t=0x0000000000000000) at route_struct.c:470:4 > frame #12: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #13: 0x0000000000465532 > kamailio`print_action(t=0x0000000003863810) at route_struct.c:470:4 > frame #14: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #15: 0x0000000000462047 > kamailio`print_action(t=0x00000000006da9d3) at route_struct.c:392:4 > frame #16: 0x0000000000471f2f > kamailio`xavp_print_list_content(head=0x00007ffd470c31a0, level=32699) at > xavp.c:584:2 > frame #17: 0x0000000000472680 > kamailio`xavp_get_list_key_names(xavp=0x00007ffd470c6da0) at xavp.c:622:3 > frame #18: 0x00007fbbb357da54 > frame #19: 0x00007fbbb3580370 > frame #20: 0x00007fbbb358317b > frame #21: 0x00007fbbb3583147 > frame #22: 0x00007fbbb3585e8d > frame #23: 0x00007fbbaec3ef23 > frame #24: 0x00007fbbaec3d5da > frame #25: 0x00007fbbaec4e158 > frame #26: 0x00007fbbaec4aadd > frame #27: 0x00007fbbaec53f05 > frame #28: 0x0000000000541563 > kamailio`handle_tcp_child(tcp_c=0x00000004b4481868, fd_i=136) at > tcp_main.c:3477:1 > frame #29: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x0000000000000000, fd_i=32699) at > tcp_main.c:3470:5 > frame #30: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000470c6da0, fd_i=0) at > tcp_main.c:3470:5 > frame #31: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #32: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #33: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #34: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c64d0, fd_i=32699) at > tcp_main.c:3470:5 > frame #35: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c658c, fd_i=32765) at > tcp_main.c:3470:5 > frame #36: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000000b4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #37: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb4481868, fd_i=1863578990) at > tcp_main.c:3470:5 > frame #38: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbd8059e38, fd_i=32699) at > tcp_main.c:3470:5 > frame #39: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007ffd470c6770, fd_i=32765) at > tcp_main.c:3470:5 > frame #40: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x0000000000000000, fd_i=32765) at > tcp_main.c:3470:5 > frame #41: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00007fbbb5179a80, fd_i=0) at > tcp_main.c:3470:5 > frame #42: 0x0000000000541223 > kamailio`handle_tcp_child(tcp_c=0x00000065dbb52b93, fd_i=32765) at > tcp_main.c:3470:5 > frame #43: 0x00000000005418fa > kamailio`handle_ser_child(p=0x00000065dbb52b93, fd_i=32765) at > tcp_main.c:3513:3 > frame #44: 0x0000000000425d6e kamailio`main_loop at main.c:1620:4 > frame #45: 0x000000000042c6af kamailio`main(argc=13, > argv=0x00007ffd470c6da8) at main.c:2568:3 > Using *GDB* I get the following info: > #22 0x00007efcca978e8d in request () from /usr/lib64/kamailio/modules/tm.so > ---Type <return> to continue, or q <return> to quit--- > No symbol table info available. > #23 0x00007efcc6031f23 in dmq_send_message (peer=0x7efccc5545c0, > body=0x7efcef106ef8, node=0x7efccc5ded10, resp_cback=0x7efcc625d370 > <notification_callback>, max_forwards=2, > content_type=0x7efcc625d360 <notification_content_type>) at > dmq_funcs.c:251 > uac_r = {method = 0x7efcc625d3b0 <dmq_request_method>, headers = > 0x7ffe13cb34b0, body = 0x7efcef106ef8, ssock = 0x7efcc625da20 > <dmq_server_socket>, dialog = 0x7efccc5e0918, > cb_flags = 1024, cb = 0x7efcc602eb7b <dmq_tm_callback>, cbp = > 0x7efccc5def58, callid = 0x0} > str_hdr = {s = 0x7efcef1004e8 "Max-Forwards: 2\r\nContent-Type: > text/plain\r\n", len = 43} > from = {s = 0x7efcef107248 "sip:notification_peer@10.12.4.238:5090", > len = 38} > to = {s = 0x7efcef11d100 "sip:notification_peer@10.12.4.170:5090", > len = 38} > cb_param = 0x7efccc5def58 > result = 0 > len = 43 > __FUNCTION__ = "dmq_send_message" > #24 0x00007efcc60305da in bcast_dmq_message1 (peer=0x7efccc5545c0, > body=0x7efcef106ef8, except=0x0, resp_cback=0x7efcc625d370 > <notification_callback>, max_forwards=2, > content_type=0x7efcc625d360 <notification_content_type>, > incl_inactive=1) at dmq_funcs.c:170 > node = 0x7efccc5ded10 > __FUNCTION__ = "bcast_dmq_message1" > #25 0x00007efcc6041158 in request_nodelist (node=0x7efccc5deac8, > forward=2) at notification_peer.c:573 > body = 0x7efcef106ef8 > ret = 0 > __FUNCTION__ = "request_nodelist" > #26 0x00007efcc603dadd in add_server_and_notify (paddr=0x7efcc625da30 > <dmq_notification_address>) at notification_peer.c:340 > puri_data = "sip:10.12.5.29:5090\000\376\177\000\000\250I+\002\000\000\000\000\230L+\002\000\000\000\000\260;\313\023\376\177\000\000\250c+\002\000\000\000\000`;\313\023\376\177", > '\000' <repeats 17 times>, > "\200`?\313\023\376\177\000\000\325\222\255\307\374~\000\000\024=\313\023\376\177\000\000\030=\313\023\376\177\000\000\034=\313\023\376\177\000\000\260:\313\023\376\177\000\000*\000\000\000\000\000\000\000]s\f\000\000\000\000\000\001\000\000\000\000\000\000\000\244\201\000\000\204\352", > '\000' <repeats 19 times>, > "\340\f\000\000\000\000\000\000\020\000\000\000\000\000\000p\006\000\000\000\000\000\000"... > puri_list = {0x7ffe13cb3950 "sip:10.12.5.29:5090", 0x7ffe13cb3a50 > "sip:10.12.4.170:5090", 0x7ffe13cb3b50 "x\321-\002", 0x7ffe13cb3c50 "", > 0x7ffe13cb3d50 " @\313\023\376\177", > 0x7ffe13cb3e50 "", 0x7ffe13cb3f50 "", 0x7ffe13cb4050 "", > 0x7ffe13cb4150 "2\247h", 0x7ffe13cb4250 "pB\313\023\376\177", > 0x7ffe13cb4350 "\200S\237\312\374~", > 0x7ffe13cb4450 "8\341\006\357\374~", 0x7ffe13cb4550 > "\320E\313\023\376\177", 0x7ffe13cb4650 "\210*,\002", 0x7ffe13cb4750 > "\330N\313\023\376\177", 0x7ffe13cb4850 "", > 0x7ffe13cb4950 "", 0x7ffe13cb4a50 "\200J\313\023\376\177", > 0x7ffe13cb4b50 "\035\362\067\037\003", 0x7ffe13cb4c50 > "\320L\313\023\376\177", 0x7ffe13cb4d50 "\177", 0x7ffe13cb4e50 "n", > 0x7ffe13cb4f50 "1\325\\\002", 0x7ffe13cb5050 > "\260P\313\023\376\177", 0x7ffe13cb5150 "", 0x7ffe13cb5250 > "\320\343\270\307\374~", 0x7ffe13cb5350 "", 0x7ffe13cb5450 "xV,\002", > 0x7ffe13cb5550 "2\247h", 0x7ffe13cb5650 "\320\235\005\306\374~"} > pfirst = 0x7efccc5deac8 > pnode = 0x7efccc5ded10 > host_cnt = 2 > index = 2 > puri = {{user = {s = 0x0, len = 0}, passwd = {s = 0x0, len = 0}, > host = {s = 0x7efceefdde8c " > kamailio-kazoo.svc.cpaas.eu-west-1.aws.prv.talkdeskstg.com:5090", len = > 58}, port = { > s = 0x7efceefddec7 "5090", len = 4}, params = {s = 0x0, len > = 0}, sip_params = {s = 0x0, len = 0}, headers = {s = 0x0, len = 0}, > port_no = 5090, proto = 0, type = SIP_URI_T, > flags = (unknown: 0), transport = {s = 0x0, len = 0}, ttl = {s > = 0x0, len = 0}, user_param = {s = 0x0, len = 0}, maddr = {s = 0x0, len = > 0}, method = {s = 0x0, len = 0}, lr = { > s = 0x0, len = 0}, r2 = {s = 0x0, len = 0}, gr = {s = 0x0, > len = 0}, transport_val = {s = 0x0, len = 0}, ttl_val = {s = 0x0, len = 0}, > user_param_val = {s = 0x0, len = 0}, > maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x0, len = > 0}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x0, len = 0}, gr_val = {s = > 0x0, len = 0}}} > pstr = {{s = 0x7ffe13cb3a50 "sip:10.12.4.170:5090", len = 20}} > __FUNCTION__ = "add_server_and_notify" > #27 0x00007efcc6046f05 in child_init (rank=0) at dmq.c:302 > i = 4 > newpid = 160 > ---Type <return> to continue, or q <return> to quit--- > __FUNCTION__ = "child_init" > #28 0x0000000000541563 in init_mod_child () > No symbol table info available. > #29 0x0000000000541223 in init_mod_child () > No symbol table info available. > #30 0x0000000000541223 in init_mod_child () > No symbol table info available. > #31 0x0000000000541223 in init_mod_child () > No symbol table info available. > #32 0x0000000000541223 in init_mod_child () > No symbol table info available. > #33 0x0000000000541223 in init_mod_child () > No symbol table info available. > #34 0x0000000000541223 in init_mod_child () > No symbol table info available. > #35 0x0000000000541223 in init_mod_child () > No symbol table info available. > #36 0x0000000000541223 in init_mod_child () > No symbol table info available. > #37 0x0000000000541223 in init_mod_child () > No symbol table info available. > #38 0x0000000000541223 in init_mod_child () > No symbol table info available. > #39 0x0000000000541223 in init_mod_child () > No symbol table info available. > #40 0x0000000000541223 in init_mod_child () > No symbol table info available. > #41 0x0000000000541223 in init_mod_child () > No symbol table info available. > #42 0x0000000000541223 in init_mod_child () > No symbol table info available. > #43 0x00000000005418fa in init_child () > No symbol table info available. > #44 0x0000000000425d6e in main_loop () > No symbol table info available. > #45 0x000000000042c6af in main () > No symbol table info available. > DMQ module parameters are: > #!ifdef DMQ_ROLE > loadmodule "dmq.so" > loadmodule "dmq_usrloc.so" > > # ---- dmq params ---- > modparam("dmq", "server_address", "sip:DMQ_SERVER_ADDRESS") > modparam("dmq", "notification_address", "sip:DMQ_NOTIFY_ADDRESS") > modparam("dmq", "ping_interval", 5) > modparam("dmq", "multi_notify", 1) > modparam("dmq", "num_workers", 4) > modparam("dmq", "worker_usleep", 0) > modparam("dmq_usrloc", "enable", 1) > #!endif > Kamailio version and flags are: > version: kamailio 5.2.5 (x86_64/linux) > flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, > DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, > Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, > FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, > USE_DST_BLACKLIST, HAVE_RESOLV_RES > ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, > BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB > poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. > id: unknown > compiled on 01:14:59 Nov 19 2019 with gcc 7.3.1 > Do you have any idea what might be causing this *SEGV*? Best regards, Sergio Carvalho

2 1

[kamailio/kamailio] tcp_reuse_port: ACK cannot be delievered to WebRTC client (#2849)
by sergey-safarov 11 Sep '21

11 Sep '21

### Description I have working Kamailio config for WebRTC clients. I now want to use `tcp_reuse_port` feature and this feature breaks WebRTC clients. #### Log Messages ``` 106(106803) DEBUG: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.c:578]: forward_request(): orig. len=865, new_len=741, proto=5 106(106803) DEBUG: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.h:169]: msg_send_buffer(): sending to: 109.121.188.190:56424, force_socket=4, send_sock=0xffffa40ffa98 106(106803) WARNING: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} <core> [core/forward.h:203]: msg_send_buffer(): TCP/TLS connection for WebSocket could not be found 106(106803) ERROR: {1 41089865 ACK d50c83b4-124a-11ec-a038-835ce78b460e} sl [sl_funcs.c:418]: sl_reply_error(): stateless error reply used: Unfortunately error on sending to next hop occurred (477/SL) ``` More logs at the attached `ack.log` file. [ask.log](https://github.com/kamailio/kamailio/files/7144893/ask.log) ### Additional Information * **Kamailio Version** - output of `kamailio -v` used master branch with small customization, base commit c503d2bd31a580138a67f1d4a265ccde5791d271 * **Operating System**: aarch64 ``` [root@tmp kamailio]# 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/2849

2 5

Bullseye builds
by George Diamantopoulos 10 Sep '21

10 Sep '21

Hello all, Debian 11 "Bullseye" is to be released this Saturday. Do you expect to have binaries available for it on deb.kamailio.org anytime soon following the release? Thanks! BR, George

2 4

git:master:7d41d020: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 7d41d02028d095bd7e52047665db4f53ae606cc3 URL: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T13:31:16+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… Patch: https://github.com/kamailio/kamailio/commit/7d41d02028d095bd7e52047665db4f5… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index e3876fa7c0..a33e556545 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -935,6 +935,9 @@ end with branch flags matching at least one set inside xavp specified by xavp_cfg parameter with inner name rlf_bflags - e.g., $xavp(reg=>rlf_bflags). + * 2 - apply the active tcp connection filter - return only contact + records that have the associated TCP/TLS/WSS connection active. UDP + and SCTP contacts are not filtered, all are returned. Default value is NULL (disabled).

1 0

git:master:622f02d0: registrar: implemented lookup filter mode 2
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 622f02d0f817c5b6c70783cc98745cf06a986f84 URL: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T13:20:12+02:00 registrar: implemented lookup filter mode 2 - use only contacts that have associated TCP/TLS/WSS connection active --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Patch: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e310636f01..cafd8bbcf3 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1109,6 +1109,14 @@ end rlf_bflags - e.g., $xavp(reg=>rlf_bflags). </para> </listitem> + <listitem> + <para> + <emphasis>2</emphasis> - apply the active tcp connection filter + - return only contact records that have the associated TCP/TLS/WSS + connection active. UDP and SCTP contacts are not filtered, all + are returned. + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 81f9b7afd9..b58fbd6f7d 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,6 +45,8 @@ #include "lookup.h" #include "config.h" +#define REG_LOOKUP_FILTER_BFLAG (1<<0) +#define REG_LOOKUP_FILTER_TCPCON (1<<1) extern int reg_lookup_filter_mode; @@ -60,12 +62,13 @@ static void reg_lookup_filter_init(void) str filter_bflags = str_init("rlf_bflags"); sr_xavp_t *vavp = NULL; - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + if(reg_lookup_filter_mode==0) { return; } memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t)); - if((reg_lookup_filter_mode & 1) + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && (reg_xavp_cfg.s != NULL && reg_xavp_cfg.len > 0) && (vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &filter_bflags)) != NULL) { if(vavp->val.v.i != 0) { @@ -73,24 +76,45 @@ static void reg_lookup_filter_init(void) _reg_lookup_filter.factive = 1; } } + + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + _reg_lookup_filter.factive = 1; + } return; } static int reg_lookup_filter_match(ucontact_t* ptr) { - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { - return 1; - } - if(_reg_lookup_filter.factive==0) { + tcp_connection_t *con = NULL; + + if(reg_lookup_filter_mode==0 || _reg_lookup_filter.factive==0) { return 1; } - if(_reg_lookup_filter.bflags!=0) { + + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && _reg_lookup_filter.bflags!=0) { if((_reg_lookup_filter.bflags & ptr->cflags)==0) { return 0; } } - return 1; + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + if(ptr->tcpconn_id > 0) { + con = tcpconn_get(ptr->tcpconn_id, 0, 0, 0, 0); + if (unlikely(con == NULL)) { + LM_DBG("connection id %d does not exist\n", ptr->tcpconn_id); + return 0; + } + if (con->state != S_CONN_OK) { + LM_DBG("connection id %d not in state ok\n", ptr->tcpconn_id); + tcpconn_put(con); + return 0; + } + tcpconn_put(con); + } + } + + return 1; } static int has_to_tag(struct sip_msg* msg) @@ -485,7 +509,9 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr) + if ((VALID_CONTACT(ptr, act_time) + || cfg_get(registrar,registrar_cfg,use_expired_contacts)) + && allowed_method(_m, ptr) && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { @@ -500,7 +526,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) continue; } if (check_self(&(path_uri.host), 0, 0)) { - /* first hop in path vector is local - check for additional hops and if present, point to next one */ + /* first hop in path vector is local + * - check for additional hops and if present, point to next one */ if (path_str.len > (path_dst.len + 3)) { path_str.s = path_str.s + path_dst.len + 3; path_str.len = path_str.len - path_dst.len - 3;

1 0

git:master:bfc545f3: modules: readme files regenerated - sipt ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: bfc545f35193290a441c430a0de2eb05cd7d749b URL: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T12:16:25+02:00 modules: readme files regenerated - sipt ... [skip ci] --- Modified: src/modules/sipt/README --- Diff: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Patch: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0…

1 0

git:master:42db40db: rollback sipt_get_redirection_info
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 42db40db857c103404aaf3080ea2461e6d57618a URL: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 rollback sipt_get_redirection_info --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Patch: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 39b6a04199..533e114699 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -371,9 +371,9 @@ static int sipt_get_redirection_info(struct sip_msg *msg, pv_param_t *param, pv_ return -1; } - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG) && (body.s[0] != ISUP_IAM)) + if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) { - LM_DBG("message not an ACM or CPG or IAM\n"); + LM_DBG("message not an ACM or CPG\n"); return -1; }

1 0

git:master:8f2b2bbf: sipt: added one function and 8 pseudo-variables
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 8f2b2bbfa43e87841dc90cf4113c9e41f09b9b97 URL: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 sipt: added one function and 8 pseudo-variables - sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number) --- Modified: src/modules/sipt/doc/sipt_admin.xml Modified: src/modules/sipt/sipt.c Modified: src/modules/sipt/ss7.h Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Patch: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4…

1 0

git:master:c311fb78: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: c311fb78976fd7ba97e9ec1e3b8c4176ebeccc0f URL: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T11:16:30+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Patch: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index bcabbe4db2..d180968e95 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -98,6 +98,7 @@ Carsten Bock 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -203,6 +204,7 @@ Carsten Bock 1.56. ka_loglevel parameter usage 1.57. ka_logmsg parameter usage 1.58. load_rank parameter usage + 1.59. db_clean_tcp parameter usage Chapter 1. Admin Guide @@ -277,6 +279,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -414,6 +417,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 3.1. nat_bflag (int) @@ -1231,6 +1235,22 @@ modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") modparam("usrloc", "load_rank", 1) ... +3.59. db_clean_tcp (int) + + If set to 1, when Kamailio starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when end + points do not listen for incoming connections on contact address, which + is quite common (end point use only tcp client connections). On + restart, connections are lost, therefore the corresponding contact + records become useless. + + Default value is “0” (do not clean tcp contacts). + + Example 1.59. db_clean_tcp parameter usage +... +modparam("usrloc", "db_clean_tcp", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:18b7337a: usrloc: added db_clean_tcp parameter
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 18b7337ad4b868a84d4cb70abb37a3d4ba16a428 URL: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T11:12:01+02:00 usrloc: added db_clean_tcp parameter - if set, tcp contacts are deleted before loading location table at start time - it is very common that end points use only tcp client connections, on restart those connections are lost and corresponding contacts are useless --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Patch: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 25124abcc1..66dae44913 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1517,6 +1517,29 @@ modparam("usrloc", "load_rank", 1) </example> </section> + <section id="usrloc.p.db_clean_tcp"> + <title><varname>db_clean_tcp</varname> (int)</title> + <para> + If set to 1, when &kamailio; starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when + end points do not listen for incoming connections on contact address, + which is quite common (end point use only tcp client connections). + On restart, connections are lost, therefore the corresponding + contact records become useless. + </para> + <para> + Default value is <quote>0</quote> (do not clean tcp contacts). + </para> + <example> + <title><varname>db_clean_tcp</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_clean_tcp", 1) +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..4025cc549e 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -45,6 +45,7 @@ #include "urecord.h" extern int ul_rm_expired_delay; +extern int ul_db_clean_tcp; #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -372,6 +373,52 @@ static inline ucontact_info_t* dbrow2info(db_val_t *vals, str *contact, int rcon return &ci; } +/*! + * \brief Delete all location records with tcp connection + * + * \param _c database connection + * \param _d loaded domain + * \return 0 on success, -1 on failure + */ +int uldb_delete_tcp_records(db1_con_t* _c, udomain_t* _d) +{ + db_key_t keys[2]; + db_op_t ops[2]; + db_val_t vals[2]; + int nr_keys = 0; + + LM_DBG("delete location tcp records\n"); + + keys[nr_keys] = &ul_con_id_col;; + ops[nr_keys] = OP_GT; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = 0; + nr_keys++; + + if (ul_db_srvid != 0) { + keys[nr_keys] = &ul_srv_id_col; + ops[nr_keys] = OP_EQ; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = server_id; + nr_keys++; + } + + if (ul_dbf.use_table(_c, _d->name) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + + if (ul_dbf.delete(_c, keys, ops, vals, nr_keys) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + /*! * \brief Load all records from a udomain @@ -400,6 +447,10 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) urecord_t* r; ucontact_t* c; + if(ul_db_clean_tcp!=0) { + uldb_delete_tcp_records(_c, _d); + } + columns[0] = &ul_user_col; columns[1] = &ul_contact_col; columns[2] = &ul_expires_col; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 733c16a3ff..5668586733 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -176,6 +176,7 @@ int ul_desc_time_order = 0; /*!< By default do not enable timestamp ordering int ul_handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int ul_close_expired_tcp = 0; /*!< By default do not close TCP connections for expired contacts */ int ul_skip_remote_socket = 0; /*!< By default do not skip remote socket */ +int ul_db_clean_tcp = 0; /*!< Clean TCP/TLS/WSS contacts in DB before loading records */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; @@ -263,6 +264,7 @@ static param_export_t params[] = { {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {"load_rank", PARAM_INT, &ul_load_rank}, + {"db_clean_tcp", PARAM_INT, &ul_db_clean_tcp}, {0, 0, 0} };

1 0

git:master:608118de: modules: readme files regenerated - snmpstats ... [skip ci]
by Kamailio Dev 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 608118deffa70cf12f4c3de29e18a0cfb1ff934c URL: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-09T21:46:13+02:00 modules: readme files regenerated - snmpstats ... [skip ci] --- Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Patch: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… --- diff --git a/src/modules/snmpstats/README b/src/modules/snmpstats/README index 5308308e36..155003e027 100644 --- a/src/modules/snmpstats/README +++ b/src/modules/snmpstats/README @@ -44,7 +44,8 @@ Olle E. Johansson 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -69,7 +70,8 @@ Olle E. Johansson 1.5. Setting the dlg_major_threshold parameter 1.6. Setting the snmpgetPath parameter 1.7. Setting the snmpCommunity parameter - 1.8. Setting the export_registrar parameter + 1.8. Setting the snmpVersion parameter + 1.9. Setting the export_registrar parameter Chapter 1. Admin Guide @@ -100,7 +102,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -309,7 +312,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 4.1. sipEntityType (String) @@ -426,7 +430,21 @@ modparam("snmpstats", "snmpgetPath", "/my/custom/path/") modparam("snmpstats", "snmpCommunity", "customCommunityString") ... -4.8. export_registrar (int) +4.8. snmpVersion (String) + + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query to + the master agent. You can use this parameter to set specific SNMP + version. + + Default value is “3”. + + Example 1.8. Setting the snmpVersion parameter +... +modparam("snmpstats", "snmpVersion", "2c") +... + +4.9. export_registrar (int) The SNMPStats module will export registrar (usrloc) records if this parameter is set to 1. This will result in more memory usage and bigger @@ -440,7 +458,7 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") Default value is “0” (don't export). - Example 1.8. Setting the export_registrar parameter + Example 1.9. Setting the export_registrar parameter ... modparam("snmpstats", "export_registrar", 1) ...

1 0

[kamailio/kamailio] snmpstats: add parameter to specify SNMP version (#2846)
by Marat 09 Sep '21

09 Sep '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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2846 -- Commit Summary -- * snmpstats: add parameter to specify SNMP version -- File Changes -- M src/modules/snmpstats/doc/snmpstats_admin.xml (26) M src/modules/snmpstats/snmpstats.c (30) M src/modules/snmpstats/snmpstats_globals.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2846.patch https://github.com/kamailio/kamailio/pull/2846.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/2846

2 3

git:master:9f3b344a: snmpstats: add parameter to specify SNMP version
by Henning Westerholt 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 9f3b344a737f2bf8628be1126e4aa6145963b9bc URL: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Author: Marat Gareev <maratkin94(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-09T21:42:56+02:00 snmpstats: add parameter to specify SNMP version --- Modified: src/modules/snmpstats/doc/snmpstats_admin.xml Modified: src/modules/snmpstats/snmpstats.c Modified: src/modules/snmpstats/snmpstats_globals.h --- Diff: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Patch: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… --- diff --git a/src/modules/snmpstats/doc/snmpstats_admin.xml b/src/modules/snmpstats/doc/snmpstats_admin.xml index a6a4f1e3b4..870a8630a0 100644 --- a/src/modules/snmpstats/doc/snmpstats_admin.xml +++ b/src/modules/snmpstats/doc/snmpstats_admin.xml @@ -439,6 +439,32 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") </example> </section> + <section id ="snmpstats.p.snmpVersion"> + <title><varname>snmpVersion</varname> (String)</title> + + <para> + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query + to the master agent. You can use this parameter to set specific + SNMP version. + </para> + + <para> + <emphasis> + Default value is <quote>3</quote>. + </emphasis> + </para> + + <example> + <title>Setting the <varname>snmpVersion</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("snmpstats", "snmpVersion", "2c") +... + </programlisting> + </example> + </section> + <section id ="snmpstats.p.export_registrar"> <title><varname>export_registrar</varname> (int)</title> diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index a9d8b1fc88..4fae5dad09 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -145,6 +145,8 @@ static param_export_t mod_params[] = { (void *)set_snmpget_path}, {"snmpCommunity", PARAM_STRING | USE_FUNC_PARAM, (void *)set_snmp_community}, + {"snmpVersion", PARAM_STRING | USE_FUNC_PARAM, + (void *)set_snmp_version}, {"export_registrar", INT_PARAM, &snmp_export_registrar}, {0, 0, 0} }; @@ -178,10 +180,11 @@ volatile pid_t sysUpTime_pid; * for a full description. */ static int spawn_sysUpTime_child(); -/*! Storage for the "snmpgetPath" and "snmpCommunity" kamailio.cfg parameters. +/*! Storage for the "snmpgetPath", "snmpCommunity" and "snmpVersion" kamailio.cfg parameters. * The parameters are used to define what happens with the sysUpTime child. */ char *snmpget_path = NULL; char *snmp_community = NULL; +char *snmp_version = NULL; /*! * This module replaces the default SIGCHLD handler with our own, as explained @@ -462,6 +465,7 @@ static int spawn_sysUpTime_child(void) char *full_path_to_snmpget = NULL; char *snmp_community_string = "public"; + char *snmp_version_string = "3"; /* Set up a new SIGCHLD handler. The handler will be responsible for * ignoring SIGCHLDs generated by our sysUpTime child process. Every @@ -509,8 +513,16 @@ static int spawn_sysUpTime_child(void) snmp_community_string); } - char *args[] = {"-Ov", "-c", snmp_community_string, "localhost", - SYSUPTIME_OID, (char *)0}; + if(snmp_version != NULL) { + snmp_version_string = snmp_version; + } else { + LM_INFO("A snmpVersion parameter was not provided." + " Defaulting to %s\n", + snmp_version_string); + } + + char *args[] = {"snmpget", "-v", snmp_version_string, "-Ov", "-c", + snmp_community_string, "localhost", SYSUPTIME_OID, (char *)0}; /* Make sure we have a path to snmpget, so we can retrieve the * sysUpTime. */ @@ -586,3 +598,15 @@ int set_snmp_community(modparam_t type, void *val) return 0; } + +/* Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val) +{ + if(!stringHandlerSanityCheck(type, val, "snmpVersion")) { + return -1; + } + + snmp_version = (char *)val; + + return 0; +} diff --git a/src/modules/snmpstats/snmpstats_globals.h b/src/modules/snmpstats/snmpstats_globals.h index f40e65d42b..3a01e7ef70 100644 --- a/src/modules/snmpstats/snmpstats_globals.h +++ b/src/modules/snmpstats/snmpstats_globals.h @@ -159,4 +159,7 @@ int set_snmpget_path(modparam_t type, void *val); /*! Handles setting of the snmp community string. */ int set_snmp_community(modparam_t type, void *val); +/*! Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val); + #endif \ No newline at end of file

1 0

[kamailio/kamailio] core: logging: JSON: CEE: add the @cee prefix in Syslog messages (#2848)
by Daniel Pocock 09 Sep '21

09 Sep '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 - [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  The JSON CEE output from ```stderr``` is OK When the messages are sent through Syslog, they need this extra prefix ```@cee:``` before the JSON string Tested with ```rsyslog-omelasticsearch``` and [OpenSearch Dashboard (replacement for Kibana)](https://opensearch.org/) ``` module(load="mmjsonparse") # we handle LOG_LOCAL5 only, use the same setting in the application config local5.* :mmjsonparse: template(name="isJSON" type="list") { property(name="$!all-json") } module(load="omelasticsearch") local5.* action(type="omelasticsearch" template="isJSON" server="some-server" serverport="9200" searchIndex="log" searchType="_doc/" uid="admin" pwd="admin") ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2848 -- Commit Summary -- * core: logging: JSON: CEE: add the @cee prefix in Syslog messages -- File Changes -- M src/core/dprint.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2848.patch https://github.com/kamailio/kamailio/pull/2848.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/2848

2 3

git:master:73e4dfea: core: logging: JSON: CEE: add the @cee prefix in Syslog messages
by Henning Westerholt 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 73e4dfea9b7b21625d029e38f45a07beb2942aff URL: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… Author: Daniel Pocock <daniel(a)pocock.pro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-09T21:33:56+02:00 core: logging: JSON: CEE: add the @cee prefix in Syslog messages --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… Patch: https://github.com/kamailio/kamailio/commit/73e4dfea9b7b21625d029e38f45a07b… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 4a6dac31ca..1a809710ae 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -652,6 +652,10 @@ static void ksr_slog_json_str_escape(str *s_in, str *s_out, int *emode) "\"file\":{\"name\":\"%s\",\"line\":%d},\"native\":{\"function\":\"%s\"},\"msg\":\"%s\"," \ "\"pname\":\"%s\",\"appname\":\"%s\",\"hostname\":\"%s\"}%s" +#define KSR_SLOG_SYSLOG_JSON_CEEFMT "@cee: " KSR_SLOG_JSON_CEEFMT + +#define KSR_SLOG_STDERR_JSON_CEEFMT KSR_SLOG_JSON_CEEFMT + void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) { va_list arglist; @@ -718,7 +722,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) strftime (iso8601buf, ISO8601_BUF_SIZE, "%FT%T", &_tm); if (unlikely(log_stderr)) { if (unlikely(log_cee)) { - fprintf(stderr, KSR_SLOG_JSON_CEEFMT, + fprintf(stderr, KSR_SLOG_STDERR_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD (uintmax_t)pthread_self(), @@ -739,7 +743,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) } } else { if (unlikely(log_cee)) { - _km_log_func(kld->v_facility, KSR_SLOG_JSON_CEEFMT, + _km_log_func(kld->v_facility, KSR_SLOG_SYSLOG_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD pthread_self(),

1 0

git:master:8cd0a5ab: misctest: info debug about input data
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 8cd0a5ab8683c7a598499e6b1bbe1fc6a489f531 URL: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T14:59:21+02:00 misctest: info debug about input data --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… Patch: https://github.com/kamailio/kamailio/commit/8cd0a5ab8683c7a598499e6b1bbe1fc… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c8fe64a56c..2b304c6b5d 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -312,37 +312,38 @@ static int misctest_message_init(void) return -1; } - tmsg.buf = tbuf; + tmsg.buf = tbuf; - LM_INFO("using data: [[%.*s]] (%d)\n", tmsg.len, tmsg.buf, tmsg.len); + LM_INFO("data - start: %p - end: %p - len: %d\n", tmsg.buf, + tmsg.buf + tmsg.len, tmsg.len); + LM_INFO("data - content: [[%.*s]]\n", tmsg.len, tmsg.buf); misctest_hexprint(tmsg.buf, tmsg.len, 20, 10); - if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { - goto cleanup; - } + if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { + goto cleanup; + } - parse_sdp(&tmsg); + parse_sdp(&tmsg); - parse_headers(&tmsg, HDR_TO_F, 0); + parse_headers(&tmsg, HDR_TO_F, 0); - parse_contact_header(&tmsg); + parse_contact_header(&tmsg); - parse_refer_to_header(&tmsg); + parse_refer_to_header(&tmsg); - parse_to_header(&tmsg); + parse_to_header(&tmsg); - parse_pai_header(&tmsg); + parse_pai_header(&tmsg); - parse_diversion_header(&tmsg); + parse_diversion_header(&tmsg); - parse_privacy(&tmsg); + parse_privacy(&tmsg); cleanup: - free_sip_msg(&tmsg); - - return 0; + free_sip_msg(&tmsg); + return 0; } /**

1 0

git:5.5:1685ebd5: usrloc: set tcp connection id to -1 for records added via rpc
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: 1685ebd5917e763c347b6d4201b19b72e2ee274e URL: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T13:33:46+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam (cherry picked from commit a0a97119bef7671f33734399dc9de4562abae39c) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… Patch: https://github.com/kamailio/kamailio/commit/1685ebd5917e763c347b6d4201b19b7… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d45a8e2783..6565b07d5c 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -678,6 +678,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; ci.server_id = server_id; + ci.tcpconn_id = -1; lock_udomain(dom, &aor);

1 0

git:5.5:b0125b66: presence: skip body operations on empty string
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: b0125b66116468b1e5d0dd2ee4eb0eebb4e7ecb4 URL: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:33:35+02:00 presence: skip body operations on empty string (cherry picked from commit c849070371740c01f9f13a889c610de9132349f3) --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… Patch: https://github.com/kamailio/kamailio/commit/b0125b66116468b1e5d0dd2ee4eb0ee… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 87ed58cff4..cf52c21c22 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1700,7 +1700,8 @@ int send_notify_request( } /* build extra headers */ - if(build_str_hdr(subs, notify_body ? 1 : 0, &str_hdr) < 0) { + if(build_str_hdr(subs, (notify_body && notify_body->len>0) ? 1 : 0, + &str_hdr) < 0) { LM_ERR("while building headers\n"); goto error; } diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..83a88f1aa1 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -303,6 +303,9 @@ int pres_dmq_handle_msg( } else if(strcmp(it->string, "body") == 0) { p_body.s = it->valuestring; p_body.len = strlen(it->valuestring); + if(p_body.len==0) { + p_body.s = NULL; + } } else { LM_ERR("unrecognized field in json object\n"); goto invalid; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index bc17bf1074..a7629a4e92 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -737,6 +737,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, result_cols[rez_ruid_col = n_result_cols++] = &str_ruid_col; if(new_t) { + /* new_t!=0 */ LM_DBG("new presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -888,6 +889,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, *sent_reply = 1; goto send_notify; } else { + /* new_t==0 */ LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -1206,7 +1208,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, update_vals[n_update_cols].val.int_val = presentity->priority; n_update_cols++; - if(body && body->s) { + if(body && body->s && body->len>0) { update_keys[n_update_cols] = &str_body_col; update_vals[n_update_cols].type = DB1_BLOB; update_vals[n_update_cols].nul = 0; @@ -1748,7 +1750,7 @@ static int ps_cache_update_presentity(sip_msg_t *msg, presentity_t *presentity, ptc.expires = presentity->expires + (int)time(NULL); ptc.received_time = presentity->received_time; ptc.priority = presentity->priority; - if(body && body->s) { + if(body && body->s && body->len>0) { ptc.body = *body; } if(presentity->sender) {

1 0

git:5.5:0c9d7e33: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: 0c9d7e3378a4e3ffb1e6a7e48f89b7649aaa6fb2 URL: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:45+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW (cherry picked from commit b86d2490f3b96c532cbe07259786757b3ab9fc02) --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… Patch: https://github.com/kamailio/kamailio/commit/0c9d7e3378a4e3ffb1e6a7e48f89b76… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7e5b00425b..243bb9bd9f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2706,7 +2706,7 @@ static void rpc_dlg_set_state(rpc_t *rpc,void *c){ dlg->init_ts = (unsigned int)(time(0)); dlg->end_ts = (unsigned int)(time(0)); } - dlg->dflags |= DLG_FLAG_NEW; + dlg->dflags |= DLG_FLAG_CHANGED; dlg_unref(dlg, unref);

1 0

git:5.5:b6380374: sca: call unsafe find entry function to avoid infinite recursion
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: b6380374f310a26c8a36f807d97ff0f415204be4 URL: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:32:58+02:00 sca: call unsafe find entry function to avoid infinite recursion (cherry picked from commit bd92fb59cce183008956ff060911cc14d3dfb160) --- Modified: src/modules/sca/sca_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… Patch: https://github.com/kamailio/kamailio/commit/b6380374f310a26c8a36f807d97ff0f… --- diff --git a/src/modules/sca/sca_hash.c b/src/modules/sca/sca_hash.c index 3e96bc2be5..690e9a39e5 100644 --- a/src/modules/sca/sca_hash.c +++ b/src/modules/sca/sca_hash.c @@ -205,7 +205,7 @@ sca_hash_entry *sca_hash_table_slot_kv_find_entry(sca_hash_slot *slot, str *key) sca_hash_entry *e; lock_get(&slot->lock); - e = sca_hash_table_slot_kv_find_entry(slot, key); + e = sca_hash_table_slot_kv_find_entry_unsafe(slot, key); lock_release(&slot->lock); return (e);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev