CF_DEFINES
static void
-check_u16(unsigned val)
+check_u16(uint val)
{
if (val > 0xFFFF)
- cf_error("Value %d out of range (0-65535)", val);
+ cf_error("Value %u out of range (0-65535)", val);
+}
+
+#define cf_assert(cond, ...) do { if (!(cond)) cf_error(__VA_ARGS__); } while (0)
+static inline void cf_assert_symbol(const struct symbol *sym, uint class) {
+ switch (class) {
+ case SYM_PROTO: cf_assert(sym->class == SYM_PROTO, "Protocol name required"); break;
+ case SYM_TEMPLATE: cf_assert(sym->class == SYM_TEMPLATE, "Protocol template name required"); break;
+ case SYM_FUNCTION: cf_assert(sym->class == SYM_FUNCTION, "Function name required"); break;
+ case SYM_FILTER: cf_assert(sym->class == SYM_FILTER, "Filter name required"); break;
+ case SYM_TABLE: cf_assert(sym->class == SYM_TABLE, "Table name required"); break;
+ case SYM_ATTRIBUTE: cf_assert(sym->class == SYM_ATTRIBUTE, "Custom attribute name required"); break;
+ case SYM_VARIABLE: cf_assert((sym->class & ~0xff) == SYM_VARIABLE, "Variable name required"); break;
+ case SYM_CONSTANT: cf_assert((sym->class & ~0xff) == SYM_CONSTANT, "Constant name required"); break;
+ default: bug("This shall not happen");
+ }
}
CF_DECLS
%union {
- int i;
+ uint i;
u32 i32;
+ u64 i64;
ip_addr a;
+ ip4_addr ip4;
+ ip6_addr ip6;
+ net_addr net;
+ net_addr *net_ptr;
struct symbol *s;
char *t;
struct rtable_config *r;
+ struct channel_config *cc;
struct f_inst *x;
- struct filter *f;
+ struct {
+ struct f_inst *begin, *end;
+ } xp;
+ enum filter_return fret;
+ enum ec_subtype ecs;
+ struct f_dynamic_attr fda;
+ struct f_static_attr fsa;
+ struct f_lval flv;
+ struct f_line *fl;
+ const struct filter *f;
struct f_tree *e;
struct f_trie *trie;
struct f_val v;
- struct f_path_mask *h;
struct password_item *p;
struct rt_show_data *ra;
- struct roa_show_data *ro;
struct sym_show_data *sd;
struct lsadb_show_data *ld;
+ struct mrt_dump_data *md;
struct iface *iface;
- struct roa_table *rot;
void *g;
- bird_clock_t time;
- struct prefix px;
+ btime time;
+ struct f_prefix px;
struct proto_spec ps;
+ struct channel_limit cl;
struct timeformat *tf;
+ mpls_label_stack *mls;
}
%token END CLI_MARKER INVALID_TOKEN ELSECOL DDOT
%token GEQ LEQ NEQ AND OR
%token PO PC
%token <i> NUM ENUM
-%token <i32> RTRID
-%token <a> IPA
-%token <s> SYM
+%token <ip4> IP4
+%token <ip6> IP6
+%token <i64> VPN_RD
+%token <s> CF_SYM_KNOWN CF_SYM_UNDEFINED
%token <t> TEXT
%type <iface> ipa_scope
-%type <i> expr bool pxlen
-%type <time> datetime
+%type <i> expr bool pxlen4
+%type <time> expr_us time
%type <a> ipa
-%type <px> prefix prefix_or_ipa
-%type <t> text_or_none
+%type <net> net_ip4_ net_ip6_ net_ip6 net_ip_ net_ip net_or_ipa
+%type <net_ptr> net_ net_any net_vpn4_ net_vpn6_ net_vpn_ net_roa4_ net_roa6_ net_roa_ net_ip6_sadr_ net_mpls_
+%type <mls> label_stack_start label_stack
+
+%type <t> text opttext
+%type <s> symbol
%nonassoc PREFIX_DUMMY
%left AND OR
-%nonassoc '=' '<' '>' '~' GEQ LEQ NEQ PO PC
+%nonassoc '=' '<' '>' '~' GEQ LEQ NEQ NMA PO PC
%left '+' '-'
%left '*' '/' '%'
%left '!'
%nonassoc '.'
-CF_KEYWORDS(DEFINE, ON, OFF, YES, NO)
+%start config
+
+CF_KEYWORDS(DEFINE, ON, OFF, YES, NO, S, MS, US, PORT, VPN, MPLS, FROM)
CF_GRAMMAR
| conf_entries conf
;
-CF_ADDTO(conf, ';')
+conf: ';' ;
+
/* Constant expressions */
+conf: definition ;
+
+definition:
+ DEFINE symbol '=' term ';' {
+ struct f_val *val = cfg_alloc(sizeof(struct f_val));
+ if (f_eval(f_linearize($4), cfg_mem, val) > F_RETURN) cf_error("Runtime error");
+ cf_define_symbol($2, SYM_CONSTANT | val->type, val, val);
+ }
+ ;
+
expr:
NUM
- | '(' term ')' { $$ = f_eval_int($2); }
- | SYM { if ($1->class != SYM_NUMBER) cf_error("Number expected"); else $$ = $1->aux; }
+ | '(' term ')' { $$ = f_eval_int(f_linearize($2)); }
+ | CF_SYM_KNOWN {
+ if ($1->class != (SYM_CONSTANT | T_INT)) cf_error("Number constant expected");
+ $$ = SYM_VAL($1).i; }
;
-/* expr_u16: expr { check_u16($1); $$ = $1; }; */
-
-CF_ADDTO(conf, definition)
-definition:
- DEFINE SYM '=' expr ';' {
- cf_define_symbol($2, SYM_NUMBER, NULL);
- $2->aux = $4;
- }
- | DEFINE SYM '=' IPA ';' {
- cf_define_symbol($2, SYM_IPA, cfg_alloc(sizeof(ip_addr)));
- *(ip_addr *)$2->def = $4;
- }
+expr_us:
+ expr S { $$ = $1 S_; }
+ | expr MS { $$ = $1 MS_; }
+ | expr US { $$ = $1 US_; }
;
+symbol: CF_SYM_UNDEFINED | CF_SYM_KNOWN ;
+
/* Switches */
bool:
- expr {$$ = !!$1; }
+ expr { $$ = !!$1; }
| ON { $$ = 1; }
| YES { $$ = 1; }
| OFF { $$ = 0; }
| /* Silence means agreement */ { $$ = 1; }
;
-/* Addresses, prefixes and netmasks */
+
+/* Addresses */
ipa:
- IPA
- | SYM {
- if ($1->class != SYM_IPA) cf_error("IP address expected");
- $$ = *(ip_addr *)$1->def;
+ IP4 { $$ = ipa_from_ip4($1); }
+ | IP6 { $$ = ipa_from_ip6($1); }
+ | CF_SYM_KNOWN {
+ if ($1->class != (SYM_CONSTANT | T_IP)) cf_error("IP address constant expected");
+ $$ = SYM_VAL($1).ip;
}
;
ipa_scope:
/* empty */ { $$ = NULL; }
- | '%' SYM { $$ = if_get_by_name($2->name); }
+ | '%' symbol { $$ = if_get_by_name($2->name); }
+ ;
+
+
+/* Networks - internal */
+
+pxlen4:
+ '/' NUM {
+ if ($2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %u", $2);
+ $$ = $2;
+ }
+ ;
+
+net_ip4_: IP4 pxlen4
+{
+ net_fill_ip4(&($$), $1, $2);
+
+ net_addr_ip4 *n = (void *) &($$);
+ if (!net_validate_ip4(n))
+ cf_error("Invalid IPv4 prefix %I4/%d, maybe you wanted %I4/%d",
+ n->prefix, n->pxlen, ip4_and(n->prefix, ip4_mkmask(n->pxlen)), n->pxlen);
+};
+
+net_ip6_: IP6 '/' NUM
+{
+ if ($3 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid prefix length %u", $3);
+
+ net_fill_ip6(&($$), $1, $3);
+
+ net_addr_ip6 *n = (void *) &($$);
+ if (!net_validate_ip6(n))
+ cf_error("Invalid IPv6 prefix %I6/%d, maybe you wanted %I6/%d",
+ n->prefix, n->pxlen, ip6_and(n->prefix, ip6_mkmask(n->pxlen)), n->pxlen);
+};
+
+net_ip6_sadr_: IP6 '/' NUM FROM IP6 '/' NUM
+{
+ if ($3 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid prefix length %u", $3);
+
+ if ($7 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid prefix length %u", $7);
+
+ $$ = cfg_alloc(sizeof(net_addr_ip6_sadr));
+ net_fill_ip6_sadr($$, $1, $3, $5, $7);
+
+ net_addr_ip6_sadr *n = (void *) $$;
+ if (!net_validate_ip6_sadr(n))
+ cf_error("Invalid SADR IPv6 prefix %I6/%d from %I6/%d, maybe you wanted %I6/%d from %I6/%d",
+ n->dst_prefix, n->dst_pxlen, n->src_prefix, n->src_pxlen,
+ ip6_and(n->dst_prefix, ip6_mkmask(n->dst_pxlen)), n->dst_pxlen,
+ ip6_and(n->src_prefix, ip6_mkmask(n->src_pxlen)), n->src_pxlen);
+};
+
+net_vpn4_: VPN_RD net_ip4_
+{
+ $$ = cfg_alloc(sizeof(net_addr_vpn4));
+ net_fill_vpn4($$, net4_prefix(&$2), net4_pxlen(&$2), $1);
+}
+
+net_vpn6_: VPN_RD net_ip6_
+{
+ $$ = cfg_alloc(sizeof(net_addr_vpn6));
+ net_fill_vpn6($$, net6_prefix(&$2), net6_pxlen(&$2), $1);
+}
+
+net_roa4_: net_ip4_ MAX NUM AS NUM
+{
+ $$ = cfg_alloc(sizeof(net_addr_roa4));
+ net_fill_roa4($$, net4_prefix(&$1), net4_pxlen(&$1), $3, $5);
+ if ($3 < net4_pxlen(&$1) || $3 > IP4_MAX_PREFIX_LENGTH)
+ cf_error("Invalid max prefix length %u", $3);
+};
+
+net_roa6_: net_ip6_ MAX NUM AS NUM
+{
+ $$ = cfg_alloc(sizeof(net_addr_roa6));
+ net_fill_roa6($$, net6_prefix(&$1), net6_pxlen(&$1), $3, $5);
+ if ($3 < net6_pxlen(&$1) || $3 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid max prefix length %u", $3);
+};
+
+net_mpls_: MPLS NUM
+{
+ $$ = cfg_alloc(sizeof(net_addr_roa6));
+ net_fill_mpls($$, $2);
+}
+
+net_ip_: net_ip4_ | net_ip6_ ;
+net_vpn_: net_vpn4_ | net_vpn6_ ;
+net_roa_: net_roa4_ | net_roa6_ ;
+
+net_:
+ net_ip_ { $$ = cfg_alloc($1.length); net_copy($$, &($1)); }
+ | net_vpn_
+ | net_roa_
+ | net_flow_
+ | net_ip6_sadr_
+ | net_mpls_
;
-prefix:
- ipa pxlen {
- if (!ip_is_prefix($1, $2)) cf_error("Invalid prefix");
- $$.addr = $1; $$.len = $2;
+
+/* Networks - regular */
+
+net_ip6:
+ net_ip6_
+ | CF_SYM_KNOWN {
+ if (($1->class != (SYM_CONSTANT | T_NET)) || (SYM_VAL($1).net->type != NET_IP6))
+ cf_error("IPv6 network constant expected");
+ $$ = * SYM_VAL($1).net;
}
;
-prefix_or_ipa:
- prefix
- | ipa { $$.addr = $1; $$.len = BITS_PER_IP_ADDRESS; }
+net_ip:
+ net_ip_
+ | CF_SYM_KNOWN {
+ if (($1->class != (SYM_CONSTANT | T_NET)) || !net_is_ip(SYM_VAL($1).net))
+ cf_error("IP network constant expected");
+ $$ = * SYM_VAL($1).net;
+ }
;
-pxlen:
- '/' expr {
- if ($2 < 0 || $2 > BITS_PER_IP_ADDRESS) cf_error("Invalid prefix length %d", $2);
- $$ = $2;
+net_any:
+ net_
+ | CF_SYM_KNOWN {
+ if ($1->class != (SYM_CONSTANT | T_NET))
+ cf_error("Network constant expected");
+ $$ = (net_addr *) SYM_VAL($1).net; /* Avoid const warning */
}
- | ':' ipa {
- $$ = ipa_mklen($2);
- if ($$ < 0) cf_error("Invalid netmask %I", $2);
+ ;
+
+net_or_ipa:
+ net_ip4_
+ | net_ip6_
+ | IP4 { net_fill_ip4(&($$), $1, IP4_MAX_PREFIX_LENGTH); }
+ | IP6 { net_fill_ip6(&($$), $1, IP6_MAX_PREFIX_LENGTH); }
+ | CF_SYM_KNOWN {
+ if ($1->class == (SYM_CONSTANT | T_IP))
+ net_fill_ip_host(&($$), SYM_VAL($1).ip);
+ else if (($1->class == (SYM_CONSTANT | T_NET)) && net_is_ip(SYM_VAL($1).net))
+ $$ = * SYM_VAL($1).net;
+ else
+ cf_error("IP address or network constant expected");
}
;
-datetime:
+label_stack_start: NUM
+{
+ $$ = cfg_allocz(sizeof(mpls_label_stack));
+ $$->len = 1;
+ $$->stack[0] = $1;
+};
+
+label_stack:
+ label_stack_start
+ | label_stack '/' NUM {
+ if ($1->len >= MPLS_MAX_LABEL_STACK)
+ cf_error("Too many labels in stack");
+ $1->stack[$1->len++] = $3;
+ $$ = $1;
+ }
+;
+
+time:
TEXT {
- $$ = tm_parse_datetime($1);
+ $$ = tm_parse_time($1);
if (!$$)
- cf_error("Invalid date and time");
+ cf_error("Invalid date/time");
}
;
-text_or_none:
- TEXT { $$ = $1; }
- | { $$ = NULL; }
+text:
+ TEXT
+ | CF_SYM_KNOWN {
+ if ($1->class != (SYM_CONSTANT | T_STRING)) cf_error("String constant expected");
+ $$ = SYM_VAL($1).s;
+ }
;
+opttext:
+ TEXT
+ | /* empty */ { $$ = NULL; }
+ ;
+
+
CF_CODE
CF_END
projects / thirdparty / bird.git / blobdiff