summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l24
-rw-r--r--conf/conf.c14
-rw-r--r--conf/conf.h6
-rw-r--r--conf/confbase.Y147
4 files changed, 132 insertions, 59 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 5a2a4d6b..ccf5826a 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -123,27 +123,15 @@ include ^{WHITE}*include{WHITE}*\".*\"{WHITE}*;
}
{DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+ {
- ip4_addr a;
- if (!ip4_pton(yytext, &a))
+ if (!ip4_pton(yytext, &cf_lval.ip4))
cf_error("Invalid IPv4 address %s", yytext);
-
-#ifdef IPV6
- cf_lval.i32 = ip4_to_u32(a);
- return RTRID;
-#else
- cf_lval.a = ipa_from_ip4(a);
- return IPA;
-#endif
+ return IP4;
}
({XIGIT}*::|({XIGIT}*:){3,})({XIGIT}*|{DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+) {
-#ifdef IPV6
- if (ipa_pton(yytext, &cf_lval.a))
- return IPA;
- cf_error("Invalid IPv6 address %s", yytext);
-#else
- cf_error("This is an IPv4 router, therefore IPv6 addresses are not supported");
-#endif
+ if (!ip6_pton(yytext, &cf_lval.ip6))
+ cf_error("Invalid IPv6 address %s", yytext);
+ return IP6;
}
0x{XIGIT}+ {
@@ -686,8 +674,6 @@ cf_symbol_class_name(struct symbol *sym)
return "filter";
case SYM_TABLE:
return "routing table";
- case SYM_ROA:
- return "ROA table";
default:
return "unknown type";
}
diff --git a/conf/conf.c b/conf/conf.c
index 825a8e9f..3fd10ad8 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -135,15 +135,16 @@ config_parse(struct config *c)
sysdep_preconfig(c);
protos_preconfig(c);
rt_preconfig(c);
- roa_preconfig(c);
cf_parse();
- protos_postconfig(c);
+
if (EMPTY_LIST(c->protos))
cf_error("No protocol is specified in the config file");
-#ifdef IPV6
+
+ /*
if (!c->router_id)
- cf_error("Router ID must be configured manually on IPv6 routers");
-#endif
+ cf_error("Router ID must be configured manually");
+ */
+
done = 1;
cleanup:
@@ -266,7 +267,6 @@ config_do_commit(struct config *c, int type)
force_restart |= global_commit(c, old_config);
DBG("rt_commit\n");
rt_commit(c, old_config);
- roa_commit(c, old_config);
DBG("protos_commit\n");
protos_commit(c, old_config, force_restart, type);
@@ -504,7 +504,7 @@ order_shutdown(void)
* error in the configuration.
*/
void
-cf_error(char *msg, ...)
+cf_error(const char *msg, ...)
{
char buf[1024];
va_list args;
diff --git a/conf/conf.h b/conf/conf.h
index 89a2c5b7..8e490c7b 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -20,12 +20,11 @@ struct config {
linpool *mem; /* Linear pool containing configuration data */
list protos; /* Configured protocol instances (struct proto_config) */
list tables; /* Configured routing tables (struct rtable_config) */
- list roa_tables; /* Configured ROA tables (struct roa_table_config) */
list logfiles; /* Configured log fils (sysdep) */
int mrtdump_file; /* Configured MRTDump file (sysdep, fd in unix) */
char *syslog_name; /* Name used for syslog (NULL -> no syslog) */
- struct rtable_config *master_rtc; /* Configuration of master routing table */
+ struct rtable_config *def_tables[NET_MAX]; /* Default routing tables for each network */
struct iface_patt *router_id_from; /* Configured list of router ID iface patterns */
u32 router_id; /* Our Router ID */
@@ -69,7 +68,7 @@ int config_commit(struct config *, int type, int timeout);
int config_confirm(void);
int config_undo(void);
void config_init(void);
-void cf_error(char *msg, ...) NORET;
+void cf_error(const char *msg, ...) NORET;
void config_add_obstacle(struct config *);
void config_del_obstacle(struct config *);
void order_shutdown(void);
@@ -121,7 +120,6 @@ struct symbol {
#define SYM_FUNCTION 3
#define SYM_FILTER 4
#define SYM_TABLE 5
-#define SYM_ROA 6
#define SYM_VARIABLE 0x100 /* 0x100-0x1ff are variable types */
#define SYM_CONSTANT 0x200 /* 0x200-0x2ff are variable types */
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 5f487c1d..22aee770 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -39,9 +39,14 @@ CF_DECLS
int i;
u32 i32;
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 f_tree *e;
@@ -50,15 +55,14 @@ CF_DECLS
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 iface *iface;
- struct roa_table *rot;
void *g;
bird_clock_t time;
- struct prefix px;
+ struct f_prefix px;
struct proto_spec ps;
+ struct channel_limit cl;
struct timeformat *tf;
}
@@ -66,19 +70,20 @@ CF_DECLS
%token GEQ LEQ NEQ AND OR
%token PO PC
%token <i> NUM ENUM
-%token <i32> RTRID
-%token <a> IPA
+%token <ip4> IP4
+%token <ip6> IP6
%token <s> SYM
%token <t> TEXT
%type <iface> ipa_scope
-%type <i> expr bool pxlen
+%type <i> expr bool pxlen4
%type <i32> expr_us
%type <time> datetime
%type <a> ipa
-%type <px> prefix prefix_or_ipa
-%type <t> text
-%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_roa4_ net_roa6_ net_roa_
+
+%type <t> text opttext
%nonassoc PREFIX_DUMMY
%left AND OR
@@ -146,13 +151,15 @@ bool:
| /* Silence means agreement */ { $$ = 1; }
;
-/* Addresses, prefixes and netmasks */
+
+/* Addresses */
ipa:
- IPA
+ IP4 { $$ = ipa_from_ip4($1); }
+ | IP6 { $$ = ipa_from_ip6($1); }
| SYM {
if ($1->class != (SYM_CONSTANT | T_IP)) cf_error("IP address expected");
- $$ = SYM_VAL($1).px.ip;
+ $$ = SYM_VAL($1).ip;
}
;
@@ -161,29 +168,110 @@ ipa_scope:
| '%' SYM { $$ = if_get_by_name($2->name); }
;
-prefix:
- ipa pxlen {
- if (!ip_is_prefix($1, $2)) cf_error("Invalid prefix");
- $$.addr = $1; $$.len = $2;
+
+/* Networks - internal */
+
+pxlen4:
+ '/' NUM {
+ if ($2 < 0 || $2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %d", $2);
+ $$ = $2;
+ }
+ | ':' IP4 {
+ $$ = ip4_masklen($2);
+ if ($$ == 255) cf_error("Invalid netmask %I4", $2);
}
;
-prefix_or_ipa:
- prefix
- | ipa { $$.addr = $1; $$.len = BITS_PER_IP_ADDRESS; }
+net_ip4_: IP4 pxlen4
+{
+ net_fill_ip4(&($$), $1, $2);
+ if (!net_validate_ip4((net_addr_ip4 *) &($$)))
+ cf_error("Invalid IPv4 prefix");
+};
+
+net_ip6_: IP6 '/' NUM
+{
+ net_fill_ip6(&($$), $1, $3);
+ if ($3 < 0 || $3 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid prefix length %d", $3);
+ if (!net_validate_ip6((net_addr_ip6 *) &($$)))
+ cf_error("Invalid IPv6 prefix");
+};
+
+net_roa4_: net_ip4_ MAX NUM AS NUM
+{
+ $$ = cfg_alloc(sizeof(net_addr_roa4));
+ net_fill_roa4($$, ((net_addr_ip4 *)&$1)->prefix, $1.pxlen, $3, $5);
+ if ($3 < 0 || $3 > IP4_MAX_PREFIX_LENGTH)
+ cf_error("Invalid max prefix length %d", $3);
+ if (((net_addr_roa4 *) $$)->max_pxlen < ($$)->pxlen)
+ cf_error("Maximum prefix length %d must be >= prefix length %d", ((net_addr_roa4 *) $$)->max_pxlen, ($$)->pxlen);
+};
+
+net_roa6_: net_ip6_ MAX NUM AS NUM
+{
+ $$ = cfg_alloc(sizeof(net_addr_roa6));
+ net_fill_roa6($$, ((net_addr_ip6 *)&$1)->prefix, $1.pxlen, $3, $5);
+ if ($3 < 0 || $3 > IP6_MAX_PREFIX_LENGTH)
+ cf_error("Invalid max prefix length %d", $3);
+ if (((net_addr_roa6 *) $$)->max_pxlen < ($$)->pxlen)
+ cf_error("Maximum prefix length %d must be >= prefix length %d", ((net_addr_roa6 *) $$)->max_pxlen, ($$)->pxlen);
+};
+
+net_ip_: net_ip4_ | net_ip6_ ;
+net_roa_: net_roa4_ | net_roa6_ ;
+
+net_:
+ net_ip_ { $$ = cfg_alloc($1.length); net_copy($$, &($1)); }
+ | net_roa_
;
-pxlen:
- '/' expr {
- if ($2 < 0 || $2 > BITS_PER_IP_ADDRESS) cf_error("Invalid prefix length %d", $2);
- $$ = $2;
+
+/* Networks - regular */
+
+net_ip6:
+ net_ip6_
+ | SYM {
+ if (($1->class != (SYM_CONSTANT | T_NET)) || (SYM_VAL($1).net->type != NET_IP6))
+ cf_error("IPv6 network expected");
+ $$ = * SYM_VAL($1).net;
+ }
+ ;
+
+net_ip:
+ net_ip_
+ | SYM {
+ if (($1->class != (SYM_CONSTANT | T_NET)) || !net_is_ip(SYM_VAL($1).net))
+ cf_error("IP network expected");
+ $$ = * SYM_VAL($1).net;
+ }
+ ;
+
+net_any:
+ net_
+ | SYM {
+ if ($1->class != (SYM_CONSTANT | T_NET))
+ cf_error("Network expected");
+ $$ = (net_addr *) SYM_VAL($1).net; /* Avoid const warning */
}
- | ':' ipa {
- $$ = ipa_masklen($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); }
+ | SYM {
+ 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 expected");
}
;
+
datetime:
TEXT {
$$ = tm_parse_datetime($1);
@@ -200,11 +288,12 @@ text:
}
;
-text_or_none:
- TEXT { $$ = $1; }
- | { $$ = NULL; }
+opttext:
+ TEXT
+ | /* empty */ { $$ = NULL; }
;
+
CF_CODE
CF_END
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 00:30:04 +0000