RIS: Catch nil pointer in cli and expose EOR (#375)

taktv6 · Oliver Geiselhardt-Herms · web-flow · commit ea9e89ed428d · 2022-09-05T17:56:23.000+02:00
Co-authored-by: Oliver Geiselhardt-Herms &lt;ogeiselhardt-herms@cloudflare.com&gt;
diff --git a/cmd/riscli/observe_rib.go b/cmd/riscli/observe_rib.go
@@ -79,6 +79,12 @@ func observeRIB(c pb.RoutingInformationServiceClient, routerName string, vrfID u
 			return fmt.Errorf("Receive failed: %w", err)
 		}
 
-		printRoute(r.Route)
+		if r.EndOfRib {
+			fmt.Printf("Received End-Of-RIB marker\n")
+		}
+
+		if r.Route != nil {
+			printRoute(r.Route)
+		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,12 @@ func observeRIB(c pb.RoutingInformationServiceClient, routerName string, vrfID u`
`79`	`79`	`return fmt.Errorf("Receive failed: %w", err)`
`80`	`80`	`}`
`81`	`81`
`82`		`- printRoute(r.Route)`
	`82`	`+ if r.EndOfRib {`
	`83`	`+ fmt.Printf("Received End-Of-RIB marker\n")`
	`84`	`+ }`
	`85`	`+`
	`86`	`+ if r.Route != nil {`
	`87`	`+ printRoute(r.Route)`
	`88`	`+ }`
`83`	`89`	`}`
`84`	`90`	`}`