X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=binapigen%2Fgen_rpc.go;fp=binapigen%2Fgen_rpc.go;h=a5974c398878850a691dc00b4b9eae086cf35d08;hb=c2456559a66107441addb96f673191bde09d6977;hp=ba23f4a25d851a1e116aebbed5d492589e54e854;hpb=f751f3f845ef56bbcdb873d81a1c6edbc5a87853;p=govpp.git

diff --git a/binapigen/gen_rpc.go b/binapigen/gen_rpc.go
index ba23f4a..a5974c3 100644
--- a/binapigen/gen_rpc.go
+++ b/binapigen/gen_rpc.go
@@ -71,7 +71,7 @@ func GenerateRPC(gen *Generator, file *File) *GenFile {
 
 func genService(g *GenFile, svc *Service) {
 	// generate comment
-	g.P("// ", serviceApiName, " defines RPC service  ", g.file.Desc.Name, ".")
+	g.P("// ", serviceApiName, " defines RPC service ", g.file.Desc.Name, ".")
 
 	// generate service interface
 	g.P("type ", serviceApiName, " interface {")
@@ -160,7 +160,15 @@ func genService(g *GenFile, svc *Service) {
 			g.P("out := new(", rpc.MsgReply.GoIdent, ")")
 			g.P("err := c.conn.Invoke(ctx, in, out)")
 			g.P("if err != nil { return nil, err }")
-			g.P("return out, nil")
+			if retvalField := getRetvalField(rpc.MsgReply); retvalField != nil {
+				if fieldType := getFieldType(g, retvalField); fieldType == "int32" {
+					g.P("return out, ", govppApiPkg.Ident("RetvalToVPPApiError"), "(out.", retvalField.GoName, ")")
+				} else {
+					g.P("return out, ", govppApiPkg.Ident("RetvalToVPPApiError"), "(int32(out.", retvalField.GoName, "))")
+				}
+			} else {
+				g.P("return out, nil")
+			}
 		} else {
 			g.P("stream, err := c.conn.NewStream(ctx)")
 			g.P("if err != nil { return err }")