Nest: Improve keeping track of IPv6 link-local addresses

[thirdparty/bird.git] / nest / iface.h

diff --git a/nest/iface.h b/nest/iface.h
index 6b47a620a17570c71dc4593ec960964d3da005c4..cf81660bf697e255f838425cc945b3fd77e198b6 100644 (file)
--- a/nest/iface.h
+++ b/nest/iface.h
@@ -34,8 +34,13 @@ struct iface {
   unsigned flags;
   unsigned mtu;
   unsigned index;                      /* OS-dependent interface index */
+  unsigned master_index;               /* Interface index of master iface */
   list addrs;                          /* Addresses assigned to this interface */
   struct ifa *addr;                    /* Primary address */
+#ifdef IPV6
+  struct ifa *llv6;                    /* Selected IPv6 link-local address */
+#endif
+  struct iface *master;                        /* Master iface (e.g. for VRF) */
   list neighbors;                      /* All neighbors on this interface */
 };
 
@@ -51,9 +56,23 @@ struct iface {
 
 #define IA_PRIMARY 0x10000             /* This address is primary */
 #define IA_SECONDARY 0x20000           /* This address has been reported as secondary by the kernel */
-#define IA_UNNUMBERED 0x40000          /* This address belongs to an unnumbered device */
+#define IA_PEER 0x40000                        /* A peer/ptp address */
+#define IA_HOST 0x80000                        /* A host/loopback address */
 #define IA_FLAGS 0xff0000
 
+/*
+ * There are three kinds of addresses in BIRD:
+ *  - Standard (prefix-based) addresses, these may define ifa.opposite (for /30 or /31).
+ *  - Peer/ptp addresses, without common prefix for ifa.ip and ifa.opposite.
+ *    ifa.opposite is defined and ifa.prefix/pxlen == ifa.opposite/32 (for simplicity).
+ *  - Host addresses, with ifa.prefix/pxlen == ifa.ip/32 (or /128).
+ *    May be considered a special case of standard addresses.
+ *
+ * Peer addresses (AFAIK) do not exist in IPv6. Linux also supports generalized peer
+ * addresses (with pxlen < 32 and ifa.ip outside prefix), we do not support that.
+ */
+
+
 #define IF_JUST_CREATED 0x10000000     /* Send creation event as soon as possible */
 #define IF_TMP_DOWN 0x20000000         /* Temporary shutdown due to interface reconfiguration */
 #define IF_UPDATED 0x40000000          /* Touched in last scan */
@@ -74,6 +93,7 @@ void ifa_dump(struct ifa *);
 void if_show(void);
 void if_show_summary(void);
 struct iface *if_update(struct iface *);
+void if_delete(struct iface *old);
 struct ifa *ifa_update(struct ifa *);
 void ifa_delete(struct ifa *);
 void if_start_update(void);
@@ -83,33 +103,39 @@ void if_flush_ifaces(struct proto *p);
 void if_feed_baby(struct proto *);
 struct iface *if_find_by_index(unsigned);
 struct iface *if_find_by_name(char *);
+struct iface *if_get_by_name(char *);
 void ifa_recalc_all_primary_addresses(void);
 
-static inline int
-ifa_match_addr(struct ifa *ifa, ip_addr addr)
+static inline struct ifa *
+ifa_llv6(struct iface *i UNUSED4)
 {
-  if (ifa->flags & IA_UNNUMBERED)
-    return ipa_equal(addr, ifa->opposite);
-  else
-    return ipa_in_net(addr, ifa->prefix, ifa->pxlen);
+#ifdef IPV6
+  return i->llv6;
+#else
+  return NULL;
+#endif
 }
 
+
 /* The Neighbor Cache */
 
 typedef struct neighbor {
   node n;                              /* Node in global neighbor list */
   node if_n;                           /* Node in per-interface neighbor list */
   ip_addr addr;                                /* Address of the neighbor */
+  struct ifa *ifa;                     /* Ifa on related iface */
   struct iface *iface;                 /* Interface it's connected to */
   struct proto *proto;                 /* Protocol this belongs to */
   void *data;                          /* Protocol-specific data */
   unsigned aux;                                /* Protocol-specific data */
   unsigned flags;
-  unsigned scope;                      /* Address scope, SCOPE_HOST when it's our own address */
+  int scope;                           /* Address scope, -1 for unreachable sticky neighbors,
+                                          SCOPE_HOST when it's our own address */
 } neighbor;
 
 #define NEF_STICKY 1
 #define NEF_ONLINK 2
+#define NEF_BIND 4                     /* Used internally for neighbors bound to an iface */
 
 neighbor *neigh_find(struct proto *, ip_addr *, unsigned flags);
 neighbor *neigh_find2(struct proto *p, ip_addr *a, struct iface *ifa, unsigned flags);
@@ -126,6 +152,7 @@ void neigh_prune(void);
 void neigh_if_up(struct iface *);
 void neigh_if_down(struct iface *);
 void neigh_if_link(struct iface *);
+void neigh_ifa_update(struct ifa *);
 void neigh_init(struct pool *);
 
 /*
@@ -151,4 +178,7 @@ int iface_patt_match(struct iface_patt *ifp, struct iface *i, struct ifa *a);
 struct iface_patt *iface_patt_find(list *l, struct iface *i, struct ifa *a);
 int iface_patts_equal(list *, list *, int (*)(struct iface_patt *, struct iface_patt *));
 
+
+u32 if_choose_router_id(struct iface_patt *mask, u32 old_id);
+
 #endif