From fe9f1a6dedda6bab23cbb605d1cd5db6cd3e2468 Mon Sep 17 00:00:00 2001 From: "Ondrej Zajicek (work)" Date: Thu, 5 Nov 2015 12:48:52 +0100 Subject: Initial commit on integrated BIRD New data types net_addr and variants (in lib/net.h) describing network addresses (prefix/pxlen). Modifications of FIB structures to handle these data types and changing everything to use these data types instead of prefix/pxlen pairs where possible. The commit is WiP, some protocols are not yet updated (BGP, Kernel), and the code contains some temporary scaffolding. Comments are welcome. --- conf/conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf/conf.c') diff --git a/conf/conf.c b/conf/conf.c index a907402d..cc5d5115 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -133,10 +133,10 @@ config_parse(struct config *c) protos_postconfig(c); if (EMPTY_LIST(c->protos)) cf_error("No protocol is specified in the config file"); -#ifdef IPV6 + /* XXXX */ if (!c->router_id) - cf_error("Router ID must be configured manually on IPv6 routers"); -#endif + cf_error("Router ID must be configured manually"); + return 1; } -- cgit v1.2.3