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

also to implicit ';'.

diff --git a/TODO b/TODO
index ced47f2e6eb21edd56b27578f961ba28fca74d16..dc209f4857347446c02fc4e7b7349920e67f5e81 100644 (file)
--- 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 791d4adcc9eebfff95ce31f5daee53e23e019045..426f5287c276445b67b9eeae4a8717af46e62124 100644 (file)
--- 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>.