From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 11 Nov 2016 15:08:59 +0000 (+0900)
Subject: [5014] client classification and reservations are now parsed properly.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb7fcf4b09bd8144362a64d2b33d91e93a08f082;p=thirdparty%2Fkea.git

[5014] client classification and reservations are now parsed properly.
---

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index db579f058a..f4c2af3b31 100644
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -140,6 +140,14 @@ JSONString                              \"{JSONStringCharacter}*\"
 \"debuglevel\" { return isc::dhcp::Dhcp6Parser::make_DEBUGLEVEL(loc); }
 \"severity\" { return isc::dhcp::Dhcp6Parser::make_SEVERITY(loc); }
 
+\"client-classes\" { return isc::dhcp::Dhcp6Parser::make_CLIENT_CLASSES(loc); }
+\"client-class\" { return isc::dhcp::Dhcp6Parser::make_CLIENT_CLASS(loc); }
+\"test\" { return isc::dhcp::Dhcp6Parser::make_TEST(loc); }
+
+\"reservations\" { return isc::dhcp::Dhcp6Parser::make_RESERVATIONS(loc); }
+\"duid\" { return isc::dhcp::Dhcp6Parser::make_DUID(loc); }
+
+
 {JSONString} {
     // A string has been matched. It contains the actual string and single quotes.
     // We need to get those quotes out of the way and just use its content, e.g.
diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 1c927e3235..fffad41509 100644
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -66,9 +66,17 @@ using namespace std;
   POOL "pool"
   SUBNET "subnet"
   INTERFACE "interface"
+
   MAC_SOURCES "mac-sources"
   RELAY_SUPPLIED_OPTIONS "relay-supplied-options"
 
+  CLIENT_CLASSES "client-classes"
+  TEST "test"
+  CLIENT_CLASS "client-class"
+
+  RESERVATIONS "reservations"
+  DUID "duid"
+
   LOGGING "Logging"
   LOGGERS "loggers"
   OUTPUT_OPTIONS "output_options"
@@ -200,6 +208,8 @@ global_param
 | lease_database
 | mac_sources
 | relay_supplied_options
+| client_classes
+| option_data_list
 ;
 
 preferred_lifetime: PREFERRED_LIFETIME COLON INTEGER {
@@ -291,6 +301,8 @@ subnet6_list_content: { /* no subnets defined at all */ }
 | subnet6_list_content COMMA subnet6
 ;
 
+// --- Subnet definitions -------------------------------
+
 // This defines a single subnet, i.e. a single map with
 // subnet6 array.
 subnet6: LCURLY_BRACKET {
@@ -301,21 +313,32 @@ subnet6: LCURLY_BRACKET {
     ctx.stack_.pop_back();
 } RCURLY_BRACKET;
 
+// This defines that subnet can have one or more parameters.
 subnet6_params: subnet6_param
 | subnet6_params COMMA subnet6_param;
 
-subnet6_param: { /* empty list */ }
-| option_data_list
+// This defines a list of allowed parameters for each subnet.
+subnet6_param: option_data_list
 | pools_list
-| SUBNET COLON STRING {
-    ElementPtr name(new StringElement($3)); ctx.stack_.back()->set("subnet", name);
-
- }
-| INTERFACE COLON STRING {
-    ElementPtr name(new StringElement($3)); ctx.stack_.back()->set("interface", name);
- }
+| subnet
+| interface
+| client_class
+| reservations
 ;
 
+subnet: SUBNET COLON STRING {
+    ElementPtr subnet(new StringElement($3)); ctx.stack_.back()->set("subnet", subnet);
+};
+
+interface: INTERFACE COLON STRING {
+    ElementPtr iface(new StringElement($3)); ctx.stack_.back()->set("interface", iface);
+};
+
+subnet: CLIENT_CLASS COLON STRING {
+    ElementPtr cls(new StringElement($3)); ctx.stack_.back()->set("client-class", cls);
+};
+
+
 // ---- option-data --------------------------
 
 // This defines the "option-data": [ ... ] entry that may appear
@@ -396,6 +419,92 @@ pool_param: POOL COLON STRING {
 
 // --- end of pools definition -------------------------------
 
+// --- reservations ------------------------------------------
+reservations: RESERVATIONS COLON LSQUARE_BRACKET {
+    ElementPtr l(new ListElement());
+    ctx.stack_.back()->set("reservations", l);
+    ctx.stack_.push_back(l);
+} reservations_list {
+    ctx.stack_.pop_back();
+} RSQUARE_BRACKET;
+
+reservations_list: { }
+| reservation
+| reservations_list COMMA reservation;
+
+reservation: LCURLY_BRACKET {
+    ElementPtr m(new MapElement());
+    ctx.stack_.back()->add(m);
+    ctx.stack_.push_back(m);
+} reservation_params RCURLY_BRACKET {
+    ctx.stack_.pop_back();
+};
+
+reservation_params: reservation_param
+| reservation_params COMMA reservation_param;
+
+// @todo probably need to add mac-address as well here
+reservation_param:
+| duid
+| reservation_client_classes
+;
+
+duid: DUID COLON STRING {
+    ElementPtr d(new StringElement($3)); ctx.stack_.back()->set("duid", d);
+};
+
+reservation_client_classes: CLIENT_CLASSES COLON {
+    ElementPtr c(new ListElement());
+    ctx.stack_.back()->set("client-classes", c);
+    ctx.stack_.push_back(c);
+} list {
+    ctx.stack_.pop_back();
+  };
+
+// --- end of reservations definitions -----------------------
+
+// --- client classes ----------------------------------------
+client_classes: CLIENT_CLASSES COLON LSQUARE_BRACKET {
+    ElementPtr l(new ListElement());
+    ctx.stack_.back()->set("client-classes", l);
+    ctx.stack_.push_back(l);
+} client_classes_list RSQUARE_BRACKET {
+    ctx.stack_.pop_back();
+};
+
+client_classes_list: client_class
+| client_classes_list COMMA client_class;
+
+client_class: LCURLY_BRACKET {
+    ElementPtr m(new MapElement());
+    ctx.stack_.back()->add(m);
+    ctx.stack_.push_back(m);
+} client_class_params RCURLY_BRACKET {
+    ctx.stack_.pop_back();
+};
+
+client_class_params: client_class_param
+| client_class_params COMMA client_class_param;
+
+client_class_param:
+| client_class_name
+| client_class_test
+| option_data_list
+;
+
+client_class_name: NAME COLON STRING {
+    ElementPtr name(new StringElement($3));
+    ctx.stack_.back()->set("name", name);
+};
+
+client_class_test: TEST COLON STRING {
+    ElementPtr test(new StringElement($3));
+    ctx.stack_.back()->set("test", test);
+}
+
+
+// --- end of client classes ---------------------------------
+
 // --- logging entry -----------------------------------------
 
 // This defines the top level "Logging" object. It parses