Decode message context using the message type only

[govpp.git] / core / request_handler.go

diff --git a/core/request_handler.go b/core/request_handler.go
index fc704cb..29685f6 100644 (file)
--- a/core/request_handler.go
+++ b/core/request_handler.go
@@ -17,7 +17,6 @@ package core
 import (
        "errors"
        "fmt"
-       "reflect"
        "sync/atomic"
        "time"
 
@@ -210,9 +209,9 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) {
                return
        }
 
-       msg, ok := c.msgMap[msgID]
-       if !ok {
-               log.Warnf("Unknown message received, ID: %d", msgID)
+       msgType, name, crc, err := c.getMessageDataByID(msgID)
+       if err != nil {
+               log.Warnln(err)
                return
        }
 
@@ -221,7 +220,7 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) {
        // - replies that don't have context as first field (comes as zero)
        // - events that don't have context at all (comes as non zero)
        //
-       context, err := c.codec.DecodeMsgContext(data, msg)
+       context, err := c.codec.DecodeMsgContext(data, msgType)
        if err != nil {
                log.WithField("msg_id", msgID).Warnf("Unable to decode message context: %v", err)
                return
@@ -230,14 +229,6 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) {
        chanID, isMulti, seqNum := unpackRequestContext(context)
 
        if log.Level == logger.DebugLevel { // for performance reasons - logrus does some processing even if debugs are disabled
-               msg = reflect.New(reflect.TypeOf(msg).Elem()).Interface().(api.Message)
-
-               // decode the message
-               if err = c.codec.DecodeMsg(data, msg); err != nil {
-                       err = fmt.Errorf("decoding message failed: %w", err)
-                       return
-               }
-
                log.WithFields(logger.Fields{
                        "context":  context,
                        "msg_id":   msgID,
@@ -245,8 +236,8 @@ func (c *Connection) msgCallback(msgID uint16, data []byte) {
                        "channel":  chanID,
                        "is_multi": isMulti,
                        "seq_num":  seqNum,
-                       "msg_crc":  msg.GetCrcString(),
-               }).Debugf("<-- govpp RECEIVE: %s %+v", msg.GetMessageName(), msg)
+                       "msg_crc":  crc,
+               }).Debugf("<-- govpp RECEIVE: %s %+v", name)
        }
 
        if context == 0 || c.isNotificationMessage(msgID) {
@@ -419,3 +410,13 @@ func compareSeqNumbers(seqNum1, seqNum2 uint16) int {
        }
        return 1
 }
+
+// Returns message data based on the message ID not depending on the message path
+func (c *Connection) getMessageDataByID(msgID uint16) (typ api.MessageType, name, crc string, err error) {
+       for _, msgs := range c.msgMapByPath {
+               if msg, ok := msgs[msgID]; ok {
+                       return msg.GetMessageType(), msg.GetMessageName(), msg.GetCrcString(), nil
+               }
+       }
+       return typ, name, crc, fmt.Errorf("unknown message received, ID: %d", msgID)
+}