diff --git a/config/sys-dev.config b/config/sys-dev.config index 2e75e21..cb34008 100644 --- a/config/sys-dev.config +++ b/config/sys-dev.config @@ -38,9 +38,10 @@ {port, 1366} ]}, - {ipv6_assistor, [ + {ipv6_assist, [ {port, 1367}, - {acceptor_nums, 5} + {acceptor_nums, 5}, + {global_addr6, "2408:4005:318:4900:164a:b5c6:9023:ca8d"} ]}, {pools, [ diff --git a/config/sys-prod.config b/config/sys-prod.config index 294fa97..4681e83 100644 --- a/config/sys-prod.config +++ b/config/sys-prod.config @@ -38,9 +38,10 @@ {port, 1366} ]}, - {ipv6_assistor, [ + {ipv6_assist, [ {port, 1367}, - {acceptor_nums, 5} + {acceptor_nums, 5}, + {global_addr6, "2408:4005:318:4900:164a:b5c6:9023:ca8d"} ]}, {pools, [ diff --git a/include/sdlan_pb.hrl b/include/sdlan_pb.hrl index 12b1a8e..1effd8a 100644 --- a/include/sdlan_pb.hrl +++ b/include/sdlan_pb.hrl @@ -31,7 +31,8 @@ {version = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits max_bidi_streams = 0 :: non_neg_integer() | undefined, % = 2, optional, 32 bits max_packet_size = 0 :: non_neg_integer() | undefined, % = 3, optional, 32 bits - heartbeat_sec = 0 :: non_neg_integer() | undefined % = 4, optional, 32 bits + heartbeat_sec = 0 :: non_neg_integer() | undefined, % = 4, optional, 32 bits + ipv6_assist = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 5, optional }). -endif. diff --git a/proto/sdlan.proto b/proto/sdlan.proto index 40c30e0..ca60ec7 100644 --- a/proto/sdlan.proto +++ b/proto/sdlan.proto @@ -26,6 +26,8 @@ message SDLWelcome { uint32 max_packet_size = 3; // 心跳包的间隔 uint32 heartbeat_sec = 4; + // ipv6辅助器地址 + SDLV6Info ipv6_assist = 5; } // 这里修改成了扁平的结构, 否则有些字段不好找放的位置 diff --git a/src/quic/sdlan_quic_channel.erl b/src/quic/sdlan_quic_channel.erl index f16ed4c..858b69a 100644 --- a/src/quic/sdlan_quic_channel.erl +++ b/src/quic/sdlan_quic_channel.erl @@ -56,6 +56,7 @@ pending_commands = #{}, ping_counter = 0, + ipv6_assist = undefined, %% 离线回调函数 offline_cb :: undefined | fun() @@ -100,7 +101,8 @@ start_link(Conn, Limits) when is_list(Limits) -> init([Conn, Limits]) -> MaxPacketSize = proplists:get_value(max_packet_size, Limits, 16384), HeartbeatSec = proplists:get_value(heartbeat_sec, Limits, 10), - {ok, initializing, #state{conn = Conn, max_packet_size = MaxPacketSize, heartbeat_sec = HeartbeatSec}, [{next_event, internal, do_init}]}. + Ipv6Assist = ipv6_assist_info(), + {ok, initializing, #state{conn = Conn, max_packet_size = MaxPacketSize, heartbeat_sec = HeartbeatSec, ipv6_assist = Ipv6Assist}, [{next_event, internal, do_init}]}. %% @private %% @doc This function is called by a gen_statem when it needs to find out @@ -123,14 +125,15 @@ handle_event(info, {quic, dgram_state_changed, Conn, Opts = #{dgram_send_enabled logger:debug("[sdlan_quic_channel] dgram_state_changed, opts: ~p", [Opts]), {keep_state, State}; -handle_event(info, {quic, new_stream, Stream, Opts}, waiting_stream, State=#state{max_packet_size = MaxPacketSize, heartbeat_sec = HeartbeatSec}) -> +handle_event(info, {quic, new_stream, Stream, Opts}, waiting_stream, State=#state{max_packet_size = MaxPacketSize, heartbeat_sec = HeartbeatSec, ipv6_assist = Ipv6Assist}) -> logger:debug("[sdlan_quic_channel] call new_stream: ~p, opts: ~p", [Stream, Opts]), %% 发送欢迎消息 WelcomePkt = sdlan_pb:encode_msg(#'SDLWelcome'{ version = 1, max_bidi_streams = 1, max_packet_size = MaxPacketSize, - heartbeat_sec = HeartbeatSec + heartbeat_sec = HeartbeatSec, + ipv6_assist = Ipv6Assist }), quic_send(Stream, <>), logger:debug("[sdlan_quic_channel] get stream: ~p, send welcome", [Stream]), @@ -428,4 +431,20 @@ quic_send(Stream, Packet) when is_binary(Packet) -> get_rules(SrcIdentityId, DstIdentityId) when is_integer(SrcIdentityId), is_integer(DstIdentityId) -> SrcPolicyIds = identity_policy_ets:get_policies(SrcIdentityId), DstPolicyIds = identity_policy_ets:get_policies(DstIdentityId), - rule_ets:get_rules(SrcPolicyIds, DstPolicyIds). \ No newline at end of file + rule_ets:get_rules(SrcPolicyIds, DstPolicyIds). + +-spec ipv6_assist_info() -> undefined | #'SDLV6Info'{}. +ipv6_assist_info() -> + case application:get_env(sdlan, ipv6_assist) of + {ok, Props} -> + Port = proplists:get_value(port, Props, 0), + GlobalAddr6 = proplists:get_value(global_addr6, Props, <<"">>), + case {Port, sdlan_util:ipv6_to_bytes(GlobalAddr6)} of + {Port0, V6Bytes = <<_:128>>} when is_integer(Port0), Port0 > 0 -> + #'SDLV6Info'{port = Port0, v6 = V6Bytes}; + _ -> + undefined + end; + _ -> + undefined + end. diff --git a/src/sdlan_pb.erl b/src/sdlan_pb.erl index 1c645c2..814f49f 100644 --- a/src/sdlan_pb.erl +++ b/src/sdlan_pb.erl @@ -47,7 +47,7 @@ -export([gpb_version_source/0]). -include("sdlan_pb.hrl"). --include_lib("gpb/include/gpb.hrl"). +-include("gpb.hrl"). %% enumerated types @@ -224,7 +224,7 @@ encode_msg_SDLV6Info(#'SDLV6Info'{port = F1, v6 = F2}, Bin, TrUserData) -> encode_msg_SDLWelcome(Msg, TrUserData) -> encode_msg_SDLWelcome(Msg, <<>>, TrUserData). -encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4}, Bin, TrUserData) -> +encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4, ipv6_assist = F5}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -252,12 +252,21 @@ encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_pac end end end, - if F4 == undefined -> B3; + B4 = if F4 == undefined -> B3; + true -> + begin + TrF4 = id(F4, TrUserData), + if TrF4 =:= 0 -> B3; + true -> e_varint(TrF4, <>, TrUserData) + end + end + end, + if F5 == undefined -> B4; true -> begin - TrF4 = id(F4, TrUserData), - if TrF4 =:= 0 -> B3; - true -> e_varint(TrF4, <>, TrUserData) + TrF5 = id(F5, TrUserData), + if TrF5 =:= undefined -> B4; + true -> e_mfield_SDLWelcome_ipv6_assist(TrF5, <>, TrUserData) end end end. @@ -1068,6 +1077,11 @@ encode_msg_SDLRegisterAck(#'SDLRegisterAck'{network_id = F1, src_mac = F2, dst_m end end. +e_mfield_SDLWelcome_ipv6_assist(Msg, Bin, TrUserData) -> + SubBin = encode_msg_SDLV6Info(Msg, <<>>, TrUserData), + Bin2 = e_varint(byte_size(SubBin), Bin), + <>. + e_mfield_SDLPeerInfo_v4_info(Msg, Bin, TrUserData) -> SubBin = encode_msg_SDLV4Info(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), @@ -1384,70 +1398,88 @@ skip_32_SDLV6Info(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d skip_64_SDLV6Info(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_SDLV6Info(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_SDLWelcome(Bin, TrUserData) -> dfp_read_field_def_SDLWelcome(Bin, 0, 0, 0, id(0, TrUserData), id(0, TrUserData), id(0, TrUserData), id(0, TrUserData), TrUserData). +decode_msg_SDLWelcome(Bin, TrUserData) -> dfp_read_field_def_SDLWelcome(Bin, 0, 0, 0, id(0, TrUserData), id(0, TrUserData), id(0, TrUserData), id(0, TrUserData), id(undefined, TrUserData), TrUserData). -dfp_read_field_def_SDLWelcome(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_SDLWelcome_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -dfp_read_field_def_SDLWelcome(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_SDLWelcome_max_bidi_streams(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -dfp_read_field_def_SDLWelcome(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_SDLWelcome_max_packet_size(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -dfp_read_field_def_SDLWelcome(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> d_field_SDLWelcome_heartbeat_sec(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -dfp_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4}; -dfp_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> dg_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData). +dfp_read_field_def_SDLWelcome(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_SDLWelcome_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dfp_read_field_def_SDLWelcome(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_SDLWelcome_max_bidi_streams(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dfp_read_field_def_SDLWelcome(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_SDLWelcome_max_packet_size(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dfp_read_field_def_SDLWelcome(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_SDLWelcome_heartbeat_sec(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dfp_read_field_def_SDLWelcome(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> d_field_SDLWelcome_ipv6_assist(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dfp_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4, ipv6_assist = F@_5}; +dfp_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dg_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). -dg_read_field_def_SDLWelcome(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 32 - 7 -> dg_read_field_def_SDLWelcome(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -dg_read_field_def_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, TrUserData) -> +dg_read_field_def_SDLWelcome(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 32 - 7 -> dg_read_field_def_SDLWelcome(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +dg_read_field_def_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_SDLWelcome_version(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData); - 16 -> d_field_SDLWelcome_max_bidi_streams(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData); - 24 -> d_field_SDLWelcome_max_packet_size(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData); - 32 -> d_field_SDLWelcome_heartbeat_sec(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, TrUserData); + 8 -> d_field_SDLWelcome_version(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 16 -> d_field_SDLWelcome_max_bidi_streams(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 24 -> d_field_SDLWelcome_max_packet_size(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 32 -> d_field_SDLWelcome_heartbeat_sec(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 42 -> d_field_SDLWelcome_ipv6_assist(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, TrUserData); - 1 -> skip_64_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, TrUserData); - 2 -> skip_length_delimited_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, TrUserData); - 3 -> skip_group_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, TrUserData); - 5 -> skip_32_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, TrUserData) + 0 -> skip_varint_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 1 -> skip_64_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 2 -> skip_length_delimited_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 3 -> skip_group_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); + 5 -> skip_32_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) end end; -dg_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4}. +dg_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4, ipv6_assist = F@_5}. -d_field_SDLWelcome_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_SDLWelcome_version(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -d_field_SDLWelcome_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, TrUserData) -> +d_field_SDLWelcome_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_SDLWelcome_version(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +d_field_SDLWelcome_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, TrUserData) -> {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, TrUserData). -d_field_SDLWelcome_max_bidi_streams(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_SDLWelcome_max_bidi_streams(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -d_field_SDLWelcome_max_bidi_streams(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, TrUserData) -> +d_field_SDLWelcome_max_bidi_streams(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_SDLWelcome_max_bidi_streams(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +d_field_SDLWelcome_max_bidi_streams(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, TrUserData) -> {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, TrUserData). -d_field_SDLWelcome_max_packet_size(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_SDLWelcome_max_packet_size(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -d_field_SDLWelcome_max_packet_size(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, TrUserData) -> +d_field_SDLWelcome_max_packet_size(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_SDLWelcome_max_packet_size(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +d_field_SDLWelcome_max_packet_size(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, TrUserData) -> {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, TrUserData). -d_field_SDLWelcome_heartbeat_sec(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> d_field_SDLWelcome_heartbeat_sec(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -d_field_SDLWelcome_heartbeat_sec(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, TrUserData) -> +d_field_SDLWelcome_heartbeat_sec(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_SDLWelcome_heartbeat_sec(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +d_field_SDLWelcome_heartbeat_sec(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, F@_5, TrUserData) -> {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, - dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, TrUserData). -skip_varint_SDLWelcome(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> skip_varint_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -skip_varint_SDLWelcome(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData). +d_field_SDLWelcome_ipv6_assist(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> d_field_SDLWelcome_ipv6_assist(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +d_field_SDLWelcome_ipv6_assist(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, Prev, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, {id(decode_msg_SDLV6Info(Bs, TrUserData), TrUserData), Rest2} end, + dfp_read_field_def_SDLWelcome(RestF, + 0, + 0, + F, + F@_1, + F@_2, + F@_3, + F@_4, + if Prev == undefined -> NewFValue; + true -> merge_msg_SDLV6Info(Prev, NewFValue, TrUserData) + end, + TrUserData). -skip_length_delimited_SDLWelcome(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) when N < 57 -> skip_length_delimited_SDLWelcome(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData); -skip_length_delimited_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> +skip_varint_SDLWelcome(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> skip_varint_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +skip_varint_SDLWelcome(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). + +skip_length_delimited_SDLWelcome(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) when N < 57 -> skip_length_delimited_SDLWelcome(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData); +skip_length_delimited_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> Length = X bsl N + Acc, <<_:Length/binary, Rest2/binary>> = Rest, - dfp_read_field_def_SDLWelcome(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, TrUserData). + dfp_read_field_def_SDLWelcome(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). -skip_group_SDLWelcome(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, TrUserData) -> +skip_group_SDLWelcome(Bin, _, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_SDLWelcome(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, TrUserData). + dfp_read_field_def_SDLWelcome(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). -skip_32_SDLWelcome(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData). +skip_32_SDLWelcome(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). -skip_64_SDLWelcome(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, TrUserData). +skip_64_SDLWelcome(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). decode_msg_SDLRegisterSuper(Bin, TrUserData) -> dfp_read_field_def_SDLRegisterSuper(Bin, 0, 0, 0, id(<<>>, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), id(0, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). @@ -3081,8 +3113,8 @@ merge_msg_SDLV6Info(#'SDLV6Info'{port = PFport, v6 = PFv6}, #'SDLV6Info'{port = end}. -compile({nowarn_unused_function,merge_msg_SDLWelcome/3}). -merge_msg_SDLWelcome(#'SDLWelcome'{version = PFversion, max_bidi_streams = PFmax_bidi_streams, max_packet_size = PFmax_packet_size, heartbeat_sec = PFheartbeat_sec}, - #'SDLWelcome'{version = NFversion, max_bidi_streams = NFmax_bidi_streams, max_packet_size = NFmax_packet_size, heartbeat_sec = NFheartbeat_sec}, _) -> +merge_msg_SDLWelcome(#'SDLWelcome'{version = PFversion, max_bidi_streams = PFmax_bidi_streams, max_packet_size = PFmax_packet_size, heartbeat_sec = PFheartbeat_sec, ipv6_assist = PFipv6_assist}, + #'SDLWelcome'{version = NFversion, max_bidi_streams = NFmax_bidi_streams, max_packet_size = NFmax_packet_size, heartbeat_sec = NFheartbeat_sec, ipv6_assist = NFipv6_assist}, TrUserData) -> #'SDLWelcome'{version = if NFversion =:= undefined -> PFversion; true -> NFversion @@ -3098,6 +3130,11 @@ merge_msg_SDLWelcome(#'SDLWelcome'{version = PFversion, max_bidi_streams = PFmax heartbeat_sec = if NFheartbeat_sec =:= undefined -> PFheartbeat_sec; true -> NFheartbeat_sec + end, + ipv6_assist = + if PFipv6_assist /= undefined, NFipv6_assist /= undefined -> merge_msg_SDLV6Info(PFipv6_assist, NFipv6_assist, TrUserData); + PFipv6_assist == undefined -> NFipv6_assist; + NFipv6_assist == undefined -> PFipv6_assist end}. -compile({nowarn_unused_function,merge_msg_SDLRegisterSuper/3}). @@ -3573,7 +3610,7 @@ v_msg_SDLV6Info(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLV6Info -compile({nowarn_unused_function,v_msg_SDLWelcome/3}). -dialyzer({nowarn_function,v_msg_SDLWelcome/3}). -v_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4}, Path, TrUserData) -> +v_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4, ipv6_assist = F5}, Path, TrUserData) -> if F1 == undefined -> ok; true -> v_type_uint32(F1, [version | Path], TrUserData) end, @@ -3586,6 +3623,9 @@ v_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_s if F4 == undefined -> ok; true -> v_type_uint32(F4, [heartbeat_sec | Path], TrUserData) end, + if F5 == undefined -> ok; + true -> v_submsg_SDLV6Info(F5, [ipv6_assist | Path], TrUserData) + end, ok; v_msg_SDLWelcome(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLWelcome'}, X, Path). @@ -4063,7 +4103,8 @@ get_msg_defs() -> [#field{name = version, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = max_bidi_streams, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, #field{name = max_packet_size, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}, - #field{name = heartbeat_sec, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}]}, + #field{name = heartbeat_sec, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}, + #field{name = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]}, {{msg, 'SDLRegisterSuper'}, [#field{name = client_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []}, #field{name = network_id, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, @@ -4247,7 +4288,8 @@ find_msg_def('SDLWelcome') -> [#field{name = version, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = max_bidi_streams, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, #field{name = max_packet_size, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}, - #field{name = heartbeat_sec, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}]; + #field{name = heartbeat_sec, fnum = 4, rnum = 5, type = uint32, occurrence = defaulty, opts = []}, + #field{name = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]; find_msg_def('SDLRegisterSuper') -> [#field{name = client_id, fnum = 1, rnum = 2, type = string, occurrence = defaulty, opts = []}, #field{name = network_id, fnum = 2, rnum = 3, type = uint32, occurrence = defaulty, opts = []}, diff --git a/src/sdlan_util.erl b/src/sdlan_util.erl index dd75aa3..0d03cc8 100644 --- a/src/sdlan_util.erl +++ b/src/sdlan_util.erl @@ -14,7 +14,7 @@ -export([json_data/1, json_error/2]). -export([is_broadcast_mac/1, is_multicast_mac/1]). -export([ipv4_to_int/1, int_to_ipv4/1, ips/2, format_ip/1]). --export([ipv6_bytes_to_binary/1]). +-export([ipv6_to_bytes/1, ipv6_bytes_to_binary/1]). -export([hmac/2]). -spec format_mac(Mac :: binary()) -> binary(). @@ -116,6 +116,21 @@ ips(NetAddr, MaskLen) when is_binary(NetAddr), is_integer(MaskLen) -> Net = (Net0 bsr L) bsl L, lists:map(fun(V) -> Net + V end, lists:seq(1, Mask - 1)). +-spec ipv6_to_bytes(Address :: binary() | string() | inet:ip6_address()) -> binary(). +ipv6_to_bytes(Address) when is_binary(Address) -> + ipv6_to_bytes(binary_to_list(Address)); +ipv6_to_bytes({A, B, C, D, E, F, G, H}) -> + <>; +ipv6_to_bytes(Address) when is_list(Address) -> + case inet:parse_ipv6strict_address(string:trim(Address)) of + {ok, Ip6Address} -> + ipv6_to_bytes(Ip6Address); + {error, _} -> + <<"">> + end; +ipv6_to_bytes(_) -> + <<"">>. + -spec ipv6_bytes_to_binary(Bytes :: binary()) -> Bin :: binary(). ipv6_bytes_to_binary(<>) -> Segments = [integer_to_list(X, 16) || X <- [A, B, C, D, E, F, G, H]], @@ -130,4 +145,4 @@ ipv6_bytes_to_binary(_) -> hmac(Key, Data) when is_binary(Key), is_binary(Data) -> Digest = crypto:mac(hmac, md5, Key, Data), %% 转成十六进制小写字符串,和 PHP hash_hmac 一致 - lists:flatten([io_lib:format("~2.16.0b", [B]) || B <- binary:bin_to_list(Digest)]). \ No newline at end of file + lists:flatten([io_lib:format("~2.16.0b", [B]) || B <- binary:bin_to_list(Digest)]).