[#2785] Extended syntax

diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll
index edc4f432d1e448ef5c44b31323df88d7bd57edba..3ac2354b3866126c21386fb0f5851244e175d6a5 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.ll
+++ b/src/bin/dhcp4/dhcp4_lexer.ll
@@ -2075,6 +2075,15 @@ ControlCharacterFill            [^"\\]|\\["\\/bfnrtu]
     }
 }
 
+\"ignore-dhcp-server-identifier\" {
+    switch(driver.ctx_) {
+    case isc::dhcp::Parser4Context::COMPATIBILITY:
+        return isc::dhcp::Dhcp4Parser::make_IGNORE_DHCP_SERVER_ID(driver.loc_);
+    default:
+        return isc::dhcp::Dhcp4Parser::make_STRING("ignore-dhcp-server-identifier", driver.loc_);
+    }
+}
+
 \"ignore-rai-link-selection\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::COMPATIBILITY:

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index 3180be0256b496063b1628be3a1c99170b0041d8..4a866bc2b7a70712fd58fbff8449c8409d132e1e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -258,6 +258,7 @@ using namespace std;
 
   COMPATIBILITY "compatibility"
   LENIENT_OPTION_PARSING "lenient-option-parsing"
+  IGNORE_DHCP_SERVER_ID "ignore-dhcp-server-identifier"
   IGNORE_RAI_LINK_SEL "ignore-rai-link-selection"
   EXCLUDE_FIRST_LAST_24 "exclude-first-last-24"
 
@@ -2937,7 +2938,8 @@ compatibility_params: compatibility_param
                     ;
 
 compatibility_param: lenient_option_parsing
-                   | ignore-rai-link-selection
+                   | ignore_dhcp_server_identifier
+                   | ignore_rai_link_selection
                    | exclude_first_last_24
                    | unknown_map_entry
                    ;
@@ -2948,7 +2950,13 @@ lenient_option_parsing: LENIENT_OPTION_PARSING COLON BOOLEAN {
     ctx.stack_.back()->set("lenient-option-parsing", b);
 };
 
-ignore-rai-link-selection: IGNORE_RAI_LINK_SEL COLON BOOLEAN {
+ignore_dhcp_server_identifier: IGNORE_DHCP_SERVER_ID COLON BOOLEAN {
+    ctx.unique("ignore-dhcp-server-identifier", ctx.loc2pos(@1));
+    ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
+    ctx.stack_.back()->set("ignore-dhcp-server-identifier", b);
+}
+
+ignore_rai_link_selection: IGNORE_RAI_LINK_SEL COLON BOOLEAN {
     ctx.unique("ignore-rai-link-selection", ctx.loc2pos(@1));
     ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
     ctx.stack_.back()->set("ignore-rai-link-selection", b);