diff --git a/include/sdlan_pb.hrl b/include/sdlan_pb.hrl index 5b78085..bc897f5 100644 --- a/include/sdlan_pb.hrl +++ b/include/sdlan_pb.hrl @@ -28,14 +28,15 @@ -ifndef('SDLV6ASSISTPROBE_PB_H'). -define('SDLV6ASSISTPROBE_PB_H', true). -record('SDLV6AssistProbe', - {assist_token = <<>> :: iodata() | undefined % = 1, optional + {pkt_id = 0 :: non_neg_integer() | undefined % = 1, optional, 32 bits }). -endif. -ifndef('SDLV6ASSISTPROBEREPLY_PB_H'). -define('SDLV6ASSISTPROBEREPLY_PB_H', true). -record('SDLV6AssistProbeReply', - {v6_info = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 1, optional + {pkt_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits + v6_info = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 2, optional }). -endif. @@ -46,8 +47,7 @@ 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 - assist_token = <<>> :: iodata() | undefined % = 6, optional + ipv6_assist = undefined :: sdlan_pb:'SDLV6Info'() | undefined % = 5, optional }). -endif. diff --git a/proto/sdlan.proto b/proto/sdlan.proto index dc8639e..cd1d3fb 100644 --- a/proto/sdlan.proto +++ b/proto/sdlan.proto @@ -17,11 +17,12 @@ message SDLV6Info { // ipv6 assist相关 message SDLV6AssistProbe { - bytes assist_token = 1; + uint32 pkt_id = 1; } message SDLV6AssistProbeReply { - SDLV6Info v6_info = 1; + uint32 pkt_id = 1; + SDLV6Info v6_info = 2; } // 和super之间采用了quic协议通讯 @@ -37,7 +38,6 @@ 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 c9e0b5f..ba800b2 100644 --- a/src/ipv6_assist/ipv6_assist_server.erl +++ b/src/ipv6_assist/ipv6_assist_server.erl @@ -81,19 +81,16 @@ handle_cast(_Request, State) -> {stop, Reason :: term(), NewState :: #state{}}. 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 -> - case ipv6_assist_probe_reply(Ip, Port) of - Reply = #'SDLV6AssistProbeReply'{} -> - ReplyBin = sdlan_pb:encode_msg(Reply), - ok = gen_udp:send(Sock, Ip, Port, ReplyBin); - undefined -> - ok - end; - false -> - ok - end; + #'SDLV6AssistProbe'{pkt_id = PktId} -> + V6Bytes = sdlan_util:ipv6_to_bytes(Ip), + ReplyBin = sdlan_pb:encode_msg(#'SDLV6AssistProbeReply'{ + pkt_id = PktId, + v6_info = #'SDLV6Info'{ + v6 = V6Bytes, + port = Port + } + }), + ok = gen_udp:send(Sock, Ip, Port, ReplyBin); _Err -> ok end, @@ -110,21 +107,4 @@ terminate(_Reason, _State = #state{}) -> Extra :: term()) -> {ok, NewState :: #state{}} | {error, Reason :: term()}. code_change(_OldVsn, State = #state{}, _Extra) -> - {ok, State}. - --spec ipv6_assist_probe_reply(Ip :: inet:ip_address(), Port :: integer()) -> - undefined | #'SDLV6AssistProbeReply'{}. -ipv6_assist_probe_reply(Ip, Port) when is_integer(Port), Port > 0, Port =< 65535 -> - case sdlan_util:ipv6_to_bytes(Ip) of - <<_:128>> = V6Bytes -> - #'SDLV6AssistProbeReply'{ - v6_info = #'SDLV6Info'{ - v6 = V6Bytes, - port = Port - } - }; - _ -> - undefined - end; -ipv6_assist_probe_reply(_, _) -> - undefined. \ No newline at end of file + {ok, State}. \ No newline at end of file diff --git a/src/quic/sdlan_quic_channel.erl b/src/quic/sdlan_quic_channel.erl index 91555c9..90ee0d3 100644 --- a/src/quic/sdlan_quic_channel.erl +++ b/src/quic/sdlan_quic_channel.erl @@ -140,8 +140,7 @@ 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, - assist_token = sdlan_token_store:generate_token() + ipv6_assist = Ipv6Assist }), quic_send(Stream, <>), logger:debug("[sdlan_quic_channel] get stream: ~p, send welcome", [Stream]), diff --git a/src/sdlan_pb.erl b/src/sdlan_pb.erl index 2d24692..379aff4 100644 --- a/src/sdlan_pb.erl +++ b/src/sdlan_pb.erl @@ -230,14 +230,13 @@ encode_msg_SDLV6Info(#'SDLV6Info'{port = F1, v6 = F2}, Bin, TrUserData) -> encode_msg_SDLV6AssistProbe(Msg, TrUserData) -> encode_msg_SDLV6AssistProbe(Msg, <<>>, TrUserData). -encode_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = F1}, Bin, TrUserData) -> +encode_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{pkt_id = 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) + if TrF1 =:= 0 -> Bin; + true -> e_varint(TrF1, <>, TrUserData) end end end. @@ -245,13 +244,22 @@ encode_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = F1}, Bin, TrUserD encode_msg_SDLV6AssistProbeReply(Msg, TrUserData) -> encode_msg_SDLV6AssistProbeReply(Msg, <<>>, TrUserData). -encode_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{v6_info = F1}, Bin, TrUserData) -> - if F1 == undefined -> Bin; +encode_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{pkt_id = F1, v6_info = 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 - TrF1 = id(F1, TrUserData), - if TrF1 =:= undefined -> Bin; - true -> e_mfield_SDLV6AssistProbeReply_v6_info(TrF1, <>, TrUserData) + TrF2 = id(F2, TrUserData), + if TrF2 =:= undefined -> B1; + true -> e_mfield_SDLV6AssistProbeReply_v6_info(TrF2, <>, TrUserData) end end end. @@ -259,7 +267,7 @@ encode_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{v6_info = F1}, Bin, Tr 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, assist_token = F6}, 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 @@ -296,22 +304,12 @@ encode_msg_SDLWelcome(#'SDLWelcome'{version = F1, max_bidi_streams = F2, max_pac end end end, - 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; + if F5 == undefined -> B4; true -> begin - TrF6 = id(F6, TrUserData), - case iolist_size(TrF6) of - 0 -> B5; - _ -> e_type_bytes(TrF6, <>, TrUserData) + TrF5 = id(F5, TrUserData), + if TrF5 =:= undefined -> B4; + true -> e_mfield_SDLWelcome_ipv6_assist(TrF5, <>, TrUserData) end end end. @@ -1450,17 +1448,17 @@ 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_SDLV6AssistProbe(Bin, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). +decode_msg_SDLV6AssistProbe(Bin, TrUserData) -> dfp_read_field_def_SDLV6AssistProbe(Bin, 0, 0, 0, id(0, TrUserData), 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(<<8, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_SDLV6AssistProbe_pkt_id(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_SDLV6AssistProbe(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbe'{pkt_id = 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_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 - 10 -> d_field_SDLV6AssistProbe_assist_token(Rest, 0, 0, 0, F@_1, TrUserData); + 8 -> d_field_SDLV6AssistProbe_pkt_id(Rest, 0, 0, 0, F@_1, TrUserData); _ -> case Key band 7 of 0 -> skip_varint_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); @@ -1470,11 +1468,11 @@ dg_read_field_def_SDLV6AssistProbe(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, T 5 -> skip_32_SDLV6AssistProbe(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) end end; -dg_read_field_def_SDLV6AssistProbe(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbe'{assist_token = F@_1}. +dg_read_field_def_SDLV6AssistProbe(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbe'{pkt_id = F@_1}. -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, +d_field_SDLV6AssistProbe_pkt_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_SDLV6AssistProbe_pkt_id(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_SDLV6AssistProbe_pkt_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, TrUserData) -> + {NewFValue, RestF} = {id((X bsl N + Acc) band 4294967295, TrUserData), Rest}, 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); @@ -1494,112 +1492,117 @@ skip_32_SDLV6AssistProbe(<<_:32, Rest/binary>>, 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). +decode_msg_SDLV6AssistProbeReply(Bin, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Bin, 0, 0, 0, id(0, TrUserData), 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). +dfp_read_field_def_SDLV6AssistProbeReply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_SDLV6AssistProbeReply_pkt_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_SDLV6AssistProbeReply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_SDLV6AssistProbeReply_v6_info(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_SDLV6AssistProbeReply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'SDLV6AssistProbeReply'{pkt_id = F@_1, v6_info = F@_2}; +dfp_read_field_def_SDLV6AssistProbeReply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_SDLV6AssistProbeReply(Other, Z1, Z2, F, F@_1, F@_2, 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) -> +dg_read_field_def_SDLV6AssistProbeReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_SDLV6AssistProbeReply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_SDLV6AssistProbeReply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> Key = X bsl N + Acc, case Key of - 10 -> d_field_SDLV6AssistProbeReply_v6_info(Rest, 0, 0, 0, F@_1, TrUserData); + 8 -> d_field_SDLV6AssistProbeReply_pkt_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_SDLV6AssistProbeReply_v6_info(Rest, 0, 0, 0, F@_1, F@_2, 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) + 0 -> skip_varint_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_SDLV6AssistProbeReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) end end; -dg_read_field_def_SDLV6AssistProbeReply(<<>>, 0, 0, _, F@_1, _) -> #'SDLV6AssistProbeReply'{v6_info = F@_1}. +dg_read_field_def_SDLV6AssistProbeReply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'SDLV6AssistProbeReply'{pkt_id = F@_1, v6_info = F@_2}. -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) -> +d_field_SDLV6AssistProbeReply_pkt_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_SDLV6AssistProbeReply_pkt_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_SDLV6AssistProbeReply_pkt_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_SDLV6AssistProbeReply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_SDLV6AssistProbeReply_v6_info(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_SDLV6AssistProbeReply_v6_info(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_SDLV6AssistProbeReply_v6_info(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, 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, + F@_1, 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_varint_SDLV6AssistProbeReply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_SDLV6AssistProbeReply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, F@_2, 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) -> +skip_length_delimited_SDLV6AssistProbeReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_SDLV6AssistProbeReply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_SDLV6AssistProbeReply(<<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_SDLV6AssistProbeReply(Rest2, 0, 0, F, F@_1, TrUserData). + dfp_read_field_def_SDLV6AssistProbeReply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_SDLV6AssistProbeReply(Bin, _, Z2, FNum, F@_1, TrUserData) -> +skip_group_SDLV6AssistProbeReply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_SDLV6AssistProbeReply(Rest, 0, Z2, FNum, F@_1, TrUserData). + dfp_read_field_def_SDLV6AssistProbeReply(Rest, 0, Z2, FNum, F@_1, F@_2, 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_32_SDLV6AssistProbeReply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(Rest, Z1, Z2, F, F@_1, F@_2, 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). +skip_64_SDLV6AssistProbeReply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_SDLV6AssistProbeReply(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), id(<<>>, 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, 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). +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, 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) -> +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, 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); + 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, 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) + 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, 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}. +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, 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) -> +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, F@_5, F@_6, 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, 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) -> +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, F@_5, F@_6, 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, 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) -> +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, F@_5, F@_6, 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, 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) -> +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, F@_5, F@_6, TrUserData). + dfp_read_field_def_SDLWelcome(RestF, 0, 0, F, F@_1, F@_2, F@_3, NewFValue, F@_5, 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) -> +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, @@ -1612,30 +1615,24 @@ 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). -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_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_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) -> +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, F@_5, F@_6, 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, F@_5, F@_6, 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, F@_5, F@_6, 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, 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_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, 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). 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). @@ -3271,23 +3268,27 @@ merge_msg_SDLV6Info(#'SDLV6Info'{port = PFport, v6 = PFv6}, #'SDLV6Info'{port = 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 +merge_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{pkt_id = PFpkt_id}, #'SDLV6AssistProbe'{pkt_id = NFpkt_id}, _) -> + #'SDLV6AssistProbe'{pkt_id = + if NFpkt_id =:= undefined -> PFpkt_id; + true -> NFpkt_id 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 = +merge_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{pkt_id = PFpkt_id, v6_info = PFv6_info}, #'SDLV6AssistProbeReply'{pkt_id = NFpkt_id, v6_info = NFv6_info}, TrUserData) -> + #'SDLV6AssistProbeReply'{pkt_id = + if NFpkt_id =:= undefined -> PFpkt_id; + true -> NFpkt_id + end, + 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, 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) -> +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 @@ -3308,10 +3309,6 @@ 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}). @@ -3789,25 +3786,28 @@ v_msg_SDLV6Info(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'SDLV6Info -compile({nowarn_unused_function,v_msg_SDLV6AssistProbe/3}). -dialyzer({nowarn_function,v_msg_SDLV6AssistProbe/3}). -v_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{assist_token = F1}, Path, TrUserData) -> +v_msg_SDLV6AssistProbe(#'SDLV6AssistProbe'{pkt_id = F1}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_type_bytes(F1, [assist_token | Path], TrUserData) + true -> v_type_uint32(F1, [pkt_id | 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) -> +v_msg_SDLV6AssistProbeReply(#'SDLV6AssistProbeReply'{pkt_id = F1, v6_info = F2}, Path, TrUserData) -> if F1 == undefined -> ok; - true -> v_submsg_SDLV6Info(F1, [v6_info | Path], TrUserData) + true -> v_type_uint32(F1, [pkt_id | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_submsg_SDLV6Info(F2, [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, assist_token = F6}, 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, @@ -3823,9 +3823,6 @@ 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). @@ -4299,15 +4296,14 @@ 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, 'SDLV6AssistProbe'}, [#field{name = pkt_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}]}, + {{msg, 'SDLV6AssistProbeReply'}, [#field{name = pkt_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6_info, fnum = 2, rnum = 3, 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 = assist_token, fnum = 6, rnum = 7, type = bytes, 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 = []}, @@ -4491,15 +4487,14 @@ 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('SDLV6AssistProbe') -> [#field{name = pkt_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}]; +find_msg_def('SDLV6AssistProbeReply') -> [#field{name = pkt_id, fnum = 1, rnum = 2, type = uint32, occurrence = defaulty, opts = []}, #field{name = v6_info, fnum = 2, rnum = 3, 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 = assist_token, fnum = 6, rnum = 7, type = bytes, 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 = []},