diff --git a/src/sdlan_network.erl b/src/sdlan_network.erl index 80d5bd8..9a9922b 100644 --- a/src/sdlan_network.erl +++ b/src/sdlan_network.erl @@ -279,22 +279,22 @@ handle_call({peer_info, SrcMac, DstMac}, _From, State = #state{endpoints = Endpo case maps:find(DstMac, Endpoints) of {ok, #endpoint{channel_pid = DstChannelPid, hole = #hole{peer = DstNatPeer, nat_type = DstNatType}, v6_info = DstV6Info}} -> %% 让目标服务器发送sendRegister事件(2024-06-25 新增,提高打洞的成功率) - %maybe - % {ok, #endpoint{hole = #hole{peer = {SrcNatIp, SrcNatPort}, nat_type = SrcNatType}, v6_info = SrcV6Info}} ?= maps:find(SrcMac, Endpoints), + maybe + {ok, #endpoint{hole = #hole{peer = {SrcNatIp, SrcNatPort}, nat_type = SrcNatType}, v6_info = SrcV6Info}} ?= maps:find(SrcMac, Endpoints), - % RegisterEvent = sdlan_pb:encode_msg(#'SDLEvent' { - % event = {send_register, #'SDLEvent.SendRegister'{ - % dst_mac = SrcMac, - % nat_ip = sdlan_util:ipv4_to_int(SrcNatIp), - % nat_type = SrcNatType, - % nat_port = SrcNatPort, - % v6_info = SrcV6Info - % }} - % }), - % logger:debug("Event: send_register, for peer_info"), + RegisterEvent = sdlan_pb:encode_msg(#'SDLEvent' { + event = {send_register, #'SDLEvent.SendRegister'{ + dst_mac = SrcMac, + nat_ip = sdlan_util:ipv4_to_int(SrcNatIp), + nat_type = SrcNatType, + nat_port = SrcNatPort, + v6_info = SrcV6Info + }} + }), + logger:debug("Event: send_register, for peer_info"), - % sdlan_quic_channel:send_event(DstChannelPid, ?EVENT_SEND_REGISTER, RegisterEvent) - %end, + sdlan_quic_channel:send_event(DstChannelPid, ?EVENT_SEND_REGISTER, RegisterEvent) + end, {reply, {ok, {DstNatPeer, DstNatType}, DstV6Info}, State}; _ -> {reply, error, State}