X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=cmd%2Fvpp-proxy%2Fmain.go;h=d1af5df5987c3b1dad6a9c5cea0e476e941bce47;hb=d1f24d37bd447b64e402298bb8eb2479681facf9;hp=de1b7b4cc9a543b4cac091591b906e0ee9a4b348;hpb=cc80dbcaaaca8bf1b6042fead850d456cf589a4e;p=govpp.git

diff --git a/cmd/vpp-proxy/main.go b/cmd/vpp-proxy/main.go
index de1b7b4..d1af5df 100644
--- a/cmd/vpp-proxy/main.go
+++ b/cmd/vpp-proxy/main.go
@@ -15,18 +15,16 @@
 package main
 
 import (
-	"context"
 	"encoding/gob"
 	"flag"
-	"io"
 	"log"
 
 	"git.fd.io/govpp.git/adapter/socketclient"
 	"git.fd.io/govpp.git/adapter/statsclient"
 	"git.fd.io/govpp.git/api"
+	interfaces "git.fd.io/govpp.git/binapi/interface"
+	"git.fd.io/govpp.git/binapi/vpe"
 	_ "git.fd.io/govpp.git/core"
-	"git.fd.io/govpp.git/examples/binapi/interfaces"
-	"git.fd.io/govpp.git/examples/binapi/vpe"
 	"git.fd.io/govpp.git/proxy"
 )
 
@@ -93,34 +91,19 @@ func runClient() {
 		panic(err)
 	}
 
-	// - using binapi message directly
 	req := &vpe.CliInband{Cmd: "show version"}
 	reply := new(vpe.CliInbandReply)
 	if err := binapiChannel.SendRequest(req).ReceiveReply(reply); err != nil {
 		log.Fatalln("binapi request failed:", err)
 	}
 	log.Printf("VPP version: %+v", reply.Reply)
-
-	// - or using generated rpc service
-	svc := interfaces.NewServiceClient(binapiChannel)
-	stream, err := svc.DumpSwInterface(context.Background(), &interfaces.SwInterfaceDump{})
-	if err != nil {
-		log.Fatalln("binapi request failed:", err)
-	}
-	for {
-		iface, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			log.Fatalln(err)
-		}
-		log.Printf("- interface: %+v", iface)
-	}
 }
 
 func runServer() {
-	p := proxy.NewServer()
+	p, err := proxy.NewServer()
+	if err != nil {
+		log.Fatalln(err)
+	}
 
 	statsAdapter := statsclient.NewStatsClient(*statsSocket)
 	binapiAdapter := socketclient.NewVppClient(*binapiSocket)
@@ -135,5 +118,7 @@ func runServer() {
 	}
 	defer p.DisconnectBinapi()
 
-	p.ListenAndServe(*proxyAddr)
+	if err := p.ListenAndServe(*proxyAddr); err != nil {
+		log.Fatalln(err)
+	}
 }