sr-dev August 2022

sr-dev@lists.kamailio.org

16 participants
204 discussions

git:5.4:14670263: usrloc: fix sending keepalive messages for IPv6, it was missing the brackets

by Henning Westerholt

Module: kamailio Branch: 5.4 Commit: 14670263837dd158f8f4512a474ea7dee3a561b3 URL: https://github.com/kamailio/kamailio/commit/14670263837dd158f8f4512a474ea7d… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-02T08:50:30Z usrloc: fix sending keepalive messages for IPv6, it was missing the brackets (cherry picked from commit bd40f0d08f5d0f14b301cb492d1082c71be91c50) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/14670263837dd158f8f4512a474ea7d… Patch: https://github.com/kamailio/kamailio/commit/14670263837dd158f8f4512a474ea7d… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index a69a76d8b9..5b1572483b 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -61,7 +61,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_CALLID_PREFIX_LEN (sizeof(ULKA_CALLID_PREFIX) - 1) #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ - "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ + "Via: SIP/2.0/%.*s %s%.*s%s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ @@ -101,6 +101,7 @@ int ul_ka_urecord(urecord_t *ur) socket_info_t *ssock; dest_info_t idst; unsigned int bcnt = 0; + unsigned int via_ipv6 = 0; int aortype = 0; int i; struct timeval tv; @@ -195,8 +196,14 @@ int ul_ka_urecord(urecord_t *ur) idst.send_sock = ssock; if(ssock->useinfo.name.len > 0) { + if (ssock->useinfo.address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->useinfo.name; } else { + if (ssock->address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->address_str; } if(ssock->useinfo.port_no > 0) { @@ -212,7 +219,9 @@ int ul_ka_urecord(urecord_t *ur) ul_ka_method.len, ul_ka_method.s, uc->c.len, uc->c.s, sproto.len, sproto.s, + (via_ipv6==1)?"[":"", vaddr.len, vaddr.s, + (via_ipv6==1)?"]":"", vport.len, vport.s, _ul_ka_counter, bcnt, (uc->path.len>0)?"Route: ":"",

10 months

git:5.5:4bc1b874: usrloc: fix sending keepalive messages for IPv6, it was missing the brackets

by Henning Westerholt

Module: kamailio Branch: 5.5 Commit: 4bc1b874330f81e582cd8aa109ee62af437d6674 URL: https://github.com/kamailio/kamailio/commit/4bc1b874330f81e582cd8aa109ee62a… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-02T08:49:00Z usrloc: fix sending keepalive messages for IPv6, it was missing the brackets (cherry picked from commit bd40f0d08f5d0f14b301cb492d1082c71be91c50) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/4bc1b874330f81e582cd8aa109ee62a… Patch: https://github.com/kamailio/kamailio/commit/4bc1b874330f81e582cd8aa109ee62a… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index a69a76d8b9..5b1572483b 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -61,7 +61,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_CALLID_PREFIX_LEN (sizeof(ULKA_CALLID_PREFIX) - 1) #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ - "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ + "Via: SIP/2.0/%.*s %s%.*s%s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ @@ -101,6 +101,7 @@ int ul_ka_urecord(urecord_t *ur) socket_info_t *ssock; dest_info_t idst; unsigned int bcnt = 0; + unsigned int via_ipv6 = 0; int aortype = 0; int i; struct timeval tv; @@ -195,8 +196,14 @@ int ul_ka_urecord(urecord_t *ur) idst.send_sock = ssock; if(ssock->useinfo.name.len > 0) { + if (ssock->useinfo.address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->useinfo.name; } else { + if (ssock->address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->address_str; } if(ssock->useinfo.port_no > 0) { @@ -212,7 +219,9 @@ int ul_ka_urecord(urecord_t *ur) ul_ka_method.len, ul_ka_method.s, uc->c.len, uc->c.s, sproto.len, sproto.s, + (via_ipv6==1)?"[":"", vaddr.len, vaddr.s, + (via_ipv6==1)?"]":"", vport.len, vport.s, _ul_ka_counter, bcnt, (uc->path.len>0)?"Route: ":"",

10 months

git:master:bd40f0d0: usrloc: fix sending keepalive messages for IPv6, it was missing the brackets

by Henning Westerholt

Module: kamailio Branch: master Commit: bd40f0d08f5d0f14b301cb492d1082c71be91c50 URL: https://github.com/kamailio/kamailio/commit/bd40f0d08f5d0f14b301cb492d1082c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-08-02T08:47:52Z usrloc: fix sending keepalive messages for IPv6, it was missing the brackets --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/bd40f0d08f5d0f14b301cb492d1082c… Patch: https://github.com/kamailio/kamailio/commit/bd40f0d08f5d0f14b301cb492d1082c… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index a69a76d8b9..5b1572483b 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -61,7 +61,7 @@ Content-Length: 0\r\n\r\n" #define ULKA_CALLID_PREFIX_LEN (sizeof(ULKA_CALLID_PREFIX) - 1) #define ULKA_MSG "%.*s %.*s SIP/2.0\r\n" \ - "Via: SIP/2.0/%.*s %.*s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ + "Via: SIP/2.0/%.*s %s%.*s%s:%.*s;branch=z9hG4bKx.%u.%u.0\r\n" \ "%s%.*s%.*s" \ "From: <%.*s>;tag=%.*s-%x-%lx-%lx-%x.%x\r\n" \ "To: <sip:%.*s%s%.*s>\r\n" \ @@ -101,6 +101,7 @@ int ul_ka_urecord(urecord_t *ur) socket_info_t *ssock; dest_info_t idst; unsigned int bcnt = 0; + unsigned int via_ipv6 = 0; int aortype = 0; int i; struct timeval tv; @@ -195,8 +196,14 @@ int ul_ka_urecord(urecord_t *ur) idst.send_sock = ssock; if(ssock->useinfo.name.len > 0) { + if (ssock->useinfo.address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->useinfo.name; } else { + if (ssock->address.af == AF_INET6) { + via_ipv6 = 1; + } vaddr = ssock->address_str; } if(ssock->useinfo.port_no > 0) { @@ -212,7 +219,9 @@ int ul_ka_urecord(urecord_t *ur) ul_ka_method.len, ul_ka_method.s, uc->c.len, uc->c.s, sproto.len, sproto.s, + (via_ipv6==1)?"[":"", vaddr.len, vaddr.s, + (via_ipv6==1)?"]":"", vport.len, vport.s, _ul_ka_counter, bcnt, (uc->path.len>0)?"Route: ":"",

10 months

[kamailio/kamailio] unexpected error log when KSR.xhttp.xhttp_reply(404...) (Issue #3204)

by hance2010

### Description  some unexpected error in kamailio.log when KSR.xhttp.xhttp_reply(404...) ### Troubleshooting #### Reproduction cat /etc/kamailio/kamailio.cfg ``` listen=tcp:127.0.0.1:5060 tcp_accept_no_cl=yes debug=3 log_stderror=yes loadmodule "jsonrpcs.so" loadmodule "tm.so" loadmodule "sl.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "xhttp.so" loadmodule "app_lua.so" modparam("xhttp", "event_callback", "ksr_xhttp_event") modparam("app_lua", "load", "/etc/kamailio/kamailio.lua") cfgengine "lua" ``` cat /etc/kamailio/kamailio.lua ``` function ksr_request_route() KSR.sl.send_reply(200, "OK") KSR.x.exit() end function ksr_xhttp_event() KSR.set_reply_no_connect() KSR.set_reply_close() KSR.xhttp.xhttp_reply(404, "Not Found", "", "") KSR.x.exit() end ``` curl http://127.0.0.1:5060 -v  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` 15(5845) DEBUG: <core> [core/ip_addr.c:571]: print_ip(): tcpconn_new: new tcp connection: 127.0.0.1 15(5845) DEBUG: <core> [core/tcp_main.c:1216]: tcpconn_new(): on port 54884, type 2, socket 29 15(5845) DEBUG: <core> [core/tcp_main.c:1548]: tcpconn_add(): hashes: 1846:1992:1067, 1 15(5845) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0x563c94544c20, 29, 2, 0x7fb2e4691088) - fd_no=23 15(5845) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x563c94544c20, 29, -1, 0x0) fd_no=24 called 15(5845) DEBUG: <core> [core/tcp_main.c:4545]: handle_tcpconn_ev(): sending to child, events 1 15(5845) DEBUG: <core> [core/tcp_main.c:4215]: send2child(): selected tcp worker idx:0 proc:7 pid:5837 for activity on [tcp:127.0.0.1:5060], 0x7fb2e4691088 7(5837) DEBUG: <core> [core/tcp_read.c:1735]: handle_io(): received n=8 con=0x7fb2e4691088, fd=6 7(5837) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 7(5837) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 7(5837) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: 7(5837) DEBUG: <core> [core/parser/msg_parser.c:678]: parse_msg(): method: <GET> 7(5837) DEBUG: <core> [core/parser/msg_parser.c:680]: parse_msg(): uri: </> 7(5837) DEBUG: <core> [core/parser/msg_parser.c:682]: parse_msg(): version: <HTTP/1.1> 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Host] type 0 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [User-Agent] type 28 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Accept] type 23 7(5837) DEBUG: <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header 7(5837) DEBUG: <core> [core/receive.c:389]: receive_msg(): --- received sip message - request - call-id: [] - cseq: [] 7(5837) DEBUG: <core> [core/receive.c:261]: ksr_evrt_pre_routing(): event route core:pre-routing not defined 7(5837) DEBUG: <core> [core/receive.c:426]: receive_msg(): handling non-sip request message 7(5837) DEBUG: xhttp [xhttp_mod.c:371]: xhttp_handler(): new fake msg created (112 bytes): <GET / HTTP/1.1 Via: SIP/2.0/TCP 127.0.0.1:54884 Host: 127.0.0.1:5060 User-Agent: curl/7.74.0 Accept: */* > 7(5837) DEBUG: <core> [core/parser/parse_fline.c:249]: parse_first_line(): first line type 1 (request) flags 2 7(5837) DEBUG: <core> [core/parser/msg_parser.c:677]: parse_msg(): SIP Request: 7(5837) DEBUG: <core> [core/parser/msg_parser.c:678]: parse_msg(): method: <GET> 7(5837) DEBUG: <core> [core/parser/msg_parser.c:680]: parse_msg(): uri: </> 7(5837) DEBUG: <core> [core/parser/msg_parser.c:682]: parse_msg(): version: <HTTP/1.1> 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Via] type 1 7(5837) DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 7(5837) DEBUG: <core> [core/parser/msg_parser.c:555]: parse_headers(): Via found, flags=2 7(5837) DEBUG: <core> [core/parser/msg_parser.c:557]: parse_headers(): this is the first via 7(5837) DEBUG: app_lua [app_lua_api.c:549]: sr_lua_reload_script(): No need to reload [/etc/kamailio/kamailio.lua] is version 0 7(5837) DEBUG: app_lua [app_lua_api.c:733]: app_lua_run_ex(): executing Lua function: [[ksr_xhttp_event]] 7(5837) DEBUG: app_lua [app_lua_api.c:735]: app_lua_run_ex(): lua top index is: 11 7(5837) DEBUG: app_lua [app_lua_api.c:1067]: sr_kemi_lua_exec_func_ex(): param[0] for: xhttp_reply is int: 404 7(5837) DEBUG: app_lua [app_lua_api.c:1063]: sr_kemi_lua_exec_func_ex(): param[1] for: xhttp_reply is str: Not Found 7(5837) DEBUG: app_lua [app_lua_api.c:1063]: sr_kemi_lua_exec_func_ex(): param[2] for: xhttp_reply is str: 7(5837) DEBUG: app_lua [app_lua_api.c:1063]: sr_kemi_lua_exec_func_ex(): param[3] for: xhttp_reply is str: 7(5837) DEBUG: xhttp [xhttp_mod.c:426]: xhttp_send_reply(): sending out response: 404 Not Found 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Host] type 0 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [User-Agent] type 28 7(5837) DEBUG: <core> [core/parser/parse_hname2.c:301]: parse_sip_header_name(): parsed header name [Accept] type 23 7(5837) DEBUG: <core> [core/parser/msg_parser.c:91]: get_hdr_field(): found end of header 7(5837) DEBUG: <core> [core/msg_translator.c:162]: check_via_address(): (127.0.0.1, 127.0.0.1, 0) 7(5837) DEBUG: <core> [core/tcp_main.c:1644]: _tcpconn_find(): found connection by id: 1 7(5837) DEBUG: <core> [core/tcp_main.c:2526]: tcpconn_send_put(): send from reader (5837 (7)), reusing fd 7(5837) DEBUG: <core> [core/tcp_main.c:2761]: tcpconn_do_send(): sending... 7(5837) DEBUG: <core> [core/tcp_main.c:2794]: tcpconn_do_send(): after real write: c= 0x7fb2e4691088 n=120 fd=6 7(5837) DEBUG: <core> [core/tcp_main.c:2795]: tcpconn_do_send(): buf= HTTP/1.1 404 Not Found Sia: SIP/2.0/TCP 127.0.0.1:54884 Server: kamailio (5.6.1 (x86_64/linux)) Content-Length: 0 15(5845) DEBUG: <core> [core/tcp_main.c:3880]: handle_ser_child(): read response= 7fb2e4691088, -1, fd -1 from 7 (5837) 7(5837) DEBUG: <core> [core/parser/parse_fline.c:255]: parse_first_line(): bad request first line 7(5837) DEBUG: <core> [core/parser/parse_fline.c:258]: parse_first_line(): at line 0 char 16: 7(5837) DEBUG: <core> [core/parser/parse_fline.c:264]: parse_first_line(): parsed so far: HTTP/1.1 404 Not 7(5837) ERROR: <core> [core/parser/parse_fline.c:271]: parse_first_line(): parse_first_line: bad message (offset: 16) 7(5837) DEBUG: <core> [core/parser/msg_parser.c:673]: parse_msg(): invalid message 7(5837) ERROR: <core> [core/parser/msg_parser.c:747]: parse_msg(): ERROR: parse_msg: message=<HTTP/1.1 404 Not Found Sia: SIP/2.0/TCP 127.0.0.1:54884 Server: kamailio (5.6.1 (x86_64/linux)) Content-Length: 0 > 7(5837) ERROR: <core> [core/msg_translator.c:3256]: build_sip_msg_from_buf(): parsing failed 7(5837) DEBUG: app_lua [app_lua_mod.c:164]: sr_kemi_config_engine_lua(): execution of route type 513 with name [ksr_xhttp_event] returned 1 7(5837) DEBUG: <core> [core/receive.c:432]: receive_msg(): finished handling non-sip request message 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/usr_avp.c:637]: destroy_avp_list(): destroying list (nil) 7(5837) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 7(5837) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 7(5837) DEBUG: <core> [core/xavp.c:541]: xavp_destroy_list(): destroying xavp list (nil) 7(5837) DEBUG: <core> [core/receive.c:628]: receive_msg(): cleaning up 7(5837) DEBUG: <core> [core/io_wait.h:374]: io_watch_add(): processing io_watch_add(0x563c94588ec0, 6, 2, 0x7fb2e4691088) - fd_no=1 7(5837) DEBUG: <core> [core/io_wait.h:599]: io_watch_del(): DBG: io_watch_del (0x563c94588ec0, 6, -1, 0x10) fd_no=2 called 7(5837) DEBUG: <core> [core/tcp_read.c:1870]: handle_io(): removing from list 0x7fb2e4691088 id 1 fd 6, state -1, flags 4028, main fd -1, refcnt 1 ([127.0.0.1]:54884 -> [127.0.0.1]:5060) 7(5837) DEBUG: <core> [core/tcp_read.c:1653]: release_tcpconn(): releasing con 0x7fb2e4691088, state -2, fd=6, id=1 ([127.0.0.1]:54884 -> [127.0.0.1]:5060) 7(5837) DEBUG: <core> [core/tcp_read.c:1657]: release_tcpconn(): extra_data (nil) 15(5845) DEBUG: <core> [core/tcp_main.c:3641]: handle_tcp_child(): reader response= 7fb2e4691088, -2 from 0 15(5845) DEBUG: <core> [core/tcp_main.c:3566]: tcp_emit_closed_event(): TCP closed event creation triggered (reason: 0) 15(5845) DEBUG: <core> [core/tcp_main.c:3574]: tcp_emit_closed_event(): no callback registering for handling TCP closed event 2(5832) DEBUG: <core> [core/timer.c:422]: adjust_ticks(): adjusting timer ticks (677813966) with 312 ms (5 ticks) 2(5832) DEBUG: <core> [core/timer.c:422]: adjust_ticks(): adjusting timer ticks (677815246) with 250 ms (4 ticks) 2(5832) DEBUG: <core> [core/timer.c:422]: adjust_ticks(): adjusting timer ticks (677816206) with 250 ms (4 ticks) 2(5832) DEBUG: <core> [core/timer.c:422]: adjust_ticks(): adjusting timer ticks (677817406) with 312 ms (5 ticks) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` Kamailio5.6.1 ``` * **Operating System**:  ``` Debian11 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3204 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3204(a)github.com>

10 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2022