From: Ondrej Fabry <ofabry@cisco.com>
Date: Fri, 23 Oct 2020 09:41:55 +0000 (+0200)
Subject: Fix panic for Retval fields with uint kinds
X-Git-Tag: v0.4.0~34
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=govpp.git;a=commitdiff_plain;h=cb540dc166c12180adba024d5b8fd463d2582928

Fix panic for Retval fields with uint kinds

Change-Id: I5e588d48461a0cf551552a5068218a58920e52aa
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
---

diff --git a/core/channel.go b/core/channel.go
index 1b5e77e..28d0710 100644
--- a/core/channel.go
+++ b/core/channel.go
@@ -350,7 +350,15 @@ func (ch *Channel) processReply(reply *vppReply, expSeqNum uint16, msg api.Messa
 	if strings.HasSuffix(msg.GetMessageName(), "_reply") {
 		// TODO: use categories for messages to avoid checking message name
 		if f := reflect.Indirect(reflect.ValueOf(msg)).FieldByName("Retval"); f.IsValid() {
-			retval := int32(f.Int())
+			var retval int32
+			switch f.Kind() {
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				retval = int32(f.Int())
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+				retval = int32(f.Uint())
+			default:
+				logrus.Warnf("invalid kind (%v) for Retval field of message %v", f.Kind(), msg.GetMessageName())
+			}
 			err = api.RetvalToVPPApiError(retval)
 		}
 	}