X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=core%2Fchannel.go;h=363a2677a37f1784a3f7abb189d78c814d9fef2a;hb=9f27eeff53ee501b8641595baa7cbc2f0014a68c;hp=5b69eabfb30eb6a2b68c8dda573052424617eb0b;hpb=eb571ee5c0cf5a5194d6ae9aaa0be6e24ea2a943;p=govpp.git

diff --git a/core/channel.go b/core/channel.go
index 5b69eab..363a267 100644
--- a/core/channel.go
+++ b/core/channel.go
@@ -21,8 +21,10 @@ import (
 	"strings"
 	"time"
 
-	"git.fd.io/govpp.git/api"
 	"github.com/sirupsen/logrus"
+
+	"git.fd.io/govpp.git/adapter"
+	"git.fd.io/govpp.git/api"
 )
 
 var (
@@ -142,10 +144,24 @@ func (ch *Channel) SendMultiRequest(msg api.Message) api.MultiRequestCtx {
 	return &multiRequestCtx{ch: ch, seqNum: seqNum}
 }
 
-func getMsgFactory(msg api.Message) func() api.Message {
-	return func() api.Message {
-		return reflect.New(reflect.TypeOf(msg).Elem()).Interface().(api.Message)
+func (ch *Channel) CheckCompatiblity(msgs ...api.Message) error {
+	var comperr api.CompatibilityError
+	for _, msg := range msgs {
+		_, err := ch.msgIdentifier.GetMessageID(msg)
+		if err != nil {
+			if uerr, ok := err.(*adapter.UnknownMsgError); ok {
+				m := fmt.Sprintf("%s_%s", uerr.MsgName, uerr.MsgCrc)
+				comperr.IncompatibleMessages = append(comperr.IncompatibleMessages, m)
+				continue
+			}
+			// other errors return immediatelly
+			return err
+		}
+	}
+	if len(comperr.IncompatibleMessages) == 0 {
+		return nil
 	}
+	return &comperr
 }
 
 func (ch *Channel) SubscribeNotification(notifChan chan api.Message, event api.Message) (api.SubscriptionCtx, error) {
@@ -180,10 +196,7 @@ func (ch *Channel) SetReplyTimeout(timeout time.Duration) {
 }
 
 func (ch *Channel) Close() {
-	if ch.reqChan != nil {
-		close(ch.reqChan)
-		ch.reqChan = nil
-	}
+	close(ch.reqChan)
 }
 
 func (req *requestCtx) ReceiveReply(msg api.Message) error {
@@ -254,16 +267,23 @@ func (ch *Channel) receiveReplyInternal(msg api.Message, expSeqNum uint16) (last
 		case vppReply := <-ch.replyChan:
 			ignore, lastReplyReceived, err = ch.processReply(vppReply, expSeqNum, msg)
 			if ignore {
+				log.WithFields(logrus.Fields{
+					"expSeqNum": expSeqNum,
+					"channel":   ch.id,
+				}).Warnf("ignoring received reply: %+v (expecting: %s)", vppReply, msg.GetMessageName())
 				continue
 			}
 			return lastReplyReceived, err
 
 		case <-timer.C:
+			log.WithFields(logrus.Fields{
+				"expSeqNum": expSeqNum,
+				"channel":   ch.id,
+			}).Debugf("timeout (%v) waiting for reply: %s", ch.replyTimeout, msg.GetMessageName())
 			err = fmt.Errorf("no reply received within the timeout period %s", ch.replyTimeout)
 			return false, err
 		}
 	}
-	return
 }
 
 func (ch *Channel) processReply(reply *vppReply, expSeqNum uint16, msg api.Message) (ignore bool, lastReplyReceived bool, err error) {
@@ -271,8 +291,8 @@ func (ch *Channel) processReply(reply *vppReply, expSeqNum uint16, msg api.Messa
 	cmpSeqNums := compareSeqNumbers(reply.seqNum, expSeqNum)
 	if cmpSeqNums == -1 {
 		// reply received too late, ignore the message
-		logrus.WithField("seqNum", reply.seqNum).Warn(
-			"Received reply to an already closed binary API request")
+		log.WithField("seqNum", reply.seqNum).
+			Warn("Received reply to an already closed binary API request")
 		ignore = true
 		return
 	}