From cb1bd816db5b69acb8c6f72211d13f987a494304 Mon Sep 17 00:00:00 2001 From: Pavel Tvrdík Date: Wed, 20 Jan 2016 15:06:19 +0100 Subject: Add ROA_* constants values to grammar of configuration Add ROA_UNKNOWN, ROA_VALID and ROA_INVALID --- filter/filter.h | 2 +- nest/config.Y | 1 + nest/route.h | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/filter/filter.h b/filter/filter.h index c100a79a..1875f314 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -133,7 +133,7 @@ void val_format(struct f_val v, buffer *buf); #define T_ENUM_SCOPE 0x32 #define T_ENUM_RTC 0x33 #define T_ENUM_RTD 0x34 -/*#define T_ENUM_ROA 0x35*/ +#define T_ENUM_ROA 0x35 /* new enums go here */ #define T_ENUM_EMPTY 0x3f /* Special hack for atomic_aggr */ diff --git a/nest/config.Y b/nest/config.Y index 06d5c363..d6aa9653 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -68,6 +68,7 @@ CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIREC CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED) CF_ENUM(T_ENUM_RTC, RTC_, UNICAST, BROADCAST, MULTICAST, ANYCAST) CF_ENUM(T_ENUM_RTD, RTD_, ROUTER, DEVICE, BLACKHOLE, UNREACHABLE, PROHIBIT, MULTIPATH) +CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID) %type idval %type imexport diff --git a/nest/route.h b/nest/route.h index 3a8788a7..c6e9cb41 100644 --- a/nest/route.h +++ b/nest/route.h @@ -563,6 +563,10 @@ extern struct protocol *attr_class_to_protocol[EAP_MAX]; #define DEF_PREF_PIPE 70 /* Routes piped from other tables */ #define DEF_PREF_INHERITED 10 /* Routes inherited from other routing daemons */ +#define ROA_UNKNOWN 0 +#define ROA_VALID 1 +#define ROA_INVALID 2 + #if 0 /* @@ -617,10 +621,6 @@ struct roa_show_data { u32 asn; /* Filter ASN, 0 -> all */ }; -#define ROA_UNKNOWN 0 -#define ROA_VALID 1 -#define ROA_INVALID 2 - #define ROA_SRC_ANY 0 #define ROA_SRC_CONFIG 1 #define ROA_SRC_DYNAMIC 2 -- cgit v1.2.3