summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2015-12-16 15:30:44 +0100
committerOndrej Zajicek (work) <santiago@crfreenet.org>2015-12-20 13:04:07 +0100
commit9656dce72eead158e6da3ad560720bb0addfe7e2 (patch)
tree190bdc886af4a3e80cbffee3becc3562412a2ee9 /conf
parentaedd3a6babbaf35becb7770f73f30b20b464393f (diff)
ROA code switchoff
Diffstat (limited to 'conf')
-rw-r--r--conf/cf-lex.l2
-rw-r--r--conf/conf.c4
-rw-r--r--conf/conf.h1
3 files changed, 2 insertions, 5 deletions
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index f90e983b..ccf5826a 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -674,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 1bb744c3..9eea5664 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -135,7 +135,7 @@ config_parse(struct config *c)
sysdep_preconfig(c);
protos_preconfig(c);
rt_preconfig(c);
- roa_preconfig(c);
+/* roa_preconfig(c); */
cf_parse();
protos_postconfig(c);
if (EMPTY_LIST(c->protos))
@@ -266,7 +266,7 @@ 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);
+/* roa_commit(c, old_config); */
DBG("protos_commit\n");
protos_commit(c, old_config, force_restart, type);
diff --git a/conf/conf.h b/conf/conf.h
index 89a2c5b7..d442cdb5 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -121,7 +121,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 */