Update ControlPing/Reply in core (#291)

* Update ControlPing/Reply in core package

Signed-off-by: Ondrej Fabry <ondrej@fabry.dev>

* Debug log for read msg header in socketclient

Signed-off-by: Ondrej Fabry <ondrej@fabry.dev>

* Import control ping messages from memclnt

Signed-off-by: Ondrej Fabry <ondrej@fabry.dev>

---------

Signed-off-by: Ondrej Fabry <ondrej@fabry.dev>

Author: ondrej-fabry

adapter/socketclient/socketclient.go

@@ -682,9 +682,11 @@ func readMsgHeader(r io.Reader, header []byte) (int, error) {
 		}
 		return 0, fmt.Errorf("invalid header (expected 16 bytes, got %d)", n)
 	}
+	if debug {
+		log.Debugf(" - header read (%d/%d): % 0X", n, len(header), header)
+	}
 
 	dataLen := binary.BigEndian.Uint32(header[8:12])
-
 	return int(dataLen), nil
 }
 

core/control_ping.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"go.fd.io/govpp/api"
+	"go.fd.io/govpp/binapi/memclnt"
 )
 
 var (
@@ -19,23 +20,7 @@ func SetControlPingReply(m api.Message) {
 	msgControlPingReply = m
 }
 
-type ControlPing struct{}
-
-func (*ControlPing) GetMessageName() string          { return "control_ping" }
-func (*ControlPing) GetCrcString() string            { return "51077d14" }
-func (*ControlPing) GetMessageType() api.MessageType { return api.RequestMessage }
-
-type ControlPingReply struct {
-	Retval      int32
-	ClientIndex uint32
-	VpePID      uint32
-}
-
-func (*ControlPingReply) GetMessageName() string          { return "control_ping_reply" }
-func (*ControlPingReply) GetCrcString() string            { return "f6b0b8ca" }
-func (*ControlPingReply) GetMessageType() api.MessageType { return api.ReplyMessage }
-
-func init() {
-	api.RegisterMessage((*ControlPing)(nil), "ControlPing")
-	api.RegisterMessage((*ControlPingReply)(nil), "ControlPingReply")
-}
+type (
+	ControlPing      = memclnt.ControlPing
+	ControlPingReply = memclnt.ControlPingReply
+)