'#' comments in config files are equivalent to end of line, therefore

also to implicit ';'.

2 files changed, 5 insertions, 12 deletions

diff --git a/TODO b/TODO
index ced47f2e..dc209f48 100644
--- a/TODO
+++ b/TODO
@@ -20,8 +20,6 @@ Core
 - default preferences of protocols: prefer BGP over OSPF/RIP external routes?
 - secondary addresses -> subinterfaces
 
-- config: comments at end of line -> explicit ';' needed?
-
 - static: check validity of route destination?
 - static: device routes
 
diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 791d4adc..426f5287 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -120,24 +120,19 @@ WHITE [ \t]
 
 {WHITE}+
 
-\\\n {
-  conf_lino++;
-}
+\\\n	conf_lino++;
+\n	{ conf_lino++; return ';'; }
 
-\n {
-  conf_lino++;
-  return ';';
-}
-
-#	{ BEGIN(COMMENT); }
+#	BEGIN(COMMENT);
 
-\/\*	{ BEGIN(CCOMM); }
+\/\*	BEGIN(CCOMM);
 
 .	cf_error("Unknown character");
 
 <COMMENT>\n {
   conf_lino++;
   BEGIN(INITIAL);
+  return ';';
 }
 
 <COMMENT>.