summaryrefslogtreecommitdiffstats
path: root/bgpd/bgpd.c
diff options
context:
space:
mode:
Diffstat (limited to 'bgpd/bgpd.c')
-rw-r--r--bgpd/bgpd.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 3caeeff9..249d20f3 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -5308,12 +5308,16 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
if (safi == SAFI_MULTICAST)
vty_out (vty, "ipv4 multicast");
else if (safi == SAFI_MPLS_VPN)
- vty_out (vty, "vpnv4 unicast");
+ vty_out (vty, "vpnv4");
+ else if (safi == SAFI_ENCAP)
+ vty_out (vty, "encap");
}
else if (afi == AFI_IP6)
{
if (safi == SAFI_MPLS_VPN)
vty_out (vty, "vpnv6");
+ else if (safi == SAFI_ENCAP)
+ vty_out (vty, "encapv6");
else
{
vty_out (vty, "ipv6");
@@ -5555,6 +5559,9 @@ bgp_config_write (struct vty *vty)
/* IPv4 VPN configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP, SAFI_MPLS_VPN);
+ /* ENCAPv4 configuration. */
+ write += bgp_config_write_family (vty, bgp, AFI_IP, SAFI_ENCAP);
+
/* IPv6 unicast configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_UNICAST);
@@ -5564,6 +5571,11 @@ bgp_config_write (struct vty *vty)
/* IPv6 VPN configuration. */
write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_MPLS_VPN);
+ /* ENCAPv6 configuration. */
+ write += bgp_config_write_family (vty, bgp, AFI_IP6, SAFI_ENCAP);
+
+ vty_out (vty, " exit%s", VTY_NEWLINE);
+
write++;
}
return write;