summaryrefslogtreecommitdiff
path: root/zebra
diff options
context:
space:
mode:
Diffstat (limited to 'zebra')
-rw-r--r--zebra/zebra_mpls.c2
-rw-r--r--zebra/zebra_vty.c2
-rw-r--r--zebra/zserv.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 93844ee2a6..510d796937 100644
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -1870,7 +1870,7 @@ zebra_mpls_lsp_uninstall (struct zebra_vrf *zvrf, struct route_node *rn, struct
* Registration from a client for the label binding for a FEC. If a binding
* already exists, it is informed to the client.
* NOTE: If there is a manually configured label binding, that is used.
- * Otherwise, if aa label index is specified, it means we have to allocate the
+ * Otherwise, if a label index is specified, it means we have to allocate the
* label from a locally configured label block (SRGB), if one exists and index
* is acceptable.
*/
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 06412e1b3f..6ba4c1b9d5 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1353,7 +1353,6 @@ DEFUN (no_ipv6_nht_default_route,
return CMD_SUCCESS;
}
-// dwalton one "show ip route" to rule them all
DEFUN (show_ip_route,
show_ip_route_cmd,
"show ip <fib|route> [vrf NAME] [tag (1-4294967295)|A.B.C.D/M longer-prefixes|supernets-only|" FRR_IP_REDIST_STR_ZEBRA "|ospf (1-65535)] [json]",
@@ -2546,7 +2545,6 @@ DEFUN (no_ipv6_route_ifname_flags,
tag, distance, vrf, NULL);
}
-// dwalton duplicate to here
DEFUN (show_ipv6_route,
show_ipv6_route_cmd,
"show ipv6 <fib|route> [vrf NAME] [tag (1-4294967295)|X:X::X:X/M longer-prefixes|" FRR_IP6_REDIST_STR_ZEBRA "] [json]",
diff --git a/zebra/zserv.c b/zebra/zserv.c
index 72f7382882..3da94459f7 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -989,6 +989,8 @@ zserv_fec_register (struct zserv *client, int sock, u_short length)
label_index = stream_getl(s);
l += 4;
}
+ else
+ label_index = MPLS_INVALID_LABEL_INDEX;
zebra_mpls_fec_register (zvrf, &p, label_index, client);
}