diff --git a/include/message_pb.hrl b/include/message_pb.hrl index dd49a4f..bbad6e6 100644 --- a/include/message_pb.hrl +++ b/include/message_pb.hrl @@ -12,15 +12,30 @@ -define('REQUESTFRAME_PB_H', true). -record('RequestFrame', {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - body :: {auth_request, message_pb:'AuthRequest'()} | {rpc_request, message_pb:'RpcRequest'()} | {container_request, message_pb:'ContainerRequest'()} | undefined % oneof + body :: {auth_request, message_pb:'AuthRequest'()} | {container_request, message_pb:'ContainerRequest'()} | undefined % oneof }). -endif. --ifndef('RESPONSEFRAME_PB_H'). --define('RESPONSEFRAME_PB_H', true). --record('ResponseFrame', +-ifndef('REPLYFRAME_PB_H'). +-define('REPLYFRAME_PB_H', true). +-record('ReplyFrame', {packet_id = 0 :: non_neg_integer() | undefined, % = 1, optional, 32 bits - body :: {auth_reply, message_pb:'AuthReply'()} | {rpc_reply, message_pb:'RpcReply'()} | undefined % oneof + reply :: {result, message_pb:'ReplyResult'()} | {error, message_pb:'ReplyError'()} | undefined % oneof + }). +-endif. + +-ifndef('REPLYRESULT_PB_H'). +-define('REPLYRESULT_PB_H', true). +-record('ReplyResult', + {data = <<>> :: iodata() | undefined % = 1, optional + }). +-endif. + +-ifndef('REPLYERROR_PB_H'). +-define('REPLYERROR_PB_H', true). +-record('ReplyError', + {code = 0 :: integer() | undefined, % = 1, optional, 32 bits + message = <<>> :: unicode:chardata() | undefined % = 2, optional }). -endif. @@ -221,14 +236,6 @@ }). -endif. --ifndef('AUTHREPLY_PB_H'). --define('AUTHREPLY_PB_H', true). --record('AuthReply', - {code = 0 :: integer() | undefined, % = 1, optional, 32 bits - payload = <<>> :: iodata() | undefined % = 2, optional - }). --endif. - -ifndef('PUB_PB_H'). -define('PUB_PB_H', true). -record('Pub', @@ -246,36 +253,6 @@ }). -endif. --ifndef('RPCREQUEST_PB_H'). --define('RPCREQUEST_PB_H', true). --record('RpcRequest', - {method = <<>> :: iodata() | undefined, % = 1, optional - params = <<>> :: iodata() | undefined % = 2, optional - }). --endif. - --ifndef('RPCREPLY.RPCRESULT_PB_H'). --define('RPCREPLY.RPCRESULT_PB_H', true). --record('RpcReply.RpcResult', - {data = <<>> :: iodata() | undefined % = 1, optional - }). --endif. - --ifndef('RPCREPLY.RPCERROR_PB_H'). --define('RPCREPLY.RPCERROR_PB_H', true). --record('RpcReply.RpcError', - {code = 0 :: integer() | undefined, % = 1, optional, 32 bits - message = <<>> :: unicode:chardata() | undefined % = 2, optional - }). --endif. - --ifndef('RPCREPLY_PB_H'). --define('RPCREPLY_PB_H', true). --record('RpcReply', - {reply :: {result, message_pb:'RpcReply.RpcResult'()} | {error, message_pb:'RpcReply.RpcError'()} | undefined % oneof - }). --endif. - -ifndef('DATA_PB_H'). -define('DATA_PB_H', true). -record('Data', diff --git a/proto/message.proto b/proto/message.proto index 9513346..f65d8aa 100644 --- a/proto/message.proto +++ b/proto/message.proto @@ -5,19 +5,27 @@ message RequestFrame { uint32 packet_id = 1; oneof body { AuthRequest auth_request = 2; - RpcRequest rpc_request = 3; - ContainerRequest container_request = 4; + ContainerRequest container_request = 3; } } -message ResponseFrame { +message ReplyFrame { uint32 packet_id = 1; - oneof body { - AuthReply auth_reply = 2; - RpcReply rpc_reply = 3; + oneof reply { + ReplyResult result = 2; + ReplyError error = 3; } } +message ReplyResult { + bytes data = 1; +} + +message ReplyError { + int32 code = 1; + string message = 2; +} + message CastFrame { oneof body { Pub pub = 1; @@ -165,7 +173,6 @@ message TmpfsMount { string options = 2; } - message AuthRequest { bytes uuid = 1; bytes username = 2; @@ -174,11 +181,6 @@ message AuthRequest { int32 timestamp = 5; } -message AuthReply { - int32 code = 1; - bytes payload = 2; -} - message Pub { bytes topic = 1; int32 qos = 2; @@ -190,27 +192,6 @@ message Command { bytes command = 2; } -message RpcRequest { - bytes method = 1; - bytes params = 2; -} - -message RpcReply { - message RpcResult { - bytes data = 1; - } - - message RpcError { - int32 code = 1; - string message = 2; - } - - oneof reply { - RpcResult result = 1; - RpcError error = 2; - } -} - message Data { bytes route_key = 1; bytes metric = 2; @@ -220,4 +201,4 @@ message TaskEventStream { int32 task_id = 1; bytes type = 2; bytes stream = 3; -} +} \ No newline at end of file diff --git a/src/efka_client.erl b/src/efka_client.erl index 744449b..4ae03a3 100644 --- a/src/efka_client.erl +++ b/src/efka_client.erl @@ -140,8 +140,8 @@ handle_event(info, flush_cache, _, State) -> %% 处理收到的ssl消息 handle_event(info, {ssl, Socket, <>}, _, State = #state{socket = Socket}) -> - ResponseFrame = message_pb:decode_msg(PacketBin, 'ResponseFrame'), - {keep_state, State, [{next_event, internal, {decoded_response, ResponseFrame}}]}; + ReplyFrame = message_pb:decode_msg(PacketBin, 'ReplyFrame'), + {keep_state, State, [{next_event, internal, {decoded_reply, ReplyFrame}}]}; handle_event(info, {ssl, Socket, <>}, _, State = #state{socket = Socket}) -> RequestFrame = message_pb:decode_msg(PacketBin, 'RequestFrame'), {keep_state, State, [{next_event, internal, {decoded_request, RequestFrame}}]}; @@ -164,44 +164,33 @@ handle_event(internal, {decoded_request, #'RequestFrame'{packet_id = PacketId, b ?STATE_ACTIVATED, State = #state{socket = Socket}) -> case handle_container_request(Request) of ok -> - send_rpc_result_reply(Socket, PacketId, <<"ok">>); + send_result_reply(Socket, PacketId, <<"ok">>); {ok, Reply} -> - send_rpc_result_reply(Socket, PacketId, Reply); + send_result_reply(Socket, PacketId, Reply); {error, Reason} -> - send_rpc_error_reply(Socket, PacketId, Reason) + send_error_reply(Socket, PacketId, Reason) end, {keep_state, State}; handle_event(internal, {decoded_request, #'RequestFrame'{packet_id = PacketId, body = _Body}}, ?STATE_RESTRICTED, State = #state{socket = Socket}) -> - send_rpc_error_reply(Socket, PacketId, <<"agent restricted">>), + send_error_reply(Socket, PacketId, <<"agent restricted">>), {keep_state, State}; handle_event(internal, {decoded_request, #'RequestFrame'{packet_id = PacketId, body = _Body}}, _StateName, State = #state{socket = Socket}) -> - send_rpc_error_reply(Socket, PacketId, <<"agent state invalid">>), + send_error_reply(Socket, PacketId, <<"agent state invalid">>), {keep_state, State}; -handle_event(internal, {decoded_response, #'ResponseFrame'{ - packet_id = 1, - body = {auth_reply, #'AuthReply'{code = Code, payload = Message}} -}}, ?STATE_AUTH, State = #state{socket = Socket}) -> - case Code of - 0 -> - logger:debug("[efka_client] auth success, message: ~p", [Message]), - {next_state, ?STATE_ACTIVATED, State, [{next_event, info, flush_cache}]}; - 1 -> - logger:debug("[efka_client] auth denied, message: ~p", [Message]), - {next_state, ?STATE_RESTRICTED, State}; - 2 -> - logger:debug("[efka_client] auth failed, message: ~p", [Message]), - disconnect(Socket), - schedule_reconnect(), - {next_state, ?STATE_DISCONNECTED, State#state{socket = undefined}}; - _ -> - logger:debug("[efka_client] auth failed, invalid message"), - disconnect(Socket), - schedule_reconnect(), - {next_state, ?STATE_DISCONNECTED, State#state{socket = undefined}} - end; +handle_event(internal, {decoded_reply, #'ReplyFrame'{packet_id = 1, reply = {result, #'ReplyResult'{data = Message}}}}, ?STATE_AUTH, State) -> + logger:debug("[efka_client] auth success, message: ~p", [Message]), + {next_state, ?STATE_ACTIVATED, State, [{next_event, info, flush_cache}]}; +handle_event(internal, {decoded_reply, #'ReplyFrame'{packet_id = 1, reply = {error, #'ReplyError'{code = 1, message = Message}}}}, ?STATE_AUTH, State) -> + logger:debug("[efka_client] auth denied, message: ~p", [Message]), + {next_state, ?STATE_RESTRICTED, State}; +handle_event(internal, {decoded_reply, #'ReplyFrame'{packet_id = 1, reply = {error, #'ReplyError'{message = Message}}}}, ?STATE_AUTH, State = #state{socket = Socket}) -> + logger:debug("[efka_client] auth failed, message: ~p", [Message]), + disconnect(Socket), + schedule_reconnect(), + {next_state, ?STATE_DISCONNECTED, State#state{socket = undefined}}; %% 处理命令 handle_event(internal, {decoded_cast, #'CastFrame'{ @@ -288,10 +277,6 @@ disconnect(Socket) -> schedule_reconnect() -> erlang:start_timer(5000, self(), create_transport). --spec encode_rpc_payload(any()) -> binary(). -encode_rpc_payload(Payload) -> - jiffy:encode(Payload, [force_utf8]). - -spec handle_container_request(message_pb:'ContainerRequest'()) -> ok. handle_container_request(#'ContainerRequest'{action = {list, #'ContainerRequest.List'{all = _All}}}) -> case docker_manager:get_containers() of @@ -318,23 +303,19 @@ handle_container_request(#'ContainerRequest'{action = {config, #'ContainerReques ContainerTarget = container_target(Target), docker_manager:config_container(ContainerTarget, iolist_to_binary(Config)). --spec send_rpc_result_reply(ssl:sslsocket(), integer(), any()) -> ok. -send_rpc_result_reply(Socket, PacketId, Payload) -> - Packet = message_pb:encode_msg(#'ResponseFrame'{ +-spec send_result_reply(ssl:sslsocket(), integer(), binary()) -> ok. +send_result_reply(Socket, PacketId, Payload) when is_binary(Payload) -> + Packet = message_pb:encode_msg(#'ReplyFrame'{ packet_id = PacketId, - body = {rpc_reply, #'RpcReply'{ - reply = {result, #'RpcReply.RpcResult'{data = encode_rpc_payload(Payload)}} - }} + reply = {result, #'ReplyResult'{data = Payload}} }), send_packet(Socket, Packet). --spec send_rpc_error_reply(ssl:sslsocket(), integer(), binary()) -> ok. -send_rpc_error_reply(Socket, PacketId, Reason) -> - Packet = message_pb:encode_msg(#'ResponseFrame'{ +-spec send_error_reply(ssl:sslsocket(), integer(), binary()) -> ok. +send_error_reply(Socket, PacketId, Reason) when is_binary(Reason) -> + Packet = message_pb:encode_msg(#'ReplyFrame'{ packet_id = PacketId, - body = {rpc_reply, #'RpcReply'{ - reply = {error, #'RpcReply.RpcError'{code = -1, message = Reason}} - }} + reply = {error, #'ReplyError'{code = -1, message = Reason}} }), send_packet(Socket, Packet). diff --git a/src/protobuf/message_pb.erl b/src/protobuf/message_pb.erl index 1506e6f..be40b58 100644 --- a/src/protobuf/message_pb.erl +++ b/src/protobuf/message_pb.erl @@ -56,7 +56,11 @@ %% message types -type 'RequestFrame'() :: #'RequestFrame'{}. --type 'ResponseFrame'() :: #'ResponseFrame'{}. +-type 'ReplyFrame'() :: #'ReplyFrame'{}. + +-type 'ReplyResult'() :: #'ReplyResult'{}. + +-type 'ReplyError'() :: #'ReplyError'{}. -type 'CastFrame'() :: #'CastFrame'{}. @@ -100,27 +104,17 @@ -type 'AuthRequest'() :: #'AuthRequest'{}. --type 'AuthReply'() :: #'AuthReply'{}. - -type 'Pub'() :: #'Pub'{}. -type 'Command'() :: #'Command'{}. --type 'RpcRequest'() :: #'RpcRequest'{}. - --type 'RpcReply.RpcResult'() :: #'RpcReply.RpcResult'{}. - --type 'RpcReply.RpcError'() :: #'RpcReply.RpcError'{}. - --type 'RpcReply'() :: #'RpcReply'{}. - -type 'Data'() :: #'Data'{}. -type 'TaskEventStream'() :: #'TaskEventStream'{}. --export_type(['RequestFrame'/0, 'ResponseFrame'/0, 'CastFrame'/0, 'ContainerRef'/0, 'ContainerRequest.List'/0, 'ContainerRequest.Deploy'/0, 'ContainerRequest.Start'/0, 'ContainerRequest.Stop'/0, 'ContainerRequest.Kill'/0, 'ContainerRequest.Remove'/0, 'ContainerRequest.Config'/0, 'ContainerRequest'/0, 'ContainerDeployParams'/0, 'ContainerSpec'/0, 'VolumeBind'/0, 'PortExpose'/0, 'Healthcheck'/0, 'RestartPolicy'/0, 'DeviceMapping'/0, 'ResourceLimits'/0, 'Ulimit'/0, 'TmpfsMount'/0, 'AuthRequest'/0, 'AuthReply'/0, 'Pub'/0, 'Command'/0, 'RpcRequest'/0, 'RpcReply.RpcResult'/0, 'RpcReply.RpcError'/0, 'RpcReply'/0, 'Data'/0, 'TaskEventStream'/0]). --type '$msg_name'() :: 'RequestFrame' | 'ResponseFrame' | 'CastFrame' | 'ContainerRef' | 'ContainerRequest.List' | 'ContainerRequest.Deploy' | 'ContainerRequest.Start' | 'ContainerRequest.Stop' | 'ContainerRequest.Kill' | 'ContainerRequest.Remove' | 'ContainerRequest.Config' | 'ContainerRequest' | 'ContainerDeployParams' | 'ContainerSpec' | 'VolumeBind' | 'PortExpose' | 'Healthcheck' | 'RestartPolicy' | 'DeviceMapping' | 'ResourceLimits' | 'Ulimit' | 'TmpfsMount' | 'AuthRequest' | 'AuthReply' | 'Pub' | 'Command' | 'RpcRequest' | 'RpcReply.RpcResult' | 'RpcReply.RpcError' | 'RpcReply' | 'Data' | 'TaskEventStream'. --type '$msg'() :: 'RequestFrame'() | 'ResponseFrame'() | 'CastFrame'() | 'ContainerRef'() | 'ContainerRequest.List'() | 'ContainerRequest.Deploy'() | 'ContainerRequest.Start'() | 'ContainerRequest.Stop'() | 'ContainerRequest.Kill'() | 'ContainerRequest.Remove'() | 'ContainerRequest.Config'() | 'ContainerRequest'() | 'ContainerDeployParams'() | 'ContainerSpec'() | 'VolumeBind'() | 'PortExpose'() | 'Healthcheck'() | 'RestartPolicy'() | 'DeviceMapping'() | 'ResourceLimits'() | 'Ulimit'() | 'TmpfsMount'() | 'AuthRequest'() | 'AuthReply'() | 'Pub'() | 'Command'() | 'RpcRequest'() | 'RpcReply.RpcResult'() | 'RpcReply.RpcError'() | 'RpcReply'() | 'Data'() | 'TaskEventStream'(). +-export_type(['RequestFrame'/0, 'ReplyFrame'/0, 'ReplyResult'/0, 'ReplyError'/0, 'CastFrame'/0, 'ContainerRef'/0, 'ContainerRequest.List'/0, 'ContainerRequest.Deploy'/0, 'ContainerRequest.Start'/0, 'ContainerRequest.Stop'/0, 'ContainerRequest.Kill'/0, 'ContainerRequest.Remove'/0, 'ContainerRequest.Config'/0, 'ContainerRequest'/0, 'ContainerDeployParams'/0, 'ContainerSpec'/0, 'VolumeBind'/0, 'PortExpose'/0, 'Healthcheck'/0, 'RestartPolicy'/0, 'DeviceMapping'/0, 'ResourceLimits'/0, 'Ulimit'/0, 'TmpfsMount'/0, 'AuthRequest'/0, 'Pub'/0, 'Command'/0, 'Data'/0, 'TaskEventStream'/0]). +-type '$msg_name'() :: 'RequestFrame' | 'ReplyFrame' | 'ReplyResult' | 'ReplyError' | 'CastFrame' | 'ContainerRef' | 'ContainerRequest.List' | 'ContainerRequest.Deploy' | 'ContainerRequest.Start' | 'ContainerRequest.Stop' | 'ContainerRequest.Kill' | 'ContainerRequest.Remove' | 'ContainerRequest.Config' | 'ContainerRequest' | 'ContainerDeployParams' | 'ContainerSpec' | 'VolumeBind' | 'PortExpose' | 'Healthcheck' | 'RestartPolicy' | 'DeviceMapping' | 'ResourceLimits' | 'Ulimit' | 'TmpfsMount' | 'AuthRequest' | 'Pub' | 'Command' | 'Data' | 'TaskEventStream'. +-type '$msg'() :: 'RequestFrame'() | 'ReplyFrame'() | 'ReplyResult'() | 'ReplyError'() | 'CastFrame'() | 'ContainerRef'() | 'ContainerRequest.List'() | 'ContainerRequest.Deploy'() | 'ContainerRequest.Start'() | 'ContainerRequest.Stop'() | 'ContainerRequest.Kill'() | 'ContainerRequest.Remove'() | 'ContainerRequest.Config'() | 'ContainerRequest'() | 'ContainerDeployParams'() | 'ContainerSpec'() | 'VolumeBind'() | 'PortExpose'() | 'Healthcheck'() | 'RestartPolicy'() | 'DeviceMapping'() | 'ResourceLimits'() | 'Ulimit'() | 'TmpfsMount'() | 'AuthRequest'() | 'Pub'() | 'Command'() | 'Data'() | 'TaskEventStream'(). -export_type(['$msg_name'/0, '$msg'/0]). -record('map',{key, value}). @@ -149,7 +143,9 @@ encode_msg(Msg, MsgName, Opts) -> TrUserData = proplists:get_value(user_data, Opts), case MsgName of 'RequestFrame' -> encode_msg_RequestFrame(id(Msg, TrUserData), TrUserData); - 'ResponseFrame' -> encode_msg_ResponseFrame(id(Msg, TrUserData), TrUserData); + 'ReplyFrame' -> encode_msg_ReplyFrame(id(Msg, TrUserData), TrUserData); + 'ReplyResult' -> encode_msg_ReplyResult(id(Msg, TrUserData), TrUserData); + 'ReplyError' -> encode_msg_ReplyError(id(Msg, TrUserData), TrUserData); 'CastFrame' -> encode_msg_CastFrame(id(Msg, TrUserData), TrUserData); 'ContainerRef' -> encode_msg_ContainerRef(id(Msg, TrUserData), TrUserData); 'ContainerRequest.List' -> 'encode_msg_ContainerRequest.List'(id(Msg, TrUserData), TrUserData); @@ -171,13 +167,8 @@ encode_msg(Msg, MsgName, Opts) -> 'Ulimit' -> encode_msg_Ulimit(id(Msg, TrUserData), TrUserData); 'TmpfsMount' -> encode_msg_TmpfsMount(id(Msg, TrUserData), TrUserData); 'AuthRequest' -> encode_msg_AuthRequest(id(Msg, TrUserData), TrUserData); - 'AuthReply' -> encode_msg_AuthReply(id(Msg, TrUserData), TrUserData); 'Pub' -> encode_msg_Pub(id(Msg, TrUserData), TrUserData); 'Command' -> encode_msg_Command(id(Msg, TrUserData), TrUserData); - 'RpcRequest' -> encode_msg_RpcRequest(id(Msg, TrUserData), TrUserData); - 'RpcReply.RpcResult' -> 'encode_msg_RpcReply.RpcResult'(id(Msg, TrUserData), TrUserData); - 'RpcReply.RpcError' -> 'encode_msg_RpcReply.RpcError'(id(Msg, TrUserData), TrUserData); - 'RpcReply' -> encode_msg_RpcReply(id(Msg, TrUserData), TrUserData); 'Data' -> encode_msg_Data(id(Msg, TrUserData), TrUserData); 'TaskEventStream' -> encode_msg_TaskEventStream(id(Msg, TrUserData), TrUserData) end. @@ -200,15 +191,14 @@ encode_msg_RequestFrame(#'RequestFrame'{packet_id = F1, body = F2}, Bin, TrUserD true -> case id(F2, TrUserData) of {auth_request, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_RequestFrame_auth_request(TrTF2, <>, TrUserData) end; - {rpc_request, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_RequestFrame_rpc_request(TrTF2, <>, TrUserData) end; - {container_request, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_RequestFrame_container_request(TrTF2, <>, TrUserData) end + {container_request, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_RequestFrame_container_request(TrTF2, <>, TrUserData) end end end. -encode_msg_ResponseFrame(Msg, TrUserData) -> encode_msg_ResponseFrame(Msg, <<>>, TrUserData). +encode_msg_ReplyFrame(Msg, TrUserData) -> encode_msg_ReplyFrame(Msg, <<>>, TrUserData). -encode_msg_ResponseFrame(#'ResponseFrame'{packet_id = F1, body = F2}, Bin, TrUserData) -> +encode_msg_ReplyFrame(#'ReplyFrame'{packet_id = F1, reply = F2}, Bin, TrUserData) -> B1 = if F1 == undefined -> Bin; true -> begin @@ -221,8 +211,47 @@ encode_msg_ResponseFrame(#'ResponseFrame'{packet_id = F1, body = F2}, Bin, TrUse if F2 =:= undefined -> B1; true -> case id(F2, TrUserData) of - {auth_reply, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_ResponseFrame_auth_reply(TrTF2, <>, TrUserData) end; - {rpc_reply, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_ResponseFrame_rpc_reply(TrTF2, <>, TrUserData) end + {result, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_ReplyFrame_result(TrTF2, <>, TrUserData) end; + {error, TF2} -> begin TrTF2 = id(TF2, TrUserData), e_mfield_ReplyFrame_error(TrTF2, <>, TrUserData) end + end + end. + +encode_msg_ReplyResult(Msg, TrUserData) -> encode_msg_ReplyResult(Msg, <<>>, TrUserData). + + +encode_msg_ReplyResult(#'ReplyResult'{data = 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_ReplyError(Msg, TrUserData) -> encode_msg_ReplyError(Msg, <<>>, TrUserData). + + +encode_msg_ReplyError(#'ReplyError'{code = F1, message = F2}, Bin, TrUserData) -> + B1 = if F1 == undefined -> Bin; + true -> + begin + TrF1 = id(F1, TrUserData), + if TrF1 =:= 0 -> Bin; + true -> e_type_int32(TrF1, <>, TrUserData) + end + end + end, + if F2 == undefined -> B1; + true -> + begin + TrF2 = id(F2, TrUserData), + case is_empty_string(TrF2) of + true -> B1; + false -> e_type_string(TrF2, <>, TrUserData) + end end end. @@ -955,30 +984,6 @@ encode_msg_AuthRequest(#'AuthRequest'{uuid = F1, username = F2, salt = F3, token end end. -encode_msg_AuthReply(Msg, TrUserData) -> encode_msg_AuthReply(Msg, <<>>, TrUserData). - - -encode_msg_AuthReply(#'AuthReply'{code = F1, payload = F2}, Bin, TrUserData) -> - B1 = if F1 == undefined -> Bin; - true -> - begin - TrF1 = id(F1, TrUserData), - if TrF1 =:= 0 -> Bin; - true -> e_type_int32(TrF1, <>, TrUserData) - end - end - end, - if F2 == undefined -> B1; - true -> - begin - TrF2 = id(F2, TrUserData), - case iolist_size(TrF2) of - 0 -> B1; - _ -> e_type_bytes(TrF2, <>, TrUserData) - end - end - end. - encode_msg_Pub(Msg, TrUserData) -> encode_msg_Pub(Msg, <<>>, TrUserData). @@ -1037,82 +1042,6 @@ encode_msg_Command(#'Command'{command_type = F1, command = F2}, Bin, TrUserData) end end. -encode_msg_RpcRequest(Msg, TrUserData) -> encode_msg_RpcRequest(Msg, <<>>, TrUserData). - - -encode_msg_RpcRequest(#'RpcRequest'{method = F1, params = F2}, Bin, TrUserData) -> - B1 = 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, - if F2 == undefined -> B1; - true -> - begin - TrF2 = id(F2, TrUserData), - case iolist_size(TrF2) of - 0 -> B1; - _ -> e_type_bytes(TrF2, <>, TrUserData) - end - end - end. - -'encode_msg_RpcReply.RpcResult'(Msg, TrUserData) -> 'encode_msg_RpcReply.RpcResult'(Msg, <<>>, TrUserData). - - -'encode_msg_RpcReply.RpcResult'(#'RpcReply.RpcResult'{data = 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_RpcReply.RpcError'(Msg, TrUserData) -> 'encode_msg_RpcReply.RpcError'(Msg, <<>>, TrUserData). - - -'encode_msg_RpcReply.RpcError'(#'RpcReply.RpcError'{code = F1, message = F2}, Bin, TrUserData) -> - B1 = if F1 == undefined -> Bin; - true -> - begin - TrF1 = id(F1, TrUserData), - if TrF1 =:= 0 -> Bin; - true -> e_type_int32(TrF1, <>, TrUserData) - end - end - end, - if F2 == undefined -> B1; - true -> - begin - TrF2 = id(F2, TrUserData), - case is_empty_string(TrF2) of - true -> B1; - false -> e_type_string(TrF2, <>, TrUserData) - end - end - end. - -encode_msg_RpcReply(Msg, TrUserData) -> encode_msg_RpcReply(Msg, <<>>, TrUserData). - - -encode_msg_RpcReply(#'RpcReply'{reply = F1}, Bin, TrUserData) -> - if F1 =:= undefined -> Bin; - true -> - case id(F1, TrUserData) of - {result, TF1} -> begin TrTF1 = id(TF1, TrUserData), e_mfield_RpcReply_result(TrTF1, <>, TrUserData) end; - {error, TF1} -> begin TrTF1 = id(TF1, TrUserData), e_mfield_RpcReply_error(TrTF1, <>, TrUserData) end - end - end. - encode_msg_Data(Msg, TrUserData) -> encode_msg_Data(Msg, <<>>, TrUserData). @@ -1177,23 +1106,18 @@ e_mfield_RequestFrame_auth_request(Msg, Bin, TrUserData) -> Bin2 = e_varint(byte_size(SubBin), Bin), <>. -e_mfield_RequestFrame_rpc_request(Msg, Bin, TrUserData) -> - SubBin = encode_msg_RpcRequest(Msg, <<>>, TrUserData), - Bin2 = e_varint(byte_size(SubBin), Bin), - <>. - e_mfield_RequestFrame_container_request(Msg, Bin, TrUserData) -> SubBin = encode_msg_ContainerRequest(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), <>. -e_mfield_ResponseFrame_auth_reply(Msg, Bin, TrUserData) -> - SubBin = encode_msg_AuthReply(Msg, <<>>, TrUserData), +e_mfield_ReplyFrame_result(Msg, Bin, TrUserData) -> + SubBin = encode_msg_ReplyResult(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), <>. -e_mfield_ResponseFrame_rpc_reply(Msg, Bin, TrUserData) -> - SubBin = encode_msg_RpcReply(Msg, <<>>, TrUserData), +e_mfield_ReplyFrame_error(Msg, Bin, TrUserData) -> + SubBin = encode_msg_ReplyError(Msg, <<>>, TrUserData), Bin2 = e_varint(byte_size(SubBin), Bin), <>. @@ -1427,16 +1351,6 @@ e_field_Healthcheck_test([Elem | Rest], Bin, TrUserData) -> e_field_Healthcheck_test(Rest, Bin3, TrUserData); e_field_Healthcheck_test([], Bin, _TrUserData) -> Bin. -e_mfield_RpcReply_result(Msg, Bin, TrUserData) -> - SubBin = 'encode_msg_RpcReply.RpcResult'(Msg, <<>>, TrUserData), - Bin2 = e_varint(byte_size(SubBin), Bin), - <>. - -e_mfield_RpcReply_error(Msg, Bin, TrUserData) -> - SubBin = 'encode_msg_RpcReply.RpcError'(Msg, <<>>, TrUserData), - Bin2 = e_varint(byte_size(SubBin), Bin), - <>. - 'encode_msg_map'(#'map'{key = F1, value = F2}, Bin, TrUserData) -> B1 = begin TrF1 = id(F1, TrUserData), e_type_string(TrF1, <>, TrUserData) end, begin TrF2 = id(F2, TrUserData), e_type_string(TrF2, <>, TrUserData) end. @@ -1580,7 +1494,9 @@ decode_msg_1_catch(Bin, MsgName, TrUserData) -> -endif. decode_msg_2_doit('RequestFrame', Bin, TrUserData) -> id(decode_msg_RequestFrame(Bin, TrUserData), TrUserData); -decode_msg_2_doit('ResponseFrame', Bin, TrUserData) -> id(decode_msg_ResponseFrame(Bin, TrUserData), TrUserData); +decode_msg_2_doit('ReplyFrame', Bin, TrUserData) -> id(decode_msg_ReplyFrame(Bin, TrUserData), TrUserData); +decode_msg_2_doit('ReplyResult', Bin, TrUserData) -> id(decode_msg_ReplyResult(Bin, TrUserData), TrUserData); +decode_msg_2_doit('ReplyError', Bin, TrUserData) -> id(decode_msg_ReplyError(Bin, TrUserData), TrUserData); decode_msg_2_doit('CastFrame', Bin, TrUserData) -> id(decode_msg_CastFrame(Bin, TrUserData), TrUserData); decode_msg_2_doit('ContainerRef', Bin, TrUserData) -> id(decode_msg_ContainerRef(Bin, TrUserData), TrUserData); decode_msg_2_doit('ContainerRequest.List', Bin, TrUserData) -> id('decode_msg_ContainerRequest.List'(Bin, TrUserData), TrUserData); @@ -1602,13 +1518,8 @@ decode_msg_2_doit('ResourceLimits', Bin, TrUserData) -> id(decode_msg_ResourceLi decode_msg_2_doit('Ulimit', Bin, TrUserData) -> id(decode_msg_Ulimit(Bin, TrUserData), TrUserData); decode_msg_2_doit('TmpfsMount', Bin, TrUserData) -> id(decode_msg_TmpfsMount(Bin, TrUserData), TrUserData); decode_msg_2_doit('AuthRequest', Bin, TrUserData) -> id(decode_msg_AuthRequest(Bin, TrUserData), TrUserData); -decode_msg_2_doit('AuthReply', Bin, TrUserData) -> id(decode_msg_AuthReply(Bin, TrUserData), TrUserData); decode_msg_2_doit('Pub', Bin, TrUserData) -> id(decode_msg_Pub(Bin, TrUserData), TrUserData); decode_msg_2_doit('Command', Bin, TrUserData) -> id(decode_msg_Command(Bin, TrUserData), TrUserData); -decode_msg_2_doit('RpcRequest', Bin, TrUserData) -> id(decode_msg_RpcRequest(Bin, TrUserData), TrUserData); -decode_msg_2_doit('RpcReply.RpcResult', Bin, TrUserData) -> id('decode_msg_RpcReply.RpcResult'(Bin, TrUserData), TrUserData); -decode_msg_2_doit('RpcReply.RpcError', Bin, TrUserData) -> id('decode_msg_RpcReply.RpcError'(Bin, TrUserData), TrUserData); -decode_msg_2_doit('RpcReply', Bin, TrUserData) -> id(decode_msg_RpcReply(Bin, TrUserData), TrUserData); decode_msg_2_doit('Data', Bin, TrUserData) -> id(decode_msg_Data(Bin, TrUserData), TrUserData); decode_msg_2_doit('TaskEventStream', Bin, TrUserData) -> id(decode_msg_TaskEventStream(Bin, TrUserData), TrUserData). @@ -1618,8 +1529,7 @@ decode_msg_RequestFrame(Bin, TrUserData) -> dfp_read_field_def_RequestFrame(Bin, dfp_read_field_def_RequestFrame(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RequestFrame_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); dfp_read_field_def_RequestFrame(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RequestFrame_auth_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_RequestFrame(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RequestFrame_rpc_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_RequestFrame(<<34, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RequestFrame_container_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_RequestFrame(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RequestFrame_container_request(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); dfp_read_field_def_RequestFrame(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'RequestFrame'{packet_id = F@_1, body = F@_2}; dfp_read_field_def_RequestFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_RequestFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). @@ -1629,8 +1539,7 @@ dg_read_field_def_RequestFrame(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, case Key of 8 -> d_field_RequestFrame_packet_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); 18 -> d_field_RequestFrame_auth_request(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 26 -> d_field_RequestFrame_rpc_request(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 34 -> d_field_RequestFrame_container_request(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 26 -> d_field_RequestFrame_container_request(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); _ -> case Key band 7 of 0 -> skip_varint_RequestFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); @@ -1662,21 +1571,6 @@ d_field_RequestFrame_auth_request(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, Pr end, TrUserData). -d_field_RequestFrame_rpc_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_RequestFrame_rpc_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_RequestFrame_rpc_request(<<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_RpcRequest(Bs, TrUserData), TrUserData), Rest2} end, - dfp_read_field_def_RequestFrame(RestF, - 0, - 0, - F, - F@_1, - case Prev of - undefined -> id({rpc_request, NewFValue}, TrUserData); - {rpc_request, MVPrev} -> id({rpc_request, merge_msg_RpcRequest(MVPrev, NewFValue, TrUserData)}, TrUserData); - _ -> id({rpc_request, NewFValue}, TrUserData) - end, - TrUserData). - d_field_RequestFrame_container_request(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_RequestFrame_container_request(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); d_field_RequestFrame_container_request(<<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_ContainerRequest(Bs, TrUserData), TrUserData), Rest2} end, @@ -1709,83 +1603,178 @@ skip_32_RequestFrame(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) - skip_64_RequestFrame(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_RequestFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_ResponseFrame(Bin, TrUserData) -> dfp_read_field_def_ResponseFrame(Bin, 0, 0, 0, id(0, TrUserData), id(undefined, TrUserData), TrUserData). +decode_msg_ReplyFrame(Bin, TrUserData) -> dfp_read_field_def_ReplyFrame(Bin, 0, 0, 0, id(0, TrUserData), id(undefined, TrUserData), TrUserData). -dfp_read_field_def_ResponseFrame(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ResponseFrame_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_ResponseFrame(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ResponseFrame_auth_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_ResponseFrame(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ResponseFrame_rpc_reply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_ResponseFrame(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ResponseFrame'{packet_id = F@_1, body = F@_2}; -dfp_read_field_def_ResponseFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_ResponseFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). +dfp_read_field_def_ReplyFrame(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ReplyFrame_packet_id(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_ReplyFrame(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ReplyFrame_result(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_ReplyFrame(<<26, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ReplyFrame_error(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_ReplyFrame(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ReplyFrame'{packet_id = F@_1, reply = F@_2}; +dfp_read_field_def_ReplyFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_ReplyFrame(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). -dg_read_field_def_ResponseFrame(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_ResponseFrame(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_ResponseFrame(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> +dg_read_field_def_ReplyFrame(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_ReplyFrame(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_ReplyFrame(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> Key = X bsl N + Acc, case Key of - 8 -> d_field_ResponseFrame_packet_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_ResponseFrame_auth_reply(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 26 -> d_field_ResponseFrame_rpc_reply(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 8 -> d_field_ReplyFrame_packet_id(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_ReplyFrame_result(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 26 -> d_field_ReplyFrame_error(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); _ -> case Key band 7 of - 0 -> skip_varint_ResponseFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_ResponseFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_ResponseFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_ResponseFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_ResponseFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + 0 -> skip_varint_ReplyFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_ReplyFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_ReplyFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_ReplyFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_ReplyFrame(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) end end; -dg_read_field_def_ResponseFrame(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ResponseFrame'{packet_id = F@_1, body = F@_2}. +dg_read_field_def_ReplyFrame(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ReplyFrame'{packet_id = F@_1, reply = F@_2}. -d_field_ResponseFrame_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ResponseFrame_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_ResponseFrame_packet_id(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> +d_field_ReplyFrame_packet_id(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ReplyFrame_packet_id(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_ReplyFrame_packet_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_ResponseFrame(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + dfp_read_field_def_ReplyFrame(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). -d_field_ResponseFrame_auth_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ResponseFrame_auth_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_ResponseFrame_auth_reply(<<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_AuthReply(Bs, TrUserData), TrUserData), Rest2} end, - dfp_read_field_def_ResponseFrame(RestF, - 0, - 0, - F, - F@_1, - case Prev of - undefined -> id({auth_reply, NewFValue}, TrUserData); - {auth_reply, MVPrev} -> id({auth_reply, merge_msg_AuthReply(MVPrev, NewFValue, TrUserData)}, TrUserData); - _ -> id({auth_reply, NewFValue}, TrUserData) - end, - TrUserData). +d_field_ReplyFrame_result(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ReplyFrame_result(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_ReplyFrame_result(<<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_ReplyResult(Bs, TrUserData), TrUserData), Rest2} end, + dfp_read_field_def_ReplyFrame(RestF, + 0, + 0, + F, + F@_1, + case Prev of + undefined -> id({result, NewFValue}, TrUserData); + {result, MVPrev} -> id({result, merge_msg_ReplyResult(MVPrev, NewFValue, TrUserData)}, TrUserData); + _ -> id({result, NewFValue}, TrUserData) + end, + TrUserData). -d_field_ResponseFrame_rpc_reply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ResponseFrame_rpc_reply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_ResponseFrame_rpc_reply(<<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_RpcReply(Bs, TrUserData), TrUserData), Rest2} end, - dfp_read_field_def_ResponseFrame(RestF, - 0, - 0, - F, - F@_1, - case Prev of - undefined -> id({rpc_reply, NewFValue}, TrUserData); - {rpc_reply, MVPrev} -> id({rpc_reply, merge_msg_RpcReply(MVPrev, NewFValue, TrUserData)}, TrUserData); - _ -> id({rpc_reply, NewFValue}, TrUserData) - end, - TrUserData). +d_field_ReplyFrame_error(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ReplyFrame_error(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_ReplyFrame_error(<<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_ReplyError(Bs, TrUserData), TrUserData), Rest2} end, + dfp_read_field_def_ReplyFrame(RestF, + 0, + 0, + F, + F@_1, + case Prev of + undefined -> id({error, NewFValue}, TrUserData); + {error, MVPrev} -> id({error, merge_msg_ReplyError(MVPrev, NewFValue, TrUserData)}, TrUserData); + _ -> id({error, NewFValue}, TrUserData) + end, + TrUserData). -skip_varint_ResponseFrame(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_ResponseFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_ResponseFrame(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ResponseFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_varint_ReplyFrame(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_ReplyFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_ReplyFrame(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -skip_length_delimited_ResponseFrame(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_ResponseFrame(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_ResponseFrame(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) -> +skip_length_delimited_ReplyFrame(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_ReplyFrame(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_ReplyFrame(<<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_ResponseFrame(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + dfp_read_field_def_ReplyFrame(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). -skip_group_ResponseFrame(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> +skip_group_ReplyFrame(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_ResponseFrame(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + dfp_read_field_def_ReplyFrame(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). -skip_32_ResponseFrame(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ResponseFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_32_ReplyFrame(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -skip_64_ResponseFrame(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ResponseFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). +skip_64_ReplyFrame(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyFrame(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +decode_msg_ReplyResult(Bin, TrUserData) -> dfp_read_field_def_ReplyResult(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_ReplyResult(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_ReplyResult_data(Rest, Z1, Z2, F, F@_1, TrUserData); +dfp_read_field_def_ReplyResult(<<>>, 0, 0, _, F@_1, _) -> #'ReplyResult'{data = F@_1}; +dfp_read_field_def_ReplyResult(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_ReplyResult(Other, Z1, Z2, F, F@_1, TrUserData). + +dg_read_field_def_ReplyResult(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_ReplyResult(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +dg_read_field_def_ReplyResult(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 10 -> d_field_ReplyResult_data(Rest, 0, 0, 0, F@_1, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_ReplyResult(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 1 -> skip_64_ReplyResult(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 2 -> skip_length_delimited_ReplyResult(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 3 -> skip_group_ReplyResult(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); + 5 -> skip_32_ReplyResult(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) + end + end; +dg_read_field_def_ReplyResult(<<>>, 0, 0, _, F@_1, _) -> #'ReplyResult'{data = F@_1}. + +d_field_ReplyResult_data(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_ReplyResult_data(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +d_field_ReplyResult_data(<<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_ReplyResult(RestF, 0, 0, F, NewFValue, TrUserData). + +skip_varint_ReplyResult(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_ReplyResult(Rest, Z1, Z2, F, F@_1, TrUserData); +skip_varint_ReplyResult(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_ReplyResult(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_length_delimited_ReplyResult(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_ReplyResult(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); +skip_length_delimited_ReplyResult(<<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_ReplyResult(Rest2, 0, 0, F, F@_1, TrUserData). + +skip_group_ReplyResult(Bin, _, Z2, FNum, F@_1, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_ReplyResult(Rest, 0, Z2, FNum, F@_1, TrUserData). + +skip_32_ReplyResult(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_ReplyResult(Rest, Z1, Z2, F, F@_1, TrUserData). + +skip_64_ReplyResult(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_ReplyResult(Rest, Z1, Z2, F, F@_1, TrUserData). + +decode_msg_ReplyError(Bin, TrUserData) -> dfp_read_field_def_ReplyError(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). + +dfp_read_field_def_ReplyError(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ReplyError_code(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_ReplyError(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_ReplyError_message(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +dfp_read_field_def_ReplyError(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ReplyError'{code = F@_1, message = F@_2}; +dfp_read_field_def_ReplyError(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_ReplyError(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). + +dg_read_field_def_ReplyError(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_ReplyError(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +dg_read_field_def_ReplyError(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> + Key = X bsl N + Acc, + case Key of + 8 -> d_field_ReplyError_code(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + 18 -> d_field_ReplyError_message(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); + _ -> + case Key band 7 of + 0 -> skip_varint_ReplyError(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 1 -> skip_64_ReplyError(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 2 -> skip_length_delimited_ReplyError(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 3 -> skip_group_ReplyError(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); + 5 -> skip_32_ReplyError(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) + end + end; +dg_read_field_def_ReplyError(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'ReplyError'{code = F@_1, message = F@_2}. + +d_field_ReplyError_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ReplyError_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_ReplyError_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> + {NewFValue, RestF} = {begin <> = <<(X bsl N + Acc):32/unsigned-native>>, id(Res, TrUserData) end, Rest}, + dfp_read_field_def_ReplyError(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). + +d_field_ReplyError_message(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_ReplyError_message(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +d_field_ReplyError_message(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> + {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, + dfp_read_field_def_ReplyError(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). + +skip_varint_ReplyError(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_ReplyError(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); +skip_varint_ReplyError(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyError(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_length_delimited_ReplyError(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_ReplyError(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); +skip_length_delimited_ReplyError(<<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_ReplyError(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). + +skip_group_ReplyError(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> + {_, Rest} = read_group(Bin, FNum), + dfp_read_field_def_ReplyError(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). + +skip_32_ReplyError(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyError(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). + +skip_64_ReplyError(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_ReplyError(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). decode_msg_CastFrame(Bin, TrUserData) -> dfp_read_field_def_CastFrame(Bin, 0, 0, 0, id(undefined, TrUserData), TrUserData). @@ -3514,57 +3503,6 @@ skip_32_AuthRequest(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@ skip_64_AuthRequest(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData) -> dfp_read_field_def_AuthRequest(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, F@_4, F@_5, TrUserData). -decode_msg_AuthReply(Bin, TrUserData) -> dfp_read_field_def_AuthReply(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). - -dfp_read_field_def_AuthReply(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_AuthReply_code(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_AuthReply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_AuthReply_payload(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_AuthReply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'AuthReply'{code = F@_1, payload = F@_2}; -dfp_read_field_def_AuthReply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_AuthReply(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). - -dg_read_field_def_AuthReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_AuthReply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_AuthReply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 8 -> d_field_AuthReply_code(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_AuthReply_payload(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_AuthReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_AuthReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_AuthReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_AuthReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_AuthReply(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end - end; -dg_read_field_def_AuthReply(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'AuthReply'{code = F@_1, payload = F@_2}. - -d_field_AuthReply_code(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_AuthReply_code(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_AuthReply_code(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {begin <> = <<(X bsl N + Acc):32/unsigned-native>>, id(Res, TrUserData) end, Rest}, - dfp_read_field_def_AuthReply(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -d_field_AuthReply_payload(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_AuthReply_payload(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_AuthReply_payload(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_AuthReply(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -skip_varint_AuthReply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_AuthReply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_AuthReply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_AuthReply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_length_delimited_AuthReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_AuthReply(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_AuthReply(<<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_AuthReply(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). - -skip_group_AuthReply(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_AuthReply(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). - -skip_32_AuthReply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_AuthReply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_64_AuthReply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_AuthReply(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - decode_msg_Pub(Bin, TrUserData) -> dfp_read_field_def_Pub(Bin, 0, 0, 0, id(<<>>, TrUserData), id(0, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_Pub(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData) -> d_field_Pub_topic(Rest, Z1, Z2, F, F@_1, F@_2, F@_3, TrUserData); @@ -3674,221 +3612,6 @@ skip_32_Command(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp skip_64_Command(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_Command(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). -decode_msg_RpcRequest(Bin, TrUserData) -> dfp_read_field_def_RpcRequest(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). - -dfp_read_field_def_RpcRequest(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RpcRequest_method(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_RpcRequest(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_RpcRequest_params(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -dfp_read_field_def_RpcRequest(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'RpcRequest'{method = F@_1, params = F@_2}; -dfp_read_field_def_RpcRequest(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dg_read_field_def_RpcRequest(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). - -dg_read_field_def_RpcRequest(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> dg_read_field_def_RpcRequest(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -dg_read_field_def_RpcRequest(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 10 -> d_field_RpcRequest_method(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> d_field_RpcRequest_params(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_RpcRequest(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> skip_64_RpcRequest(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> skip_length_delimited_RpcRequest(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> skip_group_RpcRequest(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> skip_32_RpcRequest(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end - end; -dg_read_field_def_RpcRequest(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'RpcRequest'{method = F@_1, params = F@_2}. - -d_field_RpcRequest_method(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_RpcRequest_method(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_RpcRequest_method(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_RpcRequest(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -d_field_RpcRequest_params(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> d_field_RpcRequest_params(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -d_field_RpcRequest_params(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - dfp_read_field_def_RpcRequest(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -skip_varint_RpcRequest(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> skip_varint_RpcRequest(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -skip_varint_RpcRequest(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_RpcRequest(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_length_delimited_RpcRequest(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> skip_length_delimited_RpcRequest(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -skip_length_delimited_RpcRequest(<<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_RpcRequest(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). - -skip_group_RpcRequest(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_RpcRequest(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). - -skip_32_RpcRequest(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_RpcRequest(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -skip_64_RpcRequest(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> dfp_read_field_def_RpcRequest(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -'decode_msg_RpcReply.RpcResult'(Bin, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcResult'(Bin, 0, 0, 0, id(<<>>, TrUserData), TrUserData). - -'dfp_read_field_def_RpcReply.RpcResult'(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> 'd_field_RpcReply.RpcResult_data'(Rest, Z1, Z2, F, F@_1, TrUserData); -'dfp_read_field_def_RpcReply.RpcResult'(<<>>, 0, 0, _, F@_1, _) -> #'RpcReply.RpcResult'{data = F@_1}; -'dfp_read_field_def_RpcReply.RpcResult'(Other, Z1, Z2, F, F@_1, TrUserData) -> 'dg_read_field_def_RpcReply.RpcResult'(Other, Z1, Z2, F, F@_1, TrUserData). - -'dg_read_field_def_RpcReply.RpcResult'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> 'dg_read_field_def_RpcReply.RpcResult'(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -'dg_read_field_def_RpcReply.RpcResult'(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 10 -> 'd_field_RpcReply.RpcResult_data'(Rest, 0, 0, 0, F@_1, TrUserData); - _ -> - case Key band 7 of - 0 -> 'skip_varint_RpcReply.RpcResult'(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 1 -> 'skip_64_RpcReply.RpcResult'(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 2 -> 'skip_length_delimited_RpcReply.RpcResult'(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 3 -> 'skip_group_RpcReply.RpcResult'(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 5 -> 'skip_32_RpcReply.RpcResult'(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) - end - end; -'dg_read_field_def_RpcReply.RpcResult'(<<>>, 0, 0, _, F@_1, _) -> #'RpcReply.RpcResult'{data = F@_1}. - -'d_field_RpcReply.RpcResult_data'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> 'd_field_RpcReply.RpcResult_data'(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -'d_field_RpcReply.RpcResult_data'(<<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_RpcReply.RpcResult'(RestF, 0, 0, F, NewFValue, TrUserData). - -'skip_varint_RpcReply.RpcResult'(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> 'skip_varint_RpcReply.RpcResult'(Rest, Z1, Z2, F, F@_1, TrUserData); -'skip_varint_RpcReply.RpcResult'(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcResult'(Rest, Z1, Z2, F, F@_1, TrUserData). - -'skip_length_delimited_RpcReply.RpcResult'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> 'skip_length_delimited_RpcReply.RpcResult'(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -'skip_length_delimited_RpcReply.RpcResult'(<<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_RpcReply.RpcResult'(Rest2, 0, 0, F, F@_1, TrUserData). - -'skip_group_RpcReply.RpcResult'(Bin, _, Z2, FNum, F@_1, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - 'dfp_read_field_def_RpcReply.RpcResult'(Rest, 0, Z2, FNum, F@_1, TrUserData). - -'skip_32_RpcReply.RpcResult'(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcResult'(Rest, Z1, Z2, F, F@_1, TrUserData). - -'skip_64_RpcReply.RpcResult'(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcResult'(Rest, Z1, Z2, F, F@_1, TrUserData). - -'decode_msg_RpcReply.RpcError'(Bin, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcError'(Bin, 0, 0, 0, id(0, TrUserData), id(<<>>, TrUserData), TrUserData). - -'dfp_read_field_def_RpcReply.RpcError'(<<8, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'd_field_RpcReply.RpcError_code'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -'dfp_read_field_def_RpcReply.RpcError'(<<18, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'd_field_RpcReply.RpcError_message'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -'dfp_read_field_def_RpcReply.RpcError'(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'RpcReply.RpcError'{code = F@_1, message = F@_2}; -'dfp_read_field_def_RpcReply.RpcError'(Other, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'dg_read_field_def_RpcReply.RpcError'(Other, Z1, Z2, F, F@_1, F@_2, TrUserData). - -'dg_read_field_def_RpcReply.RpcError'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 32 - 7 -> 'dg_read_field_def_RpcReply.RpcError'(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -'dg_read_field_def_RpcReply.RpcError'(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, F@_2, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 8 -> 'd_field_RpcReply.RpcError_code'(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - 18 -> 'd_field_RpcReply.RpcError_message'(Rest, 0, 0, 0, F@_1, F@_2, TrUserData); - _ -> - case Key band 7 of - 0 -> 'skip_varint_RpcReply.RpcError'(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 1 -> 'skip_64_RpcReply.RpcError'(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 2 -> 'skip_length_delimited_RpcReply.RpcError'(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 3 -> 'skip_group_RpcReply.RpcError'(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData); - 5 -> 'skip_32_RpcReply.RpcError'(Rest, 0, 0, Key bsr 3, F@_1, F@_2, TrUserData) - end - end; -'dg_read_field_def_RpcReply.RpcError'(<<>>, 0, 0, _, F@_1, F@_2, _) -> #'RpcReply.RpcError'{code = F@_1, message = F@_2}. - -'d_field_RpcReply.RpcError_code'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> 'd_field_RpcReply.RpcError_code'(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -'d_field_RpcReply.RpcError_code'(<<0:1, X:7, Rest/binary>>, N, Acc, F, _, F@_2, TrUserData) -> - {NewFValue, RestF} = {begin <> = <<(X bsl N + Acc):32/unsigned-native>>, id(Res, TrUserData) end, Rest}, - 'dfp_read_field_def_RpcReply.RpcError'(RestF, 0, 0, F, NewFValue, F@_2, TrUserData). - -'d_field_RpcReply.RpcError_message'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> 'd_field_RpcReply.RpcError_message'(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -'d_field_RpcReply.RpcError_message'(<<0:1, X:7, Rest/binary>>, N, Acc, F, F@_1, _, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, Bytes2 = binary:copy(Bytes), {id(Bytes2, TrUserData), Rest2} end, - 'dfp_read_field_def_RpcReply.RpcError'(RestF, 0, 0, F, F@_1, NewFValue, TrUserData). - -'skip_varint_RpcReply.RpcError'(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'skip_varint_RpcReply.RpcError'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); -'skip_varint_RpcReply.RpcError'(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcError'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -'skip_length_delimited_RpcReply.RpcError'(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, F@_2, TrUserData) when N < 57 -> 'skip_length_delimited_RpcReply.RpcError'(Rest, N + 7, X bsl N + Acc, F, F@_1, F@_2, TrUserData); -'skip_length_delimited_RpcReply.RpcError'(<<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_RpcReply.RpcError'(Rest2, 0, 0, F, F@_1, F@_2, TrUserData). - -'skip_group_RpcReply.RpcError'(Bin, _, Z2, FNum, F@_1, F@_2, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - 'dfp_read_field_def_RpcReply.RpcError'(Rest, 0, Z2, FNum, F@_1, F@_2, TrUserData). - -'skip_32_RpcReply.RpcError'(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcError'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -'skip_64_RpcReply.RpcError'(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> 'dfp_read_field_def_RpcReply.RpcError'(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData). - -decode_msg_RpcReply(Bin, TrUserData) -> dfp_read_field_def_RpcReply(Bin, 0, 0, 0, id(undefined, TrUserData), TrUserData). - -dfp_read_field_def_RpcReply(<<10, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_RpcReply_result(Rest, Z1, Z2, F, F@_1, TrUserData); -dfp_read_field_def_RpcReply(<<18, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> d_field_RpcReply_error(Rest, Z1, Z2, F, F@_1, TrUserData); -dfp_read_field_def_RpcReply(<<>>, 0, 0, _, F@_1, _) -> #'RpcReply'{reply = F@_1}; -dfp_read_field_def_RpcReply(Other, Z1, Z2, F, F@_1, TrUserData) -> dg_read_field_def_RpcReply(Other, Z1, Z2, F, F@_1, TrUserData). - -dg_read_field_def_RpcReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 32 - 7 -> dg_read_field_def_RpcReply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -dg_read_field_def_RpcReply(<<0:1, X:7, Rest/binary>>, N, Acc, _, F@_1, TrUserData) -> - Key = X bsl N + Acc, - case Key of - 10 -> d_field_RpcReply_result(Rest, 0, 0, 0, F@_1, TrUserData); - 18 -> d_field_RpcReply_error(Rest, 0, 0, 0, F@_1, TrUserData); - _ -> - case Key band 7 of - 0 -> skip_varint_RpcReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 1 -> skip_64_RpcReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 2 -> skip_length_delimited_RpcReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 3 -> skip_group_RpcReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData); - 5 -> skip_32_RpcReply(Rest, 0, 0, Key bsr 3, F@_1, TrUserData) - end - end; -dg_read_field_def_RpcReply(<<>>, 0, 0, _, F@_1, _) -> #'RpcReply'{reply = F@_1}. - -d_field_RpcReply_result(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_RpcReply_result(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -d_field_RpcReply_result(<<0:1, X:7, Rest/binary>>, N, Acc, F, Prev, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, {id('decode_msg_RpcReply.RpcResult'(Bs, TrUserData), TrUserData), Rest2} end, - dfp_read_field_def_RpcReply(RestF, - 0, - 0, - F, - case Prev of - undefined -> id({result, NewFValue}, TrUserData); - {result, MVPrev} -> id({result, 'merge_msg_RpcReply.RpcResult'(MVPrev, NewFValue, TrUserData)}, TrUserData); - _ -> id({result, NewFValue}, TrUserData) - end, - TrUserData). - -d_field_RpcReply_error(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> d_field_RpcReply_error(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -d_field_RpcReply_error(<<0:1, X:7, Rest/binary>>, N, Acc, F, Prev, TrUserData) -> - {NewFValue, RestF} = begin Len = X bsl N + Acc, <> = Rest, {id('decode_msg_RpcReply.RpcError'(Bs, TrUserData), TrUserData), Rest2} end, - dfp_read_field_def_RpcReply(RestF, - 0, - 0, - F, - case Prev of - undefined -> id({error, NewFValue}, TrUserData); - {error, MVPrev} -> id({error, 'merge_msg_RpcReply.RpcError'(MVPrev, NewFValue, TrUserData)}, TrUserData); - _ -> id({error, NewFValue}, TrUserData) - end, - TrUserData). - -skip_varint_RpcReply(<<1:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> skip_varint_RpcReply(Rest, Z1, Z2, F, F@_1, TrUserData); -skip_varint_RpcReply(<<0:1, _:7, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_RpcReply(Rest, Z1, Z2, F, F@_1, TrUserData). - -skip_length_delimited_RpcReply(<<1:1, X:7, Rest/binary>>, N, Acc, F, F@_1, TrUserData) when N < 57 -> skip_length_delimited_RpcReply(Rest, N + 7, X bsl N + Acc, F, F@_1, TrUserData); -skip_length_delimited_RpcReply(<<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_RpcReply(Rest2, 0, 0, F, F@_1, TrUserData). - -skip_group_RpcReply(Bin, _, Z2, FNum, F@_1, TrUserData) -> - {_, Rest} = read_group(Bin, FNum), - dfp_read_field_def_RpcReply(Rest, 0, Z2, FNum, F@_1, TrUserData). - -skip_32_RpcReply(<<_:32, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_RpcReply(Rest, Z1, Z2, F, F@_1, TrUserData). - -skip_64_RpcReply(<<_:64, Rest/binary>>, Z1, Z2, F, F@_1, TrUserData) -> dfp_read_field_def_RpcReply(Rest, Z1, Z2, F, F@_1, TrUserData). - decode_msg_Data(Bin, TrUserData) -> dfp_read_field_def_Data(Bin, 0, 0, 0, id(<<>>, TrUserData), id(<<>>, TrUserData), TrUserData). dfp_read_field_def_Data(<<10, Rest/binary>>, Z1, Z2, F, F@_1, F@_2, TrUserData) -> d_field_Data_route_key(Rest, Z1, Z2, F, F@_1, F@_2, TrUserData); @@ -4116,7 +3839,9 @@ merge_msgs(Prev, New, MsgName, Opts) -> TrUserData = proplists:get_value(user_data, Opts), case MsgName of 'RequestFrame' -> merge_msg_RequestFrame(Prev, New, TrUserData); - 'ResponseFrame' -> merge_msg_ResponseFrame(Prev, New, TrUserData); + 'ReplyFrame' -> merge_msg_ReplyFrame(Prev, New, TrUserData); + 'ReplyResult' -> merge_msg_ReplyResult(Prev, New, TrUserData); + 'ReplyError' -> merge_msg_ReplyError(Prev, New, TrUserData); 'CastFrame' -> merge_msg_CastFrame(Prev, New, TrUserData); 'ContainerRef' -> merge_msg_ContainerRef(Prev, New, TrUserData); 'ContainerRequest.List' -> 'merge_msg_ContainerRequest.List'(Prev, New, TrUserData); @@ -4138,13 +3863,8 @@ merge_msgs(Prev, New, MsgName, Opts) -> 'Ulimit' -> merge_msg_Ulimit(Prev, New, TrUserData); 'TmpfsMount' -> merge_msg_TmpfsMount(Prev, New, TrUserData); 'AuthRequest' -> merge_msg_AuthRequest(Prev, New, TrUserData); - 'AuthReply' -> merge_msg_AuthReply(Prev, New, TrUserData); 'Pub' -> merge_msg_Pub(Prev, New, TrUserData); 'Command' -> merge_msg_Command(Prev, New, TrUserData); - 'RpcRequest' -> merge_msg_RpcRequest(Prev, New, TrUserData); - 'RpcReply.RpcResult' -> 'merge_msg_RpcReply.RpcResult'(Prev, New, TrUserData); - 'RpcReply.RpcError' -> 'merge_msg_RpcReply.RpcError'(Prev, New, TrUserData); - 'RpcReply' -> merge_msg_RpcReply(Prev, New, TrUserData); 'Data' -> merge_msg_Data(Prev, New, TrUserData); 'TaskEventStream' -> merge_msg_TaskEventStream(Prev, New, TrUserData) end. @@ -4158,25 +3878,42 @@ merge_msg_RequestFrame(#'RequestFrame'{packet_id = PFpacket_id, body = PFbody}, body = case {PFbody, NFbody} of {{auth_request, OPFbody}, {auth_request, ONFbody}} -> {auth_request, merge_msg_AuthRequest(OPFbody, ONFbody, TrUserData)}; - {{rpc_request, OPFbody}, {rpc_request, ONFbody}} -> {rpc_request, merge_msg_RpcRequest(OPFbody, ONFbody, TrUserData)}; {{container_request, OPFbody}, {container_request, ONFbody}} -> {container_request, merge_msg_ContainerRequest(OPFbody, ONFbody, TrUserData)}; {_, undefined} -> PFbody; _ -> NFbody end}. --compile({nowarn_unused_function,merge_msg_ResponseFrame/3}). -merge_msg_ResponseFrame(#'ResponseFrame'{packet_id = PFpacket_id, body = PFbody}, #'ResponseFrame'{packet_id = NFpacket_id, body = NFbody}, TrUserData) -> - #'ResponseFrame'{packet_id = - if NFpacket_id =:= undefined -> PFpacket_id; - true -> NFpacket_id - end, - body = - case {PFbody, NFbody} of - {{auth_reply, OPFbody}, {auth_reply, ONFbody}} -> {auth_reply, merge_msg_AuthReply(OPFbody, ONFbody, TrUserData)}; - {{rpc_reply, OPFbody}, {rpc_reply, ONFbody}} -> {rpc_reply, merge_msg_RpcReply(OPFbody, ONFbody, TrUserData)}; - {_, undefined} -> PFbody; - _ -> NFbody - end}. +-compile({nowarn_unused_function,merge_msg_ReplyFrame/3}). +merge_msg_ReplyFrame(#'ReplyFrame'{packet_id = PFpacket_id, reply = PFreply}, #'ReplyFrame'{packet_id = NFpacket_id, reply = NFreply}, TrUserData) -> + #'ReplyFrame'{packet_id = + if NFpacket_id =:= undefined -> PFpacket_id; + true -> NFpacket_id + end, + reply = + case {PFreply, NFreply} of + {{result, OPFreply}, {result, ONFreply}} -> {result, merge_msg_ReplyResult(OPFreply, ONFreply, TrUserData)}; + {{error, OPFreply}, {error, ONFreply}} -> {error, merge_msg_ReplyError(OPFreply, ONFreply, TrUserData)}; + {_, undefined} -> PFreply; + _ -> NFreply + end}. + +-compile({nowarn_unused_function,merge_msg_ReplyResult/3}). +merge_msg_ReplyResult(#'ReplyResult'{data = PFdata}, #'ReplyResult'{data = NFdata}, _) -> + #'ReplyResult'{data = + if NFdata =:= undefined -> PFdata; + true -> NFdata + end}. + +-compile({nowarn_unused_function,merge_msg_ReplyError/3}). +merge_msg_ReplyError(#'ReplyError'{code = PFcode, message = PFmessage}, #'ReplyError'{code = NFcode, message = NFmessage}, _) -> + #'ReplyError'{code = + if NFcode =:= undefined -> PFcode; + true -> NFcode + end, + message = + if NFmessage =:= undefined -> PFmessage; + true -> NFmessage + end}. -compile({nowarn_unused_function,merge_msg_CastFrame/3}). merge_msg_CastFrame(#'CastFrame'{body = PFbody}, #'CastFrame'{body = NFbody}, TrUserData) -> @@ -4573,17 +4310,6 @@ merge_msg_AuthRequest(#'AuthRequest'{uuid = PFuuid, username = PFusername, salt true -> NFtimestamp end}. --compile({nowarn_unused_function,merge_msg_AuthReply/3}). -merge_msg_AuthReply(#'AuthReply'{code = PFcode, payload = PFpayload}, #'AuthReply'{code = NFcode, payload = NFpayload}, _) -> - #'AuthReply'{code = - if NFcode =:= undefined -> PFcode; - true -> NFcode - end, - payload = - if NFpayload =:= undefined -> PFpayload; - true -> NFpayload - end}. - -compile({nowarn_unused_function,merge_msg_Pub/3}). merge_msg_Pub(#'Pub'{topic = PFtopic, qos = PFqos, content = PFcontent}, #'Pub'{topic = NFtopic, qos = NFqos, content = NFcontent}, _) -> #'Pub'{topic = @@ -4610,45 +4336,6 @@ merge_msg_Command(#'Command'{command_type = PFcommand_type, command = PFcommand} true -> NFcommand end}. --compile({nowarn_unused_function,merge_msg_RpcRequest/3}). -merge_msg_RpcRequest(#'RpcRequest'{method = PFmethod, params = PFparams}, #'RpcRequest'{method = NFmethod, params = NFparams}, _) -> - #'RpcRequest'{method = - if NFmethod =:= undefined -> PFmethod; - true -> NFmethod - end, - params = - if NFparams =:= undefined -> PFparams; - true -> NFparams - end}. - --compile({nowarn_unused_function,'merge_msg_RpcReply.RpcResult'/3}). -'merge_msg_RpcReply.RpcResult'(#'RpcReply.RpcResult'{data = PFdata}, #'RpcReply.RpcResult'{data = NFdata}, _) -> - #'RpcReply.RpcResult'{data = - if NFdata =:= undefined -> PFdata; - true -> NFdata - end}. - --compile({nowarn_unused_function,'merge_msg_RpcReply.RpcError'/3}). -'merge_msg_RpcReply.RpcError'(#'RpcReply.RpcError'{code = PFcode, message = PFmessage}, #'RpcReply.RpcError'{code = NFcode, message = NFmessage}, _) -> - #'RpcReply.RpcError'{code = - if NFcode =:= undefined -> PFcode; - true -> NFcode - end, - message = - if NFmessage =:= undefined -> PFmessage; - true -> NFmessage - end}. - --compile({nowarn_unused_function,merge_msg_RpcReply/3}). -merge_msg_RpcReply(#'RpcReply'{reply = PFreply}, #'RpcReply'{reply = NFreply}, TrUserData) -> - #'RpcReply'{reply = - case {PFreply, NFreply} of - {{result, OPFreply}, {result, ONFreply}} -> {result, 'merge_msg_RpcReply.RpcResult'(OPFreply, ONFreply, TrUserData)}; - {{error, OPFreply}, {error, ONFreply}} -> {error, 'merge_msg_RpcReply.RpcError'(OPFreply, ONFreply, TrUserData)}; - {_, undefined} -> PFreply; - _ -> NFreply - end}. - -compile({nowarn_unused_function,merge_msg_Data/3}). merge_msg_Data(#'Data'{route_key = PFroute_key, metric = PFmetric}, #'Data'{route_key = NFroute_key, metric = NFmetric}, _) -> #'Data'{route_key = @@ -4687,7 +4374,9 @@ verify_msg(Msg, MsgName, Opts) -> TrUserData = proplists:get_value(user_data, Opts), case MsgName of 'RequestFrame' -> v_msg_RequestFrame(Msg, [MsgName], TrUserData); - 'ResponseFrame' -> v_msg_ResponseFrame(Msg, [MsgName], TrUserData); + 'ReplyFrame' -> v_msg_ReplyFrame(Msg, [MsgName], TrUserData); + 'ReplyResult' -> v_msg_ReplyResult(Msg, [MsgName], TrUserData); + 'ReplyError' -> v_msg_ReplyError(Msg, [MsgName], TrUserData); 'CastFrame' -> v_msg_CastFrame(Msg, [MsgName], TrUserData); 'ContainerRef' -> v_msg_ContainerRef(Msg, [MsgName], TrUserData); 'ContainerRequest.List' -> 'v_msg_ContainerRequest.List'(Msg, [MsgName], TrUserData); @@ -4709,13 +4398,8 @@ verify_msg(Msg, MsgName, Opts) -> 'Ulimit' -> v_msg_Ulimit(Msg, [MsgName], TrUserData); 'TmpfsMount' -> v_msg_TmpfsMount(Msg, [MsgName], TrUserData); 'AuthRequest' -> v_msg_AuthRequest(Msg, [MsgName], TrUserData); - 'AuthReply' -> v_msg_AuthReply(Msg, [MsgName], TrUserData); 'Pub' -> v_msg_Pub(Msg, [MsgName], TrUserData); 'Command' -> v_msg_Command(Msg, [MsgName], TrUserData); - 'RpcRequest' -> v_msg_RpcRequest(Msg, [MsgName], TrUserData); - 'RpcReply.RpcResult' -> 'v_msg_RpcReply.RpcResult'(Msg, [MsgName], TrUserData); - 'RpcReply.RpcError' -> 'v_msg_RpcReply.RpcError'(Msg, [MsgName], TrUserData); - 'RpcReply' -> v_msg_RpcReply(Msg, [MsgName], TrUserData); 'Data' -> v_msg_Data(Msg, [MsgName], TrUserData); 'TaskEventStream' -> v_msg_TaskEventStream(Msg, [MsgName], TrUserData); _ -> mk_type_error(not_a_known_message, Msg, []) @@ -4731,27 +4415,55 @@ v_msg_RequestFrame(#'RequestFrame'{packet_id = F1, body = F2}, Path, TrUserData) case F2 of undefined -> ok; {auth_request, OF2} -> v_submsg_AuthRequest(OF2, [auth_request, body | Path], TrUserData); - {rpc_request, OF2} -> v_submsg_RpcRequest(OF2, [rpc_request, body | Path], TrUserData); {container_request, OF2} -> v_submsg_ContainerRequest(OF2, [container_request, body | Path], TrUserData); _ -> mk_type_error(invalid_oneof, F2, [body | Path]) end, ok; v_msg_RequestFrame(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'RequestFrame'}, X, Path). --compile({nowarn_unused_function,v_msg_ResponseFrame/3}). --dialyzer({nowarn_function,v_msg_ResponseFrame/3}). -v_msg_ResponseFrame(#'ResponseFrame'{packet_id = F1, body = F2}, Path, TrUserData) -> +-compile({nowarn_unused_function,v_msg_ReplyFrame/3}). +-dialyzer({nowarn_function,v_msg_ReplyFrame/3}). +v_msg_ReplyFrame(#'ReplyFrame'{packet_id = F1, reply = F2}, Path, TrUserData) -> if F1 == undefined -> ok; true -> v_type_uint32(F1, [packet_id | Path], TrUserData) end, case F2 of undefined -> ok; - {auth_reply, OF2} -> v_submsg_AuthReply(OF2, [auth_reply, body | Path], TrUserData); - {rpc_reply, OF2} -> v_submsg_RpcReply(OF2, [rpc_reply, body | Path], TrUserData); - _ -> mk_type_error(invalid_oneof, F2, [body | Path]) + {result, OF2} -> v_submsg_ReplyResult(OF2, [result, reply | Path], TrUserData); + {error, OF2} -> v_submsg_ReplyError(OF2, [error, reply | Path], TrUserData); + _ -> mk_type_error(invalid_oneof, F2, [reply | Path]) end, ok; -v_msg_ResponseFrame(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'ResponseFrame'}, X, Path). +v_msg_ReplyFrame(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'ReplyFrame'}, X, Path). + +-compile({nowarn_unused_function,v_submsg_ReplyResult/3}). +-dialyzer({nowarn_function,v_submsg_ReplyResult/3}). +v_submsg_ReplyResult(Msg, Path, TrUserData) -> v_msg_ReplyResult(Msg, Path, TrUserData). + +-compile({nowarn_unused_function,v_msg_ReplyResult/3}). +-dialyzer({nowarn_function,v_msg_ReplyResult/3}). +v_msg_ReplyResult(#'ReplyResult'{data = F1}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_bytes(F1, [data | Path], TrUserData) + end, + ok; +v_msg_ReplyResult(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'ReplyResult'}, X, Path). + +-compile({nowarn_unused_function,v_submsg_ReplyError/3}). +-dialyzer({nowarn_function,v_submsg_ReplyError/3}). +v_submsg_ReplyError(Msg, Path, TrUserData) -> v_msg_ReplyError(Msg, Path, TrUserData). + +-compile({nowarn_unused_function,v_msg_ReplyError/3}). +-dialyzer({nowarn_function,v_msg_ReplyError/3}). +v_msg_ReplyError(#'ReplyError'{code = F1, message = F2}, Path, TrUserData) -> + if F1 == undefined -> ok; + true -> v_type_int32(F1, [code | Path], TrUserData) + end, + if F2 == undefined -> ok; + true -> v_type_string(F2, [message | Path], TrUserData) + end, + ok; +v_msg_ReplyError(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'ReplyError'}, X, Path). -compile({nowarn_unused_function,v_msg_CastFrame/3}). -dialyzer({nowarn_function,v_msg_CastFrame/3}). @@ -5209,22 +4921,6 @@ v_msg_AuthRequest(#'AuthRequest'{uuid = F1, username = F2, salt = F3, token = F4 ok; v_msg_AuthRequest(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'AuthRequest'}, X, Path). --compile({nowarn_unused_function,v_submsg_AuthReply/3}). --dialyzer({nowarn_function,v_submsg_AuthReply/3}). -v_submsg_AuthReply(Msg, Path, TrUserData) -> v_msg_AuthReply(Msg, Path, TrUserData). - --compile({nowarn_unused_function,v_msg_AuthReply/3}). --dialyzer({nowarn_function,v_msg_AuthReply/3}). -v_msg_AuthReply(#'AuthReply'{code = F1, payload = F2}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_int32(F1, [code | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_bytes(F2, [payload | Path], TrUserData) - end, - ok; -v_msg_AuthReply(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'AuthReply'}, X, Path). - -compile({nowarn_unused_function,v_submsg_Pub/3}). -dialyzer({nowarn_function,v_submsg_Pub/3}). v_submsg_Pub(Msg, Path, TrUserData) -> v_msg_Pub(Msg, Path, TrUserData). @@ -5260,67 +4956,6 @@ v_msg_Command(#'Command'{command_type = F1, command = F2}, Path, TrUserData) -> ok; v_msg_Command(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'Command'}, X, Path). --compile({nowarn_unused_function,v_submsg_RpcRequest/3}). --dialyzer({nowarn_function,v_submsg_RpcRequest/3}). -v_submsg_RpcRequest(Msg, Path, TrUserData) -> v_msg_RpcRequest(Msg, Path, TrUserData). - --compile({nowarn_unused_function,v_msg_RpcRequest/3}). --dialyzer({nowarn_function,v_msg_RpcRequest/3}). -v_msg_RpcRequest(#'RpcRequest'{method = F1, params = F2}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_bytes(F1, [method | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_bytes(F2, [params | Path], TrUserData) - end, - ok; -v_msg_RpcRequest(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'RpcRequest'}, X, Path). - --compile({nowarn_unused_function,'v_submsg_RpcReply.RpcResult'/3}). --dialyzer({nowarn_function,'v_submsg_RpcReply.RpcResult'/3}). -'v_submsg_RpcReply.RpcResult'(Msg, Path, TrUserData) -> 'v_msg_RpcReply.RpcResult'(Msg, Path, TrUserData). - --compile({nowarn_unused_function,'v_msg_RpcReply.RpcResult'/3}). --dialyzer({nowarn_function,'v_msg_RpcReply.RpcResult'/3}). -'v_msg_RpcReply.RpcResult'(#'RpcReply.RpcResult'{data = F1}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_bytes(F1, [data | Path], TrUserData) - end, - ok; -'v_msg_RpcReply.RpcResult'(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'RpcReply.RpcResult'}, X, Path). - --compile({nowarn_unused_function,'v_submsg_RpcReply.RpcError'/3}). --dialyzer({nowarn_function,'v_submsg_RpcReply.RpcError'/3}). -'v_submsg_RpcReply.RpcError'(Msg, Path, TrUserData) -> 'v_msg_RpcReply.RpcError'(Msg, Path, TrUserData). - --compile({nowarn_unused_function,'v_msg_RpcReply.RpcError'/3}). --dialyzer({nowarn_function,'v_msg_RpcReply.RpcError'/3}). -'v_msg_RpcReply.RpcError'(#'RpcReply.RpcError'{code = F1, message = F2}, Path, TrUserData) -> - if F1 == undefined -> ok; - true -> v_type_int32(F1, [code | Path], TrUserData) - end, - if F2 == undefined -> ok; - true -> v_type_string(F2, [message | Path], TrUserData) - end, - ok; -'v_msg_RpcReply.RpcError'(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'RpcReply.RpcError'}, X, Path). - --compile({nowarn_unused_function,v_submsg_RpcReply/3}). --dialyzer({nowarn_function,v_submsg_RpcReply/3}). -v_submsg_RpcReply(Msg, Path, TrUserData) -> v_msg_RpcReply(Msg, Path, TrUserData). - --compile({nowarn_unused_function,v_msg_RpcReply/3}). --dialyzer({nowarn_function,v_msg_RpcReply/3}). -v_msg_RpcReply(#'RpcReply'{reply = F1}, Path, TrUserData) -> - case F1 of - undefined -> ok; - {result, OF1} -> 'v_submsg_RpcReply.RpcResult'(OF1, [result, reply | Path], TrUserData); - {error, OF1} -> 'v_submsg_RpcReply.RpcError'(OF1, [error, reply | Path], TrUserData); - _ -> mk_type_error(invalid_oneof, F1, [reply | Path]) - end, - ok; -v_msg_RpcReply(X, Path, _TrUserData) -> mk_type_error({expected_msg, 'RpcReply'}, X, Path). - -compile({nowarn_unused_function,v_submsg_Data/3}). -dialyzer({nowarn_function,v_submsg_Data/3}). v_submsg_Data(Msg, Path, TrUserData) -> v_msg_Data(Msg, Path, TrUserData). @@ -5505,15 +5140,14 @@ get_msg_defs() -> [{{msg, 'RequestFrame'}, [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #gpb_oneof{name = body, rnum = 3, - fields = - [#field{name = auth_request, fnum = 2, rnum = 3, type = {msg, 'AuthRequest'}, occurrence = optional, opts = []}, - #field{name = rpc_request, fnum = 3, rnum = 3, type = {msg, 'RpcRequest'}, occurrence = optional, opts = []}, - #field{name = container_request, fnum = 4, rnum = 3, type = {msg, 'ContainerRequest'}, occurrence = optional, opts = []}], + fields = [#field{name = auth_request, fnum = 2, rnum = 3, type = {msg, 'AuthRequest'}, occurrence = optional, opts = []}, #field{name = container_request, fnum = 3, rnum = 3, type = {msg, 'ContainerRequest'}, occurrence = optional, opts = []}], opts = []}]}, - {{msg, 'ResponseFrame'}, + {{msg, 'ReplyFrame'}, [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, - #gpb_oneof{name = body, rnum = 3, - fields = [#field{name = auth_reply, fnum = 2, rnum = 3, type = {msg, 'AuthReply'}, occurrence = optional, opts = []}, #field{name = rpc_reply, fnum = 3, rnum = 3, type = {msg, 'RpcReply'}, occurrence = optional, opts = []}], opts = []}]}, + #gpb_oneof{name = reply, rnum = 3, + fields = [#field{name = result, fnum = 2, rnum = 3, type = {msg, 'ReplyResult'}, occurrence = optional, opts = []}, #field{name = error, fnum = 3, rnum = 3, type = {msg, 'ReplyError'}, occurrence = optional, opts = []}], opts = []}]}, + {{msg, 'ReplyResult'}, [#field{name = data, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}]}, + {{msg, 'ReplyError'}, [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, {{msg, 'CastFrame'}, [#gpb_oneof{name = body, rnum = 2, fields = @@ -5603,18 +5237,11 @@ get_msg_defs() -> #field{name = salt, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}, #field{name = token, fnum = 4, rnum = 5, type = bytes, occurrence = optional, opts = []}, #field{name = timestamp, fnum = 5, rnum = 6, type = int32, occurrence = optional, opts = []}]}, - {{msg, 'AuthReply'}, [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, {{msg, 'Pub'}, [#field{name = topic, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = qos, fnum = 2, rnum = 3, type = int32, occurrence = optional, opts = []}, #field{name = content, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}]}, {{msg, 'Command'}, [#field{name = command_type, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = command, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, - {{msg, 'RpcRequest'}, [#field{name = method, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, - {{msg, 'RpcReply.RpcResult'}, [#field{name = data, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}]}, - {{msg, 'RpcReply.RpcError'}, [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]}, - {{msg, 'RpcReply'}, - [#gpb_oneof{name = reply, rnum = 2, - fields = [#field{name = result, fnum = 1, rnum = 2, type = {msg, 'RpcReply.RpcResult'}, occurrence = optional, opts = []}, #field{name = error, fnum = 2, rnum = 2, type = {msg, 'RpcReply.RpcError'}, occurrence = optional, opts = []}], opts = []}]}, {{msg, 'Data'}, [#field{name = route_key, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = metric, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]}, {{msg, 'TaskEventStream'}, [#field{name = task_id, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, @@ -5624,7 +5251,9 @@ get_msg_defs() -> get_msg_names() -> ['RequestFrame', - 'ResponseFrame', + 'ReplyFrame', + 'ReplyResult', + 'ReplyError', 'CastFrame', 'ContainerRef', 'ContainerRequest.List', @@ -5646,13 +5275,8 @@ get_msg_names() -> 'Ulimit', 'TmpfsMount', 'AuthRequest', - 'AuthReply', 'Pub', 'Command', - 'RpcRequest', - 'RpcReply.RpcResult', - 'RpcReply.RpcError', - 'RpcReply', 'Data', 'TaskEventStream']. @@ -5662,7 +5286,9 @@ get_group_names() -> []. get_msg_or_group_names() -> ['RequestFrame', - 'ResponseFrame', + 'ReplyFrame', + 'ReplyResult', + 'ReplyError', 'CastFrame', 'ContainerRef', 'ContainerRequest.List', @@ -5684,13 +5310,8 @@ get_msg_or_group_names() -> 'Ulimit', 'TmpfsMount', 'AuthRequest', - 'AuthReply', 'Pub', 'Command', - 'RpcRequest', - 'RpcReply.RpcResult', - 'RpcReply.RpcError', - 'RpcReply', 'Data', 'TaskEventStream']. @@ -5712,15 +5333,14 @@ fetch_enum_def(EnumName) -> erlang:error({no_such_enum, EnumName}). find_msg_def('RequestFrame') -> [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, #gpb_oneof{name = body, rnum = 3, - fields = - [#field{name = auth_request, fnum = 2, rnum = 3, type = {msg, 'AuthRequest'}, occurrence = optional, opts = []}, - #field{name = rpc_request, fnum = 3, rnum = 3, type = {msg, 'RpcRequest'}, occurrence = optional, opts = []}, - #field{name = container_request, fnum = 4, rnum = 3, type = {msg, 'ContainerRequest'}, occurrence = optional, opts = []}], + fields = [#field{name = auth_request, fnum = 2, rnum = 3, type = {msg, 'AuthRequest'}, occurrence = optional, opts = []}, #field{name = container_request, fnum = 3, rnum = 3, type = {msg, 'ContainerRequest'}, occurrence = optional, opts = []}], opts = []}]; -find_msg_def('ResponseFrame') -> +find_msg_def('ReplyFrame') -> [#field{name = packet_id, fnum = 1, rnum = 2, type = uint32, occurrence = optional, opts = []}, - #gpb_oneof{name = body, rnum = 3, - fields = [#field{name = auth_reply, fnum = 2, rnum = 3, type = {msg, 'AuthReply'}, occurrence = optional, opts = []}, #field{name = rpc_reply, fnum = 3, rnum = 3, type = {msg, 'RpcReply'}, occurrence = optional, opts = []}], opts = []}]; + #gpb_oneof{name = reply, rnum = 3, + fields = [#field{name = result, fnum = 2, rnum = 3, type = {msg, 'ReplyResult'}, occurrence = optional, opts = []}, #field{name = error, fnum = 3, rnum = 3, type = {msg, 'ReplyError'}, occurrence = optional, opts = []}], opts = []}]; +find_msg_def('ReplyResult') -> [#field{name = data, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}]; +find_msg_def('ReplyError') -> [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; find_msg_def('CastFrame') -> [#gpb_oneof{name = body, rnum = 2, fields = @@ -5811,18 +5431,11 @@ find_msg_def('AuthRequest') -> #field{name = salt, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}, #field{name = token, fnum = 4, rnum = 5, type = bytes, occurrence = optional, opts = []}, #field{name = timestamp, fnum = 5, rnum = 6, type = int32, occurrence = optional, opts = []}]; -find_msg_def('AuthReply') -> [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = payload, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; find_msg_def('Pub') -> [#field{name = topic, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = qos, fnum = 2, rnum = 3, type = int32, occurrence = optional, opts = []}, #field{name = content, fnum = 3, rnum = 4, type = bytes, occurrence = optional, opts = []}]; find_msg_def('Command') -> [#field{name = command_type, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = command, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; -find_msg_def('RpcRequest') -> [#field{name = method, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = params, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; -find_msg_def('RpcReply.RpcResult') -> [#field{name = data, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}]; -find_msg_def('RpcReply.RpcError') -> [#field{name = code, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, #field{name = message, fnum = 2, rnum = 3, type = string, occurrence = optional, opts = []}]; -find_msg_def('RpcReply') -> - [#gpb_oneof{name = reply, rnum = 2, - fields = [#field{name = result, fnum = 1, rnum = 2, type = {msg, 'RpcReply.RpcResult'}, occurrence = optional, opts = []}, #field{name = error, fnum = 2, rnum = 2, type = {msg, 'RpcReply.RpcError'}, occurrence = optional, opts = []}], opts = []}]; find_msg_def('Data') -> [#field{name = route_key, fnum = 1, rnum = 2, type = bytes, occurrence = optional, opts = []}, #field{name = metric, fnum = 2, rnum = 3, type = bytes, occurrence = optional, opts = []}]; find_msg_def('TaskEventStream') -> [#field{name = task_id, fnum = 1, rnum = 2, type = int32, occurrence = optional, opts = []}, @@ -5887,7 +5500,9 @@ service_and_rpc_name_to_fqbins(S, R) -> error({gpb_error, {badservice_or_rpc, {S fqbin_to_msg_name(<<"RequestFrame">>) -> 'RequestFrame'; -fqbin_to_msg_name(<<"ResponseFrame">>) -> 'ResponseFrame'; +fqbin_to_msg_name(<<"ReplyFrame">>) -> 'ReplyFrame'; +fqbin_to_msg_name(<<"ReplyResult">>) -> 'ReplyResult'; +fqbin_to_msg_name(<<"ReplyError">>) -> 'ReplyError'; fqbin_to_msg_name(<<"CastFrame">>) -> 'CastFrame'; fqbin_to_msg_name(<<"ContainerRef">>) -> 'ContainerRef'; fqbin_to_msg_name(<<"ContainerRequest.List">>) -> 'ContainerRequest.List'; @@ -5909,20 +5524,17 @@ fqbin_to_msg_name(<<"ResourceLimits">>) -> 'ResourceLimits'; fqbin_to_msg_name(<<"Ulimit">>) -> 'Ulimit'; fqbin_to_msg_name(<<"TmpfsMount">>) -> 'TmpfsMount'; fqbin_to_msg_name(<<"AuthRequest">>) -> 'AuthRequest'; -fqbin_to_msg_name(<<"AuthReply">>) -> 'AuthReply'; fqbin_to_msg_name(<<"Pub">>) -> 'Pub'; fqbin_to_msg_name(<<"Command">>) -> 'Command'; -fqbin_to_msg_name(<<"RpcRequest">>) -> 'RpcRequest'; -fqbin_to_msg_name(<<"RpcReply.RpcResult">>) -> 'RpcReply.RpcResult'; -fqbin_to_msg_name(<<"RpcReply.RpcError">>) -> 'RpcReply.RpcError'; -fqbin_to_msg_name(<<"RpcReply">>) -> 'RpcReply'; fqbin_to_msg_name(<<"Data">>) -> 'Data'; fqbin_to_msg_name(<<"TaskEventStream">>) -> 'TaskEventStream'; fqbin_to_msg_name(E) -> error({gpb_error, {badmsg, E}}). msg_name_to_fqbin('RequestFrame') -> <<"RequestFrame">>; -msg_name_to_fqbin('ResponseFrame') -> <<"ResponseFrame">>; +msg_name_to_fqbin('ReplyFrame') -> <<"ReplyFrame">>; +msg_name_to_fqbin('ReplyResult') -> <<"ReplyResult">>; +msg_name_to_fqbin('ReplyError') -> <<"ReplyError">>; msg_name_to_fqbin('CastFrame') -> <<"CastFrame">>; msg_name_to_fqbin('ContainerRef') -> <<"ContainerRef">>; msg_name_to_fqbin('ContainerRequest.List') -> <<"ContainerRequest.List">>; @@ -5944,13 +5556,8 @@ msg_name_to_fqbin('ResourceLimits') -> <<"ResourceLimits">>; msg_name_to_fqbin('Ulimit') -> <<"Ulimit">>; msg_name_to_fqbin('TmpfsMount') -> <<"TmpfsMount">>; msg_name_to_fqbin('AuthRequest') -> <<"AuthRequest">>; -msg_name_to_fqbin('AuthReply') -> <<"AuthReply">>; msg_name_to_fqbin('Pub') -> <<"Pub">>; msg_name_to_fqbin('Command') -> <<"Command">>; -msg_name_to_fqbin('RpcRequest') -> <<"RpcRequest">>; -msg_name_to_fqbin('RpcReply.RpcResult') -> <<"RpcReply.RpcResult">>; -msg_name_to_fqbin('RpcReply.RpcError') -> <<"RpcReply.RpcError">>; -msg_name_to_fqbin('RpcReply') -> <<"RpcReply">>; msg_name_to_fqbin('Data') -> <<"Data">>; msg_name_to_fqbin('TaskEventStream') -> <<"TaskEventStream">>; msg_name_to_fqbin(E) -> error({gpb_error, {badmsg, E}}). @@ -5992,8 +5599,7 @@ get_all_proto_names() -> ["message"]. get_msg_containment("message") -> - ['AuthReply', - 'AuthRequest', + ['AuthRequest', 'CastFrame', 'Command', 'ContainerDeployParams', @@ -6012,14 +5618,12 @@ get_msg_containment("message") -> 'Healthcheck', 'PortExpose', 'Pub', + 'ReplyError', + 'ReplyFrame', + 'ReplyResult', 'RequestFrame', 'ResourceLimits', - 'ResponseFrame', 'RestartPolicy', - 'RpcReply', - 'RpcReply.RpcError', - 'RpcReply.RpcResult', - 'RpcRequest', 'TaskEventStream', 'TmpfsMount', 'Ulimit', @@ -6045,7 +5649,7 @@ get_enum_containment(P) -> error({gpb_error, {badproto, P}}). get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Stop">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"Data">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"RpcReply.RpcError">>) -> "message"; +get_proto_by_msg_name_as_fqbin(<<"ReplyError">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"Pub">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ResourceLimits">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerSpec">>) -> "message"; @@ -6053,25 +5657,22 @@ get_proto_by_msg_name_as_fqbin(<<"ContainerDeployParams">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"VolumeBind">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"Ulimit">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"TmpfsMount">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"RpcRequest">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"RpcReply.RpcResult">>) -> "message"; +get_proto_by_msg_name_as_fqbin(<<"ReplyResult">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Start">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.List">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"Command">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"AuthRequest">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"ResponseFrame">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"RequestFrame">>) -> "message"; +get_proto_by_msg_name_as_fqbin(<<"ReplyFrame">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"PortExpose">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Remove">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"CastFrame">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRef">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"DeviceMapping">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Config">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"RpcReply">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"RestartPolicy">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Deploy">>) -> "message"; -get_proto_by_msg_name_as_fqbin(<<"AuthReply">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"Healthcheck">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"ContainerRequest.Kill">>) -> "message"; get_proto_by_msg_name_as_fqbin(<<"TaskEventStream">>) -> "message";