From de8e6592e23a3819266cea5e9999c7c21fdd826f Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Mon, 4 Dec 2017 09:54:13 +0100 Subject: Fix events for mock adapter Change-Id: Iee5fa6282e845ed2aef76c9246a9068f3765139c Signed-off-by: Ondrej Fabry --- core/msg_codec.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'core/msg_codec.go') diff --git a/core/msg_codec.go b/core/msg_codec.go index c72b7f3..3887e3f 100644 --- a/core/msg_codec.go +++ b/core/msg_codec.go @@ -30,27 +30,27 @@ import ( // binary format as accepted by VPP. type MsgCodec struct{} -// vppRequestHeader struct contains header fields implemented by all VPP requests. -type vppRequestHeader struct { +// VppRequestHeader struct contains header fields implemented by all VPP requests. +type VppRequestHeader struct { VlMsgID uint16 ClientIndex uint32 Context uint32 } -// vppReplyHeader struct contains header fields implemented by all VPP replies. -type vppReplyHeader struct { +// VppReplyHeader struct contains header fields implemented by all VPP replies. +type VppReplyHeader struct { VlMsgID uint16 Context uint32 } -// vppEventHeader struct contains header fields implemented by all VPP events. -type vppEventHeader struct { +// VppEventHeader struct contains header fields implemented by all VPP events. +type VppEventHeader struct { VlMsgID uint16 Context uint32 } -// vppOtherHeader struct contains header fields implemented by other VPP messages (not requests nor replies). -type vppOtherHeader struct { +// VppOtherHeader struct contains header fields implemented by other VPP messages (not requests nor replies). +type VppOtherHeader struct { VlMsgID uint16 } @@ -72,13 +72,13 @@ func (*MsgCodec) EncodeMsg(msg api.Message, msgID uint16) ([]byte, error) { // encode message header var header interface{} if msg.GetMessageType() == api.RequestMessage { - header = &vppRequestHeader{VlMsgID: msgID} + header = &VppRequestHeader{VlMsgID: msgID} } else if msg.GetMessageType() == api.ReplyMessage { - header = &vppReplyHeader{VlMsgID: msgID} + header = &VppReplyHeader{VlMsgID: msgID} } else if msg.GetMessageType() == api.EventMessage { - header = &vppEventHeader{VlMsgID: msgID} + header = &VppEventHeader{VlMsgID: msgID} } else { - header = &vppOtherHeader{VlMsgID: msgID} + header = &VppOtherHeader{VlMsgID: msgID} } err := struc.Pack(buf, header) if err != nil { @@ -115,13 +115,13 @@ func (*MsgCodec) DecodeMsg(data []byte, msg api.Message) error { // check which header is expected var header interface{} if msg.GetMessageType() == api.RequestMessage { - header = &vppRequestHeader{} + header = &VppRequestHeader{} } else if msg.GetMessageType() == api.ReplyMessage { - header = &vppReplyHeader{} + header = &VppReplyHeader{} } else if msg.GetMessageType() == api.EventMessage { - header = &vppEventHeader{} + header = &VppEventHeader{} } else { - header = &vppOtherHeader{} + header = &VppOtherHeader{} } // decode message header -- cgit 1.2.3-korg