diff --git a/apps/sdlan/include/sdlan_pb.hrl b/apps/sdlan/include/sdlan_pb.hrl index 2a1f09f..1bac18c 100644 --- a/apps/sdlan/include/sdlan_pb.hrl +++ b/apps/sdlan/include/sdlan_pb.hrl @@ -210,4 +210,21 @@ }). -endif. +-ifndef('SDL_ARP_REQUEST_PB_H'). +-define('SDL_ARP_REQUEST_PB_H', true). +-record(sdl_arp_request, + {network_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + target_ip = 0 :: non_neg_integer() | undefined % = 2, optional, 32 bits + }). +-endif. + +-ifndef('SDL_ARP_RESPONSE_PB_H'). +-define('SDL_ARP_RESPONSE_PB_H', true). +-record(sdl_arp_response, + {network_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + target_ip = 0 :: non_neg_integer() | undefined, % = 2, optional, 32 bits + target_mac = <<>> :: iodata() | undefined % = 3, optional + }). +-endif. + -endif. diff --git a/apps/sdlan/src/sdlan_network.erl b/apps/sdlan/src/sdlan_network.erl index 5c72ee2..f30a6e7 100644 --- a/apps/sdlan/src/sdlan_network.erl +++ b/apps/sdlan/src/sdlan_network.erl @@ -23,7 +23,7 @@ %% API -export([start_link/2]). --export([get_name/1, get_pid/1, assign_ip_addr/4, peer_info/3, unregister/3, debug_info/1, get_network_id/1, get_used_map/1]). +-export([get_name/1, get_pid/1, lookup_pid/1, assign_ip_addr/4, peer_info/3, unregister/3, debug_info/1, get_network_id/1, get_used_map/1, arp_query/2]). -export([forward/5, update_hole/6, disable_client/2, get_channel/2, dropout_client/2]). -export([test_event/1]). @@ -79,6 +79,15 @@ test_event(Pid) -> get_pid(Id) when is_integer(Id) -> whereis(get_name(Id)). +-spec lookup_pid(Id :: integer()) -> error | {ok, Pid :: pid()}. +lookup_pid(Id) when is_integer(Id) -> + case whereis(get_name(Id)) of + Pid when is_pid(Pid) -> + {ok, Pid}; + undefined -> + error + end. + -spec get_name(Id :: integer()) -> atom(). get_name(Id) when is_integer(Id) -> list_to_atom("sdlan_network:" ++ integer_to_list(Id)). @@ -92,6 +101,10 @@ assign_ip_addr(Pid, ChannelPid, ClientId, Mac) when is_pid(Pid), is_pid(ChannelP get_network_id(Pid) when is_pid(Pid) -> gen_server:call(Pid, get_network_id). +-spec arp_query(Pid :: pid(), TargetIp :: integer()) -> {ok, TargetMac :: binary()} | error. +arp_query(Pid, TargetIp) when is_pid(Pid), is_integer(TargetIp) -> + gen_server:call(Pid, {arp_query, TargetIp}). + -spec unregister(Pid :: pid(), ClientId :: binary(), Mac :: binary()) -> no_return(). unregister(Pid, ClientId, Mac) when is_pid(Pid), is_binary(ClientId), is_binary(Mac) -> gen_server:cast(Pid, {unregister, ClientId, Mac}). @@ -263,6 +276,15 @@ handle_call({dropout_client, ClientId}, _From, State = #state{endpoints = Endpoi handle_call(get_network_id, _From, State = #state{network_id = NetworkId}) -> {reply, {ok, NetworkId}, State}; +%% arp查询 +handle_call({arp_query, TargetIp}, _From, State = #state{endpoints = Endpoints}) -> + case search_endpoint(fun(#endpoint{ip = Ip0}) -> TargetIp =:= Ip0 end, Endpoints) of + {ok, TargetMac, _} -> + {reply, {ok, TargetMac}, State}; + error -> + {reply, error, State} + end; + %% 网络存在的nat_peer信息 handle_call({peer_info, SrcMac, DstMac}, _From, State = #state{endpoints = Endpoints}) -> case maps:find(DstMac, Endpoints) of @@ -338,39 +360,22 @@ handle_cast({forward, Sock, SrcMac, DstMac, Packet}, State = #state{network_id = %% 广播地址和组播地址，需要转发到整个网络 case sdlan_util:is_broadcast_mac(DstMac) orelse sdlan_util:is_multicast_mac(DstMac) of true -> - %% 解析Packet是不是arp请求 - case maybe_arp_request(Packet) of - {ok, ArpRequestPkt} -> - TargetIp = arp_packet:target_ip(ArpRequestPkt), - %% 通过ip查找到对应的Endpoint + PacketBytes = byte_size(Packet), + %% 消息广播 + broadcast(fun(#endpoint{hole = Hole}) -> + case Hole of + #hole{peer = {NatIp, NatPort}} -> + gen_udp:send(Sock, NatIp, NatPort, Packet); + _ -> + ok + end + end, [SrcMac], Endpoints), - case search_endpoint(fun(#endpoint{ip = Ip0}) -> TargetIp =:= Ip0 end, Endpoints) of - {ok, TargetMac, _} -> - ArpResponse = arp_packet:marshal(arp_packet:arp_response(ArpRequestPkt, TargetMac, TargetIp)), - #endpoint{hole = #hole{peer = {NatIp, NatPort}}} = maps:get(SrcMac, Endpoints), - gen_udp:send(Sock, NatIp, NatPort, ArpResponse); - error -> - ok - end; + %% client和stun之间必须有心跳机制保持nat映射可用，并且通过服务转发的udp包肯定可以到达对端的nat + lager:debug("[sdlan_network] broadcast data networkd_id: ~p, src_mac: ~p, dst_mac: ~p", + [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), - error -> - PacketBytes = byte_size(Packet), - %% 消息广播 - broadcast(fun(#endpoint{hole = Hole}) -> - case Hole of - #hole{peer = {NatIp, NatPort}} -> - gen_udp:send(Sock, NatIp, NatPort, Packet); - _ -> - ok - end - end, [SrcMac], Endpoints), - - %% client和stun之间必须有心跳机制保持nat映射可用，并且通过服务转发的udp包肯定可以到达对端的nat - lager:debug("[sdlan_network] broadcast data networkd_id: ~p, src_mac: ~p, dst_mac: ~p", - [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), - - {noreply, State#state{forward_bytes = ForwardBytes + PacketBytes}} - end; + {noreply, State#state{forward_bytes = ForwardBytes + PacketBytes}}; false -> lager:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, forward discard 1", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), @@ -418,7 +423,7 @@ handle_cast({update_hole, ClientId, Mac, Peer, NatType, V6Info}, State = #state{ Endpoint = Endpoint0#endpoint{hole = #hole{peer = Peer, nat_type = NatType}, v6_info = V6Info}, {noreply, State#state{endpoints = maps:put(Mac, Endpoint, Endpoints)}}; - error -> + _ -> {noreply, State} end. @@ -492,20 +497,6 @@ code_change(_OldVsn, State = #state{}, _Extra) -> %%%=================================================================== %%% Internal functions %%%=================================================================== - --spec maybe_arp_request(Packet :: binary()) -> error | {ok, ArpPkt :: arp_packet:arp_packet()}. -maybe_arp_request(Packet) when is_binary(Packet) -> - maybe - {ok, LayerPacket} ?= layer_packet:parse(Packet), - arp ?= layer_packet:packet_type(LayerPacket), - {ok, ArpPacket} ?= arp_packet:parse(layer_packet:payload(LayerPacket)), - request ?= arp_packet:opcode(ArpPacket), - {ok, ArpPacket} - else - _ -> - error - end. - -spec limiting_check(ThrottleKey :: any()) -> pass | denied. limiting_check(ThrottleKey) -> case throttle:check(sdlan_network, ThrottleKey) of diff --git a/apps/sdlan/src/sdlan_pb.erl b/apps/sdlan/src/sdlan_pb.erl index a7c4c8c..e8ee172 100644 --- a/apps/sdlan/src/sdlan_pb.erl +++ b/apps/sdlan/src/sdlan_pb.erl @@ -99,9 +99,13 @@ -type sdl_stun_probe_reply() :: #sdl_stun_probe_reply{}. --export_type(['sdl_v4_info'/0, 'sdl_v6_info'/0, 'sdl_dev_addr'/0, 'sdl_empty'/0, 'sdl_register_super'/0, 'sdl_register_super_ack'/0, 'sdl_register_super_nak'/0, 'sdl_query_info'/0, 'sdl_peer_info'/0, 'sdl_nat_changed_event'/0, 'sdl_send_register_event'/0, 'sdl_network_shutdown_event'/0, 'sdl_change_network_command'/0, 'sdl_command_ack'/0, 'sdl_flows'/0, 'sdl_stun_request'/0, 'sdl_stun_reply'/0, 'sdl_data'/0, 'sdl_register'/0, 'sdl_register_ack'/0, 'sdl_stun_probe'/0, 'sdl_stun_probe_reply'/0]). --type '$msg_name'() :: sdl_v4_info | sdl_v6_info | sdl_dev_addr | sdl_empty | sdl_register_super | sdl_register_super_ack | sdl_register_super_nak | sdl_query_info | sdl_peer_info | sdl_nat_changed_event | sdl_send_register_event | sdl_network_shutdown_event | sdl_change_network_command | sdl_command_ack | sdl_flows | sdl_stun_request | sdl_stun_reply | sdl_data | sdl_register | sdl_register_ack | sdl_stun_probe | sdl_stun_probe_reply. --type '$msg'() :: sdl_v4_info() | sdl_v6_info() | sdl_dev_addr() | sdl_empty() | sdl_register_super() | sdl_register_super_ack() | sdl_register_super_nak() | sdl_query_info() | sdl_peer_info() | sdl_nat_changed_event() | sdl_send_register_event() | sdl_network_shutdown_event() | sdl_change_network_command() | sdl_command_ack() | sdl_flows() | sdl_stun_request() | sdl_stun_reply() | sdl_data() | sdl_register() | sdl_register_ack() | sdl_stun_probe() | sdl_stun_probe_reply(). +-type sdl_arp_request() :: #sdl_arp_request{}. + +-type sdl_arp_response() :: #sdl_arp_response{}. + +-export_type(['sdl_v4_info'/0, 'sdl_v6_info'/0, 'sdl_dev_addr'/0, 'sdl_empty'/0, 'sdl_register_super'/0, 'sdl_register_super_ack'/0, 'sdl_register_super_nak'/0, 'sdl_query_info'/0, 'sdl_peer_info'/0, 'sdl_nat_changed_event'/0, 'sdl_send_register_event'/0, 'sdl_network_shutdown_event'/0, 'sdl_change_network_command'/0, 'sdl_command_ack'/0, 'sdl_flows'/0, 'sdl_stun_request'/0, 'sdl_stun_reply'/0, 'sdl_data'/0, 'sdl_register'/0, 'sdl_register_ack'/0, 'sdl_stun_probe'/0, 'sdl_stun_probe_reply'/0, 'sdl_arp_request'/0, 'sdl_arp_response'/0]). +-type '$msg_name'() :: sdl_v4_info | sdl_v6_info | sdl_dev_addr | sdl_empty | sdl_register_super | sdl_register_super_ack | sdl_register_super_nak | sdl_query_info | sdl_peer_info | sdl_nat_changed_event | sdl_send_register_event | sdl_network_shutdown_event | sdl_change_network_command | sdl_command_ack | sdl_flows | sdl_stun_request | sdl_stun_reply | sdl_data | sdl_register | sdl_register_ack | sdl_stun_probe | sdl_stun_probe_reply | sdl_arp_request | sdl_arp_response. +-type '$msg'() :: sdl_v4_info() | sdl_v6_info() | sdl_dev_addr() | sdl_empty() | sdl_register_super() | sdl_register_super_ack() | sdl_register_super_nak() | sdl_query_info() | sdl_peer_info() | sdl_nat_changed_event() | sdl_send_register_event() | sdl_network_shutdown_event() | sdl_change_network_command() | sdl_command_ack() | sdl_flows() | sdl_stun_request() | sdl_stun_reply() | sdl_data() | sdl_register() | sdl_register_ack() | sdl_stun_probe() | sdl_stun_probe_reply() | sdl_arp_request() | sdl_arp_response(). -export_type(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -149,7 +153,9 @@ encode_msg(Msg, MsgName, Opts) -> sdl_register -> encode_msg_sdl_register(id(Msg, TrUserData), TrUserData); sdl_register_ack -> encode_msg_sdl_register_ack(id(Msg, TrUserData), TrUserData); sdl_stun_probe -> encode_msg_sdl_stun_probe(id(Msg, TrUserData), TrUserData); - sdl_stun_probe_reply -> encode_msg_sdl_stun_probe_reply(id(Msg, TrUserData), TrUserData) + sdl_stun_probe_reply -> encode_msg_sdl_stun_probe_reply(id(Msg, TrUserData), TrUserData); + sdl_arp_request -> encode_msg_sdl_arp_request(id(Msg, TrUserData), TrUserData); + sdl_arp_response -> encode_msg_sdl_arp_response(id(Msg, TrUserData), TrUserData) end. @@ -872,6 +878,62 @@ encode_msg_sdl_stun_probe_reply(#sdl_stun_probe_reply{cookie = F1, port = F2, ip end end. +encode_msg_sdl_arp_request(Msg, TrUserData) -> encode_msg_sdl_arp_request(Msg, <<>>, TrUserData). + + +encode_msg_sdl_arp_request(#sdl_arp_request{network_id = F1, target_ip = F2}, Bin, TrUserData) -> + B1 = if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + if TrF1 =:= 0 -> Bin; + true -> e_varint(TrF1, <>, TrUserData) + end + end + end, + if F2 == undefined -> B1; + true -> + begin + TrF2 = id(F2, TrUserData), + if TrF2 =:= 0 -> B1; + true -> e_varint(TrF2, <>, TrUserData) + end + end + end. + +encode_msg_sdl_arp_response(Msg, TrUserData) -> encode_msg_sdl_arp_response(Msg, <<>>, TrUserData). + + +encode_msg_sdl_arp_response(#sdl_arp_response{network_id = F1, target_ip = F2, target_mac = F3}, Bin, TrUserData) -> + B1 = if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + if TrF1 =:= 0 -> Bin; + true -> e_varint(TrF1, <>, TrUserData) + end + end + end, + B2 = if F2 == undefined -> B1; + true -> + begin + TrF2 = id(F2, TrUserData), + if TrF2 =:= 0 -> B1; + true -> e_varint(TrF2, <>, TrUserData) + end + end + end, + if F3 == undefined -> B2; + true -> + begin + TrF3 = id(F3, TrUserData), + case iolist_size(TrF3) of + 0 -> B2; + _ -> e_type_bytes(TrF3, <>, TrUserData) + end + end + end. + e_mfield_sdl_register_super_dev_addr(Msg, Bin, TrUserData) -> SubBin = encode_msg_sdl_dev_addr(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), @@ -1066,7 +1128,9 @@ decode_msg_2_doit(sdl_data, Bin, TrUserData) -> id(decode_msg_sdl_data(Bin, TrUs decode_msg_2_doit(sdl_register, Bin, TrUserData) -> id(decode_msg_sdl_register(Bin, TrUserData), TrUserData); decode_msg_2_doit(sdl_register_ack, Bin, TrUserData) -> id(decode_msg_sdl_register_ack(Bin, TrUserData), TrUserData); decode_msg_2_doit(sdl_stun_probe, Bin, TrUserData) -> id(decode_msg_sdl_stun_probe(Bin, TrUserData), TrUserData); -decode_msg_2_doit(sdl_stun_probe_reply, Bin, TrUserData) -> id(decode_msg_sdl_stun_probe_reply(Bin, TrUserData), TrUserData). +decode_msg_2_doit(sdl_stun_probe_reply, Bin, TrUserData) -> id(decode_msg_sdl_stun_probe_reply(Bin, TrUserData), TrUserData); +decode_msg_2_doit(sdl_arp_request, Bin, TrUserData) -> id(decode_msg_sdl_arp_request(Bin, TrUserData), TrUserData); +decode_msg_2_doit(sdl_arp_response, Bin, TrUserData) -> id(decode_msg_sdl_arp_response(Bin, TrUserData), TrUserData). @@ -2468,6 +2532,115 @@ skip_32_sdl_stun_probe_reply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, skip_64_sdl_stun_probe_reply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_stun_probe_reply(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). +decode_msg_sdl_arp_request(Bin, TrUserData) -> dfp_read_field_def_sdl_arp_request(Bin, 0, 0, 0, id(0, TrUserData), id(0, TrUserData), TrUserData). + +dfp_read_field_def_sdl_arp_request(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_sdl_arp_request_network_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_sdl_arp_request(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_sdl_arp_request_target_ip(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_sdl_arp_request(<<>>, 0, 0, _, F@_1, F@_2, _) -> #sdl_arp_request{network_id = F@_1, target_ip = F@_2}; +dfp_read_field_def_sdl_arp_request(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_sdl_arp_request(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_sdl_arp_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_sdl_arp_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_sdl_arp_request(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_sdl_arp_request_network_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 16 -> d_field_sdl_arp_request_target_ip(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_sdl_arp_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_sdl_arp_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_sdl_arp_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_sdl_arp_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_sdl_arp_request(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_sdl_arp_request(<<>>, 0, 0, _, F@_1, F@_2, _) -> #sdl_arp_request{network_id = F@_1, target_ip = F@_2}. + +d_field_sdl_arp_request_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_sdl_arp_request_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_sdl_arp_request_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_sdl_arp_request(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_sdl_arp_request_target_ip(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_sdl_arp_request_target_ip(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_sdl_arp_request_target_ip(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_sdl_arp_request(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_sdl_arp_request(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_sdl_arp_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_sdl_arp_request(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_sdl_arp_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_sdl_arp_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_sdl_arp_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_sdl_arp_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_sdl_arp_request(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_sdl_arp_request(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_sdl_arp_request(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_sdl_arp_request(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_sdl_arp_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_64_sdl_arp_request(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_sdl_arp_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +decode_msg_sdl_arp_response(Bin, TrUserData) -> dfp_read_field_def_sdl_arp_response(Bin, 0, 0, 0, id(0, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_sdl_arp_response(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_arp_response_network_id(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_sdl_arp_response(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_arp_response_target_ip(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_sdl_arp_response(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_sdl_arp_response_target_mac(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +dfp_read_field_def_sdl_arp_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_arp_response{network_id = F@_1, target_ip = F@_2, target_mac = F@_3}; +dfp_read_field_def_sdl_arp_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dg_read_field_def_sdl_arp_response(Other, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +dg_read_field_def_sdl_arp_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 32 - 7 -> dg_read_field_def_sdl_arp_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +dg_read_field_def_sdl_arp_response(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_sdl_arp_response_network_id(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 16 -> d_field_sdl_arp_response_target_ip(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + 26 -> d_field_sdl_arp_response_target_mac(Rest, 0, 0, 0, F@_1, F@_2, F@_3, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_sdl_arp_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 1 -> skip_64_sdl_arp_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 2 -> skip_length_delimited_sdl_arp_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 3 -> skip_group_sdl_arp_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData); + 5 -> skip_32_sdl_arp_response(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, TrUserData) + end + end; +dg_read_field_def_sdl_arp_response(<<>>, 0, 0, _, F@_1, F@_2, F@_3, _) -> #sdl_arp_response{network_id = F@_1, target_ip = F@_2, target_mac = F@_3}. + +d_field_sdl_arp_response_network_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_arp_response_network_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_sdl_arp_response_network_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_sdl_arp_response(RestF, 0, 0, F, NewFValue, F@_2, F@_3, TrUserData). + +d_field_sdl_arp_response_target_ip(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_arp_response_target_ip(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_sdl_arp_response_target_ip(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, + dfp_read_field_def_sdl_arp_response(RestF, 0, 0, F, F@_1, NewFValue, F@_3, TrUserData). + +d_field_sdl_arp_response_target_mac(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> d_field_sdl_arp_response_target_mac(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +d_field_sdl_arp_response_target_mac(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_sdl_arp_response(RestF, 0, 0, F, F@_1, F@_2, NewFValue, TrUserData). + +skip_varint_sdl_arp_response(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> skip_varint_sdl_arp_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); +skip_varint_sdl_arp_response(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_arp_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_length_delimited_sdl_arp_response(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) when N < 57 -> skip_length_delimited_sdl_arp_response(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, TrUserData); +skip_length_delimited_sdl_arp_response(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_sdl_arp_response(Rest2, 0, 0, F, F@_1, F@_2, F@_3, TrUserData). + +skip_group_sdl_arp_response(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_sdl_arp_response(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, TrUserData). + +skip_32_sdl_arp_response(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_arp_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + +skip_64_sdl_arp_response(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> dfp_read_field_def_sdl_arp_response(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData). + read_group(Bin, FieldNum) -> {NumBytes, EndTagLen} = read_gr_b(Bin, 0, 0, 0, 0, FieldNum), <> = Bin, @@ -2555,7 +2728,9 @@ merge_msgs(Prev, New, MsgName, Opts) -> sdl_register -> merge_msg_sdl_register(Prev, New, TrUserData); sdl_register_ack -> merge_msg_sdl_register_ack(Prev, New, TrUserData); sdl_stun_probe -> merge_msg_sdl_stun_probe(Prev, New, TrUserData); - sdl_stun_probe_reply -> merge_msg_sdl_stun_probe_reply(Prev, New, TrUserData) + sdl_stun_probe_reply -> merge_msg_sdl_stun_probe_reply(Prev, New, TrUserData); + sdl_arp_request -> merge_msg_sdl_arp_request(Prev, New, TrUserData); + sdl_arp_response -> merge_msg_sdl_arp_response(Prev, New, TrUserData) end. -compile({nowarn_unused_function,merge_msg_sdl_v4_info/3}). @@ -2914,6 +3089,32 @@ merge_msg_sdl_stun_probe_reply(#sdl_stun_probe_reply{cookie = PFcookie, port = P true -> NFip end}. +-compile({nowarn_unused_function,merge_msg_sdl_arp_request/3}). +merge_msg_sdl_arp_request(#sdl_arp_request{network_id = PFnetwork_id, target_ip = PFtarget_ip}, #sdl_arp_request{network_id = NFnetwork_id, target_ip = NFtarget_ip}, _) -> + #sdl_arp_request{network_id = + if NFnetwork_id =:= undefined -> PFnetwork_id; + true -> NFnetwork_id + end, + target_ip = + if NFtarget_ip =:= undefined -> PFtarget_ip; + true -> NFtarget_ip + end}. + +-compile({nowarn_unused_function,merge_msg_sdl_arp_response/3}). +merge_msg_sdl_arp_response(#sdl_arp_response{network_id = PFnetwork_id, target_ip = PFtarget_ip, target_mac = PFtarget_mac}, #sdl_arp_response{network_id = NFnetwork_id, target_ip = NFtarget_ip, target_mac = NFtarget_mac}, _) -> + #sdl_arp_response{network_id = + if NFnetwork_id =:= undefined -> PFnetwork_id; + true -> NFnetwork_id + end, + target_ip = + if NFtarget_ip =:= undefined -> PFtarget_ip; + true -> NFtarget_ip + end, + target_mac = + if NFtarget_mac =:= undefined -> PFtarget_mac; + true -> NFtarget_mac + end}. + verify_msg(Msg) when tuple_size(Msg) >= 1 -> verify_msg(Msg, element(1, Msg), []); verify_msg(X) -> mk_type_error(not_a_known_message, X, []). @@ -2947,6 +3148,8 @@ verify_msg(Msg, MsgName, Opts) -> sdl_register_ack -> v_msg_sdl_register_ack(Msg, [MsgName], TrUserData); sdl_stun_probe -> v_msg_sdl_stun_probe(Msg, [MsgName], TrUserData); sdl_stun_probe_reply -> v_msg_sdl_stun_probe_reply(Msg, [MsgName], TrUserData); + sdl_arp_request -> v_msg_sdl_arp_request(Msg, [MsgName], TrUserData); + sdl_arp_response -> v_msg_sdl_arp_response(Msg, [MsgName], TrUserData); _ -> mk_type_error(not_a_known_message, Msg, []) end. @@ -3301,6 +3504,33 @@ v_msg_sdl_stun_probe_reply(#sdl_stun_probe_reply{cookie = F1, port = F2, ip = F3 ok; v_msg_sdl_stun_probe_reply(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_stun_probe_reply}, X, Path). +-compile({nowarn_unused_function,v_msg_sdl_arp_request/3}). +-dialyzer({nowarn_function,v_msg_sdl_arp_request/3}). +v_msg_sdl_arp_request(#sdl_arp_request{network_id = F1, target_ip = F2}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [network_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_uint32(F2, [target_ip | Path], TrUserData) + end, + ok; +v_msg_sdl_arp_request(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_arp_request}, X, Path). + +-compile({nowarn_unused_function,v_msg_sdl_arp_response/3}). +-dialyzer({nowarn_function,v_msg_sdl_arp_response/3}). +v_msg_sdl_arp_response(#sdl_arp_response{network_id = F1, target_ip = F2, target_mac = F3}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_uint32(F1, [network_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_uint32(F2, [target_ip | Path], TrUserData) + end, + if F3 == undefined -> ok; + true -> v_type_bytes(F3, [target_mac | Path], TrUserData) + end, + ok; +v_msg_sdl_arp_response(X, Path, _TrUserData) -> mk_type_error({expected_msg, sdl_arp_response}, X, Path). + -compile({nowarn_unused_function,v_type_uint32/3}). -dialyzer({nowarn_function,v_type_uint32/3}). v_type_uint32(N, _Path, _TrUserData) when is_integer(N), 0 =< N, N =< 4294967295 -> ok; @@ -3445,7 +3675,12 @@ get_msg_defs() -> {{msg, sdl_stun_probe_reply}, [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = port, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, - #field{name = ip, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]}]. + #field{name = ip, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]}, + {{msg, sdl_arp_request}, [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = target_ip, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}]}, + {{msg, sdl_arp_response}, + [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, + #field{name = target_ip, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, + #field{name = target_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}]}]. get_msg_names() -> @@ -3470,7 +3705,9 @@ get_msg_names() -> sdl_register, sdl_register_ack, sdl_stun_probe, - sdl_stun_probe_reply]. + sdl_stun_probe_reply, + sdl_arp_request, + sdl_arp_response]. get_group_names() -> []. @@ -3498,7 +3735,9 @@ get_msg_or_group_names() -> sdl_register, sdl_register_ack, sdl_stun_probe, - sdl_stun_probe_reply]. + sdl_stun_probe_reply, + sdl_arp_request, + sdl_arp_response]. get_enum_names() -> []. @@ -3591,6 +3830,11 @@ find_msg_def(sdl_stun_probe_reply) -> [#field{name = cookie, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = port, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, #field{name = ip, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]; +find_msg_def(sdl_arp_request) -> [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = target_ip, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}]; +find_msg_def(sdl_arp_response) -> + [#field{name = network_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, + #field{name = target_ip, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, + #field{name = target_mac, fnum = 3, rnum = 4, type = bytes, occurrence = defaulty, opts = []}]; find_msg_def(_) -> error. @@ -3671,6 +3915,8 @@ fqbin_to_msg_name(<<"SDLRegister">>) -> sdl_register; fqbin_to_msg_name(<<"SDLRegisterAck">>) -> sdl_register_ack; fqbin_to_msg_name(<<"SDLStunProbe">>) -> sdl_stun_probe; fqbin_to_msg_name(<<"SDLStunProbeReply">>) -> sdl_stun_probe_reply; +fqbin_to_msg_name(<<"SDLArpRequest">>) -> sdl_arp_request; +fqbin_to_msg_name(<<"SDLArpResponse">>) -> sdl_arp_response; fqbin_to_msg_name(E) -> error({gpb_error, {badmsg, E}}). @@ -3696,6 +3942,8 @@ msg_name_to_fqbin(sdl_register) -> <<"SDLRegister">>; msg_name_to_fqbin(sdl_register_ack) -> <<"SDLRegisterAck">>; msg_name_to_fqbin(sdl_stun_probe) -> <<"SDLStunProbe">>; msg_name_to_fqbin(sdl_stun_probe_reply) -> <<"SDLStunProbeReply">>; +msg_name_to_fqbin(sdl_arp_request) -> <<"SDLArpRequest">>; +msg_name_to_fqbin(sdl_arp_response) -> <<"SDLArpResponse">>; msg_name_to_fqbin(E) -> error({gpb_error, {badmsg, E}}). @@ -3735,7 +3983,9 @@ get_all_proto_names() -> ["sdlan_pb"]. get_msg_containment("sdlan_pb") -> - [sdl_change_network_command, + [sdl_arp_request, + sdl_arp_response, + sdl_change_network_command, sdl_command_ack, sdl_data, sdl_dev_addr, @@ -3786,7 +4036,9 @@ get_proto_by_msg_name_as_fqbin(<<"SDLSendRegisterEvent">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLNetworkShutdownEvent">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLNatChangedEvent">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLChangeNetworkCommand">>) -> "sdlan_pb"; +get_proto_by_msg_name_as_fqbin(<<"SDLArpRequest">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLStunProbe">>) -> "sdlan_pb"; +get_proto_by_msg_name_as_fqbin(<<"SDLArpResponse">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLStunReply">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLStunProbeReply">>) -> "sdlan_pb"; get_proto_by_msg_name_as_fqbin(<<"SDLEmpty">>) -> "sdlan_pb"; diff --git a/apps/sdlan/src/sdlan_stun.erl b/apps/sdlan/src/sdlan_stun.erl index 3d7d6d2..f438e2c 100644 --- a/apps/sdlan/src/sdlan_stun.erl +++ b/apps/sdlan/src/sdlan_stun.erl @@ -7,6 +7,8 @@ %%% Created : 09. 4月 2024 17:37 %%%------------------------------------------------------------------- -module(sdlan_stun). +-feature(maybe_expr, enable). + -author("anlicheng"). -include("sdlan.hrl"). -include("sdlan_pb.hrl"). @@ -153,35 +155,25 @@ handle_info({udp, _, _Ip, _Port, <>}, State = #s Data = #sdl_data{network_id = NetworkId, src_mac = SrcMac, dst_mac = DstMac, ttl = TTL} = sdlan_pb:decode_msg(Body, sdl_data), lager:debug("[sdlan_stun] stun data, src_mac: ~p, dst_mac: ~p", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), - - %% 重新打包数据ttl需要减1 - case sdlan_network:get_pid(NetworkId) of - NetworkPid when is_pid(NetworkPid) -> - NData = sdlan_pb:encode_msg(Data#sdl_data{ttl = TTL - 1, is_p2p = false}), - sdlan_network:forward(NetworkPid, Sock, SrcMac, DstMac, <>); - _ -> - ok + maybe + {ok, NetworkPid} ?= sdlan_network:lookup_pid(NetworkId), + %% 重新打包数据ttl需要减1 + NData = sdlan_pb:encode_msg(Data#sdl_data{ttl = TTL - 1, is_p2p = false}), + sdlan_network:forward(NetworkPid, Sock, SrcMac, DstMac, <>) end, - {noreply, State}; -handle_info({udp, _, _Ip, _Port, <>}, State = #state{socket = Sock}) -> - Data = #sdl_data{network_id = NetworkId, src_mac = SrcMac, dst_mac = DstMac, ttl = TTL} = sdlan_pb:decode_msg(Body, sdl_data), - - lager:debug("[sdlan_stun] stun data, src_mac: ~p, dst_mac: ~p", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), - - %% 重新打包数据ttl需要减1 - case sdlan_network:get_pid(NetworkId) of - NetworkPid when is_pid(NetworkPid) -> - NData = sdlan_pb:encode_msg(Data#sdl_data{ttl = TTL - 1, is_p2p = false}), - sdlan_network:forward(NetworkPid, Sock, SrcMac, DstMac, <>); - _ -> - ok +handle_info({udp, _, Ip, Port, <>}, State = #state{socket = Sock}) -> + #sdl_arp_request{network_id = NetworkId, target_ip = TargetIp} = sdlan_pb:decode_msg(Body, sdl_arp_request), + lager:debug("[sdlan_stun] stun sdl_arp_request, network_id: ~p, target_ip: ~p", [NetworkId, TargetIp]), + maybe + {ok, NetworkPid} ?= sdlan_network:lookup_pid(NetworkId), + {ok, TargetMac} ?= sdlan_network:arp_query(NetworkPid, TargetIp), + ArpResponse = sdlan_pb:encode_msg(#sdl_arp_response{network_id = NetworkId, target_ip = TargetIp, target_mac = TargetMac}), + ok ?= gen_udp:send(Sock, Ip, Port, ArpResponse) end, - {noreply, State}; - handle_info(Info, State) -> lager:error("[sdlan_stun] get a unknown message: ~p, channel will closed", [Info]), {noreply, State}. diff --git a/message.proto b/message.proto index 96eb93c..eca1310 100644 --- a/message.proto +++ b/message.proto @@ -152,4 +152,17 @@ message SDLStunProbeReply { uint32 cookie = 1; uint32 port = 2; uint32 ip = 3; +} + +// ARP查询相关 + +message SDLArpRequest { + uint32 network_id = 1; + uint32 target_ip = 2; +} + +message SDLArpResponse { + uint32 network_id = 1; + uint32 target_ip = 2; + bytes target_mac = 3; } \ No newline at end of file