Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/.gitignore
	lib/command.c
	lib/command.h

1 files changed, 31 insertions, 105 deletions

diff --git a/zebra/rib.h b/zebra/rib.h
index 5e0bce4461..500d96cbe4 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -64,6 +64,10 @@ struct rib
   /* Metric */
   u_int32_t metric;
 
+  /* MTU */
+  u_int32_t mtu;
+  u_int32_t nexthop_mtu;
+
   /* Distance. */
   u_char distance;
 
@@ -81,6 +85,7 @@ struct rib
 #define RIB_ENTRY_REMOVED	   0x1
   /* to simplify NHT logic when NHs change, instead of doing a NH by NH cmp */
 #define RIB_ENTRY_NEXTHOPS_CHANGED 0x2
+#define RIB_ENTRY_CHANGED          0x4
 
   /* Nexthop information. */
   u_char nexthop_num;
@@ -170,52 +175,6 @@ typedef struct rib_dest_t_
 #define RNODE_FOREACH_RIB_SAFE(rn, rib, next)				\
   RIB_DEST_FOREACH_ROUTE_SAFE (rib_dest_from_rnode (rn), rib, next)
 
-/* Static route information. */
-struct static_route
-{
-  /* For linked list. */
-  struct static_route *prev;
-  struct static_route *next;
-
-  /* VRF identifier. */
-  vrf_id_t vrf_id;
-
-  /* Administrative distance. */
-  u_char distance;
-
-  /* Tag */
-  u_short tag;
-
-  /* Flag for this static route's type. */
-  u_char type;
-#define STATIC_IFINDEX               1
-#define STATIC_IPV4_GATEWAY          2
-#define STATIC_IPV4_BLACKHOLE        3
-#define STATIC_IPV6_GATEWAY          4
-#define STATIC_IPV6_GATEWAY_IFINDEX  5
-
-  /*
-   * Nexthop value.
-   *
-   * Under IPv4 addr and ifindex are
-   * used independentyly.
-   * STATIC_IPV4_GATEWAY uses addr
-   * STATIC_IFINDEX uses ifindex
-   */
-  union g_addr addr;
-  unsigned int ifindex;
-
-  char ifname[INTERFACE_NAMSIZ + 1];
-
-  /* bit flags */
-  u_char flags;
-/*
- see ZEBRA_FLAG_REJECT
-     ZEBRA_FLAG_BLACKHOLE
- */
-};
-
-
 /* The following for loop allows to iterate over the nexthop
  * structure of routes.
  *
@@ -321,14 +280,14 @@ typedef enum
   RIB_UPDATE_OTHER
 } rib_update_event_t;
 
-extern struct nexthop *rib_nexthop_ifindex_add (struct rib *, unsigned int);
+extern struct nexthop *rib_nexthop_ifindex_add (struct rib *, ifindex_t);
 extern struct nexthop *rib_nexthop_blackhole_add (struct rib *);
 extern struct nexthop *rib_nexthop_ipv4_add (struct rib *, struct in_addr *,
 					     struct in_addr *);
 extern struct nexthop *rib_nexthop_ipv4_ifindex_add (struct rib *,
 						     struct in_addr *,
 						     struct in_addr *,
-						     unsigned int);
+						     ifindex_t);
 extern void rib_nexthop_add (struct rib *rib, struct nexthop *nexthop);
 extern void rib_copy_nexthops (struct rib *rib, struct nexthop *nh);
 
@@ -361,31 +320,40 @@ extern int rib_lookup_ipv4_route (struct prefix_ipv4 *, union sockunion *,
 #define ZEBRA_RIB_FOUND_CONNECTED 2
 #define ZEBRA_RIB_NOTFOUND 3
 
+extern void rib_nexthop_delete (struct rib *rib, struct nexthop *nexthop);
 extern struct nexthop *rib_nexthop_ipv6_add (struct rib *, struct in6_addr *);
 extern struct nexthop *rib_nexthop_ipv6_ifindex_add (struct rib *rib,
 						     struct in6_addr *ipv6,
-						     unsigned int ifindex);
+						     ifindex_t ifindex);
 
 extern int is_zebra_valid_kernel_table(u_int32_t table_id);
 extern int is_zebra_main_routing_table(u_int32_t table_id);
 extern int zebra_check_addr (struct prefix *p);
 
+extern void rib_addnode (struct route_node *rn, struct rib *rib, int process);
+extern void rib_delnode (struct route_node *rn, struct rib *rib);
+extern int rib_install_kernel (struct route_node *rn, struct rib *rib, int update);
+extern int rib_uninstall_kernel (struct route_node *rn, struct rib *rib);
+
 /* NOTE:
- * All rib_add_ipv[46]* functions will not just add prefix into RIB, but
+ * All rib_add function will not just add prefix into RIB, but
  * also implicitly withdraw equal prefix of same type. */
-extern int rib_add_ipv4 (int type, u_short instance, int flags, struct prefix_ipv4 *p,
-			 struct in_addr *gate, struct in_addr *src,
-			 unsigned int ifindex, vrf_id_t vrf_id, u_int32_t table_id,
-			 u_int32_t, u_char, safi_t);
-
-extern int rib_add_ipv4_multipath (struct prefix_ipv4 *, struct rib *, safi_t);
-
-extern int rib_delete_ipv4 (int type, u_short instance, int flags, struct prefix_ipv4 *p,
-		            struct in_addr *gate, unsigned int ifindex, 
-		            vrf_id_t, u_int32_t, safi_t safi);
-
-extern struct rib *rib_match_ipv4 (struct in_addr, safi_t safi, vrf_id_t,
-				   struct route_node **rn_out);
+extern int rib_add (afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
+		    u_short instance, int flags, struct prefix *p,
+		    union g_addr *gate, union g_addr *src,
+		    ifindex_t ifindex, u_int32_t table_id,
+		    u_int32_t, u_int32_t, u_char);
+
+extern int rib_add_multipath (afi_t afi, safi_t safi, struct prefix *,
+			      struct rib *);
+
+extern int rib_delete (afi_t afi, safi_t safi, vrf_id_t vrf_id, int type,
+		       u_short instance, int flags, struct prefix *p,
+		       union g_addr *gate, ifindex_t ifindex,
+		       u_int32_t table_id);
+
+extern struct rib *rib_match (afi_t afi, safi_t safi, vrf_id_t, union g_addr *,
+			      struct route_node **rn_out);
 extern struct rib *rib_match_ipv4_multicast (struct in_addr addr,
 					     struct route_node **rn_out);
 
@@ -400,50 +368,8 @@ extern void rib_init (void);
 extern unsigned long rib_score_proto (u_char proto, u_short instance);
 extern void rib_queue_add (struct route_node *rn);
 
-extern void
-static_install_route (afi_t afi, safi_t safi, struct prefix *p, struct static_route *si);
-extern void
-static_uninstall_route (afi_t afi, safi_t safi, struct prefix *p, struct static_route *si);
-
-extern int
-static_add_ipv4 (safi_t safi, struct prefix *p, struct in_addr *gate, unsigned int ifindex,
-                 const char *ifname, u_char flags, u_short tag,
-		 u_char distance, struct zebra_vrf *zvrf);
-
-extern int
-static_delete_ipv4 (safi_t safi, struct prefix *p, struct in_addr *gate, unsigned int ifindex,
-		    u_short tag, u_char distance, struct zebra_vrf *zvrf);
-
-extern int
-rib_add_ipv6 (int type, u_short instance, int flags, struct prefix_ipv6 *p,
-	      struct in6_addr *gate, unsigned int ifindex, vrf_id_t vrf_id,
-              u_int32_t table_id, u_int32_t metric, u_char distance, safi_t safi);
-
-extern int
-rib_delete_ipv6 (int type, u_short instance, int flags, struct prefix_ipv6 *p,
-		 struct in6_addr *gate, unsigned int ifindex, vrf_id_t vrf_id,
-                 u_int32_t table_id, safi_t safi);
-
-extern struct rib *rib_lookup_ipv6 (struct in6_addr *, vrf_id_t);
-
-extern struct rib *rib_match_ipv6 (struct in6_addr *, vrf_id_t);
-
 extern struct route_table *rib_table_ipv6;
 
-extern int
-static_add_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
-		 unsigned int ifindex, const char *ifname, u_char flags,
-		 u_short tag, u_char distance, struct zebra_vrf *zvrf);
-
-extern int
-rib_add_ipv6_multipath (struct prefix *, struct rib *, safi_t,
-                        unsigned long);
-
-extern int
-static_delete_ipv6 (struct prefix *p, u_char type, struct in6_addr *gate,
-		    unsigned int ifindex, u_short tag, u_char distance,
-                    struct zebra_vrf *zvrf);
-
 extern int rib_gc_dest (struct route_node *rn);
 extern struct route_table *rib_tables_iter_next (rib_tables_iter_t *iter);