Merge pull request #2788 from ton31337/fix/print_ipv6_route_if_afi

bgpd: Display `::` if AFI is IPv6, `0.0.0.0` otherwise
This commit is contained in:
Russ White 2018-08-07 15:58:26 -04:00 committed by GitHub
commit 9728f99449
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10142,9 +10142,9 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
json_scode);
json_object_object_add(json, "bgpOriginCodes",
json_ocode);
json_object_string_add(json,
"bgpOriginatingDefaultNetwork",
"0.0.0.0");
json_object_string_add(
json, "bgpOriginatingDefaultNetwork",
(afi == AFI_IP) ? "0.0.0.0/0" : "::/0");
} else {
vty_out(vty, "BGP table version is %" PRIu64
", local router ID is %s, vrf id ",
@ -10158,7 +10158,8 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
vty_out(vty, BGP_SHOW_NCODE_HEADER);
vty_out(vty, BGP_SHOW_OCODE_HEADER);
vty_out(vty, "Originating default network 0.0.0.0\n\n");
vty_out(vty, "Originating default network %s\n\n",
(afi == AFI_IP) ? "0.0.0.0/0" : "::/0");
}
header1 = 0;
}