mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-09 22:03:12 +00:00
zebra: include backup info in show ip route
Add backup nexthop info to the show output (if present). Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp
parent
eeafa8cd43
commit
accf6280fc
@ -164,7 +164,8 @@ DEFUN (show_ip_rpf_addr,
|
|||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
|
static char re_status_output_char(const struct route_entry *re,
|
||||||
|
const struct nexthop *nhop)
|
||||||
{
|
{
|
||||||
if (CHECK_FLAG(re->status, ROUTE_ENTRY_INSTALLED)) {
|
if (CHECK_FLAG(re->status, ROUTE_ENTRY_INSTALLED)) {
|
||||||
if (!CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_DUPLICATE) &&
|
if (!CHECK_FLAG(nhop->flags, NEXTHOP_FLAG_DUPLICATE) &&
|
||||||
@ -187,6 +188,152 @@ static char re_status_output_char(struct route_entry *re, struct nexthop *nhop)
|
|||||||
return ' ';
|
return ' ';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* TODO -- Show backup nexthop info
|
||||||
|
*/
|
||||||
|
static void show_nh_backup_helper(struct vty *vty,
|
||||||
|
const struct nhg_hash_entry *nhe,
|
||||||
|
const struct nexthop *nexthop)
|
||||||
|
{
|
||||||
|
/* Double-check that there _is_ a backup */
|
||||||
|
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP))
|
||||||
|
return;
|
||||||
|
|
||||||
|
/* Locate the backup nexthop */
|
||||||
|
|
||||||
|
/* Format the backup (indented) */
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Helper api to format output for a nexthop, used in the 'detailed'
|
||||||
|
* output path.
|
||||||
|
*/
|
||||||
|
static void show_nexthop_detail_helper(struct vty *vty,
|
||||||
|
const struct route_entry *re,
|
||||||
|
const struct nexthop *nexthop)
|
||||||
|
{
|
||||||
|
char addrstr[32];
|
||||||
|
char buf[MPLS_LABEL_STRLEN];
|
||||||
|
|
||||||
|
vty_out(vty, " %c%s",
|
||||||
|
re_status_output_char(re, nexthop),
|
||||||
|
nexthop->rparent ? " " : "");
|
||||||
|
|
||||||
|
switch (nexthop->type) {
|
||||||
|
case NEXTHOP_TYPE_IPV4:
|
||||||
|
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
||||||
|
vty_out(vty, " %s",
|
||||||
|
inet_ntoa(nexthop->gate.ipv4));
|
||||||
|
if (nexthop->ifindex)
|
||||||
|
vty_out(vty, ", via %s",
|
||||||
|
ifindex2ifname(
|
||||||
|
nexthop->ifindex,
|
||||||
|
nexthop->vrf_id));
|
||||||
|
break;
|
||||||
|
case NEXTHOP_TYPE_IPV6:
|
||||||
|
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
||||||
|
vty_out(vty, " %s",
|
||||||
|
inet_ntop(AF_INET6, &nexthop->gate.ipv6,
|
||||||
|
buf, sizeof(buf)));
|
||||||
|
if (nexthop->ifindex)
|
||||||
|
vty_out(vty, ", via %s",
|
||||||
|
ifindex2ifname(
|
||||||
|
nexthop->ifindex,
|
||||||
|
nexthop->vrf_id));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NEXTHOP_TYPE_IFINDEX:
|
||||||
|
vty_out(vty, " directly connected, %s",
|
||||||
|
ifindex2ifname(nexthop->ifindex,
|
||||||
|
nexthop->vrf_id));
|
||||||
|
break;
|
||||||
|
case NEXTHOP_TYPE_BLACKHOLE:
|
||||||
|
vty_out(vty, " unreachable");
|
||||||
|
switch (nexthop->bh_type) {
|
||||||
|
case BLACKHOLE_REJECT:
|
||||||
|
vty_out(vty, " (ICMP unreachable)");
|
||||||
|
break;
|
||||||
|
case BLACKHOLE_ADMINPROHIB:
|
||||||
|
vty_out(vty,
|
||||||
|
" (ICMP admin-prohibited)");
|
||||||
|
break;
|
||||||
|
case BLACKHOLE_NULL:
|
||||||
|
vty_out(vty, " (blackhole)");
|
||||||
|
break;
|
||||||
|
case BLACKHOLE_UNSPEC:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((re->vrf_id != nexthop->vrf_id)
|
||||||
|
&& (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
|
||||||
|
struct vrf *vrf =
|
||||||
|
vrf_lookup_by_id(nexthop->vrf_id);
|
||||||
|
|
||||||
|
if (vrf)
|
||||||
|
vty_out(vty, "(vrf %s)", vrf->name);
|
||||||
|
else
|
||||||
|
vty_out(vty, "(vrf UNKNOWN)");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
|
||||||
|
vty_out(vty, " (duplicate nexthop removed)");
|
||||||
|
|
||||||
|
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
|
||||||
|
vty_out(vty, " inactive");
|
||||||
|
|
||||||
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK))
|
||||||
|
vty_out(vty, " onlink");
|
||||||
|
|
||||||
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
|
||||||
|
vty_out(vty, " (recursive)");
|
||||||
|
|
||||||
|
/* Source specified? */
|
||||||
|
switch (nexthop->type) {
|
||||||
|
case NEXTHOP_TYPE_IPV4:
|
||||||
|
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
||||||
|
if (nexthop->src.ipv4.s_addr) {
|
||||||
|
if (inet_ntop(AF_INET, &nexthop->src.ipv4,
|
||||||
|
addrstr, sizeof(addrstr)))
|
||||||
|
vty_out(vty, ", src %s",
|
||||||
|
addrstr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NEXTHOP_TYPE_IPV6:
|
||||||
|
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
||||||
|
if (!IPV6_ADDR_SAME(&nexthop->src.ipv6,
|
||||||
|
&in6addr_any)) {
|
||||||
|
if (inet_ntop(AF_INET6, &nexthop->src.ipv6,
|
||||||
|
addrstr, sizeof(addrstr)))
|
||||||
|
vty_out(vty, ", src %s",
|
||||||
|
addrstr);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (re->nexthop_mtu)
|
||||||
|
vty_out(vty, ", mtu %u", re->nexthop_mtu);
|
||||||
|
|
||||||
|
/* Label information */
|
||||||
|
if (nexthop->nh_label && nexthop->nh_label->num_labels) {
|
||||||
|
vty_out(vty, ", label %s",
|
||||||
|
mpls_label2str(nexthop->nh_label->num_labels,
|
||||||
|
nexthop->nh_label->label, buf,
|
||||||
|
sizeof(buf), 1 /*pretty*/));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (nexthop->weight)
|
||||||
|
vty_out(vty, ", weight %u", nexthop->weight);
|
||||||
|
}
|
||||||
|
|
||||||
/* New RIB. Detailed information for IPv4 route. */
|
/* New RIB. Detailed information for IPv4 route. */
|
||||||
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
||||||
int mcast, bool use_fib, bool show_ng)
|
int mcast, bool use_fib, bool show_ng)
|
||||||
@ -253,36 +400,49 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
|||||||
vty_out(vty, " Nexthop Group ID: %u\n", re->nhe_id);
|
vty_out(vty, " Nexthop Group ID: %u\n", re->nhe_id);
|
||||||
|
|
||||||
for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) {
|
for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) {
|
||||||
char addrstr[32];
|
/* Use helper to format each nexthop */
|
||||||
|
show_nexthop_detail_helper(vty, re, nexthop);
|
||||||
|
vty_out(vty, "\n");
|
||||||
|
|
||||||
vty_out(vty, " %c%s",
|
/* Include backup info, if present */
|
||||||
re_status_output_char(re, nexthop),
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP))
|
||||||
nexthop->rparent ? " " : "");
|
show_nh_backup_helper(vty, re->nhe, nexthop);
|
||||||
|
}
|
||||||
|
vty_out(vty, "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Helper for nexthop output, used in the 'show ip route' path
|
||||||
|
*/
|
||||||
|
static void show_route_nexthop_helper(struct vty *vty,
|
||||||
|
const struct route_entry *re,
|
||||||
|
const struct nexthop *nexthop)
|
||||||
|
{
|
||||||
|
char buf[MPLS_LABEL_STRLEN];
|
||||||
|
|
||||||
switch (nexthop->type) {
|
switch (nexthop->type) {
|
||||||
case NEXTHOP_TYPE_IPV4:
|
case NEXTHOP_TYPE_IPV4:
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
||||||
vty_out(vty, " %s",
|
vty_out(vty, " via %s", inet_ntoa(nexthop->gate.ipv4));
|
||||||
inet_ntoa(nexthop->gate.ipv4));
|
|
||||||
if (nexthop->ifindex)
|
if (nexthop->ifindex)
|
||||||
vty_out(vty, ", via %s",
|
vty_out(vty, ", %s",
|
||||||
ifindex2ifname(
|
ifindex2ifname(nexthop->ifindex,
|
||||||
nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
nexthop->vrf_id));
|
||||||
break;
|
break;
|
||||||
case NEXTHOP_TYPE_IPV6:
|
case NEXTHOP_TYPE_IPV6:
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
||||||
vty_out(vty, " %s",
|
vty_out(vty, " via %s",
|
||||||
inet_ntop(AF_INET6, &nexthop->gate.ipv6,
|
inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
|
||||||
buf, sizeof(buf)));
|
sizeof(buf)));
|
||||||
if (nexthop->ifindex)
|
if (nexthop->ifindex)
|
||||||
vty_out(vty, ", via %s",
|
vty_out(vty, ", %s",
|
||||||
ifindex2ifname(
|
ifindex2ifname(nexthop->ifindex,
|
||||||
nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
nexthop->vrf_id));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case NEXTHOP_TYPE_IFINDEX:
|
case NEXTHOP_TYPE_IFINDEX:
|
||||||
vty_out(vty, " directly connected, %s",
|
vty_out(vty, " is directly connected, %s",
|
||||||
ifindex2ifname(nexthop->ifindex,
|
ifindex2ifname(nexthop->ifindex,
|
||||||
nexthop->vrf_id));
|
nexthop->vrf_id));
|
||||||
break;
|
break;
|
||||||
@ -293,8 +453,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
|||||||
vty_out(vty, " (ICMP unreachable)");
|
vty_out(vty, " (ICMP unreachable)");
|
||||||
break;
|
break;
|
||||||
case BLACKHOLE_ADMINPROHIB:
|
case BLACKHOLE_ADMINPROHIB:
|
||||||
vty_out(vty,
|
vty_out(vty, " (ICMP admin-prohibited)");
|
||||||
" (ICMP admin-prohibited)");
|
|
||||||
break;
|
break;
|
||||||
case BLACKHOLE_NULL:
|
case BLACKHOLE_NULL:
|
||||||
vty_out(vty, " (blackhole)");
|
vty_out(vty, " (blackhole)");
|
||||||
@ -307,10 +466,9 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((re->vrf_id != nexthop->vrf_id)
|
if ((re == NULL || (nexthop->vrf_id != re->vrf_id)) &&
|
||||||
&& (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
|
(nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
|
||||||
struct vrf *vrf =
|
struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
|
||||||
vrf_lookup_by_id(nexthop->vrf_id);
|
|
||||||
|
|
||||||
if (vrf)
|
if (vrf)
|
||||||
vty_out(vty, " (vrf %s)", vrf->name);
|
vty_out(vty, " (vrf %s)", vrf->name);
|
||||||
@ -318,9 +476,6 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
|||||||
vty_out(vty, " (vrf UNKNOWN)");
|
vty_out(vty, " (vrf UNKNOWN)");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
|
|
||||||
vty_out(vty, " (duplicate nexthop removed)");
|
|
||||||
|
|
||||||
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
|
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
|
||||||
vty_out(vty, " inactive");
|
vty_out(vty, " inactive");
|
||||||
|
|
||||||
@ -334,48 +489,33 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
|
|||||||
case NEXTHOP_TYPE_IPV4:
|
case NEXTHOP_TYPE_IPV4:
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
||||||
if (nexthop->src.ipv4.s_addr) {
|
if (nexthop->src.ipv4.s_addr) {
|
||||||
if (inet_ntop(AF_INET,
|
if (inet_ntop(AF_INET, &nexthop->src.ipv4, buf,
|
||||||
&nexthop->src.ipv4,
|
sizeof(buf)))
|
||||||
addrstr, sizeof(addrstr)))
|
vty_out(vty, ", src %s", buf);
|
||||||
vty_out(vty, ", src %s",
|
|
||||||
addrstr);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case NEXTHOP_TYPE_IPV6:
|
case NEXTHOP_TYPE_IPV6:
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
||||||
if (!IPV6_ADDR_SAME(&nexthop->src.ipv6,
|
if (!IPV6_ADDR_SAME(&nexthop->src.ipv6, &in6addr_any)) {
|
||||||
&in6addr_any)) {
|
if (inet_ntop(AF_INET6, &nexthop->src.ipv6, buf,
|
||||||
if (inet_ntop(AF_INET6,
|
sizeof(buf)))
|
||||||
&nexthop->src.ipv6,
|
vty_out(vty, ", src %s", buf);
|
||||||
addrstr, sizeof(addrstr)))
|
|
||||||
vty_out(vty, ", src %s",
|
|
||||||
addrstr);
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (re->nexthop_mtu)
|
|
||||||
vty_out(vty, ", mtu %u", re->nexthop_mtu);
|
|
||||||
|
|
||||||
/* Label information */
|
/* Label information */
|
||||||
if (nexthop->nh_label
|
if (nexthop->nh_label && nexthop->nh_label->num_labels) {
|
||||||
&& nexthop->nh_label->num_labels) {
|
|
||||||
vty_out(vty, ", label %s",
|
vty_out(vty, ", label %s",
|
||||||
mpls_label2str(
|
mpls_label2str(nexthop->nh_label->num_labels,
|
||||||
nexthop->nh_label->num_labels,
|
|
||||||
nexthop->nh_label->label, buf,
|
nexthop->nh_label->label, buf,
|
||||||
sizeof(buf), 1));
|
sizeof(buf), 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nexthop->weight)
|
if ((re == NULL) && nexthop->weight)
|
||||||
vty_out(vty, ", weight %u", nexthop->weight);
|
vty_out(vty, ", weight %u", nexthop->weight);
|
||||||
|
|
||||||
vty_out(vty, "\n");
|
|
||||||
}
|
|
||||||
vty_out(vty, "\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
|
static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
|
||||||
@ -660,100 +800,38 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
|
|||||||
len - 3 + (2 * nexthop_level(nexthop)), ' ');
|
len - 3 + (2 * nexthop_level(nexthop)), ' ');
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (nexthop->type) {
|
show_route_nexthop_helper(vty, re, nexthop);
|
||||||
case NEXTHOP_TYPE_IPV4:
|
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
|
||||||
vty_out(vty, " via %s", inet_ntoa(nexthop->gate.ipv4));
|
|
||||||
if (nexthop->ifindex)
|
|
||||||
vty_out(vty, ", %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_IPV6:
|
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
|
||||||
vty_out(vty, " via %s",
|
|
||||||
inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
|
|
||||||
sizeof(buf)));
|
|
||||||
if (nexthop->ifindex)
|
|
||||||
vty_out(vty, ", %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NEXTHOP_TYPE_IFINDEX:
|
|
||||||
vty_out(vty, " is directly connected, %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_BLACKHOLE:
|
|
||||||
vty_out(vty, " unreachable");
|
|
||||||
switch (nexthop->bh_type) {
|
|
||||||
case BLACKHOLE_REJECT:
|
|
||||||
vty_out(vty, " (ICMP unreachable)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_ADMINPROHIB:
|
|
||||||
vty_out(vty, " (ICMP admin-prohibited)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_NULL:
|
|
||||||
vty_out(vty, " (blackhole)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_UNSPEC:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((nexthop->vrf_id != re->vrf_id)
|
|
||||||
&& (nexthop->type != NEXTHOP_TYPE_BLACKHOLE)) {
|
|
||||||
struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
|
|
||||||
|
|
||||||
if (vrf)
|
|
||||||
vty_out(vty, "(vrf %s)", vrf->name);
|
|
||||||
else
|
|
||||||
vty_out(vty, "(vrf UNKNOWN)");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
|
|
||||||
vty_out(vty, " inactive");
|
|
||||||
|
|
||||||
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK))
|
|
||||||
vty_out(vty, " onlink");
|
|
||||||
|
|
||||||
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
|
|
||||||
vty_out(vty, " (recursive)");
|
|
||||||
|
|
||||||
switch (nexthop->type) {
|
|
||||||
case NEXTHOP_TYPE_IPV4:
|
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
|
||||||
if (nexthop->src.ipv4.s_addr) {
|
|
||||||
if (inet_ntop(AF_INET, &nexthop->src.ipv4, buf,
|
|
||||||
sizeof(buf)))
|
|
||||||
vty_out(vty, ", src %s", buf);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_IPV6:
|
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
|
||||||
if (!IPV6_ADDR_SAME(&nexthop->src.ipv6, &in6addr_any)) {
|
|
||||||
if (inet_ntop(AF_INET6, &nexthop->src.ipv6, buf,
|
|
||||||
sizeof(buf)))
|
|
||||||
vty_out(vty, ", src %s", buf);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Label information */
|
|
||||||
if (nexthop->nh_label && nexthop->nh_label->num_labels) {
|
|
||||||
vty_out(vty, ", label %s",
|
|
||||||
mpls_label2str(nexthop->nh_label->num_labels,
|
|
||||||
nexthop->nh_label->label, buf,
|
|
||||||
sizeof(buf), 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
vty_out(vty, ", %s\n", up_str);
|
vty_out(vty, ", %s\n", up_str);
|
||||||
|
|
||||||
|
/* Check for backup info */
|
||||||
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP)) {
|
||||||
|
struct nexthop *backup;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if (re->nhe->backup_info == NULL ||
|
||||||
|
re->nhe->backup_info->nhe == NULL)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
for (ALL_NEXTHOPS(re->nhe->backup_info->nhe->nhg,
|
||||||
|
backup)) {
|
||||||
|
if (i == nexthop->backup_idx)
|
||||||
|
break;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Print useful backup info */
|
||||||
|
if (backup) {
|
||||||
|
/* TODO -- install state is not accurate */
|
||||||
|
vty_out(vty, " %*c [backup %d]",
|
||||||
|
/*re_status_output_char(re, backup),*/
|
||||||
|
len - 3 + (2 * nexthop_level(nexthop)),
|
||||||
|
' ', nexthop->backup_idx);
|
||||||
|
show_route_nexthop_helper(vty, re, backup);
|
||||||
|
vty_out(vty, "\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1024,110 +1102,6 @@ DEFUN (ip_nht_default_route,
|
|||||||
return CMD_SUCCESS;
|
return CMD_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Helper that prints out a nexthop in an nhe/nhg
|
|
||||||
*/
|
|
||||||
static void show_nhg_nh_helper(struct vty *vty, const struct nexthop *nexthop)
|
|
||||||
{
|
|
||||||
char buf[SRCDEST2STR_BUFFER];
|
|
||||||
|
|
||||||
switch (nexthop->type) {
|
|
||||||
case NEXTHOP_TYPE_IPV4:
|
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
|
||||||
vty_out(vty, " %s", inet_ntoa(nexthop->gate.ipv4));
|
|
||||||
if (nexthop->ifindex)
|
|
||||||
vty_out(vty, ", %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_IPV6:
|
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
|
||||||
vty_out(vty, " %s",
|
|
||||||
inet_ntop(AF_INET6, &nexthop->gate.ipv6, buf,
|
|
||||||
sizeof(buf)));
|
|
||||||
if (nexthop->ifindex)
|
|
||||||
vty_out(vty, ", %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NEXTHOP_TYPE_IFINDEX:
|
|
||||||
vty_out(vty, " directly connected %s",
|
|
||||||
ifindex2ifname(nexthop->ifindex,
|
|
||||||
nexthop->vrf_id));
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_BLACKHOLE:
|
|
||||||
vty_out(vty, " unreachable");
|
|
||||||
switch (nexthop->bh_type) {
|
|
||||||
case BLACKHOLE_REJECT:
|
|
||||||
vty_out(vty, " (ICMP unreachable)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_ADMINPROHIB:
|
|
||||||
vty_out(vty, " (ICMP admin-prohibited)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_NULL:
|
|
||||||
vty_out(vty, " (blackhole)");
|
|
||||||
break;
|
|
||||||
case BLACKHOLE_UNSPEC:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct vrf *vrf = vrf_lookup_by_id(nexthop->vrf_id);
|
|
||||||
|
|
||||||
if (vrf)
|
|
||||||
vty_out(vty, " (vrf %s)", vrf->name);
|
|
||||||
else
|
|
||||||
vty_out(vty, " (vrf UNKNOWN)");
|
|
||||||
|
|
||||||
if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
|
|
||||||
vty_out(vty, " inactive");
|
|
||||||
|
|
||||||
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ONLINK))
|
|
||||||
vty_out(vty, " onlink");
|
|
||||||
|
|
||||||
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
|
|
||||||
vty_out(vty, " (recursive)");
|
|
||||||
|
|
||||||
switch (nexthop->type) {
|
|
||||||
case NEXTHOP_TYPE_IPV4:
|
|
||||||
case NEXTHOP_TYPE_IPV4_IFINDEX:
|
|
||||||
if (nexthop->src.ipv4.s_addr) {
|
|
||||||
if (inet_ntop(AF_INET, &nexthop->src.ipv4, buf,
|
|
||||||
sizeof(buf)))
|
|
||||||
vty_out(vty, ", src %s", buf);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case NEXTHOP_TYPE_IPV6:
|
|
||||||
case NEXTHOP_TYPE_IPV6_IFINDEX:
|
|
||||||
if (!IPV6_ADDR_SAME(&nexthop->src.ipv6, &in6addr_any)) {
|
|
||||||
if (inet_ntop(AF_INET6, &nexthop->src.ipv6, buf,
|
|
||||||
sizeof(buf)))
|
|
||||||
vty_out(vty, ", src %s", buf);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Label information */
|
|
||||||
if (nexthop->nh_label && nexthop->nh_label->num_labels) {
|
|
||||||
vty_out(vty, ", label %s",
|
|
||||||
mpls_label2str(nexthop->nh_label->num_labels,
|
|
||||||
nexthop->nh_label->label, buf,
|
|
||||||
sizeof(buf), 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nexthop->weight)
|
|
||||||
vty_out(vty, ", weight %u", nexthop->weight);
|
|
||||||
|
|
||||||
vty_out(vty, "\n");
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe)
|
static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe)
|
||||||
{
|
{
|
||||||
struct nexthop *nexthop = NULL;
|
struct nexthop *nexthop = NULL;
|
||||||
@ -1173,7 +1147,39 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe)
|
|||||||
/* Make recursive nexthops a bit more clear */
|
/* Make recursive nexthops a bit more clear */
|
||||||
vty_out(vty, " ");
|
vty_out(vty, " ");
|
||||||
|
|
||||||
show_nhg_nh_helper(vty, nexthop);
|
show_route_nexthop_helper(vty, NULL, nexthop);
|
||||||
|
|
||||||
|
if (nhe->backup_info == NULL || nhe->backup_info->nhe == NULL) {
|
||||||
|
if (CHECK_FLAG(nexthop->flags,
|
||||||
|
NEXTHOP_FLAG_HAS_BACKUP))
|
||||||
|
vty_out(vty, " [backup %d]",
|
||||||
|
nexthop->backup_idx);
|
||||||
|
|
||||||
|
vty_out(vty, "\n");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* TODO -- print more useful backup info */
|
||||||
|
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_HAS_BACKUP)) {
|
||||||
|
struct nexthop *backup;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
for (ALL_NEXTHOPS(nhe->backup_info->nhe->nhg, backup)) {
|
||||||
|
if (i == nexthop->backup_idx)
|
||||||
|
break;
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* TODO */
|
||||||
|
if (backup)
|
||||||
|
vty_out(vty, " [backup %d]",
|
||||||
|
nexthop->backup_idx);
|
||||||
|
else
|
||||||
|
vty_out(vty, " [backup INVALID]");
|
||||||
|
}
|
||||||
|
|
||||||
|
vty_out(vty, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Output backup nexthops (if any) */
|
/* Output backup nexthops (if any) */
|
||||||
@ -1188,7 +1194,8 @@ static void show_nexthop_group_out(struct vty *vty, struct nhg_hash_entry *nhe)
|
|||||||
/* Make recursive nexthops a bit more clear */
|
/* Make recursive nexthops a bit more clear */
|
||||||
vty_out(vty, " ");
|
vty_out(vty, " ");
|
||||||
|
|
||||||
show_nhg_nh_helper(vty, nexthop);
|
show_route_nexthop_helper(vty, NULL, nexthop);
|
||||||
|
vty_out(vty, "\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user