X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=examples%2Fstream-client%2Fstream_client.go;h=e36e9437ce5c1d064b375c4e59fa05874c3c4fa2;hb=HEAD;hp=fadfe23653e5a46183a3e3ba58de952fe1282742;hpb=9ea1f778fb1458ce6b2265941885eab0b34b33d7;p=govpp.git diff --git a/examples/stream-client/stream_client.go b/examples/stream-client/stream_client.go index fadfe23..e36e943 100644 --- a/examples/stream-client/stream_client.go +++ b/examples/stream-client/stream_client.go @@ -24,16 +24,17 @@ import ( "os" "time" - "git.fd.io/govpp.git" - "git.fd.io/govpp.git/adapter/socketclient" - "git.fd.io/govpp.git/api" - interfaces "git.fd.io/govpp.git/binapi/interface" - "git.fd.io/govpp.git/binapi/interface_types" - "git.fd.io/govpp.git/binapi/ip" - "git.fd.io/govpp.git/binapi/ip_types" - "git.fd.io/govpp.git/binapi/mactime" - "git.fd.io/govpp.git/binapi/vpe" - "git.fd.io/govpp.git/core" + "go.fd.io/govpp" + "go.fd.io/govpp/adapter/socketclient" + "go.fd.io/govpp/api" + interfaces "go.fd.io/govpp/binapi/interface" + "go.fd.io/govpp/binapi/interface_types" + "go.fd.io/govpp/binapi/ip" + "go.fd.io/govpp/binapi/ip_types" + "go.fd.io/govpp/binapi/mactime" + "go.fd.io/govpp/binapi/memclnt" + "go.fd.io/govpp/binapi/vpe" + "go.fd.io/govpp/core" ) var ( @@ -76,8 +77,8 @@ func main() { // process errors encountered during the example defer func() { - if len(Errors) > 0 { - fmt.Printf("finished with %d errors\n", len(Errors)) + if len(errors) > 0 { + fmt.Printf("finished with %d errors\n", len(errors)) os.Exit(1) } else { fmt.Println("finished successfully") @@ -157,7 +158,7 @@ func interfaceDumpStream(stream api.Stream) { logError(err, "SwInterfaceDump sending message") return } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { logError(err, "ControlPing sending message") return } @@ -174,7 +175,7 @@ Loop: case *interfaces.SwInterfaceDetails: fmt.Printf(" - SwInterfaceDetails: %+v\n", msg) - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: fmt.Printf(" - ControlPingReply: %+v\n", msg) break Loop @@ -227,7 +228,7 @@ func ipAddressDumpStream(stream api.Stream, index interface_types.InterfaceIndex logError(err, "IPAddressDump sending message") return } - if err := stream.SendMsg(&vpe.ControlPing{}); err != nil { + if err := stream.SendMsg(&memclnt.ControlPing{}); err != nil { logError(err, "ControlPing sending sending message") return } @@ -244,7 +245,7 @@ Loop: case *ip.IPAddressDetails: fmt.Printf(" - IPAddressDetails: %+v\n", msg) - case *vpe.ControlPingReply: + case *memclnt.ControlPingReply: fmt.Printf(" - ControlPingReply: %+v\n", msg) break Loop @@ -260,7 +261,7 @@ Loop: // Mactime dump uses MactimeDumpReply message as an end of the stream // notification instead of the control ping. -func mactimeDump(stream api.Stream, ) { +func mactimeDump(stream api.Stream) { fmt.Println("Sending mactime dump..") if err := stream.SendMsg(&mactime.MactimeDump{}); err != nil { @@ -294,9 +295,9 @@ Loop: fmt.Println() } -var Errors []error +var errors []error func logError(err error, msg string) { fmt.Printf("ERROR: %s: %v\n", msg, err) - Errors = append(Errors, err) + errors = append(errors, err) }