From bcf3fbd21aa22d1546bc85ffb887ae5ba557808e Mon Sep 17 00:00:00 2001
From: Vladimir Lavor <vlavor@cisco.com>
Date: Tue, 1 Dec 2020 13:57:29 +0100
Subject: Fixed incorrect message error in the stream API

The message package is passed to the stream object and
used to evaluate correct reply message type

Change-Id: I2c9844d6447d024af1693205efd5721e2f89f22d
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>
---
 api/binapi.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'api')

diff --git a/api/binapi.go b/api/binapi.go
index cb4ab85..1b07a7e 100644
--- a/api/binapi.go
+++ b/api/binapi.go
@@ -15,7 +15,7 @@
 package api
 
 import (
-	"fmt"
+	"path"
 	"reflect"
 )
 
@@ -59,27 +59,27 @@ type DataType interface {
 }
 
 var (
-	registeredMessageTypes = make(map[reflect.Type]string)
-	registeredMessages     = make(map[string]Message)
+	registeredMessages     = make(map[string]map[string]Message)
+	registeredMessageTypes = make(map[string]map[reflect.Type]string)
 )
 
 // RegisterMessage is called from generated code to register message.
 func RegisterMessage(x Message, name string) {
-	typ := reflect.TypeOf(x)
-	namecrc := x.GetMessageName() + "_" + x.GetCrcString()
-	if _, ok := registeredMessageTypes[typ]; ok {
-		panic(fmt.Errorf("govpp: message type %v already registered as %s (%s)", typ, name, namecrc))
+	binapiPath := path.Dir(reflect.TypeOf(x).Elem().PkgPath())
+	if _, ok := registeredMessages[binapiPath]; !ok {
+		registeredMessages[binapiPath] = make(map[string]Message)
+		registeredMessageTypes[binapiPath] = make(map[reflect.Type]string)
 	}
-	registeredMessages[namecrc] = x
-	registeredMessageTypes[typ] = name
+	registeredMessages[binapiPath][x.GetMessageName()+"_"+x.GetCrcString()] = x
+	registeredMessageTypes[binapiPath][reflect.TypeOf(x)] = name
 }
 
 // GetRegisteredMessages returns list of all registered messages.
-func GetRegisteredMessages() map[string]Message {
+func GetRegisteredMessages() map[string]map[string]Message {
 	return registeredMessages
 }
 
 // GetRegisteredMessageTypes returns list of all registered message types.
-func GetRegisteredMessageTypes() map[reflect.Type]string {
+func GetRegisteredMessageTypes() map[string]map[reflect.Type]string {
 	return registeredMessageTypes
 }
-- 
cgit 1.2.3-korg