[master] regen flex/bison files

src/bin/dhcp4/dhcp4_parser.h

@@ -306,6 +306,7 @@ namespace isc { namespace dhcp {
     {
       // value
       // socket_type
+      // db_type
       // ncr_protocol_value
       // replace_client_name_value
       char dummy1[sizeof(ElementPtr)];
@@ -365,65 +366,65 @@ namespace isc { namespace dhcp {
         TOKEN_LEASE_DATABASE = 276,
         TOKEN_HOSTS_DATABASE = 277,
         TOKEN_TYPE = 278,
-        TOKEN_USER = 279,
-        TOKEN_PASSWORD = 280,
-        TOKEN_HOST = 281,
-        TOKEN_PERSIST = 282,
-        TOKEN_LFC_INTERVAL = 283,
-        TOKEN_READONLY = 284,
-        TOKEN_VALID_LIFETIME = 285,
-        TOKEN_RENEW_TIMER = 286,
-        TOKEN_REBIND_TIMER = 287,
-        TOKEN_DECLINE_PROBATION_PERIOD = 288,
-        TOKEN_SUBNET4 = 289,
-        TOKEN_SUBNET_4O6_INTERFACE = 290,
-        TOKEN_SUBNET_4O6_INTERFACE_ID = 291,
-        TOKEN_SUBNET_4O6_SUBNET = 292,
-        TOKEN_OPTION_DEF = 293,
-        TOKEN_OPTION_DATA = 294,
-        TOKEN_NAME = 295,
-        TOKEN_DATA = 296,
-        TOKEN_CODE = 297,
-        TOKEN_SPACE = 298,
-        TOKEN_CSV_FORMAT = 299,
-        TOKEN_RECORD_TYPES = 300,
-        TOKEN_ENCAPSULATE = 301,
-        TOKEN_ARRAY = 302,
-        TOKEN_POOLS = 303,
-        TOKEN_POOL = 304,
-        TOKEN_SUBNET = 305,
-        TOKEN_INTERFACE = 306,
-        TOKEN_INTERFACE_ID = 307,
-        TOKEN_ID = 308,
-        TOKEN_RAPID_COMMIT = 309,
-        TOKEN_RESERVATION_MODE = 310,
-        TOKEN_HOST_RESERVATION_IDENTIFIERS = 311,
-        TOKEN_CLIENT_CLASSES = 312,
-        TOKEN_TEST = 313,
-        TOKEN_CLIENT_CLASS = 314,
-        TOKEN_RESERVATIONS = 315,
-        TOKEN_DUID = 316,
-        TOKEN_HW_ADDRESS = 317,
-        TOKEN_CIRCUIT_ID = 318,
-        TOKEN_CLIENT_ID = 319,
-        TOKEN_HOSTNAME = 320,
-        TOKEN_RELAY = 321,
-        TOKEN_IP_ADDRESS = 322,
-        TOKEN_HOOKS_LIBRARIES = 323,
-        TOKEN_LIBRARY = 324,
-        TOKEN_PARAMETERS = 325,
-        TOKEN_EXPIRED_LEASES_PROCESSING = 326,
-        TOKEN_RECLAIM_TIMER_WAIT_TIME = 327,
-        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 328,
-        TOKEN_HOLD_RECLAIMED_TIME = 329,
-        TOKEN_MAX_RECLAIM_LEASES = 330,
-        TOKEN_MAX_RECLAIM_TIME = 331,
-        TOKEN_UNWARNED_RECLAIM_CYCLES = 332,
-        TOKEN_SERVER_ID = 333,
-        TOKEN_IDENTIFIER = 334,
-        TOKEN_HTYPE = 335,
-        TOKEN_TIME = 336,
-        TOKEN_ENTERPRISE_ID = 337,
+        TOKEN_MEMFILE = 279,
+        TOKEN_MYSQL = 280,
+        TOKEN_POSTGRESQL = 281,
+        TOKEN_CQL = 282,
+        TOKEN_USER = 283,
+        TOKEN_PASSWORD = 284,
+        TOKEN_HOST = 285,
+        TOKEN_PERSIST = 286,
+        TOKEN_LFC_INTERVAL = 287,
+        TOKEN_READONLY = 288,
+        TOKEN_CONNECT_TIMEOUT = 289,
+        TOKEN_VALID_LIFETIME = 290,
+        TOKEN_RENEW_TIMER = 291,
+        TOKEN_REBIND_TIMER = 292,
+        TOKEN_DECLINE_PROBATION_PERIOD = 293,
+        TOKEN_SUBNET4 = 294,
+        TOKEN_SUBNET_4O6_INTERFACE = 295,
+        TOKEN_SUBNET_4O6_INTERFACE_ID = 296,
+        TOKEN_SUBNET_4O6_SUBNET = 297,
+        TOKEN_OPTION_DEF = 298,
+        TOKEN_OPTION_DATA = 299,
+        TOKEN_NAME = 300,
+        TOKEN_DATA = 301,
+        TOKEN_CODE = 302,
+        TOKEN_SPACE = 303,
+        TOKEN_CSV_FORMAT = 304,
+        TOKEN_RECORD_TYPES = 305,
+        TOKEN_ENCAPSULATE = 306,
+        TOKEN_ARRAY = 307,
+        TOKEN_POOLS = 308,
+        TOKEN_POOL = 309,
+        TOKEN_SUBNET = 310,
+        TOKEN_INTERFACE = 311,
+        TOKEN_INTERFACE_ID = 312,
+        TOKEN_ID = 313,
+        TOKEN_RAPID_COMMIT = 314,
+        TOKEN_RESERVATION_MODE = 315,
+        TOKEN_HOST_RESERVATION_IDENTIFIERS = 316,
+        TOKEN_CLIENT_CLASSES = 317,
+        TOKEN_TEST = 318,
+        TOKEN_CLIENT_CLASS = 319,
+        TOKEN_RESERVATIONS = 320,
+        TOKEN_DUID = 321,
+        TOKEN_HW_ADDRESS = 322,
+        TOKEN_CIRCUIT_ID = 323,
+        TOKEN_CLIENT_ID = 324,
+        TOKEN_HOSTNAME = 325,
+        TOKEN_RELAY = 326,
+        TOKEN_IP_ADDRESS = 327,
+        TOKEN_HOOKS_LIBRARIES = 328,
+        TOKEN_LIBRARY = 329,
+        TOKEN_PARAMETERS = 330,
+        TOKEN_EXPIRED_LEASES_PROCESSING = 331,
+        TOKEN_RECLAIM_TIMER_WAIT_TIME = 332,
+        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 333,
+        TOKEN_HOLD_RECLAIMED_TIME = 334,
+        TOKEN_MAX_RECLAIM_LEASES = 335,
+        TOKEN_MAX_RECLAIM_TIME = 336,
+        TOKEN_UNWARNED_RECLAIM_CYCLES = 337,
         TOKEN_DHCP4O6_PORT = 338,
         TOKEN_CONTROL_SOCKET = 339,
         TOKEN_SOCKET_TYPE = 340,
@@ -677,6 +678,22 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_MEMFILE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MYSQL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_POSTGRESQL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_CQL (const location_type& l);
+
+    static inline
+    symbol_type
     make_USER (const location_type& l);
 
     static inline
@@ -701,6 +718,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_CONNECT_TIMEOUT (const location_type& l);
+
+    static inline
+    symbol_type
     make_VALID_LIFETIME (const location_type& l);
 
     static inline
@@ -893,26 +914,6 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
-    make_SERVER_ID (const location_type& l);
-
-    static inline
-    symbol_type
-    make_IDENTIFIER (const location_type& l);
-
-    static inline
-    symbol_type
-    make_HTYPE (const location_type& l);
-
-    static inline
-    symbol_type
-    make_TIME (const location_type& l);
-
-    static inline
-    symbol_type
-    make_ENTERPRISE_ID (const location_type& l);
-
-    static inline
-    symbol_type
     make_DHCP4O6_PORT (const location_type& l);
 
     static inline
@@ -1312,8 +1313,8 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 732,     ///< Last index in yytable_.
-      yynnts_ = 305,  ///< Number of nonterminal symbols.
+      yylast_ = 713,     ///< Last index in yytable_.
+      yynnts_ = 299,  ///< Number of nonterminal symbols.
       yyfinal_ = 24, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
@@ -1409,8 +1410,9 @@ namespace isc { namespace dhcp {
     {
       case 145: // value
       case 186: // socket_type
-      case 399: // ncr_protocol_value
-      case 408: // replace_client_name_value
+      case 195: // db_type
+      case 393: // ncr_protocol_value
+      case 402: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
@@ -1449,8 +1451,9 @@ namespace isc { namespace dhcp {
     {
       case 145: // value
       case 186: // socket_type
-      case 399: // ncr_protocol_value
-      case 408: // replace_client_name_value
+      case 195: // db_type
+      case 393: // ncr_protocol_value
+      case 402: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
@@ -1548,8 +1551,9 @@ namespace isc { namespace dhcp {
     {
       case 145: // value
       case 186: // socket_type
-      case 399: // ncr_protocol_value
-      case 408: // replace_client_name_value
+      case 195: // db_type
+      case 393: // ncr_protocol_value
+      case 402: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
@@ -1594,8 +1598,9 @@ namespace isc { namespace dhcp {
     {
       case 145: // value
       case 186: // socket_type
-      case 399: // ncr_protocol_value
-      case 408: // replace_client_name_value
+      case 195: // db_type
+      case 393: // ncr_protocol_value
+      case 402: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
@@ -1821,6 +1826,30 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_MEMFILE (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MEMFILE, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_MYSQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MYSQL, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_POSTGRESQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_POSTGRESQL, l);
+  }
+
+  Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_CQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_CQL, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_USER (const location_type& l)
   {
     return symbol_type (token::TOKEN_USER, l);
@@ -1857,6 +1886,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
+  Dhcp4Parser::make_CONNECT_TIMEOUT (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
+  }
+
+  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_VALID_LIFETIME (const location_type& l)
   {
     return symbol_type (token::TOKEN_VALID_LIFETIME, l);
@@ -2145,36 +2180,6 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_SERVER_ID (const location_type& l)
-  {
-    return symbol_type (token::TOKEN_SERVER_ID, l);
-  }
-
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_IDENTIFIER (const location_type& l)
-  {
-    return symbol_type (token::TOKEN_IDENTIFIER, l);
-  }
-
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_HTYPE (const location_type& l)
-  {
-    return symbol_type (token::TOKEN_HTYPE, l);
-  }
-
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_TIME (const location_type& l)
-  {
-    return symbol_type (token::TOKEN_TIME, l);
-  }
-
-  Dhcp4Parser::symbol_type
-  Dhcp4Parser::make_ENTERPRISE_ID (const location_type& l)
-  {
-    return symbol_type (token::TOKEN_ENTERPRISE_ID, l);
-  }
-
-  Dhcp4Parser::symbol_type
   Dhcp4Parser::make_DHCP4O6_PORT (const location_type& l)
   {
     return symbol_type (token::TOKEN_DHCP4O6_PORT, l);
@@ -2471,7 +2476,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp4_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2475 "dhcp4_parser.h" // lalr1.cc:377
+#line 2480 "dhcp4_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp4/location.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

src/bin/dhcp4/position.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

src/bin/dhcp4/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++

src/bin/dhcp6/dhcp6_parser.h

@@ -305,6 +305,7 @@ namespace isc { namespace dhcp {
     union union_type
     {
       // value
+      // db_type
       // duid_type
       // ncr_protocol_value
       // replace_client_name_value
@@ -357,125 +358,130 @@ namespace isc { namespace dhcp {
         TOKEN_LEASE_DATABASE = 268,
         TOKEN_HOSTS_DATABASE = 269,
         TOKEN_TYPE = 270,
-        TOKEN_USER = 271,
-        TOKEN_PASSWORD = 272,
-        TOKEN_HOST = 273,
-        TOKEN_PERSIST = 274,
-        TOKEN_LFC_INTERVAL = 275,
-        TOKEN_READONLY = 276,
-        TOKEN_PREFERRED_LIFETIME = 277,
-        TOKEN_VALID_LIFETIME = 278,
-        TOKEN_RENEW_TIMER = 279,
-        TOKEN_REBIND_TIMER = 280,
-        TOKEN_DECLINE_PROBATION_PERIOD = 281,
-        TOKEN_SUBNET6 = 282,
-        TOKEN_OPTION_DEF = 283,
-        TOKEN_OPTION_DATA = 284,
-        TOKEN_NAME = 285,
-        TOKEN_DATA = 286,
-        TOKEN_CODE = 287,
-        TOKEN_SPACE = 288,
-        TOKEN_CSV_FORMAT = 289,
-        TOKEN_RECORD_TYPES = 290,
-        TOKEN_ENCAPSULATE = 291,
-        TOKEN_ARRAY = 292,
-        TOKEN_POOLS = 293,
-        TOKEN_POOL = 294,
-        TOKEN_PD_POOLS = 295,
-        TOKEN_PREFIX = 296,
-        TOKEN_PREFIX_LEN = 297,
-        TOKEN_EXCLUDED_PREFIX = 298,
-        TOKEN_EXCLUDED_PREFIX_LEN = 299,
-        TOKEN_DELEGATED_LEN = 300,
-        TOKEN_SUBNET = 301,
-        TOKEN_INTERFACE = 302,
-        TOKEN_INTERFACE_ID = 303,
-        TOKEN_ID = 304,
-        TOKEN_RAPID_COMMIT = 305,
-        TOKEN_RESERVATION_MODE = 306,
-        TOKEN_MAC_SOURCES = 307,
-        TOKEN_RELAY_SUPPLIED_OPTIONS = 308,
-        TOKEN_HOST_RESERVATION_IDENTIFIERS = 309,
-        TOKEN_CLIENT_CLASSES = 310,
-        TOKEN_TEST = 311,
-        TOKEN_CLIENT_CLASS = 312,
-        TOKEN_RESERVATIONS = 313,
-        TOKEN_IP_ADDRESSES = 314,
-        TOKEN_PREFIXES = 315,
-        TOKEN_DUID = 316,
-        TOKEN_HW_ADDRESS = 317,
-        TOKEN_HOSTNAME = 318,
-        TOKEN_RELAY = 319,
-        TOKEN_IP_ADDRESS = 320,
-        TOKEN_HOOKS_LIBRARIES = 321,
-        TOKEN_LIBRARY = 322,
-        TOKEN_PARAMETERS = 323,
-        TOKEN_EXPIRED_LEASES_PROCESSING = 324,
-        TOKEN_RECLAIM_TIMER_WAIT_TIME = 325,
-        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 326,
-        TOKEN_HOLD_RECLAIMED_TIME = 327,
-        TOKEN_MAX_RECLAIM_LEASES = 328,
-        TOKEN_MAX_RECLAIM_TIME = 329,
-        TOKEN_UNWARNED_RECLAIM_CYCLES = 330,
-        TOKEN_SERVER_ID = 331,
-        TOKEN_LLT = 332,
-        TOKEN_EN = 333,
-        TOKEN_LL = 334,
-        TOKEN_IDENTIFIER = 335,
-        TOKEN_HTYPE = 336,
-        TOKEN_TIME = 337,
-        TOKEN_ENTERPRISE_ID = 338,
-        TOKEN_DHCP4O6_PORT = 339,
-        TOKEN_CONTROL_SOCKET = 340,
-        TOKEN_SOCKET_TYPE = 341,
-        TOKEN_SOCKET_NAME = 342,
-        TOKEN_DHCP_DDNS = 343,
-        TOKEN_ENABLE_UPDATES = 344,
-        TOKEN_QUALIFYING_SUFFIX = 345,
-        TOKEN_SERVER_IP = 346,
-        TOKEN_SERVER_PORT = 347,
-        TOKEN_SENDER_IP = 348,
-        TOKEN_SENDER_PORT = 349,
-        TOKEN_MAX_QUEUE_SIZE = 350,
-        TOKEN_NCR_PROTOCOL = 351,
-        TOKEN_NCR_FORMAT = 352,
-        TOKEN_ALWAYS_INCLUDE_FQDN = 353,
-        TOKEN_ALLOW_CLIENT_UPDATE = 354,
-        TOKEN_OVERRIDE_NO_UPDATE = 355,
-        TOKEN_OVERRIDE_CLIENT_UPDATE = 356,
-        TOKEN_REPLACE_CLIENT_NAME = 357,
-        TOKEN_GENERATED_PREFIX = 358,
-        TOKEN_UDP = 359,
-        TOKEN_TCP = 360,
-        TOKEN_JSON = 361,
-        TOKEN_WHEN_PRESENT = 362,
-        TOKEN_NEVER = 363,
-        TOKEN_ALWAYS = 364,
-        TOKEN_WHEN_NOT_PRESENT = 365,
-        TOKEN_LOGGING = 366,
-        TOKEN_LOGGERS = 367,
-        TOKEN_OUTPUT_OPTIONS = 368,
-        TOKEN_OUTPUT = 369,
-        TOKEN_DEBUGLEVEL = 370,
-        TOKEN_SEVERITY = 371,
-        TOKEN_DHCP4 = 372,
-        TOKEN_DHCPDDNS = 373,
-        TOKEN_TOPLEVEL_JSON = 374,
-        TOKEN_TOPLEVEL_DHCP6 = 375,
-        TOKEN_SUB_DHCP6 = 376,
-        TOKEN_SUB_INTERFACES6 = 377,
-        TOKEN_SUB_SUBNET6 = 378,
-        TOKEN_SUB_POOL6 = 379,
-        TOKEN_SUB_PD_POOL = 380,
-        TOKEN_SUB_RESERVATION = 381,
-        TOKEN_SUB_OPTION_DEF = 382,
-        TOKEN_SUB_OPTION_DATA = 383,
-        TOKEN_SUB_HOOKS_LIBRARY = 384,
-        TOKEN_SUB_DHCP_DDNS = 385,
-        TOKEN_STRING = 386,
-        TOKEN_INTEGER = 387,
-        TOKEN_FLOAT = 388,
-        TOKEN_BOOLEAN = 389
+        TOKEN_MEMFILE = 271,
+        TOKEN_MYSQL = 272,
+        TOKEN_POSTGRESQL = 273,
+        TOKEN_CQL = 274,
+        TOKEN_USER = 275,
+        TOKEN_PASSWORD = 276,
+        TOKEN_HOST = 277,
+        TOKEN_PERSIST = 278,
+        TOKEN_LFC_INTERVAL = 279,
+        TOKEN_READONLY = 280,
+        TOKEN_CONNECT_TIMEOUT = 281,
+        TOKEN_PREFERRED_LIFETIME = 282,
+        TOKEN_VALID_LIFETIME = 283,
+        TOKEN_RENEW_TIMER = 284,
+        TOKEN_REBIND_TIMER = 285,
+        TOKEN_DECLINE_PROBATION_PERIOD = 286,
+        TOKEN_SUBNET6 = 287,
+        TOKEN_OPTION_DEF = 288,
+        TOKEN_OPTION_DATA = 289,
+        TOKEN_NAME = 290,
+        TOKEN_DATA = 291,
+        TOKEN_CODE = 292,
+        TOKEN_SPACE = 293,
+        TOKEN_CSV_FORMAT = 294,
+        TOKEN_RECORD_TYPES = 295,
+        TOKEN_ENCAPSULATE = 296,
+        TOKEN_ARRAY = 297,
+        TOKEN_POOLS = 298,
+        TOKEN_POOL = 299,
+        TOKEN_PD_POOLS = 300,
+        TOKEN_PREFIX = 301,
+        TOKEN_PREFIX_LEN = 302,
+        TOKEN_EXCLUDED_PREFIX = 303,
+        TOKEN_EXCLUDED_PREFIX_LEN = 304,
+        TOKEN_DELEGATED_LEN = 305,
+        TOKEN_SUBNET = 306,
+        TOKEN_INTERFACE = 307,
+        TOKEN_INTERFACE_ID = 308,
+        TOKEN_ID = 309,
+        TOKEN_RAPID_COMMIT = 310,
+        TOKEN_RESERVATION_MODE = 311,
+        TOKEN_MAC_SOURCES = 312,
+        TOKEN_RELAY_SUPPLIED_OPTIONS = 313,
+        TOKEN_HOST_RESERVATION_IDENTIFIERS = 314,
+        TOKEN_CLIENT_CLASSES = 315,
+        TOKEN_TEST = 316,
+        TOKEN_CLIENT_CLASS = 317,
+        TOKEN_RESERVATIONS = 318,
+        TOKEN_IP_ADDRESSES = 319,
+        TOKEN_PREFIXES = 320,
+        TOKEN_DUID = 321,
+        TOKEN_HW_ADDRESS = 322,
+        TOKEN_HOSTNAME = 323,
+        TOKEN_RELAY = 324,
+        TOKEN_IP_ADDRESS = 325,
+        TOKEN_HOOKS_LIBRARIES = 326,
+        TOKEN_LIBRARY = 327,
+        TOKEN_PARAMETERS = 328,
+        TOKEN_EXPIRED_LEASES_PROCESSING = 329,
+        TOKEN_RECLAIM_TIMER_WAIT_TIME = 330,
+        TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 331,
+        TOKEN_HOLD_RECLAIMED_TIME = 332,
+        TOKEN_MAX_RECLAIM_LEASES = 333,
+        TOKEN_MAX_RECLAIM_TIME = 334,
+        TOKEN_UNWARNED_RECLAIM_CYCLES = 335,
+        TOKEN_SERVER_ID = 336,
+        TOKEN_LLT = 337,
+        TOKEN_EN = 338,
+        TOKEN_LL = 339,
+        TOKEN_IDENTIFIER = 340,
+        TOKEN_HTYPE = 341,
+        TOKEN_TIME = 342,
+        TOKEN_ENTERPRISE_ID = 343,
+        TOKEN_DHCP4O6_PORT = 344,
+        TOKEN_CONTROL_SOCKET = 345,
+        TOKEN_SOCKET_TYPE = 346,
+        TOKEN_SOCKET_NAME = 347,
+        TOKEN_DHCP_DDNS = 348,
+        TOKEN_ENABLE_UPDATES = 349,
+        TOKEN_QUALIFYING_SUFFIX = 350,
+        TOKEN_SERVER_IP = 351,
+        TOKEN_SERVER_PORT = 352,
+        TOKEN_SENDER_IP = 353,
+        TOKEN_SENDER_PORT = 354,
+        TOKEN_MAX_QUEUE_SIZE = 355,
+        TOKEN_NCR_PROTOCOL = 356,
+        TOKEN_NCR_FORMAT = 357,
+        TOKEN_ALWAYS_INCLUDE_FQDN = 358,
+        TOKEN_ALLOW_CLIENT_UPDATE = 359,
+        TOKEN_OVERRIDE_NO_UPDATE = 360,
+        TOKEN_OVERRIDE_CLIENT_UPDATE = 361,
+        TOKEN_REPLACE_CLIENT_NAME = 362,
+        TOKEN_GENERATED_PREFIX = 363,
+        TOKEN_UDP = 364,
+        TOKEN_TCP = 365,
+        TOKEN_JSON = 366,
+        TOKEN_WHEN_PRESENT = 367,
+        TOKEN_NEVER = 368,
+        TOKEN_ALWAYS = 369,
+        TOKEN_WHEN_NOT_PRESENT = 370,
+        TOKEN_LOGGING = 371,
+        TOKEN_LOGGERS = 372,
+        TOKEN_OUTPUT_OPTIONS = 373,
+        TOKEN_OUTPUT = 374,
+        TOKEN_DEBUGLEVEL = 375,
+        TOKEN_SEVERITY = 376,
+        TOKEN_DHCP4 = 377,
+        TOKEN_DHCPDDNS = 378,
+        TOKEN_TOPLEVEL_JSON = 379,
+        TOKEN_TOPLEVEL_DHCP6 = 380,
+        TOKEN_SUB_DHCP6 = 381,
+        TOKEN_SUB_INTERFACES6 = 382,
+        TOKEN_SUB_SUBNET6 = 383,
+        TOKEN_SUB_POOL6 = 384,
+        TOKEN_SUB_PD_POOL = 385,
+        TOKEN_SUB_RESERVATION = 386,
+        TOKEN_SUB_OPTION_DEF = 387,
+        TOKEN_SUB_OPTION_DATA = 388,
+        TOKEN_SUB_HOOKS_LIBRARY = 389,
+        TOKEN_SUB_DHCP_DDNS = 390,
+        TOKEN_STRING = 391,
+        TOKEN_INTEGER = 392,
+        TOKEN_FLOAT = 393,
+        TOKEN_BOOLEAN = 394
       };
     };
 
@@ -648,6 +654,22 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_MEMFILE (const location_type& l);
+
+    static inline
+    symbol_type
+    make_MYSQL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_POSTGRESQL (const location_type& l);
+
+    static inline
+    symbol_type
+    make_CQL (const location_type& l);
+
+    static inline
+    symbol_type
     make_USER (const location_type& l);
 
     static inline
@@ -672,6 +694,10 @@ namespace isc { namespace dhcp {
 
     static inline
     symbol_type
+    make_CONNECT_TIMEOUT (const location_type& l);
+
+    static inline
+    symbol_type
     make_PREFERRED_LIFETIME (const location_type& l);
 
     static inline
@@ -1327,12 +1353,12 @@ namespace isc { namespace dhcp {
     enum
     {
       yyeof_ = 0,
-      yylast_ = 752,     ///< Last index in yytable_.
-      yynnts_ = 312,  ///< Number of nonterminal symbols.
+      yylast_ = 760,     ///< Last index in yytable_.
+      yynnts_ = 314,  ///< Number of nonterminal symbols.
       yyfinal_ = 26, ///< Termination state number.
       yyterror_ = 1,
       yyerrcode_ = 256,
-      yyntokens_ = 135  ///< Number of tokens.
+      yyntokens_ = 140  ///< Number of tokens.
     };
 
 
@@ -1387,9 +1413,10 @@ namespace isc { namespace dhcp {
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139
     };
-    const unsigned int user_token_number_max_ = 389;
+    const unsigned int user_token_number_max_ = 394;
     const token_number_type undef_token_ = 2;
 
     if (static_cast<int>(t) <= yyeof_)
@@ -1422,26 +1449,27 @@ namespace isc { namespace dhcp {
   {
       switch (other.type_get ())
     {
-      case 149: // value
-      case 376: // duid_type
-      case 409: // ncr_protocol_value
-      case 418: // replace_client_name_value
+      case 154: // value
+      case 198: // db_type
+      case 383: // duid_type
+      case 416: // ncr_protocol_value
+      case 425: // replace_client_name_value
         value.copy< ElementPtr > (other.value);
         break;
 
-      case 134: // "boolean"
+      case 139: // "boolean"
         value.copy< bool > (other.value);
         break;
 
-      case 133: // "floating point"
+      case 138: // "floating point"
         value.copy< double > (other.value);
         break;
 
-      case 132: // "integer"
+      case 137: // "integer"
         value.copy< int64_t > (other.value);
         break;
 
-      case 131: // "constant string"
+      case 136: // "constant string"
         value.copy< std::string > (other.value);
         break;
 
@@ -1462,26 +1490,27 @@ namespace isc { namespace dhcp {
     (void) v;
       switch (this->type_get ())
     {
-      case 149: // value
-      case 376: // duid_type
-      case 409: // ncr_protocol_value
-      case 418: // replace_client_name_value
+      case 154: // value
+      case 198: // db_type
+      case 383: // duid_type
+      case 416: // ncr_protocol_value
+      case 425: // replace_client_name_value
         value.copy< ElementPtr > (v);
         break;
 
-      case 134: // "boolean"
+      case 139: // "boolean"
         value.copy< bool > (v);
         break;
 
-      case 133: // "floating point"
+      case 138: // "floating point"
         value.copy< double > (v);
         break;
 
-      case 132: // "integer"
+      case 137: // "integer"
         value.copy< int64_t > (v);
         break;
 
-      case 131: // "constant string"
+      case 136: // "constant string"
         value.copy< std::string > (v);
         break;
 
@@ -1561,26 +1590,27 @@ namespace isc { namespace dhcp {
     // Type destructor.
     switch (yytype)
     {
-      case 149: // value
-      case 376: // duid_type
-      case 409: // ncr_protocol_value
-      case 418: // replace_client_name_value
+      case 154: // value
+      case 198: // db_type
+      case 383: // duid_type
+      case 416: // ncr_protocol_value
+      case 425: // replace_client_name_value
         value.template destroy< ElementPtr > ();
         break;
 
-      case 134: // "boolean"
+      case 139: // "boolean"
         value.template destroy< bool > ();
         break;
 
-      case 133: // "floating point"
+      case 138: // "floating point"
         value.template destroy< double > ();
         break;
 
-      case 132: // "integer"
+      case 137: // "integer"
         value.template destroy< int64_t > ();
         break;
 
-      case 131: // "constant string"
+      case 136: // "constant string"
         value.template destroy< std::string > ();
         break;
 
@@ -1607,26 +1637,27 @@ namespace isc { namespace dhcp {
     super_type::move(s);
       switch (this->type_get ())
     {
-      case 149: // value
-      case 376: // duid_type
-      case 409: // ncr_protocol_value
-      case 418: // replace_client_name_value
+      case 154: // value
+      case 198: // db_type
+      case 383: // duid_type
+      case 416: // ncr_protocol_value
+      case 425: // replace_client_name_value
         value.move< ElementPtr > (s.value);
         break;
 
-      case 134: // "boolean"
+      case 139: // "boolean"
         value.move< bool > (s.value);
         break;
 
-      case 133: // "floating point"
+      case 138: // "floating point"
         value.move< double > (s.value);
         break;
 
-      case 132: // "integer"
+      case 137: // "integer"
         value.move< int64_t > (s.value);
         break;
 
-      case 131: // "constant string"
+      case 136: // "constant string"
         value.move< std::string > (s.value);
         break;
 
@@ -1698,7 +1729,7 @@ namespace isc { namespace dhcp {
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,   389
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394
     };
     return static_cast<token_type> (yytoken_number_[type]);
   }
@@ -1788,6 +1819,30 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_MEMFILE (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MEMFILE, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_MYSQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_MYSQL, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_POSTGRESQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_POSTGRESQL, l);
+  }
+
+  Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_CQL (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_CQL, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_USER (const location_type& l)
   {
     return symbol_type (token::TOKEN_USER, l);
@@ -1824,6 +1879,12 @@ namespace isc { namespace dhcp {
   }
 
   Dhcp6Parser::symbol_type
+  Dhcp6Parser::make_CONNECT_TIMEOUT (const location_type& l)
+  {
+    return symbol_type (token::TOKEN_CONNECT_TIMEOUT, l);
+  }
+
+  Dhcp6Parser::symbol_type
   Dhcp6Parser::make_PREFERRED_LIFETIME (const location_type& l)
   {
     return symbol_type (token::TOKEN_PREFERRED_LIFETIME, l);
@@ -2504,7 +2565,7 @@ namespace isc { namespace dhcp {
 
 #line 14 "dhcp6_parser.yy" // lalr1.cc:377
 } } // isc::dhcp
-#line 2508 "dhcp6_parser.h" // lalr1.cc:377
+#line 2569 "dhcp6_parser.h" // lalr1.cc:377
 
 
 

src/bin/dhcp6/location.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Locations for Bison parsers in C++

src/bin/dhcp6/position.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Positions for Bison parsers in C++

src/bin/dhcp6/stack.hh

@@ -1,4 +1,4 @@
-// Generated 201701102039
+// Generated 201701251401
 // A Bison parser, made by GNU Bison 3.0.4.
 
 // Stack handling for Bison parsers in C++