X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=examples%2Fsimple-client%2Fsimple_client.go;h=7aeaa0b7ea8250c4a1d234efb9303389b3f92a4f;hb=c7ae74a95d1bd6fefcbb061f5f045c60c11e32fc;hp=fe7c109645d966fa58699bc3117eb7057bab76fd;hpb=280b1c6c83b676ef4e592f4ecf60cb5b54b6a753;p=govpp.git

diff --git a/examples/simple-client/simple_client.go b/examples/simple-client/simple_client.go
index fe7c109..7aeaa0b 100644
--- a/examples/simple-client/simple_client.go
+++ b/examples/simple-client/simple_client.go
@@ -17,11 +17,11 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
 	"os"
-	"strings"
 
 	"git.fd.io/govpp.git"
 	"git.fd.io/govpp.git/adapter/socketclient"
@@ -31,6 +31,7 @@ import (
 	"git.fd.io/govpp.git/examples/binapi/interfaces"
 	"git.fd.io/govpp.git/examples/binapi/ip"
 	"git.fd.io/govpp.git/examples/binapi/ip_types"
+	"git.fd.io/govpp.git/examples/binapi/mactime"
 	"git.fd.io/govpp.git/examples/binapi/vpe"
 )
 
@@ -82,6 +83,8 @@ func main() {
 	ipAddressDump(ch, idx)
 	interfaceNotifications(ch, idx)
 
+	mactimeDump(conn)
+
 	if len(Errors) > 0 {
 		fmt.Printf("finished with %d errors\n", len(Errors))
 		os.Exit(1)
@@ -110,13 +113,13 @@ func vppVersion(ch api.Channel) {
 	}
 	fmt.Printf("reply: %+v\n", reply)
 
-	fmt.Printf("VPP version: %q\n", cleanString(reply.Version))
+	fmt.Printf("VPP version: %q\n", reply.Version)
 	fmt.Println("OK")
 	fmt.Println()
 }
 
 // createLoopback sends request to create loopback interface.
-func createLoopback(ch api.Channel) interfaces.InterfaceIndex {
+func createLoopback(ch api.Channel) interface_types.InterfaceIndex {
 	fmt.Println("Creating loopback interface")
 
 	req := &interfaces.CreateLoopback{}
@@ -160,16 +163,16 @@ func interfaceDump(ch api.Channel) {
 }
 
 // addIPAddress sends request to add IP address to interface.
-func addIPAddress(ch api.Channel, index interfaces.InterfaceIndex) {
+func addIPAddress(ch api.Channel, index interface_types.InterfaceIndex) {
 	fmt.Printf("Adding IP address to interface to interface index %d\n", index)
 
 	req := &interfaces.SwInterfaceAddDelAddress{
 		SwIfIndex: index,
 		IsAdd:     true,
 		Prefix: ip_types.AddressWithPrefix{
-			Address: interfaces.Address{
+			Address: ip_types.Address{
 				Af: ip_types.ADDRESS_IP4,
-				Un: ip_types.AddressUnionIP4(interfaces.IP4Address{10, 10, 0, uint8(index)}),
+				Un: ip_types.AddressUnionIP4(ip_types.IP4Address{10, 10, 0, uint8(index)}),
 			},
 			Len: 32,
 		},
@@ -186,7 +189,7 @@ func addIPAddress(ch api.Channel, index interfaces.InterfaceIndex) {
 	fmt.Println()
 }
 
-func ipAddressDump(ch api.Channel, index interfaces.InterfaceIndex) {
+func ipAddressDump(ch api.Channel, index interface_types.InterfaceIndex) {
 	fmt.Printf("Dumping IP addresses for interface index %d\n", index)
 
 	req := &ip.IPAddressDump{
@@ -214,7 +217,7 @@ func ipAddressDump(ch api.Channel, index interfaces.InterfaceIndex) {
 // interfaceNotifications shows the usage of notification API. Note that for notifications,
 // you are supposed to create your own Go channel with your preferred buffer size. If the channel's
 // buffer is full, the notifications will not be delivered into it.
-func interfaceNotifications(ch api.Channel, index interfaces.InterfaceIndex) {
+func interfaceNotifications(ch api.Channel, index interface_types.InterfaceIndex) {
 	fmt.Printf("Subscribing to notificaiton events for interface index %d\n", index)
 
 	notifChan := make(chan api.Message, 100)
@@ -282,6 +285,44 @@ func interfaceNotifications(ch api.Channel, index interfaces.InterfaceIndex) {
 	fmt.Println()
 }
 
-func cleanString(str string) string {
-	return strings.Split(str, "\x00")[0]
+func mactimeDump(conn api.Connection) {
+	fmt.Println("Sending mactime dump")
+
+	ctx := context.Background()
+
+	stream, err := conn.NewStream(ctx)
+	if err != nil {
+		panic(err)
+	}
+	defer stream.Close()
+
+	if err := stream.SendMsg(&mactime.MactimeDump{}); err != nil {
+		logError(err, "sending mactime dump")
+		return
+	}
+
+Loop:
+	for {
+		msg, err := stream.RecvMsg()
+		if err != nil {
+			logError(err, "dumping mactime")
+			return
+		}
+
+		switch msg.(type) {
+		case *mactime.MactimeDetails:
+			fmt.Printf(" - MactimeDetails: %+v\n", msg)
+
+		case *mactime.MactimeDumpReply:
+			fmt.Printf(" - MactimeDumpReply: %+v\n", msg)
+			break Loop
+
+		default:
+			logError(err, "unexpected message")
+			return
+		}
+	}
+
+	fmt.Println("OK")
+	fmt.Println()
 }