From 04b96cd71beb6b34727359c159fa26949bdef36d Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 14 Sep 2018 09:49:52 +0200 Subject: [PATCH] [116-interface-id-dhcpv4] Removed rapid commit --- src/bin/dhcp4/dhcp4_lexer.ll | 9 --------- src/bin/dhcp4/dhcp4_parser.yy | 7 ------- 2 files changed, 16 deletions(-) diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll index 333bfbebbe..1b9ae680c2 100644 --- a/src/bin/dhcp4/dhcp4_lexer.ll +++ b/src/bin/dhcp4/dhcp4_lexer.ll @@ -721,15 +721,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } } -\"rapid-commit\" { - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::SUBNET4: - return isc::dhcp::Dhcp4Parser::make_RAPID_COMMIT(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("rapid-commit", driver.loc_); - } -} - \"reservation-mode\" { 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 b6e9fefbdd..10301f8c15 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -123,7 +123,6 @@ using namespace std; SUBNET "subnet" INTERFACE "interface" ID "id" - RAPID_COMMIT "rapid-commit" RESERVATION_MODE "reservation-mode" DISABLED "disabled" OUT_OF_POOL "out-of-pool" @@ -1021,7 +1020,6 @@ subnet4_param: valid_lifetime | subnet | interface | id - | rapid_commit | client_class | require_client_classes | reservations @@ -1115,11 +1113,6 @@ id: ID COLON INTEGER { ctx.stack_.back()->set("id", id); }; -rapid_commit: RAPID_COMMIT COLON BOOLEAN { - ElementPtr rc(new BoolElement($3, ctx.loc2pos(@3))); - ctx.stack_.back()->set("rapid-commit", rc); -}; - // ---- shared-networks --------------------- shared_networks: SHARED_NETWORKS { -- 2.47.2