Merge commit 'ef6a903e6f44b467f9606018446095521ad01ef1' into haugesund

14 files changed, 29 insertions, 348 deletions

diff --git a/nest/a-path.c b/nest/a-path.c
index badbc911..64504c93 100644
--- a/nest/a-path.c
+++ b/nest/a-path.c
@@ -8,7 +8,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 #include "lib/unaligned.h"
diff --git a/nest/a-path_test.c b/nest/a-path_test.c
index e007a450..a6b4d3d8 100644
--- a/nest/a-path_test.c
+++ b/nest/a-path_test.c
@@ -9,7 +9,7 @@
 #include "test/birdtest.h"
 #include "test/bt-utils.h"
 
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 
diff --git a/nest/a-set.c b/nest/a-set.c
index 71fbac94..93f6431e 100644
--- a/nest/a-set.c
+++ b/nest/a-set.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 #include "lib/string.h"
diff --git a/nest/a-set_test.c b/nest/a-set_test.c
index 904e6764..daa6ab74 100644
--- a/nest/a-set_test.c
+++ b/nest/a-set_test.c
@@ -10,7 +10,7 @@
 #include "test/bt-utils.h"
 
 #include "lib/net.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/attrs.h"
 #include "lib/resource.h"
 
diff --git a/nest/attrs.h b/nest/attrs.h
index ef2b95e6..e0595846 100644
--- a/nest/attrs.h
+++ b/nest/attrs.h
@@ -11,7 +11,7 @@
 
 #include <stdint.h>
 #include "lib/unaligned.h"
-#include "nest/route.h"
+#include "lib/route.h"
 
 
 /* a-path.c */
diff --git a/nest/cmds.c b/nest/cmds.c
index 8481bf96..3e59cb6f 100644
--- a/nest/cmds.c
+++ b/nest/cmds.c
@@ -8,7 +8,7 @@
 
 #include "nest/bird.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/cli.h"
 #include "conf/conf.h"
 #include "nest/cmds.h"
diff --git a/nest/proto.c b/nest/proto.c
index 6bc9c1c3..21f76f6d 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -16,7 +16,7 @@
 #include "lib/timer.h"
 #include "lib/string.h"
 #include "conf/conf.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
 #include "filter/filter.h"
diff --git a/nest/protocol.h b/nest/protocol.h
index d813c91e..b6aa6469 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -12,7 +12,7 @@
 #include "lib/lists.h"
 #include "lib/resource.h"
 #include "lib/event.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/limit.h"
 #include "conf/conf.h"
 
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index de45dfa1..8f4319c5 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -45,7 +45,7 @@
  */
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "nest/cli.h"
@@ -529,25 +529,6 @@ ea_walk(struct ea_walk_state *s, uint id, uint max)
   return NULL;
 }
 
-/**
- * ea_get_int - fetch an integer attribute
- * @e: attribute list
- * @id: attribute ID
- * @def: default value
- *
- * This function is a shortcut for retrieving a value of an integer attribute
- * by calling ea_find() to find the attribute, extracting its value or returning
- * a provided default if no such attribute is present.
- */
-u32
-ea_get_int(ea_list *e, unsigned id, u32 def)
-{
-  eattr *a = ea_find(e, id);
-  if (!a)
-    return def;
-  return a->u.data;
-}
-
 static inline void
 ea_do_sort(ea_list *e)
 {
diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index 129c724f..d0782f2b 100644
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -18,7 +18,7 @@
 #include "nest/bird.h"
 #include "nest/iface.h"
 #include "nest/protocol.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/rt-dev.h"
 #include "conf/conf.h"
 #include "lib/resource.h"
diff --git a/nest/rt-fib.c b/nest/rt-fib.c
index 43e3039d..801561da 100644
--- a/nest/rt-fib.c
+++ b/nest/rt-fib.c
@@ -55,7 +55,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "lib/string.h"
 
 /*
diff --git a/nest/rt-show.c b/nest/rt-show.c
index aadb679e..e8ea7551 100644
--- a/nest/rt-show.c
+++ b/nest/rt-show.c
@@ -10,7 +10,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/cli.h"
 #include "nest/iface.h"
diff --git a/nest/rt-table.c b/nest/rt-table.c
index fd6e1309..0873cf42 100644
--- a/nest/rt-table.c
+++ b/nest/rt-table.c
@@ -91,7 +91,7 @@
 #undef LOCAL_DEBUG
 
 #include "nest/bird.h"
-#include "nest/route.h"
+#include "nest/rt.h"
 #include "nest/protocol.h"
 #include "nest/iface.h"
 #include "lib/resource.h"
@@ -429,7 +429,7 @@ net_roa_check_ip4_trie(rtable *tab, const net_addr_ip4 *px, u32 asn)
       net_addr_roa4 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa4(roa, &roa0) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa4(roa, &roa0) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -456,7 +456,7 @@ net_roa_check_ip4_fib(rtable *tab, const net_addr_ip4 *px, u32 asn)
       net_addr_roa4 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa4(roa, &n) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa4(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -489,7 +489,7 @@ net_roa_check_ip6_trie(rtable *tab, const net_addr_ip6 *px, u32 asn)
       net_addr_roa6 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa6(roa, &roa0) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa6(roa, &roa0) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -516,7 +516,7 @@ net_roa_check_ip6_fib(rtable *tab, const net_addr_ip6 *px, u32 asn)
       net_addr_roa6 *roa = (void *) fn->addr;
       net *r = fib_node_to_user(&tab->fib, fn);
 
-      if (net_equal_prefix_roa6(roa, &n) && rte_is_valid(r->routes))
+      if (net_equal_prefix_roa6(roa, &n) && r->routes && rte_is_valid(&r->routes->rte))
       {
 	anything = 1;
 	if (asn && (roa->asn == asn) && (roa->max_pxlen >= px->pxlen))
@@ -1143,16 +1143,16 @@ static void
 rte_announce(rtable *tab, net *net, struct rte_storage *new, struct rte_storage *old,
 	     struct rte_storage *new_best, struct rte_storage *old_best)
 {
-  if (!rte_is_valid(new))
+  if (!rte_is_valid(RTE_OR_NULL(new)))
     new = NULL;
 
-  if (!rte_is_valid(old))
+  if (!rte_is_valid(RTE_OR_NULL(old)))
     old = NULL;
 
-  if (!rte_is_valid(new_best))
+  if (!rte_is_valid(RTE_OR_NULL(new_best)))
     new_best = NULL;
 
-  if (!rte_is_valid(old_best))
+  if (!rte_is_valid(RTE_OR_NULL(old_best)))
     old_best = NULL;
 
   if (!new && !old && !new_best && !old_best)
@@ -1643,7 +1643,7 @@ rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filte
 {
   net *n = net_find(t, a);
 
-  if (!n || !rte_is_valid(n->routes))
+  if (!n || !rte_is_valid(RTE_OR_NULL(n->routes)))
     return 0;
 
   rte rt = n->routes->rte;
diff --git a/nest/route.h b/nest/rt.h
index 33936635..f7a351b2 100644
--- a/nest/route.h
+++ b/nest/rt.h
@@ -7,8 +7,8 @@
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
 
-#ifndef _BIRD_ROUTE_H_
-#define _BIRD_ROUTE_H_
+#ifndef _BIRD_NEST_RT_H_
+#define _BIRD_NEST_RT_H_
 
 #include "lib/lists.h"
 #include "lib/bitmap.h"
@@ -16,6 +16,7 @@
 #include "lib/net.h"
 #include "lib/type.h"
 #include "lib/fib.h"
+#include "lib/route.h"
 
 struct ea_list;
 struct protocol;
@@ -152,42 +153,13 @@ struct hostentry {
   u32 igp_metric;			/* Chosen route IGP metric */
 };
 
-typedef struct rte {
-  struct rta *attrs;			/* Attributes of this route */
-  const net_addr *net;			/* Network this RTE belongs to */
-  struct rte_src *src;			/* Route source that created the route */
-  struct rt_import_hook *sender;	/* Import hook used to send the route to the routing table */
-  btime lastmod;			/* Last modified (set by table) */
-  u32 id;				/* Table specific route id */
-  byte flags;				/* Table-specific flags */
-  byte pflags;				/* Protocol-specific flags */
-  u8 generation;			/* If this route import is based on other previously exported route,
-					   this value should be 1 + MAX(generation of the parent routes).
-					   Otherwise the route is independent and this value is zero. */
-} rte;
-
 struct rte_storage {
   struct rte_storage *next;		/* Next in chain */
   struct rte rte;			/* Route data */
 };
 
-#define RTE_COPY(r, l)	((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
-#define RTE_OR_NULL(r)	((r) ? &((r)->rte) : NULL)
-
-#define REF_FILTERED	2		/* Route is rejected by import filter */
-#define REF_STALE	4		/* Route is stale in a refresh cycle */
-#define REF_DISCARD	8		/* Route is scheduled for discard */
-#define REF_MODIFY	16		/* Route is scheduled for modify */
-
-/* Route is valid for propagation (may depend on other flags in the future), accepts NULL */
-static inline int rte_is_valid_rte(const rte *r) { return r && !(r->flags & REF_FILTERED); }
-static inline int rte_is_valid_storage(const struct rte_storage *r) { return r && rte_is_valid_rte(&r->rte); }
-
-#define rte_is_valid(r)		_Generic((*r), rte: rte_is_valid_rte, struct rte_storage: rte_is_valid_storage)(r)
-
-/* Route just has REF_FILTERED flag */
-static inline int rte_is_filtered(const rte *r) { return !!(r->flags & REF_FILTERED); }
-
+#define RTE_COPY(r, l) ((r) ? (((*(l)) = (r)->rte), (l)) : NULL)
+#define RTE_OR_NULL(r) ((r) ? &((r)->rte) : NULL)
 
 /* Table-channel connections */
 
@@ -375,7 +347,6 @@ static inline net *net_find_valid(rtable *tab, const net_addr *addr)
 static inline net *net_get(rtable *tab, const net_addr *addr) { return (net *) fib_get(&tab->fib, addr); }
 net *net_get(rtable *tab, const net_addr *addr);
 net *net_route(rtable *tab, const net_addr *n);
-int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
 int rt_examine(rtable *t, net_addr *a, struct channel *c, const struct filter *filter);
 rte *rt_export_merged(struct channel *c, rte ** feed, uint count, linpool *pool, int silent);
 void rt_refresh_begin(rtable *t, struct rt_import_request *);
@@ -467,279 +438,6 @@ struct rt_show_data_rtable * rt_show_add_table(struct rt_show_data *d, rtable *t
 #define RSEM_NOEXPORT	3		/* Routes rejected by export filter */
 #define RSEM_EXPORTED	4		/* Routes marked in export map */
 
-/*
- *	Route Attributes
- *
- *	Beware: All standard BGP attributes must be represented here instead
- *	of making them local to the route. This is needed to ensure proper
- *	construction of BGP route attribute lists.
- */
-
-/* Nexthop structure */
-struct nexthop {
-  ip_addr gw;				/* Next hop */
-  struct iface *iface;			/* Outgoing interface */
-  struct nexthop *next;
-  byte flags;
-  byte weight;
-  byte labels_orig;			/* Number of labels before hostentry was applied */
-  byte labels;				/* Number of all labels */
-  u32 label[0];
-};
-
-#define RNF_ONLINK		0x1	/* Gateway is onlink regardless of IP ranges */
-
-
-struct rte_src {
-  struct rte_src *next;			/* Hash chain */
-  struct proto *proto;			/* Protocol the source is based on */
-  u32 private_id;			/* Private ID, assigned by the protocol */
-  u32 global_id;			/* Globally unique ID of the source */
-  unsigned uc;				/* Use count */
-};
-
-
-typedef struct rta {
-  struct rta *next, **pprev;		/* Hash chain */
-  u32 uc;				/* Use count */
-  u32 hash_key;				/* Hash over important fields */
-  struct ea_list *eattrs;		/* Extended Attribute chain */
-  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */
-  ip_addr from;				/* Advertising router */
-  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */
-  u16 cached:1;				/* Are attributes cached? */
-  u16 source:7;				/* Route source (RTS_...) */
-  u16 scope:4;				/* Route scope (SCOPE_... -- see ip.h) */
-  u16 dest:4;				/* Route destination type (RTD_...) */
-  word pref;
-  struct nexthop nh;			/* Next hop */
-} rta;
-
-#define RTS_STATIC 1			/* Normal static route */
-#define RTS_INHERIT 2			/* Route inherited from kernel */
-#define RTS_DEVICE 3			/* Device route */
-#define RTS_STATIC_DEVICE 4		/* Static device route */
-#define RTS_REDIRECT 5			/* Learned via redirect */
-#define RTS_RIP 6			/* RIP route */
-#define RTS_OSPF 7			/* OSPF route */
-#define RTS_OSPF_IA 8			/* OSPF inter-area route */
-#define RTS_OSPF_EXT1 9			/* OSPF external route type 1 */
-#define RTS_OSPF_EXT2 10		/* OSPF external route type 2 */
-#define RTS_BGP 11			/* BGP route */
-#define RTS_PIPE 12			/* Inter-table wormhole */
-#define RTS_BABEL 13			/* Babel route */
-#define RTS_RPKI 14			/* Route Origin Authorization */
-#define RTS_PERF 15			/* Perf checker */
-#define RTS_MAX 16
-
-#define RTD_NONE 0			/* Undefined next hop */
-#define RTD_UNICAST 1			/* Next hop is neighbor router */
-#define RTD_BLACKHOLE 2			/* Silently drop packets */
-#define RTD_UNREACHABLE 3		/* Reject as unreachable */
-#define RTD_PROHIBIT 4			/* Administratively prohibited */
-#define RTD_MAX 5
-
-#define IGP_METRIC_UNKNOWN 0x80000000	/* Default igp_metric used when no other
-					   protocol-specific metric is availabe */
-
-
-extern const char * rta_dest_names[RTD_MAX];
-
-static inline const char *rta_dest_name(uint n)
-{ return (n < RTD_MAX) ? rta_dest_names[n] : "???"; }
-
-/* Route has regular, reachable nexthop (i.e. not RTD_UNREACHABLE and like) */
-static inline int rte_is_reachable(rte *r)
-{ return r->attrs->dest == RTD_UNICAST; }
-
-
-/*
- *	Extended Route Attributes
- */
-
-typedef struct eattr {
-  word id;				/* EA_CODE(PROTOCOL_..., protocol-dependent ID) */
-  byte flags;				/* Protocol-dependent flags */
-  byte type:5;				/* Attribute type */
-  byte originated:1;			/* The attribute has originated locally */
-  byte fresh:1;				/* An uncached attribute (e.g. modified in export filter) */
-  byte undef:1;				/* Explicitly undefined */
-
-  union bval u;
-} eattr;
-
-
-#define EA_CODE(proto,id) (((proto) << 8) | (id))
-#define EA_ID(ea) ((ea) & 0xff)
-#define EA_PROTO(ea) ((ea) >> 8)
-#define EA_CUSTOM(id) ((id) | EA_CUSTOM_BIT)
-#define EA_IS_CUSTOM(ea) ((ea) & EA_CUSTOM_BIT)
-#define EA_CUSTOM_ID(ea) ((ea) & ~EA_CUSTOM_BIT)
-
-const char *ea_custom_name(uint ea);
-
-#define EA_GEN_IGP_METRIC EA_CODE(PROTOCOL_NONE, 0)
-
-#define EA_CODE_MASK 0xffff
-#define EA_CUSTOM_BIT 0x8000
-#define EA_ALLOW_UNDEF 0x10000		/* ea_find: allow EAF_TYPE_UNDEF */
-#define EA_BIT(n) ((n) << 24)		/* Used in bitfield accessors */
-#define EA_BIT_GET(ea) ((ea) >> 24)
-
-typedef struct adata {
-  uint length;				/* Length of data */
-  byte data[0];
-} adata;
-
-extern const adata null_adata;		/* adata of length 0 */
-
-static inline struct adata *
-lp_alloc_adata(struct linpool *pool, uint len)
-{
-  struct adata *ad = lp_alloc(pool, sizeof(struct adata) + len);
-  ad->length = len;
-  return ad;
-}
-
-static inline int adata_same(const struct adata *a, const struct adata *b)
-{ return (a->length == b->length && !memcmp(a->data, b->data, a->length)); }
-
-
-typedef struct ea_list {
-  struct ea_list *next;			/* In case we have an override list */
-  byte flags;				/* Flags: EALF_... */
-  byte rfu;
-  word count;				/* Number of attributes */
-  eattr attrs[0];			/* Attribute definitions themselves */
-} ea_list;
-
-#define EALF_SORTED 1			/* Attributes are sorted by code */
-#define EALF_BISECT 2			/* Use interval bisection for searching */
-#define EALF_CACHED 4			/* Attributes belonging to cached rta */
-
-struct rte_src *rt_find_source(struct proto *p, u32 id);
-struct rte_src *rt_get_source(struct proto *p, u32 id);
-static inline void rt_lock_source(struct rte_src *src) { src->uc++; }
-static inline void rt_unlock_source(struct rte_src *src) { src->uc--; }
-void rt_prune_sources(void);
-
-struct ea_walk_state {
-  ea_list *eattrs;			/* Ccurrent ea_list, initially set by caller */
-  eattr *ea;				/* Current eattr, initially NULL */
-  u32 visited[4];			/* Bitfield, limiting max to 128 */
-};
-
-eattr *ea_find(ea_list *, unsigned ea);
-eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
-u32 ea_get_int(ea_list *, unsigned ea, u32 def);
-void ea_dump(ea_list *);
-void ea_sort(ea_list *);		/* Sort entries in all sub-lists */
-unsigned ea_scan(ea_list *);		/* How many bytes do we need for merged ea_list */
-void ea_merge(ea_list *from, ea_list *to); /* Merge sub-lists to allocated buffer */
-int ea_same(ea_list *x, ea_list *y);	/* Test whether two ea_lists are identical */
-uint ea_hash(ea_list *e);	/* Calculate 16-bit hash value */
-ea_list *ea_append(ea_list *to, ea_list *what);
-void ea_format_bitfield(const struct eattr *a, byte *buf, int bufsize, const char **names, int min, int max);
-
-#define ea_normalize(ea) do { \
-  if (ea->next) { \
-    ea_list *t = alloca(ea_scan(ea)); \
-    ea_merge(ea, t); \
-    ea = t; \
-  } \
-  ea_sort(ea); \
-  if (ea->count == 0) \
-    ea = NULL; \
-} while(0) \
-
-struct ea_one_attr_list {
-  ea_list l;
-  eattr a;
-};
-
-static inline eattr *
-ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, union bval val)
-{
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
-    .l.flags = EALF_SORTED,
-    .l.count = 1,
-    .l.next = *to,
-
-    .a.id = id,
-    .a.type = type,
-    .a.flags = flags,
-  };
-
-  ea->a.u = val;
-  *to = &ea->l;
-
-  return &ea->a;
-}
-
-static inline void
-ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
-{
-  struct ea_one_attr_list *ea = lp_alloc(pool, sizeof(*ea));
-  *ea = (struct ea_one_attr_list) {
-    .l.flags = EALF_SORTED,
-    .l.count = 1,
-    .l.next = *to,
-    .a.id = code,
-    .a.fresh = local,
-    .a.originated = local,
-    .a.undef = 1,
-  };
-
-  *to = &ea->l;
-}
-
-static inline void
-ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 data)
-{
-  union bval bv = { .data = data };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
-
-static inline void
-ea_set_attr_data(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, void *data, uint len)
-{
-  struct adata *a = lp_alloc_adata(pool, len);
-  memcpy(a->data, data, len);
-  union bval bv = { .ptr = a, };
-  ea_set_attr(to, pool, id, flags, type, bv);
-}
-
-
-#define NEXTHOP_MAX_SIZE (sizeof(struct nexthop) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
-
-static inline size_t nexthop_size(const struct nexthop *nh)
-{ return sizeof(struct nexthop) + sizeof(u32)*nh->labels; }
-int nexthop__same(struct nexthop *x, struct nexthop *y); /* Compare multipath nexthops */
-static inline int nexthop_same(struct nexthop *x, struct nexthop *y)
-{ return (x == y) || nexthop__same(x, y); }
-struct nexthop *nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, linpool *lp);
-struct nexthop *nexthop_sort(struct nexthop *x);
-static inline void nexthop_link(struct rta *a, struct nexthop *from)
-{ memcpy(&a->nh, from, nexthop_size(from)); }
-void nexthop_insert(struct nexthop **n, struct nexthop *y);
-int nexthop_is_sorted(struct nexthop *x);
-
-void rta_init(void);
-static inline size_t rta_size(const rta *a) { return sizeof(rta) + sizeof(u32)*a->nh.labels; }
-#define RTA_MAX_SIZE (sizeof(rta) + sizeof(u32)*MPLS_MAX_LABEL_STACK)
-rta *rta_lookup(rta *);			/* Get rta equivalent to this one, uc++ */
-static inline int rta_is_cached(rta *r) { return r->cached; }
-static inline rta *rta_clone(rta *r) { r->uc++; return r; }
-void rta__free(rta *r);
-static inline void rta_free(rta *r) { if (r && !--r->uc) rta__free(r); }
-rta *rta_do_cow(rta *o, linpool *lp);
-static inline rta * rta_cow(rta *r, linpool *lp) { return rta_is_cached(r) ? rta_do_cow(r, lp) : r; }
-void rta_dump(rta *);
-void rta_dump_all(void);
-void rta_show(struct cli *, rta *);
-
-u32 rt_get_igp_metric(rte *);
 struct hostentry * rt_get_hostentry(rtable *tab, ip_addr a, ip_addr ll, rtable *dep);
 void rta_apply_hostentry(rta *a, struct hostentry *he, mpls_label_stack *mls);
 
@@ -798,4 +496,6 @@ int rt_flowspec_check(rtable *tab_ip, rtable *tab_flow, const net_addr *n, rta *
 #define ROA_VALID	1
 #define ROA_INVALID	2
 
+int net_roa_check(rtable *tab, const net_addr *n, u32 asn);
+
 #endif