summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/config.Y25
-rw-r--r--filter/data.c20
-rw-r--r--filter/data.h84
-rw-r--r--filter/decl.m44
-rw-r--r--filter/f-inst.c128
-rw-r--r--filter/f-inst.h12
-rw-r--r--filter/f-util.c27
-rw-r--r--filter/filter.h2
-rw-r--r--filter/test.conf6
-rw-r--r--lib/type.h87
-rw-r--r--nest/config.Y2
-rw-r--r--nest/route.h47
-rw-r--r--nest/rt-attr.c23
-rw-r--r--proto/babel/babel.c6
-rw-r--r--proto/babel/config.Y2
-rw-r--r--proto/bgp/attrs.c40
-rw-r--r--proto/bgp/bgp.h16
-rw-r--r--proto/bgp/config.Y26
-rw-r--r--proto/ospf/config.Y8
-rw-r--r--proto/ospf/rt.c8
-rw-r--r--proto/radv/config.Y4
-rw-r--r--proto/rip/config.Y4
-rw-r--r--proto/rip/rip.c6
-rw-r--r--sysdep/bsd/krt-sock.c2
-rw-r--r--sysdep/linux/netlink.Y32
-rw-r--r--sysdep/linux/netlink.c12
-rw-r--r--sysdep/linux/netlink.c.orig2179
-rw-r--r--sysdep/unix/krt.Y4
28 files changed, 299 insertions, 2517 deletions
diff --git a/filter/config.Y b/filter/config.Y
index fb331c16..22981945 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -163,26 +163,11 @@ f_new_lc_item(u32 f1, u32 t1, u32 f2, u32 t2, u32 f3, u32 t3)
static inline struct f_inst *
f_generate_empty(struct f_dynamic_attr dyn)
{
- struct f_val empty;
+ const struct f_val *empty = f_get_empty(dyn.type);
+ if (!empty)
+ cf_error("Can't empty that attribute");
- switch (dyn.type) {
- case EAF_TYPE_AS_PATH:
- empty = f_const_empty_path;
- break;
- case EAF_TYPE_INT_SET:
- empty = f_const_empty_clist;
- break;
- case EAF_TYPE_EC_SET:
- empty = f_const_empty_eclist;
- break;
- case EAF_TYPE_LC_SET:
- empty = f_const_empty_lclist;
- break;
- default:
- cf_error("Can't empty that attribute");
- }
-
- return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, empty), dyn);
+ return f_new_inst(FI_EA_SET, f_new_inst(FI_CONSTANT, *empty), dyn);
}
#define BA_AS_PATH 0x02
@@ -190,7 +175,7 @@ f_generate_empty(struct f_dynamic_attr dyn)
static inline struct f_inst *
f_implicit_roa_check(struct rtable_config *tab)
{
- struct f_dynamic_attr fda = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
+ struct f_dynamic_attr fda = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH));
struct f_static_attr fsa = f_new_static_attr(T_NET, SA_NET, 1);
diff --git a/filter/data.c b/filter/data.c
index 56c1fb17..c3f8bf57 100644
--- a/filter/data.c
+++ b/filter/data.c
@@ -27,6 +27,8 @@
static const char * const f_type_str[] = {
[T_VOID] = "void",
+ [T_OPAQUE] = "opaque byte string",
+ [T_IFACE] = "interface",
[T_INT] = "int",
[T_BOOL] = "bool",
@@ -47,6 +49,7 @@ static const char * const f_type_str[] = {
[T_NET] = "prefix",
[T_STRING] = "string",
[T_PATH_MASK] = "bgpmask",
+ [T_PATH_MASK_ITEM] = "bgpmask item",
[T_PATH] = "bgppath",
[T_CLIST] = "clist",
[T_EC] = "ec",
@@ -54,22 +57,19 @@ static const char * const f_type_str[] = {
[T_LC] = "lc",
[T_LCLIST] = "lclist",
[T_RD] = "rd",
+
+ [T_SET] = "set",
+ [T_PREFIX_SET] = "prefix set",
};
const char *
-f_type_name(enum f_type t)
+f_type_name(btype t)
{
- if (t < ARRAY_SIZE(f_type_str))
- return f_type_str[t] ?: "?";
-
- if ((t == T_SET) || (t == T_PREFIX_SET))
- return "set";
-
- return "?";
+ return (t < ARRAY_SIZE(f_type_str)) ? (f_type_str[t] ?: "?") : "?";
}
-enum f_type
-f_type_element_type(enum f_type t)
+btype
+f_type_element_type(btype t)
{
switch(t) {
case T_CLIST: return T_PAIR;
diff --git a/filter/data.h b/filter/data.h
index 924bbf3e..0b1e8e57 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -11,65 +11,15 @@
#define _BIRD_FILTER_DATA_H_
#include "nest/bird.h"
-
-/* Type numbers must be in 0..0xff range */
-#define T_MASK 0xff
-
-/* Internal types */
-enum f_type {
-/* Nothing. Simply nothing. */
- T_VOID = 0,
-
-/* Something but inaccessible. */
- T_OPAQUE = 0xee,
-
-/* User visible types, which fit in int */
- T_INT = 0x10,
- T_BOOL = 0x11,
- T_PAIR = 0x12, /* Notice that pair is stored as integer: first << 16 | second */
- T_QUAD = 0x13,
-
-/* Put enumerational types in 0x30..0x3f range */
- T_ENUM_LO = 0x30,
- T_ENUM_HI = 0x3f,
-
- T_ENUM_RTS = 0x30,
- T_ENUM_BGP_ORIGIN = 0x31,
- T_ENUM_SCOPE = 0x32,
- T_ENUM_RTC = 0x33,
- T_ENUM_RTD = 0x34,
- T_ENUM_ROA = 0x35,
- T_ENUM_NETTYPE = 0x36,
- T_ENUM_RA_PREFERENCE = 0x37,
- T_ENUM_AF = 0x38,
-
-/* new enums go here */
-
-#define T_ENUM T_ENUM_LO ... T_ENUM_HI
-
-/* Bigger ones */
- T_IP = 0x20,
- T_NET = 0x21,
- T_STRING = 0x22,
- T_PATH_MASK = 0x23, /* mask for BGP path */
- T_PATH = 0x24, /* BGP path */
- T_CLIST = 0x25, /* Community list */
- T_EC = 0x26, /* Extended community value, u64 */
- T_ECLIST = 0x27, /* Extended community list */
- T_LC = 0x28, /* Large community value, lcomm */
- T_LCLIST = 0x29, /* Large community list */
- T_RD = 0x2a, /* Route distinguisher for VPN addresses */
- T_PATH_MASK_ITEM = 0x2b, /* Path mask item for path mask constructors */
-
- T_SET = 0x80,
- T_PREFIX_SET = 0x81,
-} PACKED;
+#include "lib/type.h"
/* Filter value; size of this affects filter memory consumption */
struct f_val {
- enum f_type type; /* T_* */
+ btype type; /* T_* */
union {
- uint i;
+ union bval bval;
+ BVAL_ITEMS;
+
u64 ec;
lcomm lc;
ip_addr ip;
@@ -77,17 +27,17 @@ struct f_val {
const char *s;
const struct f_tree *t;
const struct f_trie *ti;
- const struct adata *ad;
const struct f_path_mask *path_mask;
struct f_path_mask_item pmi;
} val;
};
+#define fputip(a) ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
+
/* Dynamic attribute definition (eattrs) */
struct f_dynamic_attr {
- u8 type; /* EA type (EAF_*) */
+ btype type; /* EA type (EAF_*) */
u8 bit; /* For bitfield accessors */
- enum f_type f_type; /* Filter type */
uint ea_code; /* EA code */
};
@@ -108,9 +58,9 @@ enum f_sa_code {
/* Static attribute definition (members of struct rta) */
struct f_static_attr {
- enum f_type f_type; /* Filter type */
+ btype type; /* Data type */
enum f_sa_code sa_code; /* Static attribute id */
- int readonly:1; /* Don't allow writing */
+ int readonly:1; /* Don't allow writing */
};
/* Filter l-value type */
@@ -266,9 +216,9 @@ trie_match_next_longest_ip6(net_addr_ip6 *n, ip6_addr *found)
#define F_CMP_ERROR 999
-const char *f_type_name(enum f_type t);
+const char *f_type_name(btype t);
-enum f_type f_type_element_type(enum f_type t);
+enum btype f_type_element_type(btype t);
int val_same(const struct f_val *v1, const struct f_val *v2);
int val_compare(const struct f_val *v1, const struct f_val *v2);
@@ -301,6 +251,16 @@ undef_value(struct f_val v)
}
extern const struct f_val f_const_empty_path, f_const_empty_clist, f_const_empty_eclist, f_const_empty_lclist;
+static inline const struct f_val *f_get_empty(btype t)
+{
+ switch (t) {
+ case T_PATH: return &f_const_empty_path;
+ case T_CLIST: return &f_const_empty_clist;
+ case T_ECLIST: return &f_const_empty_eclist;
+ case T_LCLIST: return &f_const_empty_lclist;
+ default: return NULL;
+ }
+}
enum filter_return f_eval(const struct f_line *expr, struct linpool *tmp_pool, struct f_val *pres);
diff --git a/filter/decl.m4 b/filter/decl.m4
index 44537aaa..2e4fb235 100644
--- a/filter/decl.m4
+++ b/filter/decl.m4
@@ -490,7 +490,7 @@ fi_constant(struct f_inst *what, struct f_val val)
}
static int
-f_const_promotion(struct f_inst *arg, enum f_type want)
+f_const_promotion(struct f_inst *arg, btype want)
{
if (arg->fi_code != FI_CONSTANT)
return 0;
@@ -640,7 +640,7 @@ FID_WR_PUT(4)m4_dnl
struct f_inst {
struct f_inst *next; /* Next instruction */
enum f_instruction_code fi_code; /* Instruction code */
- enum f_type type; /* Type of returned value, if known */
+ btype type; /* Type of returned value, if known */
int size; /* How many instructions are underneath */
int lineno; /* Line number */
union {
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 75a53499..e0bad833 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -533,21 +533,21 @@
switch (sa.sa_code)
{
- case SA_FROM: RESULT(sa.f_type, ip, rta->from); break;
- case SA_GW: RESULT(sa.f_type, ip, rta->nh.gw); break;
- case SA_NET: RESULT(sa.f_type, net, (*fs->rte)->net->n.addr); break;
- case SA_PROTO: RESULT(sa.f_type, s, (*fs->rte)->src->proto->name); break;
- case SA_SOURCE: RESULT(sa.f_type, i, rta->source); break;
- case SA_SCOPE: RESULT(sa.f_type, i, rta->scope); break;
- case SA_DEST: RESULT(sa.f_type, i, rta->dest); break;
- case SA_IFNAME: RESULT(sa.f_type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
- case SA_IFINDEX: RESULT(sa.f_type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
- case SA_WEIGHT: RESULT(sa.f_type, i, rta->nh.weight + 1); break;
- case SA_PREF: RESULT(sa.f_type, i, rta->pref); break;
- case SA_GW_MPLS: RESULT(sa.f_type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
+ case SA_FROM: RESULT(sa.type, ip, rta->from); break;
+ case SA_GW: RESULT(sa.type, ip, rta->nh.gw); break;
+ case SA_NET: RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
+ case SA_PROTO: RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
+ case SA_SOURCE: RESULT(sa.type, i, rta->source); break;
+ case SA_SCOPE: RESULT(sa.type, i, rta->scope); break;
+ case SA_DEST: RESULT(sa.type, i, rta->dest); break;
+ case SA_IFNAME: RESULT(sa.type, s, rta->nh.iface ? rta->nh.iface->name : ""); break;
+ case SA_IFINDEX: RESULT(sa.type, i, rta->nh.iface ? rta->nh.iface->index : 0); break;
+ case SA_WEIGHT: RESULT(sa.type, i, rta->nh.weight + 1); break;
+ case SA_PREF: RESULT(sa.type, i, rta->pref); break;
+ case SA_GW_MPLS: RESULT(sa.type, i, rta->nh.labels ? rta->nh.label[0] : MPLS_NULL); break;
default:
- bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+ bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
}
}
}
@@ -556,7 +556,7 @@
ACCESS_RTE;
ARG_ANY(1);
STATIC_ATTR;
- ARG_TYPE(1, sa.f_type);
+ ARG_TYPE(1, sa.type);
f_rta_cow(fs);
{
@@ -653,7 +653,7 @@
break;
default:
- bug("Invalid static attribute access (%u/%u)", sa.f_type, sa.sa_code);
+ bug("Invalid static attribute access (%u/%u)", sa.type, sa.sa_code);
}
}
}
@@ -662,68 +662,30 @@
DYNAMIC_ATTR;
ACCESS_RTE;
ACCESS_EATTRS;
- RESULT_TYPE(da.f_type);
+ RESULT_TYPE(da.type);
{
+ const struct f_val *empty;
eattr *e = ea_find(*fs->eattrs, da.ea_code);
- if (!e) {
- /* A special case: undefined as_path looks like empty as_path */
- if (da.type == EAF_TYPE_AS_PATH) {
- RESULT_(T_PATH, ad, &null_adata);
- break;
- }
-
- /* The same special case for int_set */
- if (da.type == EAF_TYPE_INT_SET) {
- RESULT_(T_CLIST, ad, &null_adata);
- break;
- }
-
- /* The same special case for ec_set */
- if (da.type == EAF_TYPE_EC_SET) {
- RESULT_(T_ECLIST, ad, &null_adata);
- break;
- }
+ if (e)
+ {
+ ASSERT_DIE(e->type == da.type);
- /* The same special case for lc_set */
- if (da.type == EAF_TYPE_LC_SET) {
- RESULT_(T_LCLIST, ad, &null_adata);
- break;
+ switch (e->type) {
+ case T_IP:
+ RESULT_(T_IP, ip, *((const ip_addr *) e->u.ptr->data));
+ break;
+ default:
+ RESULT_VAL([[(struct f_val) {
+ .type = e->type,
+ .val.bval = e->u,
+ }]]);
}
-
- /* Undefined value */
- RESULT_VOID;
- break;
- }
-
- switch (e->type) {
- case EAF_TYPE_INT:
- RESULT_(da.f_type, i, e->u.data);
- break;
- case EAF_TYPE_ROUTER_ID:
- RESULT_(T_QUAD, i, e->u.data);
- break;
- case EAF_TYPE_OPAQUE:
- RESULT_(T_OPAQUE, ad, e->u.ptr);
- break;
- case EAF_TYPE_IP_ADDRESS:
- RESULT_(T_IP, ip, *((ip_addr *) e->u.ptr->data));
- break;
- case EAF_TYPE_AS_PATH:
- RESULT_(T_PATH, ad, e->u.ptr);
- break;
- case EAF_TYPE_INT_SET:
- RESULT_(T_CLIST, ad, e->u.ptr);
- break;
- case EAF_TYPE_EC_SET:
- RESULT_(T_ECLIST, ad, e->u.ptr);
- break;
- case EAF_TYPE_LC_SET:
- RESULT_(T_LCLIST, ad, e->u.ptr);
- break;
- default:
- bug("Unknown dynamic attribute type");
}
+ else if (empty = f_get_empty(da.type))
+ RESULT_VAL(*empty);
+ else
+ RESULT_VOID;
}
}
@@ -732,7 +694,7 @@
ACCESS_EATTRS;
ARG_ANY(1);
DYNAMIC_ATTR;
- ARG_TYPE(1, da.f_type);
+ ARG_TYPE(1, da.type);
{
struct ea_list *l = lp_alloc(fs->pool, sizeof(struct ea_list) + sizeof(eattr));
@@ -746,17 +708,16 @@
l->attrs[0].fresh = 1;
l->attrs[0].undef = 0;
- switch (da.type) {
- case EAF_TYPE_INT:
- case EAF_TYPE_ROUTER_ID:
- l->attrs[0].u.data = v1.val.i;
- break;
+ if (da.type >= EAF_TYPE__MAX)
+ bug("Unsupported attribute type");
- case EAF_TYPE_OPAQUE:
+ switch (da.type) {
+ case T_OPAQUE:
+ case T_IFACE:
runtime( "Setting opaque attribute is not allowed" );
break;
- case EAF_TYPE_IP_ADDRESS:;
+ case T_IP:;
int len = sizeof(ip_addr);
struct adata *ad = lp_alloc(fs->pool, sizeof(struct adata) + len);
ad->length = len;
@@ -764,15 +725,10 @@
l->attrs[0].u.ptr = ad;
break;
- case EAF_TYPE_AS_PATH:
- case EAF_TYPE_INT_SET:
- case EAF_TYPE_EC_SET:
- case EAF_TYPE_LC_SET:
- l->attrs[0].u.ptr = v1.val.ad;
+ default:
+ l->attrs[0].u = v1.val.bval;
break;
- default:
- bug("Unknown dynamic attribute type");
}
f_rta_cow(fs);
diff --git a/filter/f-inst.h b/filter/f-inst.h
index 9265ecec..32da4653 100644
--- a/filter/f-inst.h
+++ b/filter/f-inst.h
@@ -87,12 +87,12 @@ void f_add_lines(const struct f_line_item *what, struct filter_iterator *fit);
struct filter *f_new_where(struct f_inst *);
-static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, enum f_type f_type, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
-{ return (struct f_dynamic_attr) { .type = type, .f_type = f_type, .ea_code = code }; } /* f_type currently unused; will be handy for static type checking */
-static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code) /* Type as core knows it, type as filters know it, and code of dynamic attribute */
-{ return (struct f_dynamic_attr) { .type = EAF_TYPE_INT, .bit = bit, .f_type = T_INT, .ea_code = code }; } /* f_type currently unused; will be handy for static type checking */
-static inline struct f_static_attr f_new_static_attr(int f_type, int code, int readonly)
-{ return (struct f_static_attr) { .f_type = f_type, .sa_code = code, .readonly = readonly }; }
+static inline struct f_dynamic_attr f_new_dynamic_attr(u8 type, uint code)
+{ return (struct f_dynamic_attr) { .type = type, .ea_code = code }; }
+static inline struct f_dynamic_attr f_new_dynamic_attr_bit(u8 bit, uint code)
+{ return (struct f_dynamic_attr) { .type = T_INT, .bit = bit, .ea_code = code }; }
+static inline struct f_static_attr f_new_static_attr(btype type, int code, int readonly)
+{ return (struct f_static_attr) { .type = type, .sa_code = code, .readonly = readonly }; }
struct f_inst *f_generate_complex(enum f_instruction_code fi_code, struct f_dynamic_attr da, struct f_inst *argument);
struct f_inst *f_generate_roa_check(struct rtable_config *table, struct f_inst *prefix, struct f_inst *asn);
diff --git a/filter/f-util.c b/filter/f-util.c
index 410999a6..79cf3452 100644
--- a/filter/f-util.c
+++ b/filter/f-util.c
@@ -82,8 +82,8 @@ static void
ca_dump(resource *r)
{
struct custom_attribute *ca = (void *) r;
- debug("name \"%s\" id 0x%04x ea_type 0x%02x f_type 0x%02x\n",
- ca->name, ca->fda->ea_code, ca->fda->type, ca->fda->f_type);
+ debug("name \"%s\" id 0x%04x ea_type 0x%02x\n",
+ ca->name, ca->fda->ea_code, ca->fda->type);
}
static struct resclass ca_class = {
@@ -96,31 +96,16 @@ static struct resclass ca_class = {
};
struct custom_attribute *
-ca_lookup(pool *p, const char *name, int f_type)
+ca_lookup(pool *p, const char *name, btype type)
{
- int ea_type;
-
- switch (f_type) {
+ switch (type) {
case T_INT:
- ea_type = EAF_TYPE_INT;
- break;
case T_IP:
- ea_type = EAF_TYPE_IP_ADDRESS;
- break;
case T_QUAD:
- ea_type = EAF_TYPE_ROUTER_ID;
- break;
case T_PATH:
- ea_type = EAF_TYPE_AS_PATH;
- break;
case T_CLIST:
- ea_type = EAF_TYPE_INT_SET;
- break;
case T_ECLIST:
- ea_type = EAF_TYPE_EC_SET;
- break;
case T_LCLIST:
- ea_type = EAF_TYPE_LC_SET;
break;
default:
cf_error("Custom route attribute of unsupported type");
@@ -137,7 +122,7 @@ ca_lookup(pool *p, const char *name, int f_type)
inited++;
}
- struct ca_storage *cas = HASH_FIND(ca_hash, CA, name, ea_type);
+ struct ca_storage *cas = HASH_FIND(ca_hash, CA, name, type);
if (cas) {
cas->uc++;
} else {
@@ -153,7 +138,7 @@ ca_lookup(pool *p, const char *name, int f_type)
}
cas = mb_allocz(&root_pool, sizeof(struct ca_storage) + strlen(name) + 1);
- cas->fda = f_new_dynamic_attr(ea_type, f_type, EA_CUSTOM(id));
+ cas->fda = f_new_dynamic_attr(type, EA_CUSTOM(id));
cas->uc = 1;
strcpy(cas->name, name);
diff --git a/filter/filter.h b/filter/filter.h
index 26c1037b..e9c9d917 100644
--- a/filter/filter.h
+++ b/filter/filter.h
@@ -77,6 +77,6 @@ struct custom_attribute {
const char *name;
};
-struct custom_attribute *ca_lookup(pool *p, const char *name, int ea_type);
+struct custom_attribute *ca_lookup(pool *p, const char *name, btype type);
#endif
diff --git a/filter/test.conf b/filter/test.conf
index ee2f5be4..062756b1 100644
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -406,9 +406,9 @@ bt_test_suite(t_ip_set, "Testing sets of ip address");
function t_enum()
{
- bt_assert(format(RTS_STATIC) = "(enum 30)1");
- bt_assert(format(NET_IP4) = "(enum 36)1");
- bt_assert(format(NET_VPN6) = "(enum 36)4");
+ bt_assert(format(RTS_STATIC) = "(enum 31)1");
+ bt_assert(format(NET_IP4) = "(enum 3b)1");
+ bt_assert(format(NET_VPN6) = "(enum 3b)4");
bt_assert(RTS_STATIC ~ [RTS_STATIC, RTS_DEVICE]);
bt_assert(RTS_BGP !~ [RTS_STATIC, RTS_DEVICE]);
diff --git a/lib/type.h b/lib/type.h
new file mode 100644
index 00000000..d0a887d8
--- /dev/null
+++ b/lib/type.h
@@ -0,0 +1,87 @@
+/*
+ * BIRD Internet Routing Daemon -- Internal Data Types
+ *
+ * (c) 2022 Maria Matejka <mq@jmq.cz>
+ *
+ * Can be freely distributed and used under the terms of the GNU GPL.
+ */
+
+#ifndef _BIRD_TYPE_H_
+#define _BIRD_TYPE_H_
+
+#include "lib/birdlib.h"
+
+union bval {
+#define BVAL_ITEMS \
+ u32 data; /* Integer type inherited from eattrs */ \
+ u32 i; /* Integer type inherited from filters */ \
+ const struct adata *ptr; /* Generic attribute data inherited from eattrs */ \
+ const struct adata *ad; /* Generic attribute data inherited from filters */ \
+
+ BVAL_ITEMS
+};
+
+/* Internal types */
+enum btype {
+/* Nothing. Simply nothing. */
+ T_VOID = 0,
+
+/* Something but inaccessible. */
+ T_OPAQUE = 0x02, /* Opaque byte string (not filterable) */
+ T_IFACE = 0x0c, /* Pointer to an interface (inside adata) */
+
+/* Types shared with eattrs */
+ T_INT = 0x01, /* 32-bit unsigned integer number */
+ T_IP = 0x04, /* IP address */
+ T_QUAD = 0x05, /* Router ID (IPv4 address) */
+ T_PATH = 0x06, /* BGP AS path (encoding per RFC 1771:4.3) */
+ T_CLIST = 0x0a, /* Set of u32's (e.g., a community list) */
+ T_ECLIST = 0x0e, /* Set of pairs of u32's - ext. community list */
+ T_LCLIST = 0x08, /* Set of triplets of u32's - large community list */
+
+ T_ENUM_BGP_ORIGIN = 0x11, /* BGP Origin enum */
+ T_ENUM_RA_PREFERENCE = 0x13, /* RA Preference enum */
+
+#define EAF_TYPE__MAX 0x1f
+#define EAF_EMBEDDED 0x01 /* Data stored in eattr.u.data (part of type spec) */
+ /* Otherwise, attribute data is adata */
+
+/* Other user visible types which fit in int */
+ T_BOOL = 0xa0,
+ T_PAIR = 0xa4, /* Notice that pair is stored as integer: first << 16 | second */
+
+/* Put enumerational types in 0x20..0x3f range */
+ T_ENUM_LO = 0x10,
+ T_ENUM_HI = 0x3f,
+
+ T_ENUM_RTS = 0x31,
+ T_ENUM_SCOPE = 0x33,
+ T_ENUM_RTC = 0x35,
+ T_ENUM_RTD = 0x37,
+ T_ENUM_ROA = 0x39,
+ T_ENUM_NETTYPE = 0x3b,
+ T_ENUM_AF = 0x3d,
+
+/* new enums go here */
+
+#define T_ENUM T_ENUM_LO ... T_ENUM_HI
+
+/* Bigger ones */
+ T_NET = 0xb0,
+ T_STRING = 0xb4,
+ T_PATH_MASK = 0xb8, /* mask for BGP path */
+ T_EC = 0xbc, /* Extended community value, u64 */
+ T_LC = 0xc0, /* Large community value, lcomm */
+ T_RD = 0xc4, /* Route distinguisher for VPN addresses */
+ T_PATH_MASK_ITEM = 0xc8, /* Path mask item for path mask constructors */
+
+ T_SET = 0x80,
+ T_PREFIX_SET = 0x84,
+} PACKED;
+
+typedef enum btype btype;
+
+STATIC_ASSERT(sizeof(btype) == sizeof(byte));
+
+
+#endif
diff --git a/nest/config.Y b/nest/config.Y
index 92a80589..b597b332 100644
--- a/nest/config.Y
+++ b/nest/config.Y
@@ -921,7 +921,7 @@ proto_patt2:
| TEXT { $$.ptr = $1; $$.patt = 1; }
;
-dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_GEN_IGP_METRIC); } ;
+dynamic_attr: IGP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_GEN_IGP_METRIC); } ;
CF_CODE
diff --git a/nest/route.h b/nest/route.h
index d2f60f41..da8c723f 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -13,6 +13,7 @@
#include "lib/bitmap.h"
#include "lib/resource.h"
#include "lib/net.h"
+#include "lib/type.h"
struct ea_list;
struct protocol;
@@ -506,10 +507,8 @@ typedef struct eattr {
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 {
- uintptr_t data;
- const struct adata *ptr; /* Attribute data elsewhere */
- } u;
+
+ union bval u;
} eattr;
@@ -530,22 +529,6 @@ const char *ea_custom_name(uint ea);
#define EA_BIT(n) ((n) << 24) /* Used in bitfield accessors */
#define EA_BIT_GET(ea) ((ea) >> 24)
-#define EAF_TYPE_MASK 0x1f /* Mask with this to get type */
-#define EAF_TYPE_INT 0x01 /* 32-bit unsigned integer number */
-#define EAF_TYPE_OPAQUE 0x02 /* Opaque byte string (not filterable) */
-#define EAF_TYPE_IP_ADDRESS 0x04 /* IP address */
-#define EAF_TYPE_ROUTER_ID 0x05 /* Router ID (IPv4 address) */
-#define EAF_TYPE_AS_PATH 0x06 /* BGP AS path (encoding per RFC 1771:4.3) */
-#define EAF_TYPE_INT_SET 0x0a /* Set of u32's (e.g., a community list) */
-#define EAF_TYPE_EC_SET 0x0e /* Set of pairs of u32's - ext. community list */
-#define EAF_TYPE_LC_SET 0x08 /* Set of triplets of u32's - large community list */
-#define EAF_TYPE_IFACE 0x0c /* Interface pointer stored in adata */
-#define EAF_TYPE_BGP_ORIGIN 0x11 /* BGP Origin enum */
-#define EAF_TYPE_RA_PREFERENCE 0x13 /* RA Preference enum */
-
-#define EAF_EMBEDDED 0x01 /* Data stored in eattr.u.data (part of type spec) */
- /* Otherwise, attribute data is adata */
-
typedef struct adata {
uint length; /* Length of data */
byte data[0];
@@ -591,7 +574,7 @@ struct ea_walk_state {
eattr *ea_find(ea_list *, unsigned ea);
eattr *ea_walk(struct ea_walk_state *s, uint id, uint max);
-uintptr_t ea_get_int(ea_list *, unsigned ea, uintptr_t def);
+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 */
@@ -618,7 +601,7 @@ struct ea_one_attr_list {
};
static inline eattr *
-ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, uintptr_t val)
+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) {
@@ -631,11 +614,7 @@ ea_set_attr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type,
.a.flags = flags,
};
- if (type & EAF_EMBEDDED)
- ea->a.u.data = val;
- else
- ea->a.u.ptr = (struct adata *) val;
-
+ ea->a.u = val;
*to = &ea->l;
return &ea->a;
@@ -659,19 +638,19 @@ ea_unset_attr(ea_list **to, struct linpool *pool, _Bool local, uint code)
}
static inline void
-ea_set_attr_u32(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, u32 val)
-{ ea_set_attr(to, pool, id, flags, type, (uintptr_t) val); }
-
-static inline void
-ea_set_attr_ptr(ea_list **to, struct linpool *pool, uint id, uint flags, uint type, struct adata *val)
-{ ea_set_attr(to, pool, id, flags, type, (uintptr_t) val); }
+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);
- ea_set_attr(to, pool, id, flags, type, (uintptr_t) a);
+ union bval bv = { .ptr = a, };
+ ea_set_attr(to, pool, id, flags, type, bv);
}
diff --git a/nest/rt-attr.c b/nest/rt-attr.c
index 25548dca..de45dfa1 100644
--- a/nest/rt-attr.c
+++ b/nest/rt-attr.c
@@ -539,8 +539,8 @@ ea_walk(struct ea_walk_state *s, uint id, uint max)
* by calling ea_find() to find the attribute, extracting its value or returning
* a provided default if no such attribute is present.
*/
-uintptr_t
-ea_get_int(ea_list *e, unsigned id, uintptr_t def)
+u32
+ea_get_int(ea_list *e, unsigned id, u32 def)
{
eattr *a = ea_find(e, id);
if (!a)
@@ -950,30 +950,33 @@ ea_show(struct cli *c, const eattr *e)
else
switch (e->type)
{
- case EAF_TYPE_INT:
+ case T_INT:
bsprintf(pos, "%u", e->u.data);
break;
- case EAF_TYPE_OPAQUE:
+ case T_OPAQUE:
opaque_format(ad, pos, end - pos);
break;
- case EAF_TYPE_IP_ADDRESS:
+ case T_IP:
bsprintf(pos, "%I", *(ip_addr *) ad->data);
break;
- case EAF_TYPE_ROUTER_ID:
+ case T_QUAD:
bsprintf(pos, "%R", e->u.data);
break;
- case EAF_TYPE_AS_PATH:
+ case T_PATH:
as_path_format(ad, pos, end - pos);
break;
- case EAF_TYPE_INT_SET:
+ case T_CLIST:
ea_show_int_set(c, ad, 1, pos, buf, end);
return;
- case EAF_TYPE_EC_SET:
+ case T_ECLIST:
ea_show_ec_set(c, ad, pos, buf, end);
return;
- case EAF_TYPE_LC_SET:
+ case T_LCLIST:
ea_show_lc_set(c, ad, pos, buf, end);
return;
+ case T_IFACE:
+ bsprintf(pos, "%s", ((struct iface *) e->u.ptr)->name);
+ return;
default:
bsprintf(pos, "<type %02x>", e->type);
}
diff --git a/proto/babel/babel.c b/proto/babel/babel.c
index 8040345f..a6cc7aa3 100644
--- a/proto/babel/babel.c
+++ b/proto/babel/babel.c
@@ -654,7 +654,7 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
*a0.eattrs = (ea_list) { .count = 3 };
a0.eattrs->attrs[0] = (eattr) {
.id = EA_BABEL_METRIC,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = r->metric,
};
@@ -663,13 +663,13 @@ babel_announce_rte(struct babel_proto *p, struct babel_entry *e)
memcpy(ad->data, &(r->router_id), sizeof(u64));
a0.eattrs->attrs[1] = (eattr) {
.id = EA_BABEL_ROUTER_ID,
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.u.ptr = ad,
};
a0.eattrs->attrs[2] = (eattr) {
.id = EA_BABEL_SEQNO,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = r->seqno,
};
diff --git a/proto/babel/config.Y b/proto/babel/config.Y
index 05210fa4..fa745993 100644
--- a/proto/babel/config.Y
+++ b/proto/babel/config.Y
@@ -163,7 +163,7 @@ babel_iface_opt_list:
babel_iface:
babel_iface_start iface_patt_list_nopx babel_iface_opt_list babel_iface_finish;
-dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_BABEL_METRIC); } ;
+dynamic_attr: BABEL_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_BABEL_METRIC); } ;
CF_CLI_HELP(SHOW BABEL, ..., [[Show information about Babel protocol]]);
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index b514f1b9..1bae942d 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -80,7 +80,7 @@ static const struct bgp_attr_desc bgp_attr_table[];
static inline int bgp_attr_known(uint code);
eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, uintptr_t val)
+bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val)
{
ASSERT(bgp_attr_known(code));
@@ -976,7 +976,7 @@ static inline void
bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data, uint len, ea_list **to)
{
/* Cannot use bgp_set_attr_data() as it works on known attributes only */
- ea_set_attr_data(to, s->pool, EA_CODE(PROTOCOL_BGP, code), flags, EAF_TYPE_OPAQUE, data, len);
+ ea_set_attr_data(to, s->pool, EA_CODE(PROTOCOL_BGP, code), flags, T_OPAQUE, data, len);
}
@@ -987,7 +987,7 @@ bgp_decode_unknown(struct bgp_parse_state *s, uint code, uint flags, byte *data,
static const struct bgp_attr_desc bgp_attr_table[] = {
[BA_ORIGIN] = {
.name = "origin",
- .type = EAF_TYPE_BGP_ORIGIN,
+ .type = T_ENUM_BGP_ORIGIN,
.flags = BAF_TRANSITIVE,
.export = bgp_export_origin,
.encode = bgp_encode_u8,
@@ -996,14 +996,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_AS_PATH] = {
.name = "as_path",
- .type = EAF_TYPE_AS_PATH,
+ .type = T_PATH,
.flags = BAF_TRANSITIVE,
.encode = bgp_encode_as_path,
.decode = bgp_decode_as_path,
},
[BA_NEXT_HOP] = {
.name = "next_hop",
- .type = EAF_TYPE_IP_ADDRESS,
+ .type = T_IP,
.flags = BAF_TRANSITIVE,
.encode = bgp_encode_next_hop,
.decode = bgp_decode_next_hop,
@@ -1011,14 +1011,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_MULTI_EXIT_DISC] = {
.name = "med",
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.flags = BAF_OPTIONAL,
.encode = bgp_encode_u32,
.decode = bgp_decode_med,
},
[BA_LOCAL_PREF] = {
.name = "local_pref",
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.flags = BAF_TRANSITIVE,
.export = bgp_export_local_pref,
.encode = bgp_encode_u32,
@@ -1026,14 +1026,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_ATOMIC_AGGR] = {
.name = "atomic_aggr",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_TRANSITIVE,
.encode = bgp_encode_raw,
.decode = bgp_decode_atomic_aggr,
},
[BA_AGGREGATOR] = {
.name = "aggregator",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.encode = bgp_encode_aggregator,
.decode = bgp_decode_aggregator,
@@ -1041,7 +1041,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_COMMUNITY] = {
.name = "community",
- .type = EAF_TYPE_INT_SET,
+ .type = T_CLIST,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.export = bgp_export_community,
.encode = bgp_encode_u32s,
@@ -1049,7 +1049,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_ORIGINATOR_ID] = {
.name = "originator_id",
- .type = EAF_TYPE_ROUTER_ID,
+ .type = T_QUAD,
.flags = BAF_OPTIONAL,
.export = bgp_export_originator_id,
.encode = bgp_encode_u32,
@@ -1057,7 +1057,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_CLUSTER_LIST] = {
.name = "cluster_list",
- .type = EAF_TYPE_INT_SET,
+ .type = T_CLIST,
.flags = BAF_OPTIONAL,
.export = bgp_export_cluster_list,
.encode = bgp_encode_u32s,
@@ -1066,19 +1066,19 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_MP_REACH_NLRI] = {
.name = "mp_reach_nlri",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_OPTIONAL,
.decode = bgp_decode_mp_reach_nlri,
},
[BA_MP_UNREACH_NLRI] = {
.name = "mp_unreach_nlri",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_OPTIONAL,
.decode = bgp_decode_mp_unreach_nlri,
},
[BA_EXT_COMMUNITY] = {
.name = "ext_community",
- .type = EAF_TYPE_EC_SET,
+ .type = T_ECLIST,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.export = bgp_export_ext_community,
.encode = bgp_encode_u32s,
@@ -1086,14 +1086,14 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_AS4_PATH] = {
.name = "as4_path",
- .type = EAF_TYPE_AS_PATH,
+ .type = T_PATH,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.encode = bgp_encode_raw,
.decode = bgp_decode_as4_path,
},
[BA_AS4_AGGREGATOR] = {
.name = "as4_aggregator",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.encode = bgp_encode_raw,
.decode = bgp_decode_as4_aggregator,
@@ -1101,7 +1101,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_AIGP] = {
.name = "aigp",
- .type = EAF_TYPE_OPAQUE,
+ .type = T_OPAQUE,
.flags = BAF_OPTIONAL | BAF_DECODE_FLAGS,
.export = bgp_export_aigp,
.encode = bgp_encode_raw,
@@ -1110,7 +1110,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_LARGE_COMMUNITY] = {
.name = "large_community",
- .type = EAF_TYPE_LC_SET,
+ .type = T_LCLIST,
.flags = BAF_OPTIONAL | BAF_TRANSITIVE,
.export = bgp_export_large_community,
.encode = bgp_encode_u32s,
@@ -1118,7 +1118,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
},
[BA_MPLS_LABEL_STACK] = {
.name = "mpls_label_stack",
- .type = EAF_TYPE_INT_SET,
+ .type = T_CLIST,
.export = bgp_export_mpls_label_stack,
.encode = bgp_encode_mpls_label_stack,
.decode = bgp_decode_mpls_label_stack,
diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 8a44514c..6f209595 100644
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -545,22 +545,28 @@ bgp_find_attr(ea_list *attrs, uint code)
}
eattr *
-bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, uintptr_t val);
+bgp_set_attr(ea_list **attrs, struct linpool *pool, uint code, uint flags, union bval val);
static inline void
bgp_set_attr_u32(ea_list **to, struct linpool *pool, uint code, uint flags, u32 val)
-{ bgp_set_attr(to, pool, code, flags, (uintptr_t) val); }
+{
+ union bval bv = { .data = val };
+ bgp_set_attr(to, pool, code, flags, bv);
+}
static inline void
-bgp_set_attr_ptr(ea_list **to, struct linpool *pool, uint code, uint flags, const struct adata *val)
-{ bgp_set_attr(to, pool, code, flags, (uintptr_t) val); }
+bgp_set_attr_ptr(ea_list **to, struct linpool *pool, uint code, uint flags, const struct adata *ad)
+{
+ union bval bv = { .ptr = ad };
+ bgp_set_attr(to, pool, code, flags, bv);
+}
static inline void
bgp_set_attr_data(ea_list **to, struct linpool *pool, uint code, uint flags, void *data, uint len)
{
struct adata *a = lp_alloc_adata(pool, len);
bmemcpy(a->data, data, len);
- bgp_set_attr(to, pool, code, flags, (uintptr_t) a);
+ bgp_set_attr_ptr(to, pool, code, flags, a);
}
#define bgp_unset_attr(to, pool, code) ea_unset_attr(to, pool, 0, code)
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 86124bfb..6a78f79b 100644
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -318,31 +318,31 @@ bgp_proto_channel: bgp_channel_start bgp_channel_opt_list bgp_channel_end;
dynamic_attr: BGP_ORIGIN
- { $$ = f_new_dynamic_attr(EAF_TYPE_BGP_ORIGIN, T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
+ { $$ = f_new_dynamic_attr(T_ENUM_BGP_ORIGIN, EA_CODE(PROTOCOL_BGP, BA_ORIGIN)); } ;
dynamic_attr: BGP_PATH
- { $$ = f_new_dynamic_attr(EAF_TYPE_AS_PATH, T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
+ { $$ = f_new_dynamic_attr(T_PATH, EA_CODE(PROTOCOL_BGP, BA_AS_PATH)); } ;
dynamic_attr: BGP_NEXT_HOP
- { $$ = f_new_dynamic_attr(EAF_TYPE_IP_ADDRESS, T_IP, EA_CODE(PROTOCOL_BGP, BA_NEXT_HOP)); } ;
+ { $$ = f_new_dynamic_attr(T_IP, EA_CODE(PROTOCOL_BGP, BA_NEXT_HOP)); } ;
dynamic_attr: BGP_MED
- { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC)); } ;
+ { $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_MULTI_EXIT_DISC)); } ;
dynamic_attr: BGP_LOCAL_PREF
- { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
+ { $$ = f_new_dynamic_attr(T_INT, EA_CODE(PROTOCOL_BGP, BA_LOCAL_PREF)); } ;
dynamic_attr: BGP_ATOMIC_AGGR
- { $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
+ { $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_ATOMIC_AGGR)); } ;
dynamic_attr: BGP_AGGREGATOR
- { $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
+ { $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AGGREGATOR)); } ;
dynamic_attr: BGP_COMMUNITY
- { $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
+ { $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_COMMUNITY)); } ;
dynamic_attr: BGP_ORIGINATOR_ID
- { $$ = f_new_dynamic_attr(EAF_TYPE_ROUTER_ID, T_QUAD, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID)); } ;
+ { $$ = f_new_dynamic_attr(T_QUAD, EA_CODE(PROTOCOL_BGP, BA_ORIGINATOR_ID)); } ;
dynamic_attr: BGP_CLUSTER_LIST
- { $$ = f_new_dynamic_attr(EAF_TYPE_INT_SET, T_CLIST, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST)); } ;
+ { $$ = f_new_dynamic_attr(T_CLIST, EA_CODE(PROTOCOL_BGP, BA_CLUSTER_LIST)); } ;
dynamic_attr: BGP_EXT_COMMUNITY
- { $$ = f_new_dynamic_attr(EAF_TYPE_EC_SET, T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
+ { $$ = f_new_dynamic_attr(T_ECLIST, EA_CODE(PROTOCOL_BGP, BA_EXT_COMMUNITY)); } ;
dynamic_attr: BGP_AIGP
- { $$ = f_new_dynamic_attr(EAF_TYPE_OPAQUE, T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
+ { $$ = f_new_dynamic_attr(T_OPAQUE, EA_CODE(PROTOCOL_BGP, BA_AIGP)); } ;
dynamic_attr: BGP_LARGE_COMMUNITY
- { $$ = f_new_dynamic_attr(EAF_TYPE_LC_SET, T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
+ { $$ = f_new_dynamic_attr(T_LCLIST, EA_CODE(PROTOCOL_BGP, BA_LARGE_COMMUNITY)); } ;
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y
index 4b7d5a36..a8972d2c 100644
--- a/proto/ospf/config.Y
+++ b/proto/ospf/config.Y
@@ -505,10 +505,10 @@ ospf_iface:
ospf_iface_start ospf_iface_patt_list ospf_iface_opt_list { ospf_iface_finish(); }
;
-dynamic_attr: OSPF_METRIC1 { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_METRIC1); } ;
-dynamic_attr: OSPF_METRIC2 { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_METRIC2); } ;
-dynamic_attr: OSPF_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_OSPF_TAG); } ;
-dynamic_attr: OSPF_ROUTER_ID { $$ = f_new_dynamic_attr(EAF_TYPE_ROUTER_ID, T_QUAD, EA_OSPF_ROUTER_ID); } ;
+dynamic_attr: OSPF_METRIC1 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC1); } ;
+dynamic_attr: OSPF_METRIC2 { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_METRIC2); } ;
+dynamic_attr: OSPF_TAG { $$ = f_new_dynamic_attr(T_INT, EA_OSPF_TAG); } ;
+dynamic_attr: OSPF_ROUTER_ID { $$ = f_new_dynamic_attr(T_QUAD, EA_OSPF_ROUTER_ID); } ;
CF_CLI_HELP(SHOW OSPF, ..., [[Show information about OSPF protocol]]);
CF_CLI(SHOW OSPF, optproto, [<name>], [[Show information about OSPF protocol]])
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c
index 471bb586..8643f456 100644
--- a/proto/ospf/rt.c
+++ b/proto/ospf/rt.c
@@ -2072,27 +2072,27 @@ again1:
a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
.id = EA_OSPF_METRIC1,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = nf->n.metric1,
};
if (nf->n.type == RTS_OSPF_EXT2)
a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
.id = EA_OSPF_METRIC2,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = nf->n.metric2,
};
if ((nf->n.type == RTS_OSPF_EXT1) || (nf->n.type == RTS_OSPF_EXT2))
a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
.id = EA_OSPF_TAG,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = nf->n.tag,
};
a0.eattrs->attrs[a0.eattrs->count++] = (eattr) {
.id = EA_OSPF_ROUTER_ID,
- .type = EAF_TYPE_ROUTER_ID,
+ .type = T_QUAD,
.u.data = nf->n.rid,
};
diff --git a/proto/radv/config.Y b/proto/radv/config.Y
index f16b897d..0a339cb4 100644
--- a/proto/radv/config.Y
+++ b/proto/radv/config.Y
@@ -336,8 +336,8 @@ radv_sensitive:
| SENSITIVE bool { $$ = $2; }
;
-dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(EAF_TYPE_RA_PREFERENCE, T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
-dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RA_LIFETIME); } ;
+dynamic_attr: RA_PREFERENCE { $$ = f_new_dynamic_attr(T_ENUM_RA_PREFERENCE, EA_RA_PREFERENCE); } ;
+dynamic_attr: RA_LIFETIME { $$ = f_new_dynamic_attr(T_INT, EA_RA_LIFETIME); } ;
CF_CODE
diff --git a/proto/rip/config.Y b/proto/rip/config.Y
index 28ee9609..3934d337 100644
--- a/proto/rip/config.Y
+++ b/proto/rip/config.Y
@@ -190,8 +190,8 @@ rip_iface:
rip_iface_start iface_patt_list_nopx rip_iface_opt_list rip_iface_finish;
-dynamic_attr: RIP_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RIP_METRIC); } ;
-dynamic_attr: RIP_TAG { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_RIP_TAG); } ;
+dynamic_attr: RIP_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_RIP_METRIC); } ;
+dynamic_attr: RIP_TAG { $$ = f_new_dynamic_attr(T_INT, EA_RIP_TAG); } ;
CF_CLI_HELP(SHOW RIP, ..., [[Show information about RIP protocol]]);
diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 6ca7a6b5..fa5b1289 100644
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -202,17 +202,17 @@ rip_announce_rte(struct rip_proto *p, struct rip_entry *en)
.e = {
{
.id = EA_RIP_METRIC,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = rt_metric,
},
{
.id = EA_RIP_TAG,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = rt_tag,
},
{
.id = EA_RIP_FROM,
- .type = EAF_TYPE_IFACE,
+ .type = T_IFACE,
.u.ptr = &ea_block.riad.ad,
}
},
diff --git a/sysdep/bsd/krt-sock.c b/sysdep/bsd/krt-sock.c
index efdb18a3..3b1d2299 100644
--- a/sysdep/bsd/krt-sock.c
+++ b/sysdep/bsd/krt-sock.c
@@ -589,7 +589,7 @@ krt_read_route(struct ks_msg *msg, struct krt_proto *p, int scan)
ea->attrs[0] = (eattr) {
.id = EA_KRT_SOURCE,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = src2,
};
diff --git a/sysdep/linux/netlink.Y b/sysdep/linux/netlink.Y
index 7390be73..f31b88c7 100644
--- a/sysdep/linux/netlink.Y
+++ b/sysdep/linux/netlink.Y
@@ -28,23 +28,23 @@ kern_sys_item:
| NETLINK RX BUFFER expr { THIS_KRT->sys.netlink_rx_buffer = $4; }
;
-dynamic_attr: KRT_PREFSRC { $$ = f_new_dynamic_attr(EAF_TYPE_IP_ADDRESS, T_IP, EA_KRT_PREFSRC); } ;
-dynamic_attr: KRT_REALM { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_REALM); } ;
-dynamic_attr: KRT_SCOPE { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SCOPE); } ;
+dynamic_attr: KRT_PREFSRC { $$ = f_new_dynamic_attr(T_IP, EA_KRT_PREFSRC); } ;
+dynamic_attr: KRT_REALM { $$ = f_new_dynamic_attr(T_INT, EA_KRT_REALM); } ;
+dynamic_attr: KRT_SCOPE { $$ = f_new_dynamic_attr(T_INT, EA_KRT_SCOPE); } ;
-dynamic_attr: KRT_MTU { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_MTU); } ;
-dynamic_attr: KRT_WINDOW { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_WINDOW); } ;
-dynamic_attr: KRT_RTT { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTT); } ;
-dynamic_attr: KRT_RTTVAR { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTTVAR); } ;
-dynamic_attr: KRT_SSTRESH { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SSTRESH); } ;
-dynamic_attr: KRT_CWND { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_CWND); } ;
-dynamic_attr: KRT_ADVMSS { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_ADVMSS); } ;
-dynamic_attr: KRT_REORDERING { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_REORDERING); } ;
-dynamic_attr: KRT_HOPLIMIT { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_HOPLIMIT); } ;
-dynamic_attr: KRT_INITCWND { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_INITCWND); } ;
-dynamic_attr: KRT_RTO_MIN { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_RTO_MIN); } ;
-dynamic_attr: KRT_INITRWND { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_INITRWND); } ;
-dynamic_attr: KRT_QUICKACK { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_QUICKACK); } ;
+dynamic_attr: KRT_MTU { $$ = f_new_dynamic_attr(T_INT, EA_KRT_MTU); } ;
+dynamic_attr: KRT_WINDOW { $$ = f_new_dynamic_attr(T_INT, EA_KRT_WINDOW); } ;
+dynamic_attr: KRT_RTT { $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTT); } ;
+dynamic_attr: KRT_RTTVAR { $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTTVAR); } ;
+dynamic_attr: KRT_SSTRESH { $$ = f_new_dynamic_attr(T_INT, EA_KRT_SSTRESH); } ;
+dynamic_attr: KRT_CWND { $$ = f_new_dynamic_attr(T_INT, EA_KRT_CWND); } ;
+dynamic_attr: KRT_ADVMSS { $$ = f_new_dynamic_attr(T_INT, EA_KRT_ADVMSS); } ;
+dynamic_attr: KRT_REORDERING { $$ = f_new_dynamic_attr(T_INT, EA_KRT_REORDERING); } ;
+dynamic_attr: KRT_HOPLIMIT { $$ = f_new_dynamic_attr(T_INT, EA_KRT_HOPLIMIT); } ;
+dynamic_attr: KRT_INITCWND { $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITCWND); } ;
+dynamic_attr: KRT_RTO_MIN { $$ = f_new_dynamic_attr(T_INT, EA_KRT_RTO_MIN); } ;
+dynamic_attr: KRT_INITRWND { $$ = f_new_dynamic_attr(T_INT, EA_KRT_INITRWND); } ;
+dynamic_attr: KRT_QUICKACK { $$ = f_new_dynamic_attr(T_INT, EA_KRT_QUICKACK); } ;
/* Bits of EA_KRT_LOCK, based on RTAX_* constants */
diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c
index 6c8228fd..eb4be711 100644
--- a/sysdep/linux/netlink.c
+++ b/sysdep/linux/netlink.c
@@ -1587,12 +1587,12 @@ nl_announce_route(struct nl_parse_state *s)
ea->attrs[0] = (eattr) {
.id = EA_KRT_SOURCE,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = s->krt_proto,
};
ea->attrs[1] = (eattr) {
.id = EA_KRT_METRIC,
- .type = EAF_TYPE_INT,
+ .type = T_INT,
.u.data = s->krt_metric,
};
@@ -1873,7 +1873,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ea->count = 1;
ea->attrs[0].id = EA_KRT_SCOPE;
ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_INT;
+ ea->attrs[0].type = T_INT;
ea->attrs[0].u.data = i->rtm_scope;
}
@@ -1888,7 +1888,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ea->count = 1;
ea->attrs[0].id = EA_KRT_PREFSRC;
ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_IP_ADDRESS;
+ ea->attrs[0].type = T_IP;
struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
ad->length = sizeof(ps);
@@ -1907,7 +1907,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
ea->count = 1;
ea->attrs[0].id = EA_KRT_REALM;
ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_INT;
+ ea->attrs[0].type = T_INT;
ea->attrs[0].u.data = s->rta_flow;
}
@@ -1928,7 +1928,7 @@ nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
{
ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
ea->attrs[n].flags = 0;
- ea->attrs[n].type = EAF_TYPE_INT;
+ ea->attrs[n].type = T_INT;
ea->attrs[n].u.data = metrics[t];
n++;
}
diff --git a/sysdep/linux/netlink.c.orig b/sysdep/linux/netlink.c.orig
deleted file mode 100644
index 7cea5322..00000000
--- a/sysdep/linux/netlink.c.orig
+++ /dev/null
@@ -1,2179 +0,0 @@
-/*
- * BIRD -- Linux Netlink Interface
- *
- * (c) 1999--2000 Martin Mares <mj@ucw.cz>
- *
- * Can be freely distributed and used under the terms of the GNU GPL.
- */
-
-#include <alloca.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <errno.h>
-
-#undef LOCAL_DEBUG
-
-#include "nest/bird.h"
-#include "nest/route.h"
-#include "nest/protocol.h"
-#include "nest/iface.h"
-#include "lib/alloca.h"
-#include "sysdep/unix/unix.h"
-#include "sysdep/unix/krt.h"
-#include "lib/socket.h"
-#include "lib/string.h"
-#include "lib/hash.h"
-#include "conf/conf.h"
-
-#include <asm/types.h>
-#include <linux/if.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-#ifdef HAVE_MPLS_KERNEL
-#include <linux/lwtunnel.h>
-#endif
-
-#ifndef MSG_TRUNC /* Hack: Several versions of glibc miss this one :( */
-#define MSG_TRUNC 0x20
-#endif
-
-#ifndef IFA_FLAGS
-#define IFA_FLAGS 8
-#endif
-
-#ifndef IFF_LOWER_UP
-#define IFF_LOWER_UP 0x10000
-#endif
-
-#ifndef RTA_TABLE
-#define RTA_TABLE 15
-#endif
-
-#ifndef RTA_VIA
-#define RTA_VIA 18
-#endif
-
-#ifndef RTA_NEWDST
-#define RTA_NEWDST 19
-#endif
-
-#ifndef RTA_ENCAP_TYPE
-#define RTA_ENCAP_TYPE 21
-#endif
-
-#ifndef RTA_ENCAP
-#define RTA_ENCAP 22
-#endif
-
-#define krt_ipv4(p) ((p)->af == AF_INET)
-#define krt_ecmp6(p) ((p)->af == AF_INET6)
-
-const int rt_default_ecmp = 16;
-
-/*
- * Structure nl_parse_state keeps state of received route processing. Ideally,
- * we could just independently parse received Netlink messages and immediately
- * propagate received routes to the rest of BIRD, but older Linux kernel (before
- * version 4.11) represents and announces IPv6 ECMP routes not as one route with
- * multiple next hops (like RTA_MULTIPATH in IPv4 ECMP), but as a sequence of
- * routes with the same prefix. More recent kernels work as with IPv4.
- *
- * Therefore, BIRD keeps currently processed route in nl_parse_state structure
- * and postpones its propagation until we expect it to be final; i.e., when
- * non-matching route is received or when the scan ends. When another matching
- * route is received, it is merged with the already processed route to form an
- * ECMP route. Note that merging is done only for IPv6 (merge == 1), but the
- * postponing is done in both cases (for simplicity). All IPv4 routes or IPv6
- * routes with RTA_MULTIPATH set are just considered non-matching.
- *
- * This is ignored for asynchronous notifications (every notification is handled
- * as a separate route). It is not an issue for our routes, as we ignore such
- * notifications anyways. But importing alien IPv6 ECMP routes does not work
- * properly with older kernels.
- *
- * Whatever the kernel version is, IPv6 ECMP routes are sent as multiple routes
- * for the same prefix.
- */
-
-struct nl_parse_state
-{
- struct linpool *pool;
- int scan;
- int merge;
-
- net *net;
- rta *attrs;
- struct krt_proto *proto;
- s8 new;
- s8 krt_src;
- u8 krt_type;
- u8 krt_proto;
- u32 krt_metric;
-
- u32 rta_flow; /* Used during parsing */
-};
-
-/*
- * Synchronous Netlink interface
- */
-
-struct nl_sock
-{
- int fd;
- u32 seq;
- byte *rx_buffer; /* Receive buffer */
- struct nlmsghdr *last_hdr; /* Recently received packet */
- uint last_size;
-};
-
-#define NL_RX_SIZE 8192
-
-#define NL_OP_DELETE 0
-#define NL_OP_ADD (NLM_F_CREATE|NLM_F_EXCL)
-#define NL_OP_REPLACE (NLM_F_CREATE|NLM_F_REPLACE)
-#define NL_OP_APPEND (NLM_F_CREATE|NLM_F_APPEND)
-
-static linpool *nl_linpool;
-
-static struct nl_sock nl_scan = {.fd = -1}; /* Netlink socket for synchronous scan */
-static struct nl_sock nl_req = {.fd = -1}; /* Netlink socket for requests */
-
-static void
-nl_open_sock(struct nl_sock *nl)
-{
- if (nl->fd < 0)
- {
- nl->fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- if (nl->fd < 0)
- die("Unable to open rtnetlink socket: %m");
- nl->seq = (u32) (current_time() TO_S); /* Or perhaps random_u32() ? */
- nl->rx_buffer = xmalloc(NL_RX_SIZE);
- nl->last_hdr = NULL;
- nl->last_size = 0;
- }
-}
-
-static void
-nl_open(void)
-{
- nl_open_sock(&nl_scan);
- nl_open_sock(&nl_req);
-}
-
-static void
-nl_send(struct nl_sock *nl, struct nlmsghdr *nh)
-{
- struct sockaddr_nl sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.nl_family = AF_NETLINK;
- nh->nlmsg_pid = 0;
- nh->nlmsg_seq = ++(nl->seq);
- nh->nlmsg_len = NLMSG_ALIGN(nh->nlmsg_len);
- if (sendto(nl->fd, nh, nh->nlmsg_len, 0, (struct sockaddr *)&sa, sizeof(sa)) < 0)
- die("rtnetlink sendto: %m");
- nl->last_hdr = NULL;
-}
-
-static void
-nl_request_dump(int af, int cmd)
-{
- struct {
- struct nlmsghdr nh;
- struct rtgenmsg g;
- } req = {
- .nh.nlmsg_type = cmd,
- .nh.nlmsg_len = sizeof(req),
- .nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP,
- .g.rtgen_family = af
- };
- nl_send(&nl_scan, &req.nh);
-}
-
-static struct nlmsghdr *
-nl_get_reply(struct nl_sock *nl)
-{
- for(;;)
- {
- if (!nl->last_hdr)
- {
- struct iovec iov = { nl->rx_buffer, NL_RX_SIZE };
- struct sockaddr_nl sa;
- struct msghdr m = {
- .msg_name = &sa,
- .msg_namelen = sizeof(sa),
- .msg_iov = &iov,
- .msg_iovlen = 1,
- };
- int x = recvmsg(nl->fd, &m, 0);
- if (x < 0)
- die("nl_get_reply: %m");
- if (sa.nl_pid) /* It isn't from the kernel */
- {
- DBG("Non-kernel packet\n");
- continue;
- }
- nl->last_size = x;
- nl->last_hdr = (void *) nl->rx_buffer;
- if (m.msg_flags & MSG_TRUNC)
- bug("nl_get_reply: got truncated reply which should be impossible");
- }
- if (NLMSG_OK(nl->last_hdr, nl->last_size))
- {
- struct nlmsghdr *h = nl->last_hdr;
- nl->last_hdr = NLMSG_NEXT(h, nl->last_size);
- if (h->nlmsg_seq != nl->seq)
- {
- log(L_WARN "nl_get_reply: Ignoring out of sequence netlink packet (%x != %x)",
- h->nlmsg_seq, nl->seq);
- continue;
- }
- return h;
- }
- if (nl->last_size)
- log(L_WARN "nl_get_reply: Found packet remnant of size %d", nl->last_size);
- nl->last_hdr = NULL;
- }
-}
-
-static struct tbf rl_netlink_err = TBF_DEFAULT_LOG_LIMITS;
-
-static int
-nl_error(struct nlmsghdr *h, int ignore_esrch)
-{
- struct nlmsgerr *e;
- int ec;
-
- if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
- {
- log(L_WARN "Netlink: Truncated error message received");
- return ENOBUFS;
- }
- e = (struct nlmsgerr *) NLMSG_DATA(h);
- ec = -e->error;
- if (ec && !(ignore_esrch && (ec == ESRCH)))
- log_rl(&rl_netlink_err, L_WARN "Netlink: %s", strerror(ec));
- return ec;
-}
-
-static struct nlmsghdr *
-nl_get_scan(void)
-{
- struct nlmsghdr *h = nl_get_reply(&nl_scan);
-
- if (h->nlmsg_type == NLMSG_DONE)
- return NULL;
- if (h->nlmsg_type == NLMSG_ERROR)
- {
- nl_error(h, 0);
- return NULL;
- }
- return h;
-}
-
-static int
-nl_exchange(struct nlmsghdr *pkt, int ignore_esrch)
-{
- struct nlmsghdr *h;
-
- nl_send(&nl_req, pkt);
- for(;;)
- {
- h = nl_get_reply(&nl_req);
- if (h->nlmsg_type == NLMSG_ERROR)
- break;
- log(L_WARN "nl_exchange: Unexpected reply received");
- }
- return nl_error(h, ignore_esrch) ? -1 : 0;
-}
-
-/*
- * Netlink attributes
- */
-
-static int nl_attr_len;
-
-static void *
-nl_checkin(struct nlmsghdr *h, int lsize)
-{
- nl_attr_len = h->nlmsg_len - NLMSG_LENGTH(lsize);
- if (nl_attr_len < 0)
- {
- log(L_ERR "nl_checkin: underrun by %d bytes", -nl_attr_len);
- return NULL;
- }
- return NLMSG_DATA(h);
-}
-
-struct nl_want_attrs {
- u8 defined:1;
- u8 checksize:1;
- u8 size;
-};
-
-
-#define BIRD_IFLA_MAX (IFLA_WIRELESS+1)
-
-static struct nl_want_attrs ifla_attr_want[BIRD_IFLA_MAX] = {
- [IFLA_IFNAME] = { 1, 0, 0 },
- [IFLA_MTU] = { 1, 1, sizeof(u32) },
- [IFLA_MASTER] = { 1, 1, sizeof(u32) },
- [IFLA_WIRELESS] = { 1, 0, 0 },
-};
-
-
-#define BIRD_IFA_MAX (IFA_FLAGS+1)
-
-static struct nl_want_attrs ifa_attr_want4[BIRD_IFA_MAX] = {
- [IFA_ADDRESS] = { 1, 1, sizeof(ip4_addr) },
- [IFA_LOCAL] = { 1, 1, sizeof(ip4_addr) },
- [IFA_BROADCAST] = { 1, 1, sizeof(ip4_addr) },
- [IFA_FLAGS] = { 1, 1, sizeof(u32) },
-};
-
-static struct nl_want_attrs ifa_attr_want6[BIRD_IFA_MAX] = {
- [IFA_ADDRESS] = { 1, 1, sizeof(ip6_addr) },
- [IFA_LOCAL] = { 1, 1, sizeof(ip6_addr) },
- [IFA_FLAGS] = { 1, 1, sizeof(u32) },
-};
-
-
-#define BIRD_RTA_MAX (RTA_ENCAP+1)
-
-static struct nl_want_attrs nexthop_attr_want4[BIRD_RTA_MAX] = {
- [RTA_GATEWAY] = { 1, 1, sizeof(ip4_addr) },
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_FLOW] = { 1, 1, sizeof(u32) },
- [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
- [RTA_ENCAP] = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs nexthop_attr_want6[BIRD_RTA_MAX] = {
- [RTA_GATEWAY] = { 1, 1, sizeof(ip6_addr) },
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_FLOW] = { 1, 1, sizeof(u32) },
- [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
- [RTA_ENCAP] = { 1, 0, 0 },
-};
-
-#ifdef HAVE_MPLS_KERNEL
-static struct nl_want_attrs nexthop_attr_want_mpls[BIRD_RTA_MAX] = {
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_NEWDST] = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs encap_mpls_want[BIRD_RTA_MAX] = {
- [RTA_DST] = { 1, 0, 0 },
-};
-#endif
-
-static struct nl_want_attrs rtm_attr_want4[BIRD_RTA_MAX] = {
- [RTA_DST] = { 1, 1, sizeof(ip4_addr) },
- [RTA_OIF] = { 1, 1, sizeof(u32) },
- [RTA_GATEWAY] = { 1, 1, sizeof(ip4_addr) },
- [RTA_PRIORITY] = { 1, 1, sizeof(u32) },
- [RTA_PREFSRC] = { 1, 1, sizeof(ip4_addr) },
- [RTA_METRICS] = { 1, 0, 0 },
- [RTA_MULTIPATH] = { 1, 0, 0 },
- [RTA_FLOW] = { 1, 1, sizeof(u32) },
- [RTA_TABLE] = { 1, 1, sizeof(u32) },
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
- [RTA_ENCAP] = { 1, 0, 0 },
-};
-
-static struct nl_want_attrs rtm_attr_want6[BIRD_RTA_MAX] = {
- [RTA_DST] = { 1, 1, sizeof(ip6_addr) },
- [RTA_SRC] = { 1, 1, sizeof(ip6_addr) },
- [RTA_IIF] = { 1, 1, sizeof(u32) },
- [RTA_OIF] = { 1, 1, sizeof(u32) },
- [RTA_GATEWAY] = { 1, 1, sizeof(ip6_addr) },
- [RTA_PRIORITY] = { 1, 1, sizeof(u32) },
- [RTA_PREFSRC] = { 1, 1, sizeof(ip6_addr) },
- [RTA_METRICS] = { 1, 0, 0 },
- [RTA_MULTIPATH] = { 1, 0, 0 },
- [RTA_FLOW] = { 1, 1, sizeof(u32) },
- [RTA_TABLE] = { 1, 1, sizeof(u32) },
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_ENCAP_TYPE]= { 1, 1, sizeof(u16) },
- [RTA_ENCAP] = { 1, 0, 0 },
-};
-
-#ifdef HAVE_MPLS_KERNEL
-static struct nl_want_attrs rtm_attr_want_mpls[BIRD_RTA_MAX] = {
- [RTA_DST] = { 1, 1, sizeof(u32) },
- [RTA_IIF] = { 1, 1, sizeof(u32) },
- [RTA_OIF] = { 1, 1, sizeof(u32) },
- [RTA_PRIORITY] = { 1, 1, sizeof(u32) },
- [RTA_METRICS] = { 1, 0, 0 },
- [RTA_MULTIPATH] = { 1, 0, 0 },
- [RTA_FLOW] = { 1, 1, sizeof(u32) },
- [RTA_TABLE] = { 1, 1, sizeof(u32) },
- [RTA_VIA] = { 1, 0, 0 },
- [RTA_NEWDST] = { 1, 0, 0 },
-};
-#endif
-
-
-static int
-nl_parse_attrs(struct rtattr *a, struct nl_want_attrs *want, struct rtattr **k, int ksize)
-{
- int max = ksize / sizeof(struct rtattr *);
- bzero(k, ksize);
-
- for ( ; RTA_OK(a, nl_attr_len); a = RTA_NEXT(a, nl_attr_len))
- {
- if ((a->rta_type >= max) || !want[a->rta_type].defined)
- continue;
-
- if (want[a->rta_type].checksize && (RTA_PAYLOAD(a) != want[a->rta_type].size))
- {
- log(L_ERR "nl_parse_attrs: Malformed attribute received");
- return 0;
- }
-
- k[a->rta_type] = a;
- }
-
- if (nl_attr_len)
- {
- log(L_ERR "nl_parse_attrs: remnant of size %d", nl_attr_len);
- return 0;
- }
-
- return 1;
-}
-
-static inline u16 rta_get_u16(struct rtattr *a)
-{ return *(u16 *) RTA_DATA(a); }
-
-static inline u32 rta_get_u32(struct rtattr *a)
-{ return *(u32 *) RTA_DATA(a); }
-
-static inline ip4_addr rta_get_ip4(struct rtattr *a)
-{ return ip4_ntoh(*(ip4_addr *) RTA_DATA(a)); }
-
-static inline ip6_addr rta_get_ip6(struct rtattr *a)
-{ return ip6_ntoh(*(ip6_addr *) RTA_DATA(a)); }
-
-static inline ip_addr rta_get_ipa(struct rtattr *a)
-{
- if (RTA_PAYLOAD(a) == sizeof(ip4_addr))
- return ipa_from_ip4(rta_get_ip4(a));
- else
- return ipa_from_ip6(rta_get_ip6(a));
-}
-
-#ifdef HAVE_MPLS_KERNEL
-static inline ip_addr rta_get_via(struct rtattr *a)
-{
- struct rtvia *v = RTA_DATA(a);
- switch(v->rtvia_family) {
- case AF_INET: return ipa_from_ip4(ip4_ntoh(*(ip4_addr *) v->rtvia_addr));
- case AF_INET6: return ipa_from_ip6(ip6_ntoh(*(ip6_addr *) v->rtvia_addr));
- }
- return IPA_NONE;
-}
-
-static u32 rta_mpls_stack[MPLS_MAX_LABEL_STACK];
-static inline int rta_get_mpls(struct rtattr *a, u32 *stack)
-{
- if (!a)
- return 0;
-
- if (RTA_PAYLOAD(a) % 4)
- log(L_WARN "KRT: Strange length of received MPLS stack: %u", RTA_PAYLOAD(a));
-
- int labels = mpls_get(RTA_DATA(a), RTA_PAYLOAD(a) & ~0x3, stack);
-
- if (labels < 0)
- {
- log(L_WARN "KRT: Too long MPLS stack received, ignoring");
- labels = 0;
- }
-
- return labels;
-}
-#endif
-
-struct rtattr *
-nl_add_attr(struct nlmsghdr *h, uint bufsize, uint code, const void *data, uint dlen)
-{
- uint pos = NLMSG_ALIGN(h->nlmsg_len);
- uint len = RTA_LENGTH(dlen);
-
- if (pos + len > bufsize)
- bug("nl_add_attr: packet buffer overflow");
-
- struct rtattr *a = (struct rtattr *)((char *)h + pos);
- a->rta_type = code;
- a->rta_len = len;
- h->nlmsg_len = pos + len;
-
- if (dlen > 0)
- memcpy(RTA_DATA(a), data, dlen);
-
- return a;
-}
-
-static inline struct rtattr *
-nl_open_attr(struct nlmsghdr *h, uint bufsize, uint code)
-{
- return nl_add_attr(h, bufsize, code, NULL, 0);
-}
-
-static inline void
-nl_close_attr(struct nlmsghdr *h, struct rtattr *a)
-{
- a->rta_len = (void *)h + NLMSG_ALIGN(h->nlmsg_len) - (void *)a;
-}
-
-static inline void
-nl_add_attr_u16(struct nlmsghdr *h, uint bufsize, int code, u16 data)
-{
- nl_add_attr(h, bufsize, code, &data, 2);
-}
-
-static inline void
-nl_add_attr_u32(struct nlmsghdr *h, uint bufsize, int code, u32 data)
-{
- nl_add_attr(h, bufsize, code, &data, 4);
-}
-
-static inline void
-nl_add_attr_ip4(struct nlmsghdr *h, uint bufsize, int code, ip4_addr ip4)
-{
- ip4 = ip4_hton(ip4);
- nl_add_attr(h, bufsize, code, &ip4, sizeof(ip4));
-}
-
-static inline void
-nl_add_attr_ip6(struct nlmsghdr *h, uint bufsize, int code, ip6_addr ip6)
-{
- ip6 = ip6_hton(ip6);
- nl_add_attr(h, bufsize, code, &ip6, sizeof(ip6));
-}
-
-static inline void
-nl_add_attr_ipa(struct nlmsghdr *h, uint bufsize, int code, ip_addr ipa)
-{
- if (ipa_is_ip4(ipa))
- nl_add_attr_ip4(h, bufsize, code, ipa_to_ip4(ipa));
- else
- nl_add_attr_ip6(h, bufsize, code, ipa_to_ip6(ipa));
-}
-
-#ifdef HAVE_MPLS_KERNEL
-static inline void
-nl_add_attr_mpls(struct nlmsghdr *h, uint bufsize, int code, int len, u32 *stack)
-{
- char buf[len*4];
- mpls_put(buf, len, stack);
- nl_add_attr(h, bufsize, code, buf, len*4);
-}
-
-static inline void
-nl_add_attr_mpls_encap(struct nlmsghdr *h, uint bufsize, int len, u32 *stack)
-{
- nl_add_attr_u16(h, bufsize, RTA_ENCAP_TYPE, LWTUNNEL_ENCAP_MPLS);
-
- struct rtattr *nest = nl_open_attr(h, bufsize, RTA_ENCAP);
- nl_add_attr_mpls(h, bufsize, RTA_DST, len, stack);
- nl_close_attr(h, nest);
-}
-
-static inline void
-nl_add_attr_via(struct nlmsghdr *h, uint bufsize, ip_addr ipa)
-{
- struct rtvia *via = alloca(sizeof(struct rtvia) + 16);
-
- if (ipa_is_ip4(ipa))
- {
- via->rtvia_family = AF_INET;
- put_ip4(via->rtvia_addr, ipa_to_ip4(ipa));
- nl_add_attr(h, bufsize, RTA_VIA, via, sizeof(struct rtvia) + 4);
- }
- else
- {
- via->rtvia_family = AF_INET6;
- put_ip6(via->rtvia_addr, ipa_to_ip6(ipa));
- nl_add_attr(h, bufsize, RTA_VIA, via, sizeof(struct rtvia) + 16);
- }
-}
-#endif
-
-static inline struct rtnexthop *
-nl_open_nexthop(struct nlmsghdr *h, uint bufsize)
-{
- uint pos = NLMSG_ALIGN(h->nlmsg_len);
- uint len = RTNH_LENGTH(0);
-
- if (pos + len > bufsize)
- bug("nl_open_nexthop: packet buffer overflow");
-
- h->nlmsg_len = pos + len;
-
- return (void *)h + pos;
-}
-
-static inline void
-nl_close_nexthop(struct nlmsghdr *h, struct rtnexthop *nh)
-{
- nh->rtnh_len = (void *)h + NLMSG_ALIGN(h->nlmsg_len) - (void *)nh;
-}
-
-static inline void
-nl_add_nexthop(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af UNUSED)
-{
-#ifdef HAVE_MPLS_KERNEL
- if (nh->labels > 0)
- if (af == AF_MPLS)
- nl_add_attr_mpls(h, bufsize, RTA_NEWDST, nh->labels, nh->label);
- else
- nl_add_attr_mpls_encap(h, bufsize, nh->labels, nh->label);
-
- if (ipa_nonzero(nh->gw))
- {
- if (af == (ipa_is_ip4(nh->gw) ? AF_INET : AF_INET6))
- nl_add_attr_ipa(h, bufsize, RTA_GATEWAY, nh->gw);
- else
- nl_add_attr_via(h, bufsize, nh->gw);
- }
-#else
-
- if (ipa_nonzero(nh->gw))
- nl_add_attr_ipa(h, bufsize, RTA_GATEWAY, nh->gw);
-#endif
-}
-
-static void
-nl_add_multipath(struct nlmsghdr *h, uint bufsize, struct nexthop *nh, int af, ea_list *eattrs)
-{
- struct rtattr *a = nl_open_attr(h, bufsize, RTA_MULTIPATH);
- eattr *flow = ea_find(eattrs, EA_KRT_REALM);
-
- for (; nh; nh = nh->next)
- {
- struct rtnexthop *rtnh = nl_open_nexthop(h, bufsize);
-
- rtnh->rtnh_flags = 0;
- rtnh->rtnh_hops = nh->weight;
- rtnh->rtnh_ifindex = nh->iface->index;
-
- nl_add_nexthop(h, bufsize, nh, af);
-
- if (nh->flags & RNF_ONLINK)
- rtnh->rtnh_flags |= RTNH_F_ONLINK;
-
- /* Our KRT_REALM is per-route, but kernel RTA_FLOW is per-nexthop.
- Therefore, we need to attach the same attribute to each nexthop. */
- if (flow)
- nl_add_attr_u32(h, bufsize, RTA_FLOW, flow->u.data);
-
- nl_close_nexthop(h, rtnh);
- }
-
- nl_close_attr(h, a);
-}
-
-static struct nexthop *
-nl_parse_multipath(struct nl_parse_state *s, struct krt_proto *p, const net_addr *n, struct rtattr *ra, int af, int krt_src)
-{
- struct rtattr *a[BIRD_RTA_MAX];
- struct rtnexthop *nh = RTA_DATA(ra);
- struct nexthop *rv, *first, **last;
- unsigned len = RTA_PAYLOAD(ra);
-
- first = NULL;
- last = &first;
-
- while (len)
- {
- /* Use RTNH_OK(nh,len) ?? */
- if ((len < sizeof(*nh)) || (len < nh->rtnh_len))
- goto err;
-
- if ((nh->rtnh_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
- goto next;
-
- *last = rv = lp_allocz(s->pool, NEXTHOP_MAX_SIZE);
- last = &(rv->next);
-
- rv->weight = nh->rtnh_hops;
- rv->iface = if_find_by_index(nh->rtnh_ifindex);
- if (!rv->iface)
- {
- log(L_ERR "KRT: Received route %N with unknown ifindex %u", n, nh->rtnh_ifindex);
- return NULL;
- }
-
- /* Nonexistent RTNH_PAYLOAD ?? */
- nl_attr_len = nh->rtnh_len - RTNH_LENGTH(0);
- switch (af)
- {
- case AF_INET:
- if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want4, a, sizeof(a)))
- goto err;
- break;
-
- case AF_INET6:
- if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want6, a, sizeof(a)))
- goto err;
- break;
-
-#ifdef HAVE_MPLS_KERNEL
- case AF_MPLS:
- if (!nl_parse_attrs(RTNH_DATA(nh), nexthop_attr_want_mpls, a, sizeof(a)))
- goto err;
-
- if (a[RTA_NEWDST])
- rv->labels = rta_get_mpls(a[RTA_NEWDST], rv->label);
-
- break;
-#endif
-
- default:
- goto err;
- }
-
- if (a[RTA_GATEWAY])
- rv->gw = rta_get_ipa(a[RTA_GATEWAY]);
-
- if (a[RTA_FLOW])
- s->rta_flow = rta_get_u32(a[RTA_FLOW]);
-
-#ifdef HAVE_MPLS_KERNEL
- if (a[RTA_VIA])
- rv->gw = rta_get_via(a[RTA_VIA]);
-#endif
-
- if (ipa_nonzero(rv->gw))
- {
- if (nh->rtnh_flags & RTNH_F_ONLINK)
- rv->flags |= RNF_ONLINK;
-
- neighbor *nbr;
- nbr = neigh_find(&p->p, rv->gw, rv->iface,
- (rv->flags & RNF_ONLINK) ? NEF_ONLINK : 0);
- if (!nbr || (nbr->scope == SCOPE_HOST))
- {
- log(L_ERR "KRT: Received route %N with strange next-hop %I", n, rv->gw);
- return NULL;
- }
- }
-
-#ifdef HAVE_MPLS_KERNEL
- if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE])
- {
- if (rta_get_u16(a[RTA_ENCAP_TYPE]) != LWTUNNEL_ENCAP_MPLS)
- {
- log(L_WARN "KRT: Received route %N with unknown encapsulation method %d",
- n, rta_get_u16(a[RTA_ENCAP_TYPE]));
- return NULL;
- }
-
- struct rtattr *enca[BIRD_RTA_MAX];
- nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
- nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
- rv->labels = rta_get_mpls(enca[RTA_DST], rv->label);
- }
-#endif
-
- next:
- len -= NLMSG_ALIGN(nh->rtnh_len);
- nh = RTNH_NEXT(nh);
- }
-
- /* Ensure nexthops are sorted to satisfy nest invariant */
- if (!nexthop_is_sorted(first))
- first = nexthop_sort(first);
-
- return first;
-
-err:
- log(L_ERR "KRT: Received strange multipath route %N", n);
- return NULL;
-}
-
-static void
-nl_add_metrics(struct nlmsghdr *h, uint bufsize, u32 *metrics, int max)
-{
- struct rtattr *a = nl_open_attr(h, bufsize, RTA_METRICS);
- int t;
-
- for (t = 1; t < max; t++)
- if (metrics[0] & (1 << t))
- nl_add_attr_u32(h, bufsize, t, metrics[t]);
-
- nl_close_attr(h, a);
-}
-
-static int
-nl_parse_metrics(struct rtattr *hdr, u32 *metrics, int max)
-{
- struct rtattr *a = RTA_DATA(hdr);
- int len = RTA_PAYLOAD(hdr);
-
- metrics[0] = 0;
- for (; RTA_OK(a, len); a = RTA_NEXT(a, len))
- {
- if (a->rta_type == RTA_UNSPEC)
- continue;
-
- if (a->rta_type >= max)
- continue;
-
- if (RTA_PAYLOAD(a) != 4)
- return -1;
-
- metrics[0] |= 1 << a->rta_type;
- metrics[a->rta_type] = rta_get_u32(a);
- }
-
- if (len > 0)
- return -1;
-
- return 0;
-}
-
-
-/*
- * Scanning of interfaces
- */
-
-static void
-nl_parse_link(struct nlmsghdr *h, int scan)
-{
- struct ifinfomsg *i;
- struct rtattr *a[BIRD_IFLA_MAX];
- int new = h->nlmsg_type == RTM_NEWLINK;
- struct iface f = {};
- struct iface *ifi;
- char *name;
- u32 mtu, master = 0;
- uint fl;
-
- if (!(i = nl_checkin(h, sizeof(*i))) || !nl_parse_attrs(IFLA_RTA(i), ifla_attr_want, a, sizeof(a)))
- return;
- if (!a[IFLA_IFNAME] || (RTA_PAYLOAD(a[IFLA_IFNAME]) < 2) || !a[IFLA_MTU])
- {
- /*
- * IFLA_IFNAME and IFLA_MTU are required, in fact, but there may also come
- * a message with IFLA_WIRELESS set, where (e.g.) no IFLA_IFNAME exists.
- * We simply ignore all such messages with IFLA_WIRELESS without notice.
- */
-
- if (a[IFLA_WIRELESS])
- return;
-
- log(L_ERR "KIF: Malformed message received");
- return;
- }
-
- name = RTA_DATA(a[IFLA_IFNAME]);
- mtu = rta_get_u32(a[IFLA_MTU]);
-
- if (a[IFLA_MASTER])
- master = rta_get_u32(a[IFLA_MASTER]);
-
- ifi = if_find_by_index(i->ifi_index);
- if (!new)
- {
- DBG("KIF: IF%d(%s) goes down\n", i->ifi_index, name);
- if (!ifi)
- return;
-
- if_delete(ifi);
- }
- else
- {
- DBG("KIF: IF%d(%s) goes up (mtu=%d,flg=%x)\n", i->ifi_index, name, mtu, i->ifi_flags);
- if (ifi && strncmp(ifi->name, name, sizeof(ifi->name)-1))
- if_delete(ifi);
-
- strncpy(f.name, name, sizeof(f.name)-1);
- f.index = i->ifi_index;
- f.mtu = mtu;
-
- f.master_index = master;
- f.master = if_find_by_index(master);
-
- fl = i->ifi_flags;
- if (fl & IFF_UP)
- f.flags |= IF_ADMIN_UP;
- if (fl & IFF_LOWER_UP)
- f.flags |= IF_LINK_UP;
- if (fl & IFF_LOOPBACK) /* Loopback */
- f.flags |= IF_MULTIACCESS | IF_LOOPBACK | IF_IGNORE;
- else if (fl & IFF_POINTOPOINT) /* PtP */
- f.flags |= IF_MULTICAST;
- else if (fl & IFF_BROADCAST) /* Broadcast */
- f.flags |= IF_MULTIACCESS | IF_BROADCAST | IF_MULTICAST;
- else
- f.flags |= IF_MULTIACCESS; /* NBMA */
-
- if (fl & IFF_MULTICAST)
- f.flags |= IF_MULTICAST;
-
- ifi = if_update(&f);
-
- if (!scan)
- if_end_partial_update(ifi);
- }
-}
-
-static void
-nl_parse_addr4(struct ifaddrmsg *i, int scan, int new)
-{
- struct rtattr *a[BIRD_IFA_MAX];
- struct iface *ifi;
- u32 ifa_flags;
- int scope;
-
- if (!nl_parse_attrs(IFA_RTA(i), ifa_attr_want4, a, sizeof(a)))
- return;
-
- if (!a[IFA_LOCAL])
- {
- log(L_ERR "KIF: Malformed message received (missing IFA_LOCAL)");
- return;
- }
- if (!a[IFA_ADDRESS])
- {
- log(L_ERR "KIF: Malformed message received (missing IFA_ADDRESS)");
- return;
- }
-
- ifi = if_find_by_index(i->ifa_index);
- if (!ifi)
- {
- log(L_ERR "KIF: Received address message for unknown interface %d", i->ifa_index);
- return;
- }
-
- if (a[IFA_FLAGS])
- ifa_flags = rta_get_u32(a[IFA_FLAGS]);
- else
- ifa_flags = i->ifa_flags;
-
- struct ifa ifa;
- bzero(&ifa, sizeof(ifa));
- ifa.iface = ifi;
- if (ifa_flags & IFA_F_SECONDARY)
- ifa.flags |= IA_SECONDARY;
-
- ifa.ip = rta_get_ipa(a[IFA_LOCAL]);
-
- if (i->ifa_prefixlen > IP4_MAX_PREFIX_LENGTH)
- {
- log(L_ERR "KIF: Invalid prefix length for interface %s: %d", ifi->name, i->ifa_prefixlen);
- new = 0;
- }
- if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH)
- {
- ifa.brd = rta_get_ipa(a[IFA_ADDRESS]);
- net_fill_ip4(&ifa.prefix, rta_get_ip4(a[IFA_ADDRESS]), i->ifa_prefixlen);
-
- /* It is either a host address or a peer address */
- if (ipa_equal(ifa.ip, ifa.brd))
- ifa.flags |= IA_HOST;
- else
- {
- ifa.flags |= IA_PEER;
- ifa.opposite = ifa.brd;
- }
- }
- else
- {
- net_fill_ip4(&ifa.prefix, ipa_to_ip4(ifa.ip), i->ifa_prefixlen);
- net_normalize(&ifa.prefix);
-
- if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 1)
- ifa.opposite = ipa_opposite_m1(ifa.ip);
-
- if (i->ifa_prefixlen == IP4_MAX_PREFIX_LENGTH - 2)
- ifa.opposite = ipa_opposite_m2(ifa.ip);
-
- if (ifi->flags & IF_BROADCAST)
- {
- /* If kernel offers us a broadcast address, we trust it */
- if (a[IFA_BROADCAST])
- ifa.brd = ipa_from_ip4(rta_get_ip4(a[IFA_BROADCAST]));
- /* Otherwise we create one (except for /31) */
- else if (i->ifa_prefixlen < (IP4_MAX_PREFIX_LENGTH - 1))
- ifa.brd = ipa_from_ip4(ip4_or(ipa_to_ip4(ifa.ip),
- ip4_not(ip4_mkmask(i->ifa_prefixlen))));
- }
- }
-
- scope = ipa_classify(ifa.ip);
- if (scope < 0)
- {
- log(L_ERR "KIF: Invalid interface address %I for %s", ifa.ip, ifi->name);
- return;
- }
- ifa.scope = scope & IADDR_SCOPE_MASK;
-
- DBG("KIF: IF%d(%s): %s IPA %I, flg %x, net %N, brd %I, opp %I\n",
- ifi->index, ifi->name,
- new ? "added" : "removed",
- ifa.ip, ifa.flags, &ifa.prefix, ifa.brd, ifa.opposite);
-
- if (new)
- ifa_update(&ifa);
- else
- ifa_delete(&ifa);
-
- if (!scan)
- if_end_partial_update(ifi);
-}
-
-static void
-nl_parse_addr6(struct ifaddrmsg *i, int scan, int new)
-{
- struct rtattr *a[BIRD_IFA_MAX];
- struct iface *ifi;
- u32 ifa_flags;
- int scope;
-
- if (!nl_parse_attrs(IFA_RTA(i), ifa_attr_want6, a, sizeof(a)))
- return;
-
- if (!a[IFA_ADDRESS])
- {
- log(L_ERR "KIF: Malformed message received (missing IFA_ADDRESS)");
- return;
- }
-
- ifi = if_find_by_index(i->ifa_index);
- if (!ifi)
- {
- log(L_ERR "KIF: Received address message for unknown interface %d", i->ifa_index);
- return;
- }
-
- if (a[IFA_FLAGS])
- ifa_flags = rta_get_u32(a[IFA_FLAGS]);
- else
- ifa_flags = i->ifa_flags;
-
- struct ifa ifa;
- bzero(&ifa, sizeof(ifa));
- ifa.iface = ifi;
- if (ifa_flags & IFA_F_SECONDARY)
- ifa.flags |= IA_SECONDARY;
-
- /* Ignore tentative addresses silently */
- if (ifa_flags & IFA_F_TENTATIVE)
- return;
-
- /* IFA_LOCAL can be unset for IPv6 interfaces */
- ifa.ip = rta_get_ipa(a[IFA_LOCAL] ? : a[IFA_ADDRESS]);
-
- if (i->ifa_prefixlen > IP6_MAX_PREFIX_LENGTH)
- {
- log(L_ERR "KIF: Invalid prefix length for interface %s: %d", ifi->name, i->ifa_prefixlen);
- new = 0;
- }
- if (i->ifa_prefixlen == IP6_MAX_PREFIX_LENGTH)
- {
- ifa.brd = rta_get_ipa(a[IFA_ADDRESS]);
- net_fill_ip6(&ifa.prefix, rta_get_ip6(a[IFA_ADDRESS]), i->ifa_prefixlen);
-
- /* It is either a host address or a peer address */
- if (ipa_equal(ifa.ip, ifa.brd))
- ifa.flags |= IA_HOST;
- else
- {
- ifa.flags |= IA_PEER;
- ifa.opposite = ifa.brd;
- }
- }
- else
- {
- net_fill_ip6(&ifa.prefix, ipa_to_ip6(ifa.ip), i->ifa_prefixlen);
- net_normalize(&ifa.prefix);
-
- if (i->ifa_prefixlen == IP6_MAX_PREFIX_LENGTH - 1)
- ifa.opposite = ipa_opposite_m1(ifa.ip);
- }
-
- scope = ipa_classify(ifa.ip);
- if (scope < 0)
- {
- log(L_ERR "KIF: Invalid interface address %I for %s", ifa.ip, ifi->name);
- return;
- }
- ifa.scope = scope & IADDR_SCOPE_MASK;
-
- DBG("KIF: IF%d(%s): %s IPA %I, flg %x, net %N, brd %I, opp %I\n",
- ifi->index, ifi->name,
- new ? "added" : "removed",
- ifa.ip, ifa.flags, &ifa.prefix, ifa.brd, ifa.opposite);
-
- if (new)
- ifa_update(&ifa);
- else
- ifa_delete(&ifa);
-
- if (!scan)
- if_end_partial_update(ifi);
-}
-
-static void
-nl_parse_addr(struct nlmsghdr *h, int scan)
-{
- struct ifaddrmsg *i;
-
- if (!(i = nl_checkin(h, sizeof(*i))))
- return;
-
- int new = (h->nlmsg_type == RTM_NEWADDR);
-
- switch (i->ifa_family)
- {
- case AF_INET:
- return nl_parse_addr4(i, scan, new);
-
- case AF_INET6:
- return nl_parse_addr6(i, scan, new);
- }
-}
-
-void
-kif_do_scan(struct kif_proto *p UNUSED)
-{
- struct nlmsghdr *h;
-
- if_start_update();
-
- nl_request_dump(AF_UNSPEC, RTM_GETLINK);
- while (h = nl_get_scan())
- if (h->nlmsg_type == RTM_NEWLINK || h->nlmsg_type == RTM_DELLINK)
- nl_parse_link(h, 1);
- else
- log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
- /* Re-resolve master interface for slaves */
- struct iface *i;
- WALK_LIST(i, iface_list)
- if (i->master_index)
- {
- struct iface f = {
- .flags = i->flags,
- .mtu = i->mtu,
- .index = i->index,
- .master_index = i->master_index,
- .master = if_find_by_index(i->master_index)
- };
-
- if (f.master != i->master)
- {
- memcpy(f.name, i->name, sizeof(f.name));
- if_update(&f);
- }
- }
-
- nl_request_dump(AF_INET, RTM_GETADDR);
- while (h = nl_get_scan())
- if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR)
- nl_parse_addr(h, 1);
- else
- log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
- nl_request_dump(AF_INET6, RTM_GETADDR);
- while (h = nl_get_scan())
- if (h->nlmsg_type == RTM_NEWADDR || h->nlmsg_type == RTM_DELADDR)
- nl_parse_addr(h, 1);
- else
- log(L_DEBUG "nl_scan_ifaces: Unknown packet received (type=%d)", h->nlmsg_type);
-
- if_end_update();
-}
-
-/*
- * Routes
- */
-
-static inline u32
-krt_table_id(struct krt_proto *p)
-{
- return KRT_CF->sys.table_id;
-}
-
-static HASH(struct krt_proto) nl_table_map;
-
-#define RTH_KEY(p) p->af, krt_table_id(p)
-#define RTH_NEXT(p) p->sys.hash_next
-#define RTH_EQ(a1,i1,a2,i2) a1 == a2 && i1 == i2
-#define RTH_FN(a,i) a ^ u32_hash(i)
-
-#define RTH_REHASH rth_rehash
-#define RTH_PARAMS /8, *2, 2, 2, 6, 20
-
-HASH_DEFINE_REHASH_FN(RTH, struct krt_proto)
-
-int
-krt_capable(rte *e)
-{
- rta *a = e->attrs;
-
- switch (a->dest)
- {
- case RTD_UNICAST:
- case RTD_BLACKHOLE:
- case RTD_UNREACHABLE:
- case RTD_PROHIBIT:
- return 1;
-
- default:
- return 0;
- }
-}
-
-static inline int
-nh_bufsize(struct nexthop *nh)
-{
- int rv = 0;
- for (; nh != NULL; nh = nh->next)
- rv += RTNH_LENGTH(RTA_LENGTH(sizeof(ip_addr)));
- return rv;
-}
-
-static int
-nl_send_route(struct krt_proto *p, rte *e, int op, int dest, struct nexthop *nh)
-{
- eattr *ea;
- net *net = e->net;
- rta *a = e->attrs;
- ea_list *eattrs = a->eattrs;
- int bufsize = 128 + KRT_METRICS_MAX*8 + nh_bufsize(&(a->nh));
- u32 priority = 0;
-
- struct {
- struct nlmsghdr h;
- struct rtmsg r;
- char buf[0];
- } *r;
-
- int rsize = sizeof(*r) + bufsize;
- r = alloca(rsize);
-
- DBG("nl_send_route(%N,op=%x)\n", net->n.addr, op);
-
- bzero(&r->h, sizeof(r->h));
- bzero(&r->r, sizeof(r->r));
- r->h.nlmsg_type = op ? RTM_NEWROUTE : RTM_DELROUTE;
- r->h.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
- r->h.nlmsg_flags = op | NLM_F_REQUEST | NLM_F_ACK;
-
- r->r.rtm_family = p->af;
- r->r.rtm_dst_len = net_pxlen(net->n.addr);
- r->r.rtm_protocol = RTPROT_BIRD;
- r->r.rtm_scope = RT_SCOPE_NOWHERE;
-#ifdef HAVE_MPLS_KERNEL
- if (p->af == AF_MPLS)
- {
- /*
- * Kernel MPLS code is a bit picky. We must:
- * 1) Always set RT_SCOPE_UNIVERSE and RTN_UNICAST (even for RTM_DELROUTE)
- * 2) Never use RTA_PRIORITY
- */
-
- u32 label = net_mpls(net->n.addr);
- nl_add_attr_mpls(&r->h, rsize, RTA_DST, 1, &label);
- r->r.rtm_scope = RT_SCOPE_UNIVERSE;
- r->r.rtm_type = RTN_UNICAST;
- }
- else
-#endif
- {
- nl_add_attr_ipa(&r->h, rsize, RTA_DST, net_prefix(net->n.addr));
-
- /* Add source address for IPv6 SADR routes */
- if (net->n.addr->type == NET_IP6_SADR)
- {
- net_addr_ip6_sadr *a = (void *) &net->n.addr;
- nl_add_attr_ip6(&r->h, rsize, RTA_SRC, a->src_prefix);
- r->r.rtm_src_len = a->src_pxlen;
- }
- }
-
- /*
- * Strange behavior for RTM_DELROUTE:
- * 1) rtm_family is ignored in IPv6, works for IPv4
- * 2) not setting RTA_PRIORITY is different from setting default value (on IPv6)
- * 3) not setting RTA_PRIORITY is equivalent to setting 0, which is wildcard
- */
-
- if (krt_table_id(p) < 256)
- r->r.rtm_table = krt_table_id(p);
- else
- nl_add_attr_u32(&r->h, rsize, RTA_TABLE, krt_table_id(p));
-
- if (p->af == AF_MPLS)
- priority = 0;
- else if (a->source == RTS_DUMMY)
- priority = e->u.krt.metric;
- else if (KRT_CF->sys.metric)
- priority = KRT_CF->sys.metric;
- else if ((op != NL_OP_DELETE) && (ea = ea_find(eattrs, EA_KRT_METRIC)))
- priority = ea->u.data;
-
- if (priority)
- nl_add_attr_u32(&r->h, rsize, RTA_PRIORITY, priority);
-
- /* For route delete, we do not specify remaining route attributes */
- if (op == NL_OP_DELETE)
- goto dest;
-
- /* Default scope is LINK for device routes, UNIVERSE otherwise */
- if (p->af == AF_MPLS)
- r->r.rtm_scope = RT_SCOPE_UNIVERSE;
- else if (ea = ea_find(eattrs, EA_KRT_SCOPE))
- r->r.rtm_scope = ea->u.data;
- else
- r->r.rtm_scope = (dest == RTD_UNICAST && ipa_zero(nh->gw)) ? RT_SCOPE_LINK : RT_SCOPE_UNIVERSE;
-
- if (ea = ea_find(eattrs, EA_KRT_PREFSRC))
- nl_add_attr_ipa(&r->h, rsize, RTA_PREFSRC, *(ip_addr *)ea->u.ptr->data);
-
- if (ea = ea_find(eattrs, EA_KRT_REALM))
- nl_add_attr_u32(&r->h, rsize, RTA_FLOW, ea->u.data);
-
-
- u32 metrics[KRT_METRICS_MAX];
- metrics[0] = 0;
-
- struct ea_walk_state ews = { .eattrs = eattrs };
- while (ea = ea_walk(&ews, EA_KRT_METRICS, KRT_METRICS_MAX))
- {
- int id = ea->id - EA_KRT_METRICS;
- metrics[0] |= 1 << id;
- metrics[id] = ea->u.data;
- }
-
- if (metrics[0])
- nl_add_metrics(&r->h, rsize, metrics, KRT_METRICS_MAX);
-
-
-dest:
- switch (dest)
- {
- case RTD_UNICAST:
- r->r.rtm_type = RTN_UNICAST;
- if (nh->next && !krt_ecmp6(p))
- nl_add_multipath(&r->h, rsize, nh, p->af, eattrs);
- else
- {
- nl_add_attr_u32(&r->h, rsize, RTA_OIF, nh->iface->index);
- nl_add_nexthop(&r->h, rsize, nh, p->af);
-
- if (nh->flags & RNF_ONLINK)
- r->r.rtm_flags |= RTNH_F_ONLINK;
- }
- break;
- case RTD_BLACKHOLE:
- r->r.rtm_type = RTN_BLACKHOLE;
- break;
- case RTD_UNREACHABLE:
- r->r.rtm_type = RTN_UNREACHABLE;
- break;
- case RTD_PROHIBIT:
- r->r.rtm_type = RTN_PROHIBIT;
- break;
- case RTD_NONE:
- break;
- default:
- bug("krt_capable inconsistent with nl_send_route");
- }
-
- /* Ignore missing for DELETE */
- return nl_exchange(&r->h, (op == NL_OP_DELETE));
-}
-
-static inline int
-nl_add_rte(struct krt_proto *p, rte *e)
-{
- rta *a = e->attrs;
- int err = 0;
-
- if (krt_ecmp6(p) && a->nh.next)
- {
- struct nexthop *nh = &(a->nh);
-
- err = nl_send_route(p, e, NL_OP_ADD, RTD_UNICAST, nh);
- if (err < 0)
- return err;
-
- for (nh = nh->next; nh; nh = nh->next)
- err += nl_send_route(p, e, NL_OP_APPEND, RTD_UNICAST, nh);
-
- return err;
- }
-
- return nl_send_route(p, e, NL_OP_ADD, a->dest, &(a->nh));
-}
-
-static inline int
-nl_delete_rte(struct krt_proto *p, rte *e)
-{
- int err = 0;
-
- /* For IPv6, we just repeatedly request DELETE until we get error */
- do
- err = nl_send_route(p, e, NL_OP_DELETE, RTD_NONE, NULL);
- while (krt_ecmp6(p) && !err);
-
- return err;
-}
-
-static inline int
-nl_replace_rte(struct krt_proto *p, rte *e)
-{
- rta *a = e->attrs;
- return nl_send_route(p, e, NL_OP_REPLACE, a->dest, &(a->nh));
-}
-
-
-void
-krt_replace_rte(struct krt_proto *p, net *n UNUSED, rte *new, rte *old)
-{
- int err = 0;
-
- /*
- * We use NL_OP_REPLACE for IPv4, it has an issue with not checking for
- * matching rtm_protocol, but that is OK when dedicated priority is used.
- *
- * We do not use NL_OP_REPLACE for IPv6, as it has broken semantics for ECMP
- * and with some kernel versions ECMP replace crashes kernel. Would need more
- * testing and checks for kernel versions.
- *
- * For IPv6, we use NL_OP_DELETE and then NL_OP_ADD. We also do not trust the
- * old route value, so we do not try to optimize IPv6 ECMP reconfigurations.
- */
-
- if (krt_ipv4(p) && old && new)
- {
- err = nl_replace_rte(p, new);
- }
- else
- {
- if (old)
- nl_delete_rte(p, old);
-
- if (new)
- err = nl_add_rte(p, new);
- }
-
- if (new)
- {
- if (err < 0)
- bmap_clear(&p->sync_map, new->id);
- else
- bmap_set(&p->sync_map, new->id);
- }
-}
-
-static int
-nl_mergable_route(struct nl_parse_state *s, net *net, struct krt_proto *p, uint priority, uint krt_type, uint rtm_family)
-{
- /* Route merging is used for IPv6 scans */
- if (!s->scan || (rtm_family != AF_INET6))
- return 0;
-
- /* Saved and new route must have same network, proto/table, and priority */
- if ((s->net != net) || (s->proto != p) || (s->krt_metric != priority))
- return 0;
-
- /* Both must be regular unicast routes */
- if ((s->krt_type != RTN_UNICAST) || (krt_type != RTN_UNICAST))
- return 0;
-
- return 1;
-}
-
-static void
-nl_announce_route(struct nl_parse_state *s)
-{
- rte *e = rte_get_temp(s->attrs);
- e->net = s->net;
- e->u.krt.src = s->krt_src;
- e->u.krt.proto = s->krt_proto;
- e->u.krt.seen = 0;
- e->u.krt.best = 0;
- e->u.krt.metric = s->krt_metric;
-
- if (s->scan)
- krt_got_route(s->proto, e);
- else
- krt_got_route_async(s->proto, e, s->new);
-
- s->net = NULL;
- s->attrs = NULL;
- s->proto = NULL;
- lp_flush(s->pool);
-}
-
-static inline void
-nl_parse_begin(struct nl_parse_state *s, int scan)
-{
- memset(s, 0, sizeof (struct nl_parse_state));
- s->pool = nl_linpool;
- s->scan = scan;
-}
-
-static inline void
-nl_parse_end(struct nl_parse_state *s)
-{
- if (s->net)
- nl_announce_route(s);
-}
-
-
-#define SKIP0(ARG, ...) do { DBG("KRT: Ignoring route - " ARG, ##__VA_ARGS__); return; } while(0)
-#define SKIP(ARG, ...) do { DBG("KRT: Ignoring route %N - " ARG, &dst, ##__VA_ARGS__); return; } while(0)
-
-static void
-nl_parse_route(struct nl_parse_state *s, struct nlmsghdr *h)
-{
- struct krt_proto *p;
- struct rtmsg *i;
- struct rtattr *a[BIRD_RTA_MAX];
- int new = h->nlmsg_type == RTM_NEWROUTE;
-
- net_addr dst, src = {};
- u32 oif = ~0;
- u32 table_id;
- u32 priority = 0;
- u32 def_scope = RT_SCOPE_UNIVERSE;
- int krt_src;
-
- if (!(i = nl_checkin(h, sizeof(*i))))
- return;
-
- switch (i->rtm_family)
- {
- case AF_INET:
- if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want4, a, sizeof(a)))
- return;
-
- if (a[RTA_DST])
- net_fill_ip4(&dst, rta_get_ip4(a[RTA_DST]), i->rtm_dst_len);
- else
- net_fill_ip4(&dst, IP4_NONE, 0);
- break;
-
- case AF_INET6:
- if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want6, a, sizeof(a)))
- return;
-
- if (a[RTA_DST])
- net_fill_ip6(&dst, rta_get_ip6(a[RTA_DST]), i->rtm_dst_len);
- else
- net_fill_ip6(&dst, IP6_NONE, 0);
-
- if (a[RTA_SRC])
- net_fill_ip6(&src, rta_get_ip6(a[RTA_SRC]), i->rtm_src_len);
- else
- net_fill_ip6(&src, IP6_NONE, 0);
- break;
-
-#ifdef HAVE_MPLS_KERNEL
- case AF_MPLS:
- if (!nl_parse_attrs(RTM_RTA(i), rtm_attr_want_mpls, a, sizeof(a)))
- return;
-
- if (!a[RTA_DST])
- SKIP0("MPLS route without RTA_DST\n");
-
- if (rta_get_mpls(a[RTA_DST], rta_mpls_stack) != 1)
- SKIP0("MPLS route with multi-label RTA_DST\n");
-
- net_fill_mpls(&dst, rta_mpls_stack[0]);
- break;
-#endif
-
- default:
- return;
- }
-
- if (a[RTA_OIF])
- oif = rta_get_u32(a[RTA_OIF]);
-
- if (a[RTA_TABLE])
- table_id = rta_get_u32(a[RTA_TABLE]);
- else
- table_id = i->rtm_table;
-
- if (i->rtm_flags & RTM_F_CLONED)
- SKIP("cloned\n");
-
- /* Do we know this table? */
- p = HASH_FIND(nl_table_map, RTH, i->rtm_family, table_id);
- if (!p)
- SKIP("unknown table %u\n", table_id);
-
- if (a[RTA_SRC] && (p->p.net_type != NET_IP6_SADR))
- SKIP("src prefix for non-SADR channel\n");
-
- if (a[RTA_IIF])
- SKIP("IIF set\n");
-
- if (i->rtm_tos != 0) /* We don't support TOS */
- SKIP("TOS %02x\n", i->rtm_tos);
-
- if (s->scan && !new)
- SKIP("RTM_DELROUTE in scan\n");
-
- if (a[RTA_PRIORITY])
- priority = rta_get_u32(a[RTA_PRIORITY]);
-
- int c = net_classify(&dst);
- if ((c < 0) || !(c & IADDR_HOST) || ((c & IADDR_SCOPE_MASK) <= SCOPE_LINK))
- SKIP("strange class/scope\n");
-
- switch (i->rtm_protocol)
- {
- case RTPROT_UNSPEC:
- SKIP("proto unspec\n");
-
- case RTPROT_REDIRECT:
- krt_src = KRT_SRC_REDIRECT;
- break;
-
- case RTPROT_KERNEL:
- krt_src = KRT_SRC_KERNEL;
- return;
-
- case RTPROT_BIRD:
- if (!s->scan)
- SKIP("echo\n");
- krt_src = KRT_SRC_BIRD;
- break;
-
- case RTPROT_BOOT:
- default:
- krt_src = KRT_SRC_ALIEN;
- }
-
- net_addr *n = &dst;
- if (p->p.net_type == NET_IP6_SADR)
- {
- n = alloca(sizeof(net_addr_ip6_sadr));
- net_fill_ip6_sadr(n, net6_prefix(&dst), net6_pxlen(&dst),
- net6_prefix(&src), net6_pxlen(&src));
- }
-
- net *net = net_get(p->p.main_channel->table, n);
-
- if (s->net && !nl_mergable_route(s, net, p, priority, i->rtm_type, i->rtm_family))
- nl_announce_route(s);
-
- rta *ra = lp_allocz(s->pool, RTA_MAX_SIZE);
- ra->src = p->p.main_source;
- ra->source = RTS_INHERIT;
- ra->scope = SCOPE_UNIVERSE;
-
- if (a[RTA_FLOW])
- s->rta_flow = rta_get_u32(a[RTA_FLOW]);
- else
- s->rta_flow = 0;
-
- switch (i->rtm_type)
- {
- case RTN_UNICAST:
- ra->dest = RTD_UNICAST;
-
- if (a[RTA_MULTIPATH])
- {
- struct nexthop *nh = nl_parse_multipath(s, p, n, a[RTA_MULTIPATH], i->rtm_family, krt_src);
- if (!nh)
- SKIP("strange RTA_MULTIPATH\n");
-
- nexthop_link(ra, nh);
- break;
- }
-
- if ((i->rtm_flags & RTNH_F_DEAD) && (krt_src != KRT_SRC_BIRD))
- SKIP("ignore RTNH_F_DEAD\n");
-
- ra->nh.iface = if_find_by_index(oif);
- if (!ra->nh.iface)
- {
- log(L_ERR "KRT: Received route %N with unknown ifindex %u", net->n.addr, oif);
- return;
- }
-
- if (a[RTA_GATEWAY])
- ra->nh.gw = rta_get_ipa(a[RTA_GATEWAY]);
-
-#ifdef HAVE_MPLS_KERNEL
- if (a[RTA_VIA])
- ra->nh.gw = rta_get_via(a[RTA_VIA]);
-#endif
-
- if (ipa_nonzero(ra->nh.gw))
- {
- /* Silently skip strange 6to4 routes */
- const net_addr_ip6 sit = NET_ADDR_IP6(IP6_NONE, 96);
- if ((i->rtm_family == AF_INET6) && ipa_in_netX(ra->nh.gw, (net_addr *) &sit))
- return;
-
- if (i->rtm_flags & RTNH_F_ONLINK)
- ra->nh.flags |= RNF_ONLINK;
-
- neighbor *nbr;
- nbr = neigh_find(&p->p, ra->nh.gw, ra->nh.iface,
- (ra->nh.flags & RNF_ONLINK) ? NEF_ONLINK : 0);
- if (!nbr || (nbr->scope == SCOPE_HOST))
- {
- log(L_ERR "KRT: Received route %N with strange next-hop %I", net->n.addr,
- ra->nh.gw);
- return;
- }
- }
-
- break;
- case RTN_BLACKHOLE:
- ra->dest = RTD_BLACKHOLE;
- break;
- case RTN_UNREACHABLE:
- ra->dest = RTD_UNREACHABLE;
- break;
- case RTN_PROHIBIT:
- ra->dest = RTD_PROHIBIT;
- break;
- /* FIXME: What about RTN_THROW? */
- default:
- SKIP("type %d\n", i->rtm_type);
- return;
- }
-
-#ifdef HAVE_MPLS_KERNEL
- if ((i->rtm_family == AF_MPLS) && a[RTA_NEWDST] && !ra->nh.next)
- ra->nh.labels = rta_get_mpls(a[RTA_NEWDST], ra->nh.label);
-
- if (a[RTA_ENCAP] && a[RTA_ENCAP_TYPE] && !ra->nh.next)
- {
- switch (rta_get_u16(a[RTA_ENCAP_TYPE]))
- {
- case LWTUNNEL_ENCAP_MPLS:
- {
- struct rtattr *enca[BIRD_RTA_MAX];
- nl_attr_len = RTA_PAYLOAD(a[RTA_ENCAP]);
- nl_parse_attrs(RTA_DATA(a[RTA_ENCAP]), encap_mpls_want, enca, sizeof(enca));
- ra->nh.labels = rta_get_mpls(enca[RTA_DST], ra->nh.label);
- break;
- }
- default:
- SKIP("unknown encapsulation method %d\n", rta_get_u16(a[RTA_ENCAP_TYPE]));
- break;
- }
- }
-#endif
-
- if (i->rtm_scope != def_scope)
- {
- ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
- ea->next = ra->eattrs;
- ra->eattrs = ea;
- ea->flags = EALF_SORTED;
- ea->count = 1;
- ea->attrs[0].id = EA_KRT_SCOPE;
- ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_INT;
- ea->attrs[0].u.data = i->rtm_scope;
- }
-
- if (a[RTA_PREFSRC])
- {
- ip_addr ps = rta_get_ipa(a[RTA_PREFSRC]);
-
- ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
- ea->next = ra->eattrs;
- ra->eattrs = ea;
- ea->flags = EALF_SORTED;
- ea->count = 1;
- ea->attrs[0].id = EA_KRT_PREFSRC;
- ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_IP_ADDRESS;
-
- struct adata *ad = lp_alloc(s->pool, sizeof(struct adata) + sizeof(ps));
- ad->length = sizeof(ps);
- memcpy(ad->data, &ps, sizeof(ps));
-
- ea->attrs[0].u.ptr = ad;
- }
-
- /* Can be set per-route or per-nexthop */
- if (s->rta_flow)
- {
- ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + sizeof(eattr));
- ea->next = ra->eattrs;
- ra->eattrs = ea;
- ea->flags = EALF_SORTED;
- ea->count = 1;
- ea->attrs[0].id = EA_KRT_REALM;
- ea->attrs[0].flags = 0;
- ea->attrs[0].type = EAF_TYPE_INT;
- ea->attrs[0].u.data = s->rta_flow;
- }
-
- if (a[RTA_METRICS])
- {
- u32 metrics[KRT_METRICS_MAX];
- ea_list *ea = lp_alloc(s->pool, sizeof(ea_list) + KRT_METRICS_MAX * sizeof(eattr));
- int t, n = 0;
-
- if (nl_parse_metrics(a[RTA_METRICS], metrics, ARRAY_SIZE(metrics)) < 0)
- {
- log(L_ERR "KRT: Received route %N with strange RTA_METRICS attribute", net->n.addr);
- return;
- }
-
- for (t = 1; t < KRT_METRICS_MAX; t++)
- if (metrics[0] & (1 << t))
- {
- ea->attrs[n].id = EA_CODE(PROTOCOL_KERNEL, KRT_METRICS_OFFSET + t);
- ea->attrs[n].flags = 0;
- ea->attrs[n].type = EAF_TYPE_INT; /* FIXME: Some are EAF_TYPE_BITFIELD */
- ea->attrs[n].u.data = metrics[t];
- n++;
- }
-
- if (n > 0)
- {
- ea->next = ra->eattrs;
- ea->flags = EALF_SORTED;
- ea->count = n;
- ra->eattrs = ea;
- }
- }
-
- /*
- * Ideally, now we would send the received route to the rest of kernel code.
- * But IPv6 ECMP routes before 4.11 are sent as a sequence of routes, so we
- * postpone it and merge next hops until the end of the sequence. Note that
- * when doing merging of next hops, we expect the new route to be unipath.
- * Otherwise, we ignore additional next hops in nexthop_insert().
- */
-
- if (!s->net)
- {
- /* Store the new route */
- s->net = net;
- s->attrs = ra;
- s->proto = p;
- s->new = new;
- s->krt_src = krt_src;
- s->krt_type = i->rtm_type;
- s->krt_proto = i->rtm_protocol;
- s->krt_metric = priority;
- }
- else
- {
- /* Merge next hops with the stored route */
- rta *oa = s->attrs;
-
- struct nexthop *nhs = &oa->nh;
- nexthop_insert(&nhs, &ra->nh);
-
- /* Perhaps new nexthop is inserted at the first position */
- if (nhs == &ra->nh)
- {
- /* Swap rtas */
- s->attrs = ra;
-
- /* Keep old eattrs */
- ra->eattrs = oa->eattrs;
- }
- }
-}
-
-void
-krt_do_scan(struct krt_proto *p UNUSED) /* CONFIG_ALL_TABLES_AT_ONCE => p is NULL */
-{
- struct nlmsghdr *h;
- struct nl_parse_state s;
-
- nl_parse_begin(&s, 1);
- nl_request_dump(AF_UNSPEC, RTM_GETROUTE);
- while (h = nl_get_scan())
- if (h->nlmsg_type == RTM_NEWROUTE || h->nlmsg_type == RTM_DELROUTE)
- nl_parse_route(&s, h);
- else
- log(L_DEBUG "nl_scan_fire: Unknown packet received (type=%d)", h->nlmsg_type);
- nl_parse_end(&s);
-}
-
-/*
- * Asynchronous Netlink interface
- */
-
-static sock *nl_async_sk; /* BIRD socket for asynchronous notifications */
-static byte *nl_async_rx_buffer; /* Receive buffer */
-
-static void
-nl_async_msg(struct nlmsghdr *h)
-{
- struct nl_parse_state s;
-
- switch (h->nlmsg_type)
- {
- case RTM_NEWROUTE:
- case RTM_DELROUTE:
- DBG("KRT: Received async route notification (%d)\n", h->nlmsg_type);
- nl_parse_begin(&s, 0);
- nl_parse_route(&s, h);
- nl_parse_end(&s);
- break;
- case RTM_NEWLINK:
- case RTM_DELLINK:
- DBG("KRT: Received async link notification (%d)\n", h->nlmsg_type);
- if (kif_proto)
- nl_parse_link(h, 0);
- break;
- case RTM_NEWADDR:
- case RTM_DELADDR:
- DBG("KRT: Received async address notification (%d)\n", h->nlmsg_type);
- if (kif_proto)
- nl_parse_addr(h, 0);
- break;
- default:
- DBG("KRT: Received unknown async notification (%d)\n", h->nlmsg_type);
- }
-}
-
-static int
-nl_async_hook(sock *sk, uint size UNUSED)
-{
- struct iovec iov = { nl_async_rx_buffer, NL_RX_SIZE };
- struct sockaddr_nl sa;
- struct msghdr m = {
- .msg_name = &sa,
- .msg_namelen = sizeof(sa),
- .msg_iov = &iov,
- .msg_iovlen = 1,
- };
- struct nlmsghdr *h;
- int x;
- uint len;
-
- x = recvmsg(sk->fd, &m, 0);
- if (x < 0)
- {
- if (errno == ENOBUFS)
- {
- /*
- * Netlink reports some packets have been thrown away.
- * One day we might react to it by asking for route table
- * scan in near future.
- */
- log(L_WARN "Kernel dropped some netlink messages, will resync on next scan.");
- return 1; /* More data are likely to be ready */
- }
- else if (errno != EWOULDBLOCK)
- log(L_ERR "Netlink recvmsg: %m");
- return 0;
- }
- if (sa.nl_pid) /* It isn't from the kernel */
- {
- DBG("Non-kernel packet\n");
- return 1;
- }
- h = (void *) nl_async_rx_buffer;
- len = x;
- if (m.msg_flags & MSG_TRUNC)
- {
- log(L_WARN "Netlink got truncated asynchronous message");
- return 1;
- }
- while (NLMSG_OK(h, len))
- {
- nl_async_msg(h);
- h = NLMSG_NEXT(h, len);
- }
- if (len)
- log(L_WARN "nl_async_hook: Found packet remnant of size %d", len);
- return 1;
-}
-
-static void
-nl_async_err_hook(sock *sk, int e UNUSED)
-{
- nl_async_hook(sk, 0);
-}
-
-static void
-nl_open_async(void)
-{
- sock *sk;
- struct sockaddr_nl sa;
- int fd;
-
- if (nl_async_sk)
- return;
-
- DBG("KRT: Opening async netlink socket\n");
-
- fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- if (fd < 0)
- {
- log(L_ERR "Unable to open asynchronous rtnetlink socket: %m");
- return;
- }
-
- bzero(&sa, sizeof(sa));
- sa.nl_family = AF_NETLINK;
- sa.nl_groups = RTMGRP_LINK |
- RTMGRP_IPV4_IFADDR | RTMGRP_IPV4_ROUTE |
- RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_ROUTE;
-
- if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0)
- {
- log(L_ERR "Unable to bind asynchronous rtnetlink socket: %m");
- close(fd);
- return;
- }
-
- nl_async_rx_buffer = xmalloc(NL_RX_SIZE);
-
- sk = nl_async_sk = sk_new(krt_pool);
- sk->type = SK_MAGIC;
- sk->rx_hook = nl_async_hook;
- sk->err_hook = nl_async_err_hook;
- sk->fd = fd;
- if (sk_open(sk) < 0)
- bug("Netlink: sk_open failed");
-}
-
-
-/*
- * Interface to the UNIX krt module
- */
-
-void
-krt_sys_io_init(void)
-{
- nl_linpool = lp_new_default(krt_pool);
- HASH_INIT(nl_table_map, krt_pool, 6);
-}
-
-int
-krt_sys_start(struct krt_proto *p)
-{
- struct krt_proto *old = HASH_FIND(nl_table_map, RTH, p->af, krt_table_id(p));
-
- if (old)
- {
- log(L_ERR "%s: Kernel table %u already registered by %s",
- p->p.name, krt_table_id(p), old->p.name);
- return 0;
- }
-
- HASH_INSERT2(nl_table_map, RTH, krt_pool, p);
-
- nl_open();
- nl_open_async();
-
- return 1;
-}
-
-void
-krt_sys_shutdown(struct krt_proto *p)
-{
- HASH_REMOVE2(nl_table_map, RTH, krt_pool, p);
-}
-
-int
-krt_sys_reconfigure(struct krt_proto *p UNUSED, struct krt_config *n, struct krt_config *o)
-{
- return (n->sys.table_id == o->sys.table_id) && (n->sys.metric == o->sys.metric);
-}
-
-void
-krt_sys_init_config(struct krt_config *cf)
-{
- cf->sys.table_id = RT_TABLE_MAIN;
- cf->sys.metric = 32;
-}
-
-void
-krt_sys_copy_config(struct krt_config *d, struct krt_config *s)
-{
- d->sys.table_id = s->sys.table_id;
- d->sys.metric = s->sys.metric;
-}
-
-static const char *krt_metrics_names[KRT_METRICS_MAX] = {
- NULL, "lock", "mtu", "window", "rtt", "rttvar", "sstresh", "cwnd", "advmss",
- "reordering", "hoplimit", "initcwnd", "features", "rto_min", "initrwnd", "quickack"
-};
-
-static const char *krt_features_names[KRT_FEATURES_MAX] = {
- "ecn", NULL, NULL, "allfrag"
-};
-
-int
-krt_sys_get_attr(const eattr *a, byte *buf, int buflen UNUSED)
-{
- switch (a->id)
- {
- case EA_KRT_PREFSRC:
- bsprintf(buf, "prefsrc");
- return GA_NAME;
-
- case EA_KRT_REALM:
- bsprintf(buf, "realm");
- return GA_NAME;
-
- case EA_KRT_SCOPE:
- bsprintf(buf, "scope");
- return GA_NAME;
-
- case EA_KRT_LOCK:
- buf += bsprintf(buf, "lock:");
- ea_format_bitfield(a, buf, buflen, krt_metrics_names, 2, KRT_METRICS_MAX);
- return GA_FULL;
-
- case EA_KRT_FEATURES:
- buf += bsprintf(buf, "features:");
- ea_format_bitfield(a, buf, buflen, krt_features_names, 0, KRT_FEATURES_MAX);
- return GA_FULL;
-
- default:;
- int id = (int)EA_ID(a->id) - KRT_METRICS_OFFSET;
- if (id > 0 && id < KRT_METRICS_MAX)
- {
- bsprintf(buf, "%s", krt_metrics_names[id]);
- return GA_NAME;
- }
-
- return GA_UNKNOWN;
- }
-}
-
-
-
-void
-kif_sys_start(struct kif_proto *p UNUSED)
-{
- nl_open();
- nl_open_async();
-}
-
-void
-kif_sys_shutdown(struct kif_proto *p UNUSED)
-{
-}
-
-int
-kif_update_sysdep_addr(struct iface *i UNUSED)
-{
- return 0;
-}
diff --git a/sysdep/unix/krt.Y b/sysdep/unix/krt.Y
index 95b54d65..2a3f41de 100644
--- a/sysdep/unix/krt.Y
+++ b/sysdep/unix/krt.Y
@@ -122,8 +122,8 @@ kif_iface:
kif_iface_start iface_patt_list_nopx kif_iface_opt_list;
-dynamic_attr: KRT_SOURCE { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_SOURCE); } ;
-dynamic_attr: KRT_METRIC { $$ = f_new_dynamic_attr(EAF_TYPE_INT, T_INT, EA_KRT_METRIC); } ;
+dynamic_attr: KRT_SOURCE { $$ = f_new_dynamic_attr(T_INT, EA_KRT_SOURCE); } ;
+dynamic_attr: KRT_METRIC { $$ = f_new_dynamic_attr(T_INT, EA_KRT_METRIC); } ;
CF_CODE
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-05 01:35:01 +0000