From 7a5cb71bd46a9b007b2f2c55787ddb440fce3415 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 16 Apr 2026 15:27:18 +0800 Subject: [PATCH] fix --- include/sdlan_pb.hrl | 17 +- proto/sdlan.proto | 10 + src/ipv6_assist/ipv6_assist_server.erl | 42 ++-- src/quic/sdlan_quic_channel.erl | 3 +- src/sdlan_app.erl | 1 + src/sdlan_pb.erl | 332 ++++++++++++++++++++----- src/sdlan_token_store.erl | 43 ++++ swift_pb.sh | 7 +- 8 files changed, 366 insertions(+), 89 deletions(-) create mode 100644 src/sdlan_token_store.erl diff --git a/include/sdlan_pb.hrl b/include/sdlan_pb.hrl index 1effd8a..5b78085 100644 --- a/include/sdlan_pb.hrl +++ b/include/sdlan_pb.hrl @@ -25,6 +25,20 @@ }). -endif. +-ifndef('SDLV6ASSISTPROBE_PB_H'). +-define('SDLV6ASSISTPROBE_PB_H', true). +-record('SDLV6AssistProbe', + {assist_token = <<>> :: iodata() | undefined % = 1, optional + }). +-endif. + +-ifndef('SDLV6ASSISTPROBEREPLY_PB_H'). +-define('SDLV6ASSISTPROBEREPLY_PB_H', true). +-record('SDLV6AssistProbeReply', + {v6_info = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 1, optional + }). +-endif. + -ifndef('SDLWELCOME_PB_H'). -define('SDLWELCOME_PB_H', true). -record('SDLWelcome', @@ -32,7 +46,8 @@ 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 - ipv6_assist = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 5, optional + ipv6_assist = undefined :: sdlan_pb:'SDLV6Info'() | undefined, % = 5, optional + assist_token = <<>> :: iodata() | undefined % = 6, optional }). -endif. diff --git a/proto/sdlan.proto b/proto/sdlan.proto index ca60ec7..dc8639e 100644 --- a/proto/sdlan.proto +++ b/proto/sdlan.proto @@ -15,6 +15,15 @@ message SDLV6Info { bytes v6 = 2; } +// ipv6 assist相关 +message SDLV6AssistProbe { + bytes assist_token = 1; +} + +message SDLV6AssistProbeReply { + SDLV6Info v6_info = 1; +} + // 和super之间采用了quic协议通讯 // 传输层采用: <> @@ -28,6 +37,7 @@ message SDLWelcome { uint32 heartbeat_sec = 4; // ipv6辅助器地址 SDLV6Info ipv6_assist = 5; + bytes assist_token = 6; } // 这里修改成了扁平的结构, 否则有些字段不好找放的位置 diff --git a/src/ipv6_assist/ipv6_assist_server.erl b/src/ipv6_assist/ipv6_assist_server.erl index 87351da..506b2d5 100644 --- a/src/ipv6_assist/ipv6_assist_server.erl +++ b/src/ipv6_assist/ipv6_assist_server.erl @@ -79,32 +79,26 @@ handle_cast(_Request, State) -> {noreply, NewState :: #state{}} | {noreply, NewState :: #state{}, timeout() | hibernate} | {stop, Reason :: term(), NewState :: #state{}}. -handle_info({udp, Sock, Ip, Port, <>}, State = #state{socket = Sock}) -> - case catch sdlan_pb:decode_msg(Body, 'SDLRegister') of - #'SDLRegister'{network_id = NetworkId, src_mac = SrcMac, dst_mac = DstMac} -> - Reply = sdlan_pb:encode_msg(#'SDLRegisterAck'{ - network_id = NetworkId, - src_mac = SrcMac, - dst_mac = DstMac - }), - ok = gen_udp:send(Sock, Ip, Port, <>), - logger:debug("[ipv6_assistor_server] reply register_ack, network_id: ~p, src_mac: ~p, dst_mac: ~p", [ - NetworkId, - sdlan_util:format_mac(SrcMac), - sdlan_util:format_mac(DstMac) - ]); - Reason -> - logger:warning("[ipv6_assistor_server] decode register packet error: ~p", [Reason]) +handle_info({udp, Sock, Ip, Port, Body}, State = #state{socket = Sock}) -> + case catch sdlan_pb:decode_msg(Body, 'SDLV6AssistProbe') of + #'SDLV6AssistProbe'{assist_token = Token} -> + case sdlan_token_store:lookup(Token) of + true -> + Reply = sdlan_pb:encode_msg(#'SDLV6AssistProbeReply'{ + v6_info = #'SDLV6Info' { + v6 = Ip, + port = Port + } + }), + ok = gen_udp:send(Sock, Ip, Port, Reply); + false -> + ok + end; + _Err -> + ok end, {noreply, State}; -handle_info({udp, Sock, Ip, Port, <>}, State = #state{socket = Sock}) -> - ok = gen_udp:send(Sock, Ip, Port, <>), - {noreply, State}; -handle_info({udp, _Sock, Ip, Port, Packet}, State) -> - logger:debug("[ipv6_assistor_server] ignore packet from ~p:~p, size: ~p", [Ip, Port, byte_size(Packet)]), - {noreply, State}; -handle_info(Info, State) -> - logger:debug("[ipv6_assistor_server] ignore message: ~p", [Info]), +handle_info(_Info, State) -> {noreply, State}. -spec terminate(Reason :: (normal | shutdown | {shutdown, term()} | term()), diff --git a/src/quic/sdlan_quic_channel.erl b/src/quic/sdlan_quic_channel.erl index 90ee0d3..91555c9 100644 --- a/src/quic/sdlan_quic_channel.erl +++ b/src/quic/sdlan_quic_channel.erl @@ -140,7 +140,8 @@ handle_event(info, {quic, new_stream, Stream, Opts}, waiting_stream, State=#stat max_bidi_streams = 1, max_packet_size = MaxPacketSize, heartbeat_sec = HeartbeatSec, - ipv6_assist = Ipv6Assist + ipv6_assist = Ipv6Assist, + assist_token = sdlan_token_store:generate_token() }), quic_send(Stream, <>), logger:debug("[sdlan_quic_channel] get stream: ~p, send welcome", [Stream]), diff --git a/src/sdlan_app.erl b/src/sdlan_app.erl index ba4ec1c..623fdc7 100644 --- a/src/sdlan_app.erl +++ b/src/sdlan_app.erl @@ -25,6 +25,7 @@ start(_StartType, _StartArgs) -> %% 启动注册表 sdlan_hostname_regedit:init(), sdlan_domain_regedit:init(), + sdlan_token_store:init(), %% 权限的数据管理 identity_policy_ets:init(), diff --git a/src/sdlan_pb.erl b/src/sdlan_pb.erl index 4709806..2d24692 100644 --- a/src/sdlan_pb.erl +++ b/src/sdlan_pb.erl @@ -58,6 +58,10 @@ -type 'SDLV6Info'() :: #'SDLV6Info'{}. +-type 'SDLV6AssistProbe'() :: #'SDLV6AssistProbe'{}. + +-type 'SDLV6AssistProbeReply'() :: #'SDLV6AssistProbeReply'{}. + -type 'SDLWelcome'() :: #'SDLWelcome'{}. -type 'SDLRegisterSuper'() :: #'SDLRegisterSuper'{}. @@ -106,9 +110,9 @@ -type 'SDLRegisterAck'() :: #'SDLRegisterAck'{}. --export_type(['SDLV4Info'/0, 'SDLV6Info'/0, 'SDLWelcome'/0, 'SDLRegisterSuper'/0, 'SDLRegisterSuperAck'/0, 'SDLRegisterSuperNak'/0, 'SDLQueryInfo'/0, 'SDLPeerInfo'/0, 'SDLArpRequest'/0, 'SDLArpResponse'/0, 'SDLPolicyRequest'/0, 'SDLPolicyResponse'/0, 'SDLEvent.NatChanged'/0, 'SDLEvent.SendRegister'/0, 'SDLEvent.NetworkShutdown'/0, 'SDLEvent'/0, 'SDLCommand.ExitNodeControl'/0, 'SDLCommand'/0, 'SDLCommandAck'/0, 'SDLStunRequest'/0, 'SDLStunReply'/0, 'SDLData'/0, 'SDLStunProbe'/0, 'SDLStunProbeReply'/0, 'SDLRegister'/0, 'SDLRegisterAck'/0]). --type '$msg_name'() :: 'SDLV4Info' | 'SDLV6Info' | 'SDLWelcome' | 'SDLRegisterSuper' | 'SDLRegisterSuperAck' | 'SDLRegisterSuperNak' | 'SDLQueryInfo' | 'SDLPeerInfo' | 'SDLArpRequest' | 'SDLArpResponse' | 'SDLPolicyRequest' | 'SDLPolicyResponse' | 'SDLEvent.NatChanged' | 'SDLEvent.SendRegister' | 'SDLEvent.NetworkShutdown' | 'SDLEvent' | 'SDLCommand.ExitNodeControl' | 'SDLCommand' | 'SDLCommandAck' | 'SDLStunRequest' | 'SDLStunReply' | 'SDLData' | 'SDLStunProbe' | 'SDLStunProbeReply' | 'SDLRegister' | 'SDLRegisterAck'. --type '$msg'() :: 'SDLV4Info'() | 'SDLV6Info'() | 'SDLWelcome'() | 'SDLRegisterSuper'() | 'SDLRegisterSuperAck'() | 'SDLRegisterSuperNak'() | 'SDLQueryInfo'() | 'SDLPeerInfo'() | 'SDLArpRequest'() | 'SDLArpResponse'() | 'SDLPolicyRequest'() | 'SDLPolicyResponse'() | 'SDLEvent.NatChanged'() | 'SDLEvent.SendRegister'() | 'SDLEvent.NetworkShutdown'() | 'SDLEvent'() | 'SDLCommand.ExitNodeControl'() | 'SDLCommand'() | 'SDLCommandAck'() | 'SDLStunRequest'() | 'SDLStunReply'() | 'SDLData'() | 'SDLStunProbe'() | 'SDLStunProbeReply'() | 'SDLRegister'() | 'SDLRegisterAck'(). +-export_type(['SDLV4Info'/0, 'SDLV6Info'/0, 'SDLV6AssistProbe'/0, 'SDLV6AssistProbeReply'/0, 'SDLWelcome'/0, 'SDLRegisterSuper'/0, 'SDLRegisterSuperAck'/0, 'SDLRegisterSuperNak'/0, 'SDLQueryInfo'/0, 'SDLPeerInfo'/0, 'SDLArpRequest'/0, 'SDLArpResponse'/0, 'SDLPolicyRequest'/0, 'SDLPolicyResponse'/0, 'SDLEvent.NatChanged'/0, 'SDLEvent.SendRegister'/0, 'SDLEvent.NetworkShutdown'/0, 'SDLEvent'/0, 'SDLCommand.ExitNodeControl'/0, 'SDLCommand'/0, 'SDLCommandAck'/0, 'SDLStunRequest'/0, 'SDLStunReply'/0, 'SDLData'/0, 'SDLStunProbe'/0, 'SDLStunProbeReply'/0, 'SDLRegister'/0, 'SDLRegisterAck'/0]). +-type '$msg_name'() :: 'SDLV4Info' | 'SDLV6Info' | 'SDLV6AssistProbe' | 'SDLV6AssistProbeReply' | 'SDLWelcome' | 'SDLRegisterSuper' | 'SDLRegisterSuperAck' | 'SDLRegisterSuperNak' | 'SDLQueryInfo' | 'SDLPeerInfo' | 'SDLArpRequest' | 'SDLArpResponse' | 'SDLPolicyRequest' | 'SDLPolicyResponse' | 'SDLEvent.NatChanged' | 'SDLEvent.SendRegister' | 'SDLEvent.NetworkShutdown' | 'SDLEvent' | 'SDLCommand.ExitNodeControl' | 'SDLCommand' | 'SDLCommandAck' | 'SDLStunRequest' | 'SDLStunReply' | 'SDLData' | 'SDLStunProbe' | 'SDLStunProbeReply' | 'SDLRegister' | 'SDLRegisterAck'. +-type '$msg'() :: 'SDLV4Info'() | 'SDLV6Info'() | 'SDLV6AssistProbe'() | 'SDLV6AssistProbeReply'() | 'SDLWelcome'() | 'SDLRegisterSuper'() | 'SDLRegisterSuperAck'() | 'SDLRegisterSuperNak'() | 'SDLQueryInfo'() | 'SDLPeerInfo'() | 'SDLArpRequest'() | 'SDLArpResponse'() | 'SDLPolicyRequest'() | 'SDLPolicyResponse'() | 'SDLEvent.NatChanged'() | 'SDLEvent.SendRegister'() | 'SDLEvent.NetworkShutdown'() | 'SDLEvent'() | 'SDLCommand.ExitNodeControl'() | 'SDLCommand'() | 'SDLCommandAck'() | 'SDLStunRequest'() | 'SDLStunReply'() | 'SDLData'() | 'SDLStunProbe'() | 'SDLStunProbeReply'() | 'SDLRegister'() | 'SDLRegisterAck'(). -export_type(['$msg_name'/0, '$msg'/0]). -if(?OTP_RELEASE >= 24). @@ -137,6 +141,8 @@ encode_msg(Msg, MsgName, Opts) -> case MsgName of 'SDLV4Info' -> encode_msg_SDLV4Info(id(Msg, TrUserData), TrUserData); 'SDLV6Info' -> encode_msg_SDLV6Info(id(Msg, TrUserData), TrUserData); + 'SDLV6AssistProbe' -> encode_msg_SDLV6AssistProbe(id(Msg, TrUserData), TrUserData); + 'SDLV6AssistProbeReply' -> encode_msg_SDLV6AssistProbeReply(id(Msg, TrUserData), TrUserData); 'SDLWelcome' -> encode_msg_SDLWelcome(id(Msg, TrUserData), TrUserData); 'SDLRegisterSuper' -> encode_msg_SDLRegisterSuper(id(Msg, TrUserData), TrUserData); 'SDLRegisterSuperAck' -> encode_msg_SDLRegisterSuperAck(id(Msg, TrUserData), TrUserData); @@ -221,10 +227,39 @@ encode_msg_SDLV6Info(#'SDLV6Info'{port = F1, v6 = F2}, Bin, TrUserData) -> end end. +encode_msg_SDLV6AssistProbe(Msg, TrUserData) -> encode_msg_SDLV6AssistProbe(Msg, <<>>, TrUserData). + + +encode_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = F1}, Bin, TrUserData) -> + if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + case iolist_size(TrF1) of + 0 -> Bin; + _ -> e_type_bytes(TrF1, <>, TrUserData) + end + end + end. + +encode_msg_SDLV6AssistProbeReply(Msg, TrUserData) -> encode_msg_SDLV6AssistProbeReply(Msg, <<>>, TrUserData). + + +encode_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{v6_info = F1}, Bin, TrUserData) -> + if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + if TrF1 =:= undefined -> Bin; + true -> e_mfield_SDLV6AssistProbeReply_v6_info(TrF1, <>, TrUserData) + end + end + end. + 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, ipv6_assist = F5}, Bin, TrUserData) -> +encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4, ipv6_assist = F5, assist_token = F6}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -261,12 +296,22 @@ encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_pac end end end, - if F5 == undefined -> B4; + B5 = if F5 == undefined -> B4; + true -> + begin + TrF5 = id(F5, TrUserData), + if TrF5 =:= undefined -> B4; + true -> e_mfield_SDLWelcome_ipv6_assist(TrF5, <>, TrUserData) + end + end + end, + if F6 == undefined -> B5; true -> begin - TrF5 = id(F5, TrUserData), - if TrF5 =:= undefined -> B4; - true -> e_mfield_SDLWelcome_ipv6_assist(TrF5, <>, TrUserData) + TrF6 = id(F6, TrUserData), + case iolist_size(TrF6) of + 0 -> B5; + _ -> e_type_bytes(TrF6, <>, TrUserData) end end end. @@ -1077,6 +1122,11 @@ encode_msg_SDLRegisterAck(#'SDLRegisterAck'{network_id = F1, src_mac = F2, dst_m end end. +e_mfield_SDLV6AssistProbeReply_v6_info(Msg, Bin, TrUserData) -> + SubBin = encode_msg_SDLV6Info(Msg, <<>>, TrUserData), + Bin2 = e_varint(byte_size(SubBin), Bin), + <>. + e_mfield_SDLWelcome_ipv6_assist(Msg, Bin, TrUserData) -> SubBin = encode_msg_SDLV6Info(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), @@ -1262,6 +1312,8 @@ decode_msg_1_catch(Bin, MsgName, TrUserData) -> decode_msg_2_doit('SDLV4Info', Bin, TrUserData) -> id(decode_msg_SDLV4Info(Bin, TrUserData), TrUserData); decode_msg_2_doit('SDLV6Info', Bin, TrUserData) -> id(decode_msg_SDLV6Info(Bin, TrUserData), TrUserData); +decode_msg_2_doit('SDLV6AssistProbe', Bin, TrUserData) -> id(decode_msg_SDLV6AssistProbe(Bin, TrUserData), TrUserData); +decode_msg_2_doit('SDLV6AssistProbeReply', Bin, TrUserData) -> id(decode_msg_SDLV6AssistProbeReply(Bin, TrUserData), TrUserData); decode_msg_2_doit('SDLWelcome', Bin, TrUserData) -> id(decode_msg_SDLWelcome(Bin, TrUserData), TrUserData); decode_msg_2_doit('SDLRegisterSuper', Bin, TrUserData) -> id(decode_msg_SDLRegisterSuper(Bin, TrUserData), TrUserData); decode_msg_2_doit('SDLRegisterSuperAck', Bin, TrUserData) -> id(decode_msg_SDLRegisterSuperAck(Bin, TrUserData), TrUserData); @@ -1398,58 +1450,156 @@ 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), id(undefined, TrUserData), TrUserData). +decode_msg_SDLV6AssistProbe(Bin, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Bin, 0, 0, 0, id(<<>>, TrUserData), 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). +dfp_read_field_def_SDLV6AssistProbe(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_SDLV6AssistProbe_assist_token(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_SDLV6AssistProbe(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbe'{assist_token = F@_1}; +dfp_read_field_def_SDLV6AssistProbe(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_SDLV6AssistProbe(Other, Z1, Z2, F, F@_1, 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) -> +dg_read_field_def_SDLV6AssistProbe(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_SDLV6AssistProbe(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +dg_read_field_def_SDLV6AssistProbe(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, 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, 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); + 10 -> d_field_SDLV6AssistProbe_assist_token(Rest, 0, 0, 0, F@_1, TrUserData); _ -> case Key band 7 of - 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) + 0 -> skip_varint_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 1 -> skip_64_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 2 -> skip_length_delimited_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 3 -> skip_group_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 5 -> skip_32_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) end end; -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}. +dg_read_field_def_SDLV6AssistProbe(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbe'{assist_token = F@_1}. -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) -> +d_field_SDLV6AssistProbe_assist_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_SDLV6AssistProbe_assist_token(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_SDLV6AssistProbe_assist_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_SDLV6AssistProbe(RestF, 0, 0, F, NewFValue, TrUserData). + +skip_varint_SDLV6AssistProbe(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_SDLV6AssistProbe(Rest, Z1, Z2, F, F@_1, TrUserData); +skip_varint_SDLV6AssistProbe(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_length_delimited_SDLV6AssistProbe(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_SDLV6AssistProbe(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +skip_length_delimited_SDLV6AssistProbe(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_SDLV6AssistProbe(Rest2, 0, 0, F, F@_1, TrUserData). + +skip_group_SDLV6AssistProbe(Bin, _, Z2, FNum, F@_1, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_SDLV6AssistProbe(Rest, 0, Z2, FNum, F@_1, TrUserData). + +skip_32_SDLV6AssistProbe(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_64_SDLV6AssistProbe(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Rest, Z1, Z2, F, F@_1, TrUserData). + +decode_msg_SDLV6AssistProbeReply(Bin, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Bin, 0, 0, 0, id(undefined, TrUserData), TrUserData). + +dfp_read_field_def_SDLV6AssistProbeReply(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_SDLV6AssistProbeReply_v6_info(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_SDLV6AssistProbeReply(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbeReply'{v6_info = F@_1}; +dfp_read_field_def_SDLV6AssistProbeReply(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_SDLV6AssistProbeReply(Other, Z1, Z2, F, F@_1, TrUserData). + +dg_read_field_def_SDLV6AssistProbeReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_SDLV6AssistProbeReply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +dg_read_field_def_SDLV6AssistProbeReply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 10 -> d_field_SDLV6AssistProbeReply_v6_info(Rest, 0, 0, 0, F@_1, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 1 -> skip_64_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 2 -> skip_length_delimited_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 3 -> skip_group_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 5 -> skip_32_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) + end + end; +dg_read_field_def_SDLV6AssistProbeReply(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbeReply'{v6_info = F@_1}. + +d_field_SDLV6AssistProbeReply_v6_info(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_SDLV6AssistProbeReply_v6_info(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_SDLV6AssistProbeReply_v6_info(<<0:1, X:7, Rest/binary>>, N, Acc, F, Prev, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, {id(decode_msg_SDLV6Info(Bs, TrUserData), TrUserData), Rest2} end, + dfp_read_field_def_SDLV6AssistProbeReply(RestF, + 0, + 0, + F, + if Prev == undefined -> NewFValue; + true -> merge_msg_SDLV6Info(Prev, NewFValue, TrUserData) + end, + TrUserData). + +skip_varint_SDLV6AssistProbeReply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, TrUserData); +skip_varint_SDLV6AssistProbeReply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_length_delimited_SDLV6AssistProbeReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_SDLV6AssistProbeReply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +skip_length_delimited_SDLV6AssistProbeReply(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) -> + Length = X bsl N + Acc, + <<_:Length/binary, Rest2/binary>> = Rest, + dfp_read_field_def_SDLV6AssistProbeReply(Rest2, 0, 0, F, F@_1, TrUserData). + +skip_group_SDLV6AssistProbeReply(Bin, _, Z2, FNum, F@_1, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_SDLV6AssistProbeReply(Rest, 0, Z2, FNum, F@_1, TrUserData). + +skip_32_SDLV6AssistProbeReply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_64_SDLV6AssistProbeReply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, 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), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_SDLWelcome(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_version(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<16, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_max_bidi_streams(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<24, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_max_packet_size(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_heartbeat_sec(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<42, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_ipv6_assist(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<50, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> d_field_SDLWelcome_assist_token(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +dfp_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4, ipv6_assist = F@_5, assist_token = F@_6}; +dfp_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dg_read_field_def_SDLWelcome(Other, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_6, 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, F@_6, TrUserData); +dg_read_field_def_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_5, F@_6, TrUserData); + 16 -> d_field_SDLWelcome_max_bidi_streams(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 24 -> d_field_SDLWelcome_max_packet_size(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 32 -> d_field_SDLWelcome_heartbeat_sec(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 42 -> d_field_SDLWelcome_ipv6_assist(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 50 -> d_field_SDLWelcome_assist_token(Rest, 0, 0, 0, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 1 -> skip_64_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 2 -> skip_length_delimited_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 3 -> skip_group_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); + 5 -> skip_32_SDLWelcome(Rest, 0, 0, Key bsr 3, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) + end + end; +dg_read_field_def_SDLWelcome(<<>>, 0, 0, _, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, _) -> #'SDLWelcome'{version = F@_1, max_bidi_streams = F@_2, max_packet_size = F@_3, heartbeat_sec = F@_4, ipv6_assist = F@_5, assist_token = F@_6}. + +d_field_SDLWelcome_version(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_6, TrUserData); +d_field_SDLWelcome_version(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, NewFValue, F@_2, F@_3, F@_4, F@_5, F@_6, 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) -> +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, F@_6, 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, F@_6, TrUserData); +d_field_SDLWelcome_max_bidi_streams(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, F@_3, F@_4, F@_5, F@_6, 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, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, NewFValue, F@_3, F@_4, F@_5, F@_6, 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) -> +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, F@_6, 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, F@_6, TrUserData); +d_field_SDLWelcome_max_packet_size(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, _, F@_4, F@_5, F@_6, 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, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, NewFValue, F@_4, F@_5, F@_6, 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) -> +d_field_SDLWelcome_heartbeat_sec(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_6, TrUserData); +d_field_SDLWelcome_heartbeat_sec(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, _, F@_5, F@_6, 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, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, F@_6, 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) -> +d_field_SDLWelcome_ipv6_assist(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_6, TrUserData); +d_field_SDLWelcome_ipv6_assist(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, Prev, F@_6, 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, @@ -1462,24 +1612,30 @@ d_field_SDLWelcome_ipv6_assist(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, if Prev == undefined -> NewFValue; true -> merge_msg_SDLV6Info(Prev, NewFValue, TrUserData) end, + F@_6, 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). +d_field_SDLWelcome_assist_token(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) when N < 57 -> d_field_SDLWelcome_assist_token(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +d_field_SDLWelcome_assist_token(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, _, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, NewFValue, 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) -> +skip_varint_SDLWelcome(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> skip_varint_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData); +skip_varint_SDLWelcome(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData). + +skip_length_delimited_SDLWelcome(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_6, TrUserData); +skip_length_delimited_SDLWelcome(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(Rest2, 0, 0, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData). -skip_group_SDLWelcome(Bin, _, Z2, FNum, 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, F@_5, F@_6, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_SDLWelcome(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). + dfp_read_field_def_SDLWelcome(Rest, 0, Z2, FNum, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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_32_SDLWelcome(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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). +skip_64_SDLWelcome(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, TrUserData) -> dfp_read_field_def_SDLWelcome(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, F@_6, 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). @@ -3060,6 +3216,8 @@ merge_msgs(Prev, New, MsgName, Opts) -> case MsgName of 'SDLV4Info' -> merge_msg_SDLV4Info(Prev, New, TrUserData); 'SDLV6Info' -> merge_msg_SDLV6Info(Prev, New, TrUserData); + 'SDLV6AssistProbe' -> merge_msg_SDLV6AssistProbe(Prev, New, TrUserData); + 'SDLV6AssistProbeReply' -> merge_msg_SDLV6AssistProbeReply(Prev, New, TrUserData); 'SDLWelcome' -> merge_msg_SDLWelcome(Prev, New, TrUserData); 'SDLRegisterSuper' -> merge_msg_SDLRegisterSuper(Prev, New, TrUserData); 'SDLRegisterSuperAck' -> merge_msg_SDLRegisterSuperAck(Prev, New, TrUserData); @@ -3112,9 +3270,24 @@ merge_msg_SDLV6Info(#'SDLV6Info'{port = PFport, v6 = PFv6}, #'SDLV6Info'{port = true -> NFv6 end}. +-compile({nowarn_unused_function,merge_msg_SDLV6AssistProbe/3}). +merge_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = PFassist_token}, #'SDLV6AssistProbe'{assist_token = NFassist_token}, _) -> + #'SDLV6AssistProbe'{assist_token = + if NFassist_token =:= undefined -> PFassist_token; + true -> NFassist_token + end}. + +-compile({nowarn_unused_function,merge_msg_SDLV6AssistProbeReply/3}). +merge_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{v6_info = PFv6_info}, #'SDLV6AssistProbeReply'{v6_info = NFv6_info}, TrUserData) -> + #'SDLV6AssistProbeReply'{v6_info = + if PFv6_info /= undefined, NFv6_info /= undefined -> merge_msg_SDLV6Info(PFv6_info, NFv6_info, TrUserData); + PFv6_info == undefined -> NFv6_info; + NFv6_info == undefined -> PFv6_info + 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, 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) -> +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, assist_token = PFassist_token}, + #'SDLWelcome'{version = NFversion, max_bidi_streams = NFmax_bidi_streams, max_packet_size = NFmax_packet_size, heartbeat_sec = NFheartbeat_sec, ipv6_assist = NFipv6_assist, assist_token = NFassist_token}, TrUserData) -> #'SDLWelcome'{version = if NFversion =:= undefined -> PFversion; true -> NFversion @@ -3135,6 +3308,10 @@ merge_msg_SDLWelcome(#'SDLWelcome'{version = PFversion, max_bidi_streams = PFmax 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, + assist_token = + if NFassist_token =:= undefined -> PFassist_token; + true -> NFassist_token end}. -compile({nowarn_unused_function,merge_msg_SDLRegisterSuper/3}). @@ -3545,6 +3722,8 @@ verify_msg(Msg, MsgName, Opts) -> case MsgName of 'SDLV4Info' -> v_msg_SDLV4Info(Msg, [MsgName], TrUserData); 'SDLV6Info' -> v_msg_SDLV6Info(Msg, [MsgName], TrUserData); + 'SDLV6AssistProbe' -> v_msg_SDLV6AssistProbe(Msg, [MsgName], TrUserData); + 'SDLV6AssistProbeReply' -> v_msg_SDLV6AssistProbeReply(Msg, [MsgName], TrUserData); 'SDLWelcome' -> v_msg_SDLWelcome(Msg, [MsgName], TrUserData); 'SDLRegisterSuper' -> v_msg_SDLRegisterSuper(Msg, [MsgName], TrUserData); 'SDLRegisterSuperAck' -> v_msg_SDLRegisterSuperAck(Msg, [MsgName], TrUserData); @@ -3608,9 +3787,27 @@ v_msg_SDLV6Info(#'SDLV6Info'{port = F1, v6 = F2}, Path, TrUserData) -> ok; v_msg_SDLV6Info(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLV6Info'}, X, Path). +-compile({nowarn_unused_function,v_msg_SDLV6AssistProbe/3}). +-dialyzer({nowarn_function,v_msg_SDLV6AssistProbe/3}). +v_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = F1}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_bytes(F1, [assist_token | Path], TrUserData) + end, + ok; +v_msg_SDLV6AssistProbe(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLV6AssistProbe'}, X, Path). + +-compile({nowarn_unused_function,v_msg_SDLV6AssistProbeReply/3}). +-dialyzer({nowarn_function,v_msg_SDLV6AssistProbeReply/3}). +v_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{v6_info = F1}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_submsg_SDLV6Info(F1, [v6_info | Path], TrUserData) + end, + ok; +v_msg_SDLV6AssistProbeReply(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLV6AssistProbeReply'}, X, Path). + -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, ipv6_assist = F5}, Path, TrUserData) -> +v_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_size = F3, heartbeat_sec = F4, ipv6_assist = F5, assist_token = F6}, Path, TrUserData) -> if F1 == undefined -> ok; true -> v_type_uint32(F1, [version | Path], TrUserData) end, @@ -3626,6 +3823,9 @@ v_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_packet_s if F5 == undefined -> ok; true -> v_submsg_SDLV6Info(F5, [ipv6_assist | Path], TrUserData) end, + if F6 == undefined -> ok; + true -> v_type_bytes(F6, [assist_token | Path], TrUserData) + end, ok; v_msg_SDLWelcome(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLWelcome'}, X, Path). @@ -4099,12 +4299,15 @@ get_msg_defs() -> #field{name = v4, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}, #field{name = nat_type, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]}, {{msg, 'SDLV6Info'}, [#field{name = port, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}]}, + {{msg, 'SDLV6AssistProbe'}, [#field{name = assist_token, fnum = 1, rnum = 2, type = bytes, occurrence = defaulty, opts = []}]}, + {{msg, 'SDLV6AssistProbeReply'}, [#field{name = v6_info, fnum = 1, rnum = 2, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]}, {{msg, '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 = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]}, + #field{name = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}, + #field{name = assist_token, fnum = 6, rnum = 7, type = bytes, 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 = []}, @@ -4207,6 +4410,8 @@ get_msg_defs() -> get_msg_names() -> ['SDLV4Info', 'SDLV6Info', + 'SDLV6AssistProbe', + 'SDLV6AssistProbeReply', 'SDLWelcome', 'SDLRegisterSuper', 'SDLRegisterSuperAck', @@ -4239,6 +4444,8 @@ get_group_names() -> []. get_msg_or_group_names() -> ['SDLV4Info', 'SDLV6Info', + 'SDLV6AssistProbe', + 'SDLV6AssistProbeReply', 'SDLWelcome', 'SDLRegisterSuper', 'SDLRegisterSuperAck', @@ -4284,12 +4491,15 @@ find_msg_def('SDLV4Info') -> #field{name = v4, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}, #field{name = nat_type, fnum = 3, rnum = 4, type = uint32, occurrence = defaulty, opts = []}]; find_msg_def('SDLV6Info') -> [#field{name = port, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6, fnum = 2, rnum = 3, type = bytes, occurrence = defaulty, opts = []}]; +find_msg_def('SDLV6AssistProbe') -> [#field{name = assist_token, fnum = 1, rnum = 2, type = bytes, occurrence = defaulty, opts = []}]; +find_msg_def('SDLV6AssistProbeReply') -> [#field{name = v6_info, fnum = 1, rnum = 2, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]; 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 = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}]; + #field{name = ipv6_assist, fnum = 5, rnum = 6, type = {msg, 'SDLV6Info'}, occurrence = defaulty, opts = []}, + #field{name = assist_token, fnum = 6, rnum = 7, type = bytes, 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 = []}, @@ -4447,6 +4657,8 @@ service_and_rpc_name_to_fqbins(S, R) -> error({gpb_error, {badservice_or_rpc, {S fqbin_to_msg_name(<<"SDLV4Info">>) -> 'SDLV4Info'; fqbin_to_msg_name(<<"SDLV6Info">>) -> 'SDLV6Info'; +fqbin_to_msg_name(<<"SDLV6AssistProbe">>) -> 'SDLV6AssistProbe'; +fqbin_to_msg_name(<<"SDLV6AssistProbeReply">>) -> 'SDLV6AssistProbeReply'; fqbin_to_msg_name(<<"SDLWelcome">>) -> 'SDLWelcome'; fqbin_to_msg_name(<<"SDLRegisterSuper">>) -> 'SDLRegisterSuper'; fqbin_to_msg_name(<<"SDLRegisterSuperAck">>) -> 'SDLRegisterSuperAck'; @@ -4476,6 +4688,8 @@ fqbin_to_msg_name(E) -> error({gpb_error, {badmsg, E}}). msg_name_to_fqbin('SDLV4Info') -> <<"SDLV4Info">>; msg_name_to_fqbin('SDLV6Info') -> <<"SDLV6Info">>; +msg_name_to_fqbin('SDLV6AssistProbe') -> <<"SDLV6AssistProbe">>; +msg_name_to_fqbin('SDLV6AssistProbeReply') -> <<"SDLV6AssistProbeReply">>; msg_name_to_fqbin('SDLWelcome') -> <<"SDLWelcome">>; msg_name_to_fqbin('SDLRegisterSuper') -> <<"SDLRegisterSuper">>; msg_name_to_fqbin('SDLRegisterSuperAck') -> <<"SDLRegisterSuperAck">>; @@ -4563,6 +4777,8 @@ get_msg_containment("sdlan") -> 'SDLStunReply', 'SDLStunRequest', 'SDLV4Info', + 'SDLV6AssistProbe', + 'SDLV6AssistProbeReply', 'SDLV6Info', 'SDLWelcome']; get_msg_containment(P) -> error({gpb_error, {badproto, P}}). @@ -4595,9 +4811,11 @@ get_proto_by_msg_name_as_fqbin(<<"SDLEvent">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLCommand">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLArpRequest">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLWelcome">>) -> "sdlan"; +get_proto_by_msg_name_as_fqbin(<<"SDLV6AssistProbe">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLStunProbe">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLPolicyResponse">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLArpResponse">>) -> "sdlan"; +get_proto_by_msg_name_as_fqbin(<<"SDLV6AssistProbeReply">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLStunReply">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLStunProbeReply">>) -> "sdlan"; get_proto_by_msg_name_as_fqbin(<<"SDLRegisterSuperNak">>) -> "sdlan"; diff --git a/src/sdlan_token_store.erl b/src/sdlan_token_store.erl new file mode 100644 index 0000000..7e527b2 --- /dev/null +++ b/src/sdlan_token_store.erl @@ -0,0 +1,43 @@ +%%%------------------------------------------------------------------- +%%% @author anlicheng +%%% @copyright (C) 2026, +%%% @doc +%%% Token存储 +%%% @end +%%% Created : 16. 4月 2026 12:00 +%%%------------------------------------------------------------------- +-module(sdlan_token_store). +-author("anlicheng"). + +%% API +-export([init/0, store/1, lookup/1, delete/1, generate_token/0]). + +-define(TABLE, sdlan_token_store). + +-spec init() -> ok. +init() -> + ets:new(?TABLE, [named_table, set, public, {read_concurrency, true}, {write_concurrency, true}]). + +generate_token() -> + Token = sdlan_util:rand_byte(128), + store(Token), + Token. + +-spec store(Token :: binary()) -> ok. +store(Token) when is_binary(Token) -> + true = ets:insert(?TABLE, {Token}), + ok. + +-spec lookup(Token :: binary()) -> boolean(). +lookup(Token) when is_binary(Token) -> + case ets:lookup(?TABLE, Token) of + [{Token}] -> + true; + [] -> + false + end. + +-spec delete(Token :: binary()) -> ok. +delete(Token) when is_binary(Token) -> + true = ets:delete(?TABLE, Token), + ok. \ No newline at end of file diff --git a/swift_pb.sh b/swift_pb.sh index 7a1c67c..ab3bff3 100755 --- a/swift_pb.sh +++ b/swift_pb.sh @@ -4,14 +4,9 @@ rm -rf tmp mkdir tmp cp proto/sdlan.proto tmp/sdlan_pb.proto -cp proto/tun.proto tmp/tun_pb.proto cd tmp protoc sdlan_pb.proto --swift_out=. cp sdlan_pb.pb.swift SDLMessage.pb.swift -cp SDLMessage.pb.swift /usr/local/code/macos/punchnet/Tun/Punchnet/ - -protoc tun_pb.proto --swift_out=. -cp tun_pb.pb.swift TunMessage.pb.swift -cp TunMessage.pb.swift /usr/local/code/macos/punchnet/Tun/Punchnet/ +cp SDLMessage.pb.swift /usr/local/code/macos/punchnet/Tun/Punchnet/Protobuf/