From: Francis Dupont <fdupont@isc.org>
Date: Wed, 12 Sep 2018 18:45:09 +0000 (+0200)
Subject: [116-interface-id-dhcpv4] Updated syntax
X-Git-Tag: 137-improve-kea-compilation-time-2_base~11^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=210e4a53395dffc28699b70ca245333a05bea7df;p=thirdparty%2Fkea.git

[116-interface-id-dhcpv4] Updated syntax
---

diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll
index 278ca6c8b2..333bfbebbe 100644
--- a/src/bin/dhcp4/dhcp4_lexer.ll
+++ b/src/bin/dhcp4/dhcp4_lexer.ll
@@ -712,15 +712,6 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
     }
 }
 
-\"interface-id\" {
-    switch(driver.ctx_) {
-    case isc::dhcp::Parser4Context::SUBNET4:
-        return isc::dhcp::Dhcp4Parser::make_INTERFACE_ID(driver.loc_);
-    default:
-        return isc::dhcp::Dhcp4Parser::make_STRING("interface-id", driver.loc_);
-    }
-}
-
 \"id\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:
diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index a065259a75..b6e9fefbdd 100644
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -122,7 +122,6 @@ using namespace std;
 
   SUBNET "subnet"
   INTERFACE "interface"
-  INTERFACE_ID "interface-id"
   ID "id"
   RAPID_COMMIT "rapid-commit"
   RESERVATION_MODE "reservation-mode"
@@ -1021,7 +1020,6 @@ subnet4_param: valid_lifetime
              | pools_list
              | subnet
              | interface
-             | interface_id
              | id
              | rapid_commit
              | client_class
@@ -1081,14 +1079,6 @@ interface: INTERFACE {
     ctx.leave();
 };
 
-interface_id: INTERFACE_ID {
-    ctx.enter(ctx.NO_KEYWORD);
-} COLON STRING {
-    ElementPtr iface(new StringElement($4, ctx.loc2pos(@4)));
-    ctx.stack_.back()->set("interface-id", iface);
-    ctx.leave();
-};
-
 client_class: CLIENT_CLASS {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {