Merge pull request #104 from opensourcerouting/time-cleanup

[mirror_frr.git] / bgpd / bgpd.c

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 3cd1ac65c024386acc03daefb3e1c27ab96cc639..3602a1e18f351bcd5117ce631cbcd73319c916cf 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -652,7 +652,7 @@ bgp_listen_limit_unset (struct bgp *bgp)
 }
 
 int
-bgp_map_afi_safi_iana2int (afi_t pkt_afi, safi_t pkt_safi,
+bgp_map_afi_safi_iana2int (iana_afi_t pkt_afi, safi_t pkt_safi,
                            afi_t *afi, safi_t *safi)
 {
   /* Map from IANA values to internal values, return error if
@@ -668,7 +668,7 @@ bgp_map_afi_safi_iana2int (afi_t pkt_afi, safi_t pkt_safi,
 
 int
 bgp_map_afi_safi_int2iana (afi_t afi, safi_t safi,
-                           afi_t *pkt_afi, safi_t *pkt_safi)
+                           iana_afi_t *pkt_afi, safi_t *pkt_safi)
 {
   /* Map from internal values to IANA values, return error if
    * internal values are bad (unexpected).
@@ -7182,9 +7182,9 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
       else if (safi == SAFI_MULTICAST)
        vty_out (vty, "ipv4 multicast");
       else if (safi == SAFI_MPLS_VPN)
-       vty_out (vty, "vpnv4");
+       vty_out (vty, "ipv4 vpn");
       else if (safi == SAFI_ENCAP)
-       vty_out (vty, "encap");
+       vty_out (vty, "ipv4 encap");
     }
   else if (afi == AFI_IP6)
     {
@@ -7193,9 +7193,9 @@ bgp_config_write_family_header (struct vty *vty, afi_t afi, safi_t safi,
       else if (safi == SAFI_MULTICAST)
         vty_out (vty, "ipv6 multicast");
       else if (safi == SAFI_MPLS_VPN)
-       vty_out (vty, "vpnv6");
+       vty_out (vty, "ipv6 vpn");
       else if (safi == SAFI_ENCAP)
-        vty_out (vty, "encapv6");
+        vty_out (vty, "ipv6 encap");
     }
 
   vty_out (vty, "%s", VTY_NEWLINE);