From: Thomas Markwalder Date: Thu, 1 Nov 2018 15:19:55 +0000 (-0400) Subject: [#42, !103] Interrim commit, kea-dhcp4 supports "queue-control" X-Git-Tag: Kea-1.5.0-beta1~12^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=036d249fd1b283f19a7a8e8075143337e706b840;p=thirdparty%2Fkea.git [#42, !103] Interrim commit, kea-dhcp4 supports "queue-control" kea-dhcp4 will parse and use "queue-control" to configure ring buffer size: "Dhcp4": { "queue-control": { # max number of packets the ring will hold "capacity" : 100 }, : This is an interrim commit for testing purposes. Expect a fair amount of refactoring in subsequent commits. New files: src/lib/dhcp/queue_control.cc src/lib/dhcp/queue_control.h src/lib/dhcp/tests/queue_control_unittest.cc src/lib/dhcpsrv/parsers/queue_control_parser.cc src/lib/dhcpsrv/parsers/queue_control_parser.h src/bin/dhcp4/ctrl_dhcp4_srv.cc ControlledDhcpv4Srv::processConfig() - added logic to set packet queue controller src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll src/bin/dhcp4/dhcp4_parser.yy src/bin/dhcp4/parser_context.* Added queue-control parsing src/bin/dhcp4/json_config_parser.cc configureDhcp4Server() - recognize and parse "queue-control" src/bin/dhcp4/tests/config_parser_unittest.cc TEST_F(Dhcp4ParserTest, queueControl) TEST_F(Dhcp4ParserTest, queueControlInvalid) - new tests src/lib/dhcp/iface_mgr.* IfaceMgr::getPacketQueueControl4() IfaceMgr::setPacketQueueControl4() IfaceMgr::getPacketQueueControl6() IfaceMgr::setPacketQueueControl6() src/lib/dhcp/packet_queue.* Use QueueControl class src/lib/dhcpsrv/srv_config.* Added QueueControl member, getter/setter SrvConfig::toElement() - now emits queue-control if not null --- diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index 2ebe9d86fc..8de9f716a5 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -634,6 +634,26 @@ ControlledDhcpv4Srv::processConfig(isc::data::ConstElementPtr config) { return (isc::config::createAnswer(1, err.str())); } + try { + // @todo Consider making this a function and consider whether + // it should check for old gc != null and new gc null before + // calling setPacketQueueControl(). Or if we should even + // call it when it's null? + // Still grappling with what to if there is a custom queue + // loaded. Could have a flag in the control that means + // using custom impl, in which case we don't make the call + // at all. ... I dunno + ConstQueueControlPtr qc; + qc = CfgMgr::instance().getStagingCfg()->getQueueControlInfo(); + IfaceMgr::instance().setPacketQueueControl4(qc); + qc = IfaceMgr::instance().getPacketQueueControl4(); + std::cout << "TKM using capacity: " << qc->getCapacity() << std::endl; + } catch (const std::exception& ex) { + err << "Error setting packet queue controls after server reconfiguration: " + << ex.what(); + return (isc::config::createAnswer(1, err.str())); + } + // Configuration may change active interfaces. Therefore, we have to reopen // sockets according to new configuration. It is possible that this // operation will fail for some interfaces but the openSockets function diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index d523df1df2..72ca9116d2 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -691,8 +691,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); /* %% [3.0] code to copy yytext_ptr to yytext[] goes here, if %array \ */\ (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 174 -#define YY_END_OF_BUFFER 175 +#define YY_NUM_RULES 176 +#define YY_END_OF_BUFFER 177 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -700,76 +700,77 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[1454] = +static const flex_int16_t yy_accept[1474] = { 0, - 167, 167, 0, 0, 0, 0, 0, 0, 0, 0, - 175, 173, 10, 11, 173, 1, 167, 164, 167, 167, - 173, 166, 165, 173, 173, 173, 173, 173, 160, 161, - 173, 173, 173, 162, 163, 5, 5, 5, 173, 173, - 173, 10, 11, 0, 0, 156, 0, 0, 0, 0, + 169, 169, 0, 0, 0, 0, 0, 0, 0, 0, + 177, 175, 10, 11, 175, 1, 169, 166, 169, 169, + 175, 168, 167, 175, 175, 175, 175, 175, 162, 163, + 175, 175, 175, 164, 165, 5, 5, 5, 175, 175, + 175, 10, 11, 0, 0, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 167, 167, 0, 166, 167, 3, 2, 6, 0, 167, + 169, 169, 0, 168, 169, 3, 2, 6, 0, 169, 0, 0, 0, 0, 0, 0, 4, 0, 0, 9, - 0, 157, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 159, 0, 0, 0, + 0, 159, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, - 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 172, 170, 0, 169, 168, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 174, 172, + 0, 171, 170, 0, 0, 0, 0, 0, 0, 0, - 137, 0, 136, 0, 0, 73, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 34, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 139, 0, 138, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, + 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, - 0, 0, 0, 0, 171, 168, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 138, 0, 0, 140, - 0, 0, 0, 0, 0, 0, 0, 74, 0, 0, - 0, 0, 0, 0, 59, 0, 0, 0, 0, 0, - 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 62, 0, 38, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 18, 0, 0, 0, 0, 173, - 0, 88, 30, 0, 0, 35, 0, 0, 0, 0, - 0, 0, 0, 0, 12, 145, 0, 142, 0, 141, - 0, 0, 0, 101, 0, 0, 0, 0, 0, 0, + 170, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 140, 0, 0, 142, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 0, 0, 0, 0, 0, 0, + 59, 0, 0, 0, 0, 0, 91, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 81, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 58, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, + 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 88, 30, + 0, 0, 35, 0, 0, 0, 0, 0, 0, 0, + 0, 12, 147, 0, 144, 0, 143, 0, 0, 0, + 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 102, + 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 61, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 102, 0, - 0, 0, 97, 0, 0, 0, 0, 0, 0, 0, - 7, 0, 0, 143, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 97, 0, 0, 0, 0, 0, 0, 0, 7, + 0, 0, 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, @@ -777,90 +778,91 @@ static const flex_int16_t yy_accept[1454] = 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 76, 0, - 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 65, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 76, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 95, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, - 77, 0, 0, 0, 0, 82, 31, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 39, 0, + 0, 0, 0, 0, 0, 0, 95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 107, 77, 0, 0, 0, 0, 82, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 54, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 146, 0, 0, 0, 0, 0, + 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 96, 0, 0, 0, 0, 0, - 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 36, - 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 148, 0, 0, + 0, 0, 0, 120, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 96, 0, + 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 84, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 36, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 84, 0, 0, 0, - 0, 93, 0, 0, 0, 0, 0, 0, 0, 0, - 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 23, + 0, 0, 0, 0, 0, 0, 93, 0, 0, 0, + 0, 0, 0, 0, 0, 121, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 124, 0, 0, 122, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 150, 0, 0, - 0, 0, 0, 0, 94, 0, 0, 0, 0, 0, - 0, 98, 80, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 92, 22, 0, - 103, 0, 0, 0, 0, 0, 0, 0, 0, 128, - 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, - 106, 33, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, + 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 126, 0, 0, + 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 152, 0, 0, 0, 0, 0, 0, + + 94, 0, 0, 0, 0, 0, 0, 98, 80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, + 0, 0, 0, 92, 22, 0, 103, 0, 0, 0, + 0, 0, 0, 0, 0, 130, 0, 0, 0, 0, + 56, 0, 0, 0, 0, 0, 106, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 153, 0, 57, 71, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, - 0, 0, 0, 0, 0, 125, 0, 123, 0, 118, - 117, 0, 46, 0, 21, 0, 0, 0, 0, 0, - 139, 0, 0, 87, 0, 0, 0, 0, 0, 0, - 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 104, 15, 0, 40, 0, 0, - 0, 0, 0, 127, 0, 0, 0, 0, 0, 0, - 51, 0, 0, 99, 0, 0, 0, 0, 90, 0, - 0, 0, 0, 0, 0, 63, 0, 148, 0, 147, + 0, 0, 0, 0, 53, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 155, 0, 57, 71, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, + 0, 0, 0, 127, 0, 125, 0, 118, 117, 0, + 46, 0, 21, 0, 0, 0, 0, 0, 141, 0, + 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, + 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 104, 15, 0, 40, 0, 0, 0, 0, + 0, 129, 0, 0, 0, 0, 0, 0, 0, 51, + 0, 0, 99, 0, 0, 0, 0, 90, 0, 0, + + 0, 0, 0, 0, 63, 0, 150, 0, 149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 119, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 45, 0, 0, 0, 0, 0, - 155, 85, 27, 0, 0, 47, 116, 0, 0, 151, - 120, 0, 0, 0, 0, 0, 0, 0, 0, 25, - 0, 0, 24, 0, 126, 0, 0, 0, 0, 0, + 157, 85, 27, 0, 0, 47, 116, 0, 0, 153, + 122, 0, 0, 0, 0, 0, 0, 0, 0, 25, + 0, 0, 24, 0, 128, 0, 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 105, 0, 0, 0, - - 26, 0, 152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 44, 0, 0, 20, 154, 55, - 0, 149, 144, 0, 28, 0, 16, 0, 0, 133, + 26, 0, 154, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 44, 0, 0, 20, 156, 55, + 0, 151, 146, 0, 28, 0, 16, 0, 0, 135, 0, 0, 0, 0, 0, 0, 113, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, - 0, 0, 0, 0, 0, 0, 134, 13, 0, 0, - 0, 0, 0, 121, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 136, 13, 0, 0, + 0, 0, 0, 123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 0, 19, 0, - 130, 0, 0, 0, 0, 0, 129, 0, 0, 0, - 111, 0, 0, 48, 0, 0, 43, 132, 0, 0, + 132, 0, 0, 0, 0, 0, 131, 0, 0, 0, + 111, 0, 0, 48, 0, 0, 43, 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 131, 0, 86, 0, 0, 0, 0, + 0, 0, 0, 133, 0, 86, 0, 0, 0, 0, 0, 0, 109, 114, 52, 0, 0, 0, 0, 108, - 0, 0, 135, 0, 0, 0, 0, 0, 75, 0, + 0, 0, 137, 0, 0, 0, 0, 0, 75, 0, 0, 110, 0 } ; @@ -908,353 +910,357 @@ static const YY_CHAR yy_meta[72] = 3 } ; -static const flex_int16_t yy_base[1466] = +static const flex_int16_t yy_base[1486] = { 0, 0, 70, 19, 29, 41, 49, 52, 58, 87, 95, - 1817, 1818, 32, 1813, 141, 0, 201, 1818, 206, 88, - 11, 213, 1818, 1795, 114, 25, 2, 6, 1818, 1818, - 73, 11, 17, 1818, 1818, 1818, 104, 1801, 1756, 0, - 1793, 107, 1808, 217, 247, 1818, 1752, 185, 1751, 1757, - 93, 58, 1749, 91, 211, 195, 14, 273, 195, 1748, - 181, 275, 202, 209, 76, 68, 188, 1757, 232, 219, - 296, 284, 207, 1740, 230, 287, 324, 305, 1759, 0, - 339, 359, 367, 374, 379, 1818, 0, 1818, 301, 344, - 295, 336, 196, 348, 350, 292, 1818, 1756, 1795, 1818, - - 355, 1818, 395, 1784, 331, 1742, 1752, 351, 367, 1747, - 363, 370, 373, 379, 241, 1790, 0, 446, 375, 1734, - 1736, 1732, 1740, 363, 1736, 1725, 1726, 76, 1742, 1725, - 1734, 1734, 322, 1725, 367, 1726, 1724, 359, 1770, 1774, - 1716, 1767, 1709, 1732, 1729, 1729, 1723, 349, 1716, 1709, - 1714, 1708, 381, 1719, 1712, 1703, 1702, 1716, 362, 1702, - 381, 1718, 1695, 442, 376, 390, 1716, 1713, 1714, 1712, - 417, 1694, 1696, 418, 1688, 1705, 1697, 0, 392, 428, - 441, 401, 445, 448, 1696, 1818, 0, 1739, 454, 1686, - 1689, 444, 450, 1697, 457, 1740, 460, 1739, 454, 1738, - - 1818, 498, 1737, 482, 1698, 1678, 1694, 1691, 1690, 1681, - 468, 1730, 1724, 1690, 1669, 1677, 1672, 1686, 1682, 1670, - 1682, 1682, 1673, 1657, 1661, 1674, 1676, 1673, 1665, 1655, - 1673, 1818, 1668, 1671, 1652, 1651, 1701, 1650, 1660, 1663, - 453, 1659, 1647, 1658, 1694, 1641, 1697, 1634, 1649, 505, - 1639, 1655, 1636, 1635, 1641, 1632, 1631, 1638, 1686, 1644, - 1643, 1637, 77, 1644, 1639, 1631, 1621, 1636, 1635, 1630, - 1634, 1615, 1631, 1617, 1623, 1630, 1618, 314, 1611, 1625, - 1666, 1627, 468, 1618, 484, 1818, 1818, 485, 1818, 1818, - 1605, 0, 475, 489, 1607, 524, 505, 1661, 1614, 501, - - 1818, 1659, 1818, 1653, 551, 1818, 502, 1595, 1651, 1597, - 1603, 1653, 1610, 1605, 1608, 491, 1818, 1606, 1648, 1603, - 1600, 540, 1606, 1644, 1638, 1593, 1588, 1585, 1634, 1593, - 1582, 1598, 1630, 1578, 548, 1592, 1577, 1590, 1577, 1587, - 1582, 1589, 1584, 1580, 500, 1578, 1581, 1576, 1572, 1620, - 509, 1614, 1818, 1613, 1565, 1564, 1563, 1556, 1558, 1562, - 1551, 1564, 530, 1609, 1564, 1561, 1818, 1564, 1553, 1553, - 1565, 521, 1540, 1541, 1562, 531, 1544, 1593, 1540, 1554, - 1553, 1539, 1551, 1550, 1549, 1548, 527, 1589, 1588, 1818, - 1532, 1531, 574, 1544, 1818, 1818, 1543, 0, 1532, 1524, - - 529, 1529, 1580, 1579, 1537, 1577, 1818, 1525, 1575, 1818, - 556, 602, 559, 1574, 1530, 1526, 1514, 1818, 1519, 1525, - 1528, 1527, 1514, 1513, 1818, 1515, 1512, 190, 1510, 1512, - 1818, 1520, 1517, 1502, 1515, 1510, 583, 1517, 1505, 1498, - 1547, 1818, 1496, 1512, 1544, 1507, 1504, 1505, 1507, 1539, - 1492, 1487, 1486, 1535, 1481, 1496, 1474, 1481, 1486, 1534, - 1818, 1481, 1477, 1475, 1484, 1478, 1485, 1469, 1469, 1479, - 1482, 1471, 1466, 1818, 1521, 1818, 1465, 1476, 1461, 1466, - 1475, 1469, 1463, 1472, 1512, 1506, 1470, 1453, 1453, 1448, - 1468, 1443, 1449, 1448, 1456, 1460, 1443, 1499, 1441, 1455, - - 1444, 1818, 1818, 1444, 1442, 1818, 1453, 1487, 1449, 0, - 1433, 1450, 1488, 1438, 1818, 1818, 1435, 1818, 1441, 1818, - 556, 568, 596, 1818, 1438, 1426, 1477, 1424, 1475, 1422, - 1421, 1428, 1421, 1433, 1432, 1432, 1420, 1461, 1428, 1420, - 1463, 1409, 1425, 1424, 1818, 1409, 1406, 1462, 1419, 1411, - 1417, 1408, 1416, 1401, 1417, 1399, 1413, 557, 1395, 1389, - 1394, 1409, 1406, 1407, 1404, 1445, 1402, 1818, 1388, 1390, - 1399, 1397, 1434, 1433, 1386, 563, 1395, 1378, 1379, 1376, - 1818, 1390, 1369, 1388, 1380, 1423, 1377, 1384, 1420, 1818, - 1367, 1381, 1365, 1379, 1382, 1363, 1413, 1412, 1411, 1358, - - 1409, 1408, 1818, 14, 1370, 1370, 1368, 1351, 1356, 1358, - 1818, 1364, 1354, 1818, 1399, 1347, 1402, 573, 584, 560, - 1352, 1395, 585, 1399, 573, 1393, 1392, 1391, 1345, 1335, - 1388, 1341, 1351, 1385, 1348, 1342, 1329, 1337, 1380, 1384, - 1341, 1340, 1818, 1341, 1334, 1323, 1336, 1339, 1334, 1335, - 1332, 1331, 1327, 1333, 1328, 1369, 1368, 1318, 1308, 575, - 1365, 1818, 1364, 1313, 1305, 1306, 1355, 1318, 1305, 1316, - 1818, 1304, 1313, 1312, 1312, 1352, 1295, 1304, 1309, 1286, - 1290, 1341, 1305, 1287, 1297, 1337, 1336, 1335, 1282, 1333, - 1297, 497, 593, 1274, 1284, 577, 1818, 1334, 1280, 1290, - - 1290, 1273, 1278, 1282, 1272, 1284, 1287, 1324, 1818, 1318, - 577, 1271, 1279, 1278, 1273, 1269, 1276, 1818, 1264, 1277, - 1257, 1260, 6, 94, 198, 229, 270, 309, 375, 439, - 417, 422, 494, 516, 1818, 544, 588, 583, 596, 594, - 647, 580, 592, 607, 595, 653, 612, 598, 601, 1818, - 1818, 611, 616, 621, 609, 1818, 1818, 623, 610, 604, - 609, 627, 614, 662, 615, 665, 616, 672, 1818, 619, - 623, 618, 676, 631, 621, 622, 618, 631, 642, 626, - 644, 639, 640, 642, 635, 637, 638, 638, 640, 655, - 694, 653, 658, 635, 1818, 660, 650, 695, 655, 645, - - 660, 661, 648, 662, 1818, 681, 689, 669, 659, 706, - 671, 675, 714, 664, 659, 671, 666, 667, 663, 672, - 667, 723, 682, 673, 1818, 675, 686, 671, 687, 681, - 727, 695, 680, 681, 1818, 697, 700, 683, 740, 685, - 1818, 702, 705, 685, 703, 741, 701, 697, 692, 710, - 709, 710, 696, 711, 703, 710, 700, 718, 703, 1818, - 711, 717, 762, 1818, 713, 718, 760, 713, 725, 719, - 724, 722, 720, 722, 732, 775, 721, 721, 778, 724, - 736, 1818, 724, 732, 730, 735, 747, 731, 736, 746, - 747, 752, 791, 750, 766, 771, 745, 756, 747, 799, - - 744, 1818, 744, 764, 753, 758, 765, 806, 807, 756, - 1818, 752, 755, 754, 774, 771, 776, 777, 763, 771, - 780, 760, 775, 784, 824, 1818, 825, 826, 779, 789, - 791, 780, 776, 783, 792, 835, 784, 782, 784, 801, - 840, 792, 791, 797, 795, 793, 846, 847, 843, 1818, - 807, 800, 791, 810, 798, 808, 805, 810, 806, 819, - 819, 1818, 803, 804, 1818, 805, 863, 804, 823, 824, - 821, 807, 828, 827, 811, 816, 834, 1818, 824, 857, - 848, 820, 879, 842, 1818, 825, 827, 844, 842, 834, - 838, 1818, 1818, 848, 883, 832, 885, 834, 892, 837, - - 848, 840, 846, 842, 860, 862, 863, 1818, 1818, 862, - 1818, 847, 848, 868, 858, 851, 863, 905, 871, 1818, - 863, 913, 856, 915, 1818, 916, 860, 866, 873, 915, - 1818, 1818, 865, 867, 881, 886, 869, 926, 885, 886, - 887, 925, 879, 884, 933, 883, 935, 1818, 884, 937, - 938, 880, 940, 901, 942, 886, 898, 903, 889, 919, - 948, 908, 1818, 900, 951, 900, 915, 902, 898, 914, - 919, 901, 959, 914, 919, 1818, 920, 913, 922, 923, - 920, 910, 913, 913, 918, 971, 972, 917, 974, 971, - 914, 929, 922, 980, 1818, 936, 1818, 1818, 941, 933, - - 943, 929, 930, 989, 935, 945, 992, 1818, 943, 943, - 945, 947, 998, 941, 944, 1818, 963, 1818, 947, 1818, - 1818, 961, 1818, 955, 1818, 1005, 956, 1007, 1008, 990, - 1818, 968, 969, 1818, 957, 965, 959, 958, 961, 961, - 962, 958, 1818, 980, 966, 967, 982, 982, 985, 985, - 982, 1024, 988, 980, 1818, 1818, 991, 1818, 988, 993, - 994, 991, 1033, 1818, 984, 985, 985, 991, 990, 1001, - 1818, 1040, 989, 1818, 990, 990, 992, 998, 1818, 1000, - 1052, 1003, 1006, 1055, 1018, 1818, 1015, 1818, 1012, 1818, - 1035, 1055, 1061, 1062, 1063, 1022, 1008, 1066, 1067, 1022, - - 1016, 1070, 1071, 1067, 1032, 1028, 1070, 1020, 1025, 1023, - 1080, 1038, 1082, 1042, 1084, 1047, 1037, 1031, 1047, 1047, - 1091, 1035, 1052, 1051, 1035, 1091, 1092, 1041, 1094, 1059, - 1060, 1818, 1060, 1047, 1818, 1058, 1105, 1065, 1078, 1065, - 1818, 1818, 1818, 1053, 1110, 1818, 1818, 1059, 1070, 1818, - 1818, 1060, 1109, 1054, 1059, 1117, 1067, 1077, 1078, 1818, - 1121, 1076, 1818, 1123, 1818, 1068, 1083, 1071, 1086, 1090, - 1818, 1124, 1092, 1085, 1094, 1076, 1083, 1137, 1098, 1097, - 1140, 1141, 1142, 1093, 1818, 1144, 1145, 1092, 1147, 1818, - 1097, 1149, 1095, 1094, 1152, 1107, 1818, 1149, 1102, 1099, - - 1818, 1113, 1818, 1116, 1159, 1114, 1161, 1122, 1105, 1107, - 1104, 1120, 1121, 1130, 1818, 1120, 1170, 1818, 1818, 1818, - 1166, 1818, 1818, 1131, 1818, 1168, 1818, 1122, 1129, 1818, - 1126, 1131, 1129, 1179, 1180, 1125, 1818, 1140, 1818, 1141, - 1131, 1143, 1186, 1130, 1138, 1139, 1152, 1818, 1151, 1141, - 1140, 1154, 1145, 1154, 1156, 1160, 1818, 1818, 1199, 1144, - 1201, 1161, 1203, 1818, 1199, 1163, 1164, 1151, 1146, 1209, - 1168, 1169, 1170, 1213, 1172, 1175, 1818, 1216, 1818, 1179, - 1818, 1161, 1219, 1220, 1165, 1182, 1818, 1168, 1168, 1170, - 1818, 1175, 1185, 1818, 1171, 1183, 1818, 1818, 1188, 1182, - - 1186, 1177, 1229, 1178, 1186, 1195, 1188, 1183, 1198, 1189, - 1196, 1183, 1198, 1203, 1246, 1205, 1248, 1193, 1209, 1200, - 1214, 1210, 1203, 1818, 1255, 1818, 1256, 1257, 1214, 1213, - 1214, 1204, 1818, 1818, 1818, 1262, 1206, 1222, 1265, 1818, - 1261, 1212, 1818, 1211, 1213, 1224, 1271, 1222, 1818, 1231, - 1274, 1818, 1818, 1280, 1285, 1290, 1295, 1300, 1305, 1310, - 1313, 1287, 1292, 1294, 1307 + 1836, 1837, 32, 1832, 141, 0, 201, 1837, 206, 88, + 11, 213, 1837, 1814, 114, 25, 2, 6, 1837, 1837, + 73, 11, 17, 1837, 1837, 1837, 104, 1820, 1775, 0, + 1812, 107, 1827, 217, 247, 1837, 1771, 185, 1770, 1776, + 93, 58, 1768, 91, 211, 195, 14, 273, 195, 1767, + 193, 195, 217, 294, 76, 68, 231, 1776, 268, 221, + 296, 282, 275, 1759, 188, 304, 312, 304, 1778, 0, + 356, 362, 374, 380, 383, 1837, 0, 1837, 386, 397, + 212, 295, 216, 298, 314, 293, 1837, 1775, 1814, 1837, + + 326, 1837, 373, 1803, 316, 1761, 1771, 336, 202, 1766, + 319, 361, 339, 374, 239, 1809, 0, 424, 369, 1753, + 1755, 1753, 1750, 1758, 369, 1754, 1743, 1744, 76, 1760, + 1743, 1752, 1752, 371, 1743, 379, 1744, 1742, 396, 1788, + 1792, 1734, 1785, 1727, 1750, 1747, 1747, 1741, 356, 1734, + 1727, 1732, 1726, 392, 1737, 1730, 1721, 1720, 1734, 380, + 1720, 394, 416, 1714, 421, 405, 425, 1735, 1732, 1733, + 1731, 442, 1713, 1715, 443, 1707, 1724, 1716, 0, 429, + 424, 396, 443, 455, 460, 1715, 1837, 0, 1758, 467, + 1705, 1708, 453, 459, 1716, 469, 1759, 470, 1758, 462, + + 1757, 1837, 506, 1756, 479, 1717, 1697, 1715, 1712, 1709, + 1708, 1699, 449, 1748, 1742, 1708, 1687, 1695, 1690, 1704, + 1700, 1688, 1700, 1700, 1691, 1675, 1679, 1692, 1694, 1691, + 1683, 1673, 1691, 1837, 1686, 1689, 1670, 1669, 1719, 1668, + 1678, 1681, 482, 1677, 1665, 1676, 1712, 1659, 1715, 1652, + 1667, 498, 1657, 1673, 1654, 1653, 1659, 1650, 1649, 1656, + 1646, 1703, 1661, 1660, 1654, 77, 1661, 1656, 1648, 1638, + 1653, 1652, 1647, 1651, 1632, 1648, 1634, 1640, 1647, 1635, + 224, 1628, 1642, 1683, 1644, 348, 1635, 478, 1837, 1837, + 488, 1837, 1837, 1622, 0, 445, 457, 1624, 518, 489, + + 1678, 1631, 502, 1837, 1676, 1837, 1670, 550, 1837, 499, + 1612, 1668, 1632, 1613, 1619, 1669, 1626, 1621, 1624, 480, + 1837, 1622, 1664, 1619, 1616, 534, 1622, 1660, 1654, 1609, + 1604, 1601, 1650, 1609, 1598, 1614, 1646, 1594, 550, 1608, + 1593, 1606, 1593, 1603, 1598, 1605, 1600, 1596, 479, 1594, + 1597, 1592, 1588, 1636, 499, 1630, 1837, 1629, 1581, 1580, + 1579, 1572, 1574, 1578, 1567, 1580, 498, 1625, 1580, 1577, + 1580, 1837, 1579, 1568, 1568, 1580, 520, 1555, 1556, 1577, + 530, 1559, 1608, 1555, 1569, 1568, 1554, 1566, 1565, 1564, + 1563, 505, 1604, 1603, 1837, 1547, 1546, 573, 1559, 1837, + + 1837, 1558, 0, 1547, 1539, 546, 1544, 1595, 1594, 1552, + 1592, 1837, 1540, 1590, 1837, 556, 602, 549, 1589, 1545, + 1541, 1540, 1528, 1837, 1533, 1539, 1542, 1541, 1528, 1527, + 1837, 1529, 1526, 219, 1524, 1526, 1837, 1534, 1531, 1516, + 1529, 1524, 579, 1531, 1519, 1512, 1561, 1837, 1510, 1526, + 1558, 1521, 1518, 1519, 1521, 1553, 1506, 1501, 1500, 1549, + 1495, 1510, 1488, 1495, 1500, 1548, 1837, 1495, 1491, 1489, + 1498, 1492, 1499, 1483, 1483, 1493, 1496, 1485, 1480, 1837, + 1535, 1837, 1479, 1490, 1527, 1474, 1479, 1488, 1482, 1476, + 1485, 1525, 1519, 1483, 1466, 1466, 1461, 1481, 1456, 1462, + + 1461, 1469, 1473, 1456, 1512, 1454, 1468, 1457, 1837, 1837, + 1457, 1455, 1837, 1466, 1500, 1462, 0, 1446, 1463, 1501, + 1451, 1837, 1837, 1448, 1837, 1454, 1837, 556, 558, 594, + 1837, 1451, 1439, 1438, 1489, 1436, 1487, 1434, 1433, 1440, + 1433, 1445, 1444, 1444, 1432, 1473, 1440, 1432, 1475, 1421, + 1437, 1436, 1837, 1421, 1418, 1474, 1431, 1423, 1429, 1420, + 1428, 1413, 1429, 1411, 1425, 522, 1407, 1401, 1406, 1421, + 1418, 1419, 1416, 1457, 1414, 1837, 1400, 1402, 1411, 1409, + 1446, 1445, 1398, 586, 1407, 1390, 1391, 1388, 1837, 1402, + 1381, 1402, 1399, 1391, 1434, 1388, 1395, 1431, 1837, 1378, + + 1392, 1376, 1390, 1393, 1374, 1424, 1423, 1422, 1369, 1420, + 1419, 1837, 14, 1381, 1381, 1379, 1362, 1367, 1369, 1837, + 1375, 1365, 1837, 1410, 1358, 1413, 558, 584, 558, 1363, + 1349, 1405, 584, 1409, 555, 1403, 1402, 1401, 1355, 1345, + 1398, 1351, 1361, 1395, 1358, 1352, 1339, 1347, 1390, 1394, + 1351, 1350, 1837, 1351, 1344, 1333, 1346, 1349, 1344, 1345, + 1342, 1341, 1337, 1343, 1338, 1379, 1378, 1328, 1318, 548, + 1375, 1837, 1374, 1323, 1315, 1316, 1365, 1328, 1315, 1326, + 1837, 1314, 1323, 1322, 1322, 1362, 1305, 1314, 1307, 1318, + 1295, 1299, 1350, 1314, 1296, 1306, 1346, 1345, 1344, 1291, + + 1342, 1306, 579, 582, 1283, 1293, 580, 1837, 1343, 1289, + 1299, 1299, 1282, 1287, 1291, 1281, 1293, 1296, 1333, 1837, + 1327, 601, 2, 20, 90, 319, 312, 444, 499, 1837, + 512, 545, 541, 563, 577, 596, 594, 585, 590, 599, + 595, 649, 608, 598, 614, 604, 1837, 614, 614, 607, + 619, 617, 660, 604, 606, 621, 608, 666, 625, 611, + 614, 1837, 1837, 624, 629, 634, 622, 1837, 1837, 636, + 623, 617, 622, 640, 627, 675, 628, 678, 629, 685, + 1837, 632, 636, 637, 632, 690, 645, 635, 636, 632, + 645, 656, 640, 658, 653, 654, 656, 649, 651, 652, + + 652, 654, 669, 708, 667, 672, 649, 1837, 674, 664, + 709, 669, 659, 674, 675, 662, 676, 1837, 695, 703, + 683, 673, 720, 1837, 685, 689, 728, 678, 673, 685, + 680, 681, 677, 686, 681, 737, 696, 687, 1837, 689, + 700, 685, 701, 695, 741, 709, 694, 695, 1837, 711, + 714, 697, 754, 699, 1837, 716, 719, 699, 717, 755, + 715, 711, 706, 724, 723, 724, 710, 725, 717, 724, + 714, 732, 717, 1837, 725, 731, 719, 777, 1837, 728, + 733, 775, 728, 740, 735, 739, 737, 735, 737, 747, + 790, 736, 736, 793, 739, 751, 1837, 739, 747, 745, + + 750, 762, 746, 751, 761, 762, 767, 806, 765, 781, + 787, 760, 771, 762, 814, 759, 1837, 759, 779, 768, + 773, 780, 821, 822, 771, 1837, 767, 770, 769, 789, + 786, 791, 792, 778, 786, 795, 775, 790, 798, 839, + 1837, 840, 841, 794, 804, 806, 795, 791, 798, 807, + 850, 799, 797, 799, 816, 855, 807, 806, 812, 810, + 808, 861, 862, 858, 809, 1837, 823, 816, 807, 826, + 814, 824, 821, 826, 822, 835, 835, 1837, 819, 820, + 1837, 821, 879, 820, 839, 840, 838, 823, 844, 843, + 827, 832, 850, 1837, 840, 873, 864, 836, 895, 858, + + 1837, 841, 843, 860, 858, 850, 854, 1837, 1837, 864, + 899, 848, 901, 850, 908, 853, 864, 856, 862, 858, + 876, 878, 879, 1837, 1837, 878, 1837, 863, 864, 884, + 874, 867, 879, 921, 887, 1837, 879, 929, 872, 931, + 1837, 932, 876, 882, 889, 931, 1837, 1837, 881, 886, + 884, 898, 903, 886, 943, 902, 903, 904, 942, 896, + 901, 950, 900, 952, 1837, 901, 954, 955, 897, 957, + 918, 959, 903, 915, 920, 906, 936, 965, 925, 1837, + 917, 968, 917, 932, 919, 915, 931, 936, 918, 976, + 931, 936, 1837, 937, 930, 939, 940, 937, 927, 930, + + 930, 935, 988, 989, 934, 991, 988, 931, 946, 939, + 997, 1837, 953, 1837, 1837, 958, 950, 960, 946, 947, + 957, 1007, 953, 963, 1011, 1837, 961, 961, 963, 965, + 1016, 959, 962, 1837, 981, 1837, 965, 1837, 1837, 979, + 1837, 973, 1837, 1023, 974, 1025, 1026, 1008, 1837, 986, + 987, 1837, 975, 983, 977, 976, 979, 979, 980, 976, + 1837, 998, 984, 985, 1000, 1000, 1003, 1003, 1000, 1042, + 1006, 998, 1837, 1837, 1009, 1837, 1006, 1011, 1012, 1009, + 1051, 1837, 1002, 1003, 1003, 1009, 1008, 1019, 1063, 1837, + 1059, 1008, 1837, 1009, 1009, 1011, 1017, 1837, 1019, 1071, + + 1022, 1025, 1074, 1037, 1837, 1034, 1837, 1031, 1837, 1054, + 1074, 1080, 1081, 1082, 1041, 1027, 1085, 1086, 1041, 1035, + 1089, 1090, 1086, 1051, 1047, 1089, 1039, 1044, 1042, 1099, + 1057, 1101, 1061, 1103, 1066, 1056, 1050, 1066, 1066, 1110, + 1054, 1071, 1070, 1837, 1054, 1110, 1111, 1060, 1113, 1078, + 1079, 1837, 1079, 1066, 1837, 1077, 1124, 1084, 1097, 1084, + 1837, 1837, 1837, 1072, 1129, 1837, 1837, 1078, 1089, 1837, + 1837, 1079, 1128, 1073, 1078, 1136, 1086, 1096, 1097, 1837, + 1140, 1095, 1837, 1142, 1837, 1087, 1102, 1090, 1105, 1109, + 1837, 1143, 1111, 1104, 1113, 1095, 1102, 1156, 1117, 1116, + + 1159, 1160, 1161, 1112, 1837, 1163, 1164, 1111, 1166, 1837, + 1116, 1168, 1114, 1113, 1171, 1126, 1837, 1168, 1121, 1118, + 1837, 1132, 1837, 1135, 1178, 1133, 1180, 1141, 1124, 1126, + 1123, 1139, 1140, 1149, 1837, 1139, 1189, 1837, 1837, 1837, + 1185, 1837, 1837, 1150, 1837, 1187, 1837, 1141, 1148, 1837, + 1145, 1150, 1148, 1198, 1199, 1144, 1837, 1159, 1837, 1160, + 1150, 1162, 1205, 1149, 1157, 1158, 1171, 1837, 1170, 1160, + 1159, 1173, 1164, 1173, 1175, 1179, 1837, 1837, 1218, 1163, + 1220, 1180, 1222, 1837, 1218, 1182, 1183, 1170, 1165, 1228, + 1187, 1188, 1189, 1232, 1191, 1194, 1837, 1235, 1837, 1198, + + 1837, 1180, 1238, 1239, 1184, 1201, 1837, 1187, 1187, 1189, + 1837, 1194, 1204, 1837, 1190, 1202, 1837, 1837, 1207, 1201, + 1205, 1196, 1248, 1197, 1205, 1214, 1207, 1202, 1217, 1208, + 1215, 1202, 1217, 1222, 1265, 1224, 1267, 1212, 1228, 1219, + 1233, 1229, 1222, 1837, 1274, 1837, 1275, 1276, 1233, 1232, + 1233, 1223, 1837, 1837, 1837, 1281, 1225, 1241, 1284, 1837, + 1280, 1231, 1837, 1230, 1232, 1243, 1290, 1241, 1837, 1250, + 1293, 1837, 1837, 1299, 1304, 1309, 1314, 1319, 1324, 1329, + 1332, 1306, 1311, 1313, 1326 } ; -static const flex_int16_t yy_def[1466] = +static const flex_int16_t yy_def[1486] = { 0, - 1454, 1454, 1455, 1455, 1454, 1454, 1454, 1454, 1454, 1454, - 1453, 1453, 1453, 1453, 1453, 1456, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1457, - 1453, 1453, 1453, 1458, 15, 1453, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1459, 45, 45, + 1474, 1474, 1475, 1475, 1474, 1474, 1474, 1474, 1474, 1474, + 1473, 1473, 1473, 1473, 1473, 1476, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1477, + 1473, 1473, 1473, 1478, 15, 1473, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1479, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1456, - 1453, 1453, 1453, 1453, 1453, 1453, 1460, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1457, 1453, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1476, + 1473, 1473, 1473, 1473, 1473, 1473, 1480, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1477, 1473, - 1458, 1453, 1453, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1461, 45, 1459, 45, 45, + 1478, 1473, 1473, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1481, 45, 1479, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1460, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1462, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1461, + 45, 45, 45, 45, 45, 45, 45, 45, 1480, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1482, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1453, 1459, 45, 45, 45, 45, 45, 45, 45, 45, + 1481, 1473, 1479, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1463, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1483, 45, 45, 45, 45, 45, - 1453, 45, 1453, 45, 1459, 1453, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1453, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 1473, 45, 1479, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1453, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1453, - 45, 45, 45, 45, 1453, 1453, 1453, 1464, 45, 45, - - 45, 45, 45, 45, 45, 45, 1453, 45, 45, 1453, - 45, 1459, 45, 45, 45, 45, 45, 1453, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1453, 45, 1453, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1473, 45, 45, 45, 45, 1473, - 45, 1453, 1453, 45, 45, 1453, 45, 45, 1453, 1465, - 45, 45, 45, 45, 1453, 1453, 45, 1453, 45, 1453, - 45, 45, 45, 1453, 45, 45, 45, 45, 45, 45, + 1473, 1473, 1484, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 45, 1473, 45, 1479, 45, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 1473, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1473, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, + + 45, 45, 45, 45, 45, 45, 45, 45, 1473, 1473, + 45, 45, 1473, 45, 45, 1473, 1485, 45, 45, 45, + 45, 1473, 1473, 45, 1473, 45, 1473, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 1453, + 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, - 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 1453, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 1473, + 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1453, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1453, 45, - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1473, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1453, - 1453, 45, 45, 45, 45, 1453, 1453, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 1453, 45, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 1473, 45, 45, 45, 45, 1473, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1453, - 45, 45, 45, 1453, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, + 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, - 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 1453, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, + 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 1453, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 45, 1453, 1453, 45, 45, 45, 45, 45, 45, 45, - - 45, 45, 45, 45, 45, 45, 45, 1453, 1453, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 1453, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 45, - 1453, 1453, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, + 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, + + 1473, 45, 45, 45, 45, 45, 45, 1473, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 1453, 45, 45, 45, 45, + 45, 45, 45, 1473, 1473, 45, 1473, 45, 45, 45, + 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 1473, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 1453, 1453, 45, 45, - - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, - 45, 45, 45, 45, 45, 1453, 45, 1453, 45, 1453, - 1453, 45, 1453, 45, 1453, 45, 45, 45, 45, 45, - 1453, 45, 45, 1453, 45, 45, 45, 45, 45, 45, - 45, 45, 1453, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 1453, 45, 1453, 45, 45, - 45, 45, 45, 1453, 45, 45, 45, 45, 45, 45, - 1453, 45, 45, 1453, 45, 45, 45, 45, 1453, 45, - 45, 45, 45, 45, 45, 1453, 45, 1453, 45, 1453, + 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 1473, 1473, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1473, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 1473, 45, 1473, 1473, 45, + 1473, 45, 1473, 45, 45, 45, 45, 45, 1473, 45, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1473, 1473, 45, 1473, 45, 45, 45, 45, + 45, 1473, 45, 45, 45, 45, 45, 45, 45, 1473, + 45, 45, 1473, 45, 45, 45, 45, 1473, 45, 45, + + 45, 45, 45, 45, 1473, 45, 1473, 45, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 1453, 45, 45, 1453, 45, 45, 45, 45, 45, - 1453, 1453, 1453, 45, 45, 1453, 1453, 45, 45, 1453, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 1453, - 45, 45, 1453, 45, 1453, 45, 45, 45, 45, 45, - 1453, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 45, 45, 1453, - 45, 45, 45, 45, 45, 45, 1453, 45, 45, 45, - - 1453, 45, 1453, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 1453, 45, 45, 1453, 1453, 1453, - 45, 1453, 1453, 45, 1453, 45, 1453, 45, 45, 1453, - 45, 45, 45, 45, 45, 45, 1453, 45, 1453, 45, - 45, 45, 45, 45, 45, 45, 45, 1453, 45, 45, - 45, 45, 45, 45, 45, 45, 1453, 1453, 45, 45, - 45, 45, 45, 1453, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 1453, 45, 1453, 45, - 1453, 45, 45, 45, 45, 45, 1453, 45, 45, 45, - 1453, 45, 45, 1453, 45, 45, 1453, 1453, 45, 45, - + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, + 45, 1473, 45, 45, 1473, 45, 45, 45, 45, 45, + 1473, 1473, 1473, 45, 45, 1473, 1473, 45, 45, 1473, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 1473, + 45, 45, 1473, 45, 1473, 45, 45, 45, 45, 45, + 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 45, 1473, 45, 45, 45, 45, 1473, + 45, 45, 45, 45, 45, 45, 1473, 45, 45, 45, + 1473, 45, 1473, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1473, 45, 45, 1473, 1473, 1473, + 45, 1473, 1473, 45, 1473, 45, 1473, 45, 45, 1473, + 45, 45, 45, 45, 45, 45, 1473, 45, 1473, 45, + 45, 45, 45, 45, 45, 45, 45, 1473, 45, 45, + 45, 45, 45, 45, 45, 45, 1473, 1473, 45, 45, + 45, 45, 45, 1473, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1473, 45, 1473, 45, + + 1473, 45, 45, 45, 45, 45, 1473, 45, 45, 45, + 1473, 45, 45, 1473, 45, 45, 1473, 1473, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 1453, 45, 1453, 45, 45, 45, 45, - 45, 45, 1453, 1453, 1453, 45, 45, 45, 45, 1453, - 45, 45, 1453, 45, 45, 45, 45, 45, 1453, 45, - 45, 1453, 0, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453 + 45, 45, 45, 1473, 45, 1473, 45, 45, 45, 45, + 45, 45, 1473, 1473, 1473, 45, 45, 45, 45, 1473, + 45, 45, 1473, 45, 45, 45, 45, 45, 1473, 45, + 45, 1473, 0, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473 } ; -static const flex_int16_t yy_nxt[1890] = +static const flex_int16_t yy_nxt[1909] = { 0, - 1453, 13, 14, 13, 1453, 15, 16, 1453, 17, 18, - 19, 20, 21, 22, 22, 22, 23, 24, 86, 697, - 37, 14, 37, 87, 25, 26, 38, 1453, 698, 27, + 1473, 13, 14, 13, 1473, 15, 16, 1473, 17, 18, + 19, 20, 21, 22, 22, 22, 23, 24, 86, 708, + 37, 14, 37, 87, 25, 26, 38, 1473, 709, 27, 37, 14, 37, 42, 28, 42, 38, 92, 93, 29, 115, 30, 13, 14, 13, 91, 92, 25, 31, 93, - 13, 14, 13, 13, 14, 13, 32, 40, 1453, 13, - 14, 13, 33, 40, 115, 92, 93, 818, 91, 34, + 13, 14, 13, 13, 14, 13, 32, 40, 821, 13, + 14, 13, 33, 40, 115, 92, 93, 822, 91, 34, 35, 13, 14, 13, 95, 15, 16, 96, 17, 18, 19, 20, 21, 22, 22, 22, 23, 24, 13, 14, 13, 109, 39, 91, 25, 26, 13, 14, 13, 27, 39, 85, 85, 85, 28, 42, 41, 42, 42, 29, 42, 30, 83, 108, 41, 111, 94, 25, 31, 109, - 215, 216, 89, 136, 89, 138, 32, 90, 90, 90, - 137, 371, 33, 139, 372, 83, 108, 819, 111, 34, + 217, 218, 89, 137, 89, 139, 32, 90, 90, 90, + 138, 376, 33, 140, 377, 83, 108, 823, 111, 34, 35, 44, 44, 44, 45, 45, 46, 45, 45, 45, 45, 45, 45, 45, 45, 47, 45, 45, 45, 45, 45, 48, 45, 49, 50, 45, 51, 45, 52, 53, @@ -1264,208 +1270,211 @@ static const flex_int16_t yy_nxt[1890] = 74, 75, 76, 77, 78, 79, 57, 45, 45, 45, 45, 45, 81, 105, 82, 82, 82, 81, 114, 84, - 84, 84, 102, 105, 81, 83, 84, 84, 84, 108, - 83, 181, 122, 112, 140, 123, 536, 83, 124, 105, - 125, 114, 126, 113, 141, 820, 142, 132, 83, 119, - 159, 537, 108, 83, 160, 120, 112, 103, 133, 181, - 83, 45, 148, 135, 161, 199, 149, 45, 134, 45, - 45, 113, 45, 163, 45, 45, 45, 164, 117, 144, - 145, 45, 45, 146, 45, 45, 150, 821, 199, 147, + 84, 84, 102, 105, 81, 83, 84, 84, 84, 304, + 83, 164, 194, 112, 392, 165, 122, 83, 128, 105, + 180, 114, 129, 113, 123, 130, 131, 124, 83, 119, + 125, 182, 126, 83, 127, 120, 112, 103, 132, 194, + 83, 45, 133, 200, 149, 544, 180, 45, 150, 45, + 45, 113, 45, 134, 45, 45, 45, 141, 117, 182, + 545, 45, 45, 135, 45, 45, 200, 142, 151, 143, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 90, 90, 90, 45, 127, 301, - 111, 45, 128, 179, 387, 129, 130, 181, 114, 45, - 165, 822, 154, 45, 166, 45, 118, 167, 131, 151, - 155, 152, 156, 153, 168, 169, 112, 157, 158, 179, - 170, 174, 85, 85, 85, 184, 113, 90, 90, 90, - 102, 175, 823, 83, 180, 221, 176, 222, 189, 171, - 81, 172, 82, 82, 82, 89, 179, 89, 180, 192, - 90, 90, 90, 83, 113, 81, 83, 84, 84, 84, - 180, 173, 85, 85, 85, 103, 189, 193, 83, 195, - - 101, 196, 182, 83, 183, 192, 83, 101, 197, 209, - 198, 240, 189, 228, 224, 241, 229, 195, 210, 211, - 230, 83, 252, 253, 193, 285, 83, 195, 196, 203, - 225, 269, 270, 824, 285, 101, 197, 198, 255, 101, - 204, 256, 257, 101, 825, 195, 271, 246, 196, 198, - 272, 101, 260, 285, 273, 101, 286, 101, 187, 202, - 202, 202, 288, 345, 826, 287, 202, 202, 202, 202, - 202, 202, 287, 286, 294, 278, 281, 297, 392, 298, - 827, 300, 286, 304, 302, 261, 262, 263, 287, 202, - 202, 202, 202, 202, 202, 290, 264, 294, 265, 289, - - 266, 267, 294, 268, 300, 297, 298, 302, 395, 395, - 304, 305, 305, 305, 346, 356, 314, 347, 305, 305, - 305, 305, 305, 305, 315, 307, 399, 401, 393, 406, - 316, 395, 396, 409, 422, 474, 400, 828, 403, 404, - 401, 305, 305, 305, 305, 305, 305, 405, 785, 357, - 428, 423, 406, 442, 429, 786, 401, 462, 443, 455, - 456, 409, 513, 358, 412, 412, 412, 463, 671, 413, - 829, 412, 412, 412, 412, 412, 412, 483, 488, 506, - 500, 484, 489, 501, 507, 521, 618, 522, 545, 830, - 513, 475, 513, 546, 412, 412, 412, 412, 412, 412, - - 619, 614, 653, 654, 444, 672, 620, 710, 711, 445, - 807, 712, 521, 618, 522, 45, 45, 45, 719, 720, - 523, 713, 45, 45, 45, 45, 45, 45, 619, 754, - 716, 711, 755, 793, 831, 710, 717, 832, 807, 794, - 833, 834, 837, 787, 788, 45, 45, 45, 45, 45, - 45, 789, 835, 838, 839, 790, 840, 836, 841, 842, - 843, 844, 845, 846, 847, 848, 849, 850, 851, 852, - 853, 855, 856, 857, 854, 858, 859, 860, 861, 862, - 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, - 873, 874, 875, 876, 877, 878, 879, 880, 881, 882, - - 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, - 893, 894, 895, 896, 897, 898, 899, 900, 901, 902, - 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, - 913, 914, 915, 916, 917, 918, 896, 919, 920, 895, - 921, 922, 923, 924, 925, 926, 928, 929, 930, 931, - 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, - 942, 943, 944, 945, 947, 948, 949, 950, 951, 952, - 953, 954, 955, 956, 946, 957, 958, 959, 960, 961, - 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, - 972, 973, 974, 975, 976, 977, 978, 979, 980, 982, - - 981, 927, 983, 984, 985, 986, 987, 988, 989, 990, - 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, - 1001, 1002, 1003, 1004, 1005, 1006, 980, 981, 1007, 1008, - 1009, 1011, 1013, 1014, 1015, 1010, 1016, 1017, 1018, 1019, - 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, - 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, - 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, - 1050, 1051, 1052, 1012, 1053, 1054, 1055, 1056, 1057, 1058, - 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, - 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, - - 1079, 1080, 1081, 1082, 1060, 1083, 1084, 1085, 1086, 1087, - 1061, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, - 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, - 1107, 1108, 1109, 1110, 1111, 1112, 1114, 1115, 1116, 1117, + 45, 45, 45, 45, 108, 145, 146, 45, 160, 147, + 111, 45, 161, 181, 824, 148, 180, 114, 182, 45, + 155, 102, 162, 45, 112, 45, 118, 108, 156, 152, + 157, 153, 181, 154, 113, 158, 159, 166, 136, 181, + 175, 167, 183, 190, 168, 196, 185, 172, 397, 173, + 176, 169, 170, 825, 193, 177, 103, 171, 184, 85, + 85, 85, 113, 81, 198, 82, 82, 82, 101, 174, + 83, 190, 89, 196, 89, 101, 83, 90, 90, 90, + 193, 81, 197, 84, 84, 84, 85, 85, 85, 90, + + 90, 90, 198, 83, 83, 199, 190, 83, 398, 83, + 90, 90, 90, 101, 223, 211, 224, 101, 242, 197, + 290, 101, 243, 204, 212, 213, 226, 83, 196, 101, + 83, 263, 199, 101, 205, 101, 188, 203, 203, 203, + 254, 255, 227, 290, 203, 203, 203, 203, 203, 203, + 230, 257, 289, 231, 258, 259, 196, 232, 248, 260, + 272, 273, 288, 261, 264, 265, 266, 203, 203, 203, + 203, 203, 203, 197, 199, 267, 288, 268, 289, 269, + 270, 274, 271, 289, 290, 275, 300, 297, 301, 276, + 288, 307, 349, 303, 305, 406, 404, 318, 826, 297, + + 281, 284, 400, 480, 291, 319, 405, 293, 360, 292, + 297, 320, 400, 411, 300, 301, 303, 305, 307, 308, + 308, 308, 310, 428, 406, 400, 308, 308, 308, 308, + 308, 308, 408, 409, 414, 401, 411, 406, 461, 462, + 429, 410, 361, 350, 434, 827, 351, 468, 435, 308, + 308, 308, 308, 308, 308, 448, 362, 469, 507, 481, + 449, 508, 414, 417, 417, 417, 418, 663, 664, 828, + 417, 417, 417, 417, 417, 417, 490, 495, 513, 520, + 491, 496, 520, 514, 553, 528, 627, 529, 829, 554, + 628, 681, 721, 417, 417, 417, 417, 417, 417, 623, + + 731, 732, 766, 830, 629, 767, 450, 520, 722, 723, + 530, 451, 528, 627, 529, 45, 45, 45, 628, 724, + 721, 831, 45, 45, 45, 45, 45, 45, 682, 728, + 798, 722, 800, 801, 820, 729, 806, 799, 832, 833, + 802, 834, 807, 835, 803, 45, 45, 45, 45, 45, + 45, 836, 837, 838, 839, 840, 841, 842, 843, 844, + 845, 846, 820, 847, 848, 849, 851, 852, 853, 854, + 850, 855, 856, 857, 858, 859, 860, 861, 862, 863, + 864, 865, 866, 867, 869, 870, 871, 868, 872, 873, + 874, 875, 876, 877, 878, 879, 880, 881, 882, 883, + + 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, + 894, 895, 896, 897, 898, 899, 900, 901, 902, 903, + 904, 905, 906, 907, 908, 909, 910, 911, 912, 913, + 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, + 924, 925, 926, 927, 928, 929, 930, 931, 932, 933, + 911, 934, 935, 910, 936, 937, 938, 939, 940, 941, + 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, + 953, 954, 955, 956, 957, 958, 959, 960, 962, 963, + 964, 965, 966, 967, 968, 969, 970, 971, 961, 972, + 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, + + 983, 984, 985, 986, 987, 988, 989, 990, 991, 992, + 993, 994, 995, 996, 998, 942, 997, 999, 1000, 1001, + 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, + 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, + 1022, 996, 1023, 997, 1024, 1025, 1027, 1029, 1030, 1031, + 1026, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, + 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, + 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, + 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1028, 1069, + 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, + + 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, + 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, + 1077, 1100, 1101, 1102, 1103, 1104, 1078, 1105, 1106, 1107, + 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, - 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1136, 1137, 1138, + 1128, 1129, 1130, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, - 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, - 1130, 1159, 1160, 1161, 1163, 1164, 1113, 1165, 1166, 1167, - 1168, 1162, 1169, 1170, 1171, 1172, 1173, 1174, 1135, 1175, - - 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, - 1186, 1187, 1188, 1190, 1191, 1192, 1193, 1189, 1194, 1195, - 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, - 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1191, 1213, 1214, - 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, - 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, - 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, - 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, - 1255, 1256, 1257, 1258, 1259, 1260, 1262, 1263, 1264, 1265, - 1266, 1239, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, - - 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, 1283, 1284, - 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, - 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, - 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, - 1287, 1261, 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, - 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332, - 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, - 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, - 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, - 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, - - 1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, - 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, - 1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, - 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, - 1413, 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, - 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, - 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, - 1443, 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, - 12, 12, 12, 12, 12, 36, 36, 36, 36, 36, - 80, 292, 80, 80, 80, 99, 398, 99, 510, 99, - - 101, 101, 101, 101, 101, 116, 116, 116, 116, 116, - 178, 101, 178, 178, 178, 200, 200, 200, 817, 816, - 815, 814, 813, 812, 811, 810, 809, 808, 806, 805, - 804, 803, 802, 801, 800, 799, 798, 797, 796, 795, - 792, 791, 784, 783, 782, 781, 780, 779, 778, 777, - 776, 775, 774, 773, 772, 771, 770, 769, 768, 767, - 766, 765, 764, 763, 762, 761, 760, 759, 758, 757, - 756, 753, 752, 751, 750, 749, 748, 747, 746, 745, - 744, 743, 742, 741, 740, 739, 738, 737, 736, 735, - 734, 733, 732, 731, 730, 729, 728, 727, 726, 725, - - 724, 723, 722, 721, 718, 715, 714, 709, 708, 707, - 706, 705, 704, 703, 702, 701, 700, 699, 696, 695, - 694, 693, 692, 691, 690, 689, 688, 687, 686, 685, - 684, 683, 682, 681, 680, 679, 678, 677, 676, 675, - 674, 673, 670, 669, 668, 667, 666, 665, 664, 663, - 662, 661, 660, 659, 658, 657, 656, 655, 652, 651, - 650, 649, 648, 647, 646, 645, 644, 643, 642, 641, - 640, 639, 638, 637, 636, 635, 634, 633, 632, 631, - 630, 629, 628, 627, 626, 625, 624, 623, 622, 621, - 617, 616, 615, 614, 613, 612, 611, 610, 609, 608, - - 607, 606, 605, 604, 603, 602, 601, 600, 599, 598, - 597, 596, 595, 594, 593, 592, 591, 590, 589, 588, - 587, 586, 585, 584, 583, 582, 581, 580, 579, 578, - 577, 576, 575, 574, 573, 572, 571, 570, 569, 568, - 567, 566, 565, 564, 563, 562, 561, 560, 559, 558, - 557, 556, 555, 554, 553, 552, 551, 550, 549, 548, - 547, 544, 543, 542, 541, 540, 539, 538, 535, 534, - 533, 532, 531, 530, 529, 528, 527, 526, 525, 524, - 520, 519, 518, 517, 516, 515, 514, 512, 511, 509, - 508, 505, 504, 503, 502, 499, 498, 497, 496, 495, - - 494, 493, 492, 491, 490, 487, 486, 485, 482, 481, - 480, 479, 478, 477, 476, 473, 472, 471, 470, 469, - 468, 467, 466, 465, 464, 461, 460, 459, 458, 457, - 454, 453, 452, 451, 450, 449, 448, 447, 446, 441, - 440, 439, 438, 437, 436, 435, 434, 433, 432, 431, - 430, 427, 426, 425, 424, 421, 420, 419, 418, 417, - 416, 415, 414, 411, 410, 408, 407, 402, 397, 394, - 391, 390, 389, 388, 386, 385, 384, 383, 382, 381, - 380, 379, 378, 377, 376, 375, 374, 373, 370, 369, - 368, 367, 366, 365, 364, 363, 362, 361, 360, 359, - - 355, 354, 353, 352, 351, 350, 349, 348, 344, 343, - 342, 341, 340, 339, 338, 337, 336, 335, 334, 333, - 332, 331, 330, 329, 328, 327, 326, 325, 324, 323, - 322, 321, 320, 319, 318, 317, 313, 312, 311, 310, - 309, 308, 306, 201, 303, 301, 299, 296, 295, 293, - 291, 284, 283, 282, 280, 279, 277, 276, 275, 274, - 259, 258, 254, 251, 250, 249, 248, 247, 245, 244, - 243, 242, 239, 238, 237, 236, 235, 234, 233, 232, - 231, 227, 226, 223, 220, 219, 218, 217, 214, 213, - 212, 208, 207, 206, 205, 201, 194, 191, 190, 188, - - 186, 185, 177, 162, 143, 121, 110, 107, 106, 104, - 43, 100, 98, 97, 88, 43, 1453, 11, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453 + 1149, 1150, 1151, 1152, 1154, 1155, 1156, 1157, 1158, 1159, + 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, + 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1148, 1177, 1178, + + 1179, 1181, 1182, 1131, 1183, 1184, 1185, 1186, 1180, 1187, + 1188, 1189, 1190, 1191, 1192, 1153, 1193, 1194, 1195, 1196, + 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, + 1207, 1209, 1210, 1211, 1212, 1208, 1213, 1214, 1215, 1216, + 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, + 1227, 1228, 1229, 1230, 1231, 1210, 1232, 1233, 1234, 1235, + 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, + 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, + 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, + 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, + + 1276, 1277, 1278, 1279, 1280, 1282, 1283, 1284, 1285, 1286, + 1259, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 1295, + 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, + 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, + 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323, 1324, 1325, + 1326, 1327, 1328, 1329, 1330, 1331, 1332, 1333, 1334, 1307, + 1281, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, + 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353, + 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, + 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, + + 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1383, + 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, + 1394, 1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, + 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, + 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, + 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, + 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, + 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, + 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463, + 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 12, + + 12, 12, 12, 12, 36, 36, 36, 36, 36, 80, + 295, 80, 80, 80, 99, 403, 99, 517, 99, 101, + 101, 101, 101, 101, 116, 116, 116, 116, 116, 179, + 101, 179, 179, 179, 201, 201, 201, 819, 818, 817, + 816, 815, 814, 813, 812, 811, 810, 809, 808, 805, + 804, 797, 796, 795, 794, 793, 792, 791, 790, 789, + 788, 787, 786, 785, 784, 783, 782, 781, 780, 779, + 778, 777, 776, 775, 774, 773, 772, 771, 770, 769, + 768, 765, 764, 763, 762, 761, 760, 759, 758, 757, + 756, 755, 754, 753, 752, 751, 750, 749, 748, 747, + + 746, 745, 744, 743, 742, 741, 740, 739, 738, 737, + 736, 735, 734, 733, 730, 727, 726, 725, 720, 719, + 718, 717, 716, 715, 714, 713, 712, 711, 710, 707, + 706, 705, 704, 703, 702, 701, 700, 699, 698, 697, + 696, 695, 694, 693, 692, 691, 690, 689, 688, 687, + 686, 685, 684, 683, 680, 679, 678, 677, 676, 675, + 674, 673, 672, 671, 670, 669, 668, 667, 666, 665, + 662, 661, 660, 659, 658, 657, 656, 655, 654, 653, + 652, 651, 650, 649, 648, 647, 646, 645, 644, 643, + 642, 641, 640, 639, 638, 637, 636, 635, 634, 633, + + 632, 631, 630, 626, 625, 624, 623, 622, 621, 620, + 619, 618, 617, 616, 615, 614, 613, 612, 611, 610, + 609, 608, 607, 606, 605, 604, 603, 602, 601, 600, + 599, 598, 597, 596, 595, 594, 593, 592, 591, 590, + 589, 588, 587, 586, 585, 584, 583, 582, 581, 580, + 579, 578, 577, 576, 575, 574, 573, 572, 571, 570, + 569, 568, 567, 566, 565, 564, 563, 562, 561, 560, + 559, 558, 557, 556, 555, 552, 551, 550, 549, 548, + 547, 546, 543, 542, 541, 540, 539, 538, 537, 536, + 535, 534, 533, 532, 531, 527, 526, 525, 524, 523, + + 522, 521, 519, 518, 516, 515, 512, 511, 510, 509, + 506, 505, 504, 503, 502, 501, 500, 499, 498, 497, + 494, 493, 492, 489, 488, 487, 486, 485, 484, 483, + 482, 479, 478, 477, 476, 475, 474, 473, 472, 471, + 470, 467, 466, 465, 464, 463, 460, 459, 458, 457, + 456, 455, 454, 453, 452, 447, 446, 445, 444, 443, + 442, 441, 440, 439, 438, 437, 436, 433, 432, 431, + 430, 427, 426, 425, 424, 423, 422, 421, 420, 419, + 416, 415, 413, 412, 407, 402, 399, 396, 395, 394, + 393, 391, 390, 389, 388, 387, 386, 385, 384, 383, + + 382, 381, 380, 379, 378, 375, 374, 373, 372, 371, + 370, 369, 368, 367, 366, 365, 364, 363, 359, 358, + 357, 356, 355, 354, 353, 352, 348, 347, 346, 345, + 344, 343, 342, 341, 340, 339, 338, 337, 336, 335, + 334, 333, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 323, 322, 321, 317, 316, 315, 314, 313, 312, + 311, 309, 202, 306, 304, 302, 299, 298, 296, 294, + 287, 286, 285, 283, 282, 280, 279, 278, 277, 262, + 256, 253, 252, 251, 250, 249, 247, 246, 245, 244, + 241, 240, 239, 238, 237, 236, 235, 234, 233, 229, + + 228, 225, 222, 221, 220, 219, 216, 215, 214, 210, + 209, 208, 207, 206, 202, 195, 192, 191, 189, 187, + 186, 178, 163, 144, 121, 110, 107, 106, 104, 43, + 100, 98, 97, 88, 43, 1473, 11, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473 } ; -static const flex_int16_t yy_chk[1890] = +static const flex_int16_t yy_chk[1909] = { 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 21, 604, - 3, 3, 3, 21, 1, 1, 3, 0, 604, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 21, 613, + 3, 3, 3, 21, 1, 1, 3, 0, 613, 1, 4, 4, 4, 13, 1, 13, 4, 27, 28, 1, 57, 1, 5, 5, 5, 26, 32, 1, 1, 33, - 6, 6, 6, 7, 7, 7, 1, 7, 0, 8, - 8, 8, 1, 8, 57, 27, 28, 723, 26, 1, + 6, 6, 6, 7, 7, 7, 1, 7, 723, 8, + 8, 8, 1, 8, 57, 27, 28, 724, 26, 1, 1, 2, 2, 2, 32, 2, 2, 33, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, 9, 52, 5, 31, 2, 2, 10, 10, 10, 2, 6, 20, 20, 20, 2, 37, 9, 37, 42, 2, 42, 2, 20, 51, 10, 54, 31, 2, 2, 52, - 128, 128, 25, 65, 25, 66, 2, 25, 25, 25, - 65, 263, 2, 66, 263, 20, 51, 724, 54, 2, + 129, 129, 25, 65, 25, 66, 2, 25, 25, 25, + 65, 266, 2, 66, 266, 20, 51, 725, 54, 2, 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, @@ -1475,189 +1484,192 @@ static const flex_int16_t yy_chk[1890] = 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 17, 48, 17, 17, 17, 19, 56, 19, - 19, 19, 44, 59, 22, 17, 22, 22, 22, 64, - 19, 93, 61, 55, 67, 61, 428, 22, 61, 48, - 61, 56, 61, 55, 67, 725, 67, 63, 17, 59, - 73, 428, 64, 19, 73, 59, 55, 44, 63, 93, - 22, 45, 70, 64, 73, 115, 70, 45, 63, 45, - 45, 55, 45, 75, 45, 45, 45, 75, 58, 69, - 69, 45, 45, 69, 45, 58, 70, 726, 115, 69, + 19, 19, 44, 59, 22, 17, 22, 22, 22, 281, + 19, 75, 109, 55, 281, 75, 61, 22, 62, 48, + 91, 56, 62, 55, 61, 62, 62, 61, 17, 59, + 61, 93, 61, 19, 61, 59, 55, 44, 62, 109, + 22, 45, 63, 115, 70, 434, 91, 45, 70, 45, + 45, 55, 45, 63, 45, 45, 45, 67, 58, 93, + 434, 45, 45, 63, 45, 58, 115, 67, 70, 67, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 58, 89, 89, 89, 58, 62, 278, - 71, 58, 62, 91, 278, 62, 62, 96, 78, 58, - 76, 727, 72, 58, 76, 58, 58, 76, 62, 71, - 72, 71, 72, 71, 76, 76, 77, 72, 72, 91, - 76, 78, 81, 81, 81, 96, 77, 90, 90, 90, - 101, 78, 728, 81, 92, 133, 78, 133, 105, 77, - 82, 77, 82, 82, 82, 83, 94, 83, 95, 108, - 83, 83, 83, 82, 77, 84, 81, 84, 84, 84, - 92, 77, 85, 85, 85, 101, 105, 109, 84, 111, - - 103, 112, 94, 85, 95, 108, 82, 103, 113, 124, - 114, 148, 119, 138, 135, 148, 138, 153, 124, 124, - 138, 84, 159, 159, 109, 179, 85, 111, 112, 119, - 135, 165, 165, 729, 182, 103, 113, 114, 161, 103, - 119, 161, 161, 103, 730, 153, 166, 153, 171, 174, - 166, 103, 164, 179, 166, 103, 180, 103, 103, 118, - 118, 118, 182, 241, 731, 181, 118, 118, 118, 118, - 118, 118, 184, 183, 189, 171, 174, 192, 283, 193, - 732, 195, 180, 199, 197, 164, 164, 164, 181, 118, - 118, 118, 118, 118, 118, 184, 164, 189, 164, 183, - - 164, 164, 204, 164, 195, 192, 193, 197, 285, 288, - 199, 202, 202, 202, 241, 250, 211, 241, 202, 202, - 202, 202, 202, 202, 211, 204, 293, 294, 283, 297, - 211, 285, 288, 300, 316, 363, 293, 733, 296, 296, - 307, 202, 202, 202, 202, 202, 202, 296, 692, 250, - 322, 316, 297, 335, 322, 692, 294, 351, 335, 345, - 345, 300, 401, 250, 305, 305, 305, 351, 576, 307, - 734, 305, 305, 305, 305, 305, 305, 372, 376, 393, - 387, 372, 376, 387, 393, 411, 521, 411, 437, 736, - 401, 363, 413, 437, 305, 305, 305, 305, 305, 305, - - 522, 523, 558, 558, 335, 576, 523, 618, 619, 335, - 711, 620, 411, 521, 411, 412, 412, 412, 625, 625, - 413, 620, 412, 412, 412, 412, 412, 412, 522, 660, - 623, 619, 660, 696, 737, 618, 623, 738, 711, 696, - 739, 740, 742, 693, 693, 412, 412, 412, 412, 412, - 412, 693, 741, 743, 744, 693, 745, 741, 746, 747, - 748, 749, 752, 753, 754, 755, 758, 759, 760, 761, - 762, 763, 764, 765, 762, 766, 767, 768, 770, 771, - 772, 773, 774, 775, 776, 777, 778, 779, 780, 781, - 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, - - 792, 793, 794, 796, 797, 798, 799, 800, 801, 802, - 803, 804, 806, 807, 808, 809, 810, 811, 812, 813, - 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, - 824, 826, 827, 828, 829, 830, 807, 831, 832, 806, - 833, 834, 836, 837, 838, 839, 840, 842, 843, 844, - 845, 846, 847, 848, 849, 850, 851, 852, 853, 854, - 855, 856, 857, 858, 859, 861, 862, 863, 865, 866, - 867, 868, 869, 870, 858, 871, 872, 873, 874, 875, - 876, 877, 878, 879, 880, 881, 883, 884, 885, 886, - 887, 888, 889, 890, 891, 892, 893, 894, 895, 897, - - 896, 839, 898, 899, 900, 901, 903, 904, 905, 906, - 907, 908, 909, 910, 912, 913, 914, 915, 916, 917, - 918, 919, 920, 921, 922, 923, 895, 896, 924, 925, - 927, 928, 929, 930, 931, 927, 932, 933, 934, 935, - 936, 937, 938, 939, 940, 941, 942, 943, 944, 945, - 946, 947, 948, 949, 951, 952, 953, 954, 955, 956, - 957, 958, 959, 960, 961, 963, 964, 966, 967, 968, - 969, 970, 971, 928, 972, 973, 974, 975, 976, 977, - 979, 980, 981, 982, 983, 984, 986, 987, 988, 989, - 990, 991, 994, 995, 996, 997, 998, 999, 1000, 1001, - - 1002, 1003, 1004, 1005, 980, 1006, 1007, 1010, 1012, 1013, - 981, 1014, 1015, 1016, 1017, 1018, 1019, 1021, 1022, 1023, - 1024, 1026, 1027, 1028, 1029, 1030, 1033, 1034, 1035, 1036, - 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, - 1047, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1057, - 1058, 1059, 1060, 1061, 1062, 1064, 1065, 1066, 1067, 1068, - 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1077, 1078, 1079, - 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, - 1060, 1090, 1091, 1092, 1093, 1094, 1042, 1096, 1099, 1100, - 1101, 1092, 1102, 1103, 1104, 1105, 1106, 1107, 1065, 1109, - - 1110, 1111, 1112, 1113, 1114, 1115, 1117, 1119, 1122, 1124, - 1126, 1127, 1128, 1129, 1130, 1132, 1133, 1128, 1135, 1136, - 1137, 1138, 1139, 1140, 1141, 1142, 1144, 1145, 1146, 1147, - 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1130, 1157, 1159, - 1160, 1161, 1162, 1163, 1165, 1166, 1167, 1168, 1169, 1170, - 1172, 1173, 1175, 1176, 1177, 1178, 1180, 1181, 1182, 1183, - 1184, 1185, 1187, 1189, 1191, 1192, 1193, 1194, 1195, 1196, - 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, - 1207, 1208, 1209, 1210, 1210, 1211, 1212, 1213, 1214, 1215, - 1216, 1191, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, - - 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1233, 1234, 1236, - 1237, 1238, 1239, 1240, 1244, 1245, 1248, 1249, 1252, 1253, - 1254, 1255, 1256, 1257, 1258, 1259, 1261, 1262, 1264, 1266, - 1267, 1268, 1269, 1270, 1272, 1273, 1274, 1275, 1276, 1277, - 1239, 1211, 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1286, - 1287, 1288, 1289, 1291, 1292, 1293, 1294, 1295, 1296, 1298, - 1299, 1300, 1302, 1304, 1305, 1306, 1307, 1308, 1309, 1310, - 1311, 1312, 1313, 1314, 1316, 1317, 1321, 1324, 1326, 1328, - 1329, 1331, 1332, 1333, 1334, 1335, 1336, 1338, 1340, 1341, - 1342, 1343, 1344, 1345, 1346, 1347, 1349, 1350, 1351, 1352, - - 1353, 1354, 1355, 1356, 1359, 1360, 1361, 1362, 1363, 1365, - 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375, - 1376, 1378, 1380, 1382, 1383, 1384, 1385, 1386, 1388, 1389, - 1390, 1392, 1393, 1395, 1396, 1399, 1400, 1401, 1402, 1403, - 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, - 1414, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, 1423, - 1425, 1427, 1428, 1429, 1430, 1431, 1432, 1436, 1437, 1438, - 1439, 1441, 1442, 1444, 1445, 1446, 1447, 1448, 1450, 1451, - 1454, 1454, 1454, 1454, 1454, 1455, 1455, 1455, 1455, 1455, - 1456, 1462, 1456, 1456, 1456, 1457, 1463, 1457, 1464, 1457, - - 1458, 1458, 1458, 1458, 1458, 1459, 1459, 1459, 1459, 1459, - 1460, 1465, 1460, 1460, 1460, 1461, 1461, 1461, 722, 721, - 720, 719, 717, 716, 715, 714, 713, 712, 710, 708, - 707, 706, 705, 704, 703, 702, 701, 700, 699, 698, - 695, 694, 691, 690, 689, 688, 687, 686, 685, 684, - 683, 682, 681, 680, 679, 678, 677, 676, 675, 674, - 673, 672, 670, 669, 668, 667, 666, 665, 664, 663, - 661, 659, 658, 657, 656, 655, 654, 653, 652, 651, - 650, 649, 648, 647, 646, 645, 644, 642, 641, 640, - 639, 638, 637, 636, 635, 634, 633, 632, 631, 630, - - 629, 628, 627, 626, 624, 622, 621, 617, 616, 615, - 613, 612, 610, 609, 608, 607, 606, 605, 602, 601, - 600, 599, 598, 597, 596, 595, 594, 593, 592, 591, - 589, 588, 587, 586, 585, 584, 583, 582, 580, 579, - 578, 577, 575, 574, 573, 572, 571, 570, 569, 567, - 566, 565, 564, 563, 562, 561, 560, 559, 557, 556, - 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, + 45, 45, 45, 58, 64, 69, 69, 58, 73, 69, + 71, 58, 73, 92, 726, 69, 94, 78, 96, 58, + 72, 101, 73, 58, 77, 58, 58, 64, 72, 71, + 72, 71, 95, 71, 77, 72, 72, 76, 64, 92, + 78, 76, 94, 105, 76, 111, 96, 77, 286, 77, + 78, 76, 76, 727, 108, 78, 101, 76, 95, 81, + 81, 81, 77, 82, 113, 82, 82, 82, 103, 77, + 81, 105, 83, 111, 83, 103, 82, 83, 83, 83, + 108, 84, 112, 84, 84, 84, 85, 85, 85, 89, + + 89, 89, 113, 81, 84, 114, 119, 85, 286, 82, + 90, 90, 90, 103, 134, 125, 134, 103, 149, 112, + 182, 103, 149, 119, 125, 125, 136, 84, 154, 103, + 85, 165, 114, 103, 119, 103, 103, 118, 118, 118, + 160, 160, 136, 182, 118, 118, 118, 118, 118, 118, + 139, 162, 181, 139, 162, 162, 154, 139, 154, 163, + 166, 166, 180, 163, 165, 165, 165, 118, 118, 118, + 118, 118, 118, 172, 175, 165, 183, 165, 181, 165, + 165, 167, 165, 184, 185, 167, 193, 190, 194, 167, + 180, 200, 243, 196, 198, 297, 296, 213, 728, 205, + + 172, 175, 288, 367, 183, 213, 296, 185, 252, 184, + 190, 213, 291, 300, 193, 194, 196, 198, 200, 203, + 203, 203, 205, 320, 297, 288, 203, 203, 203, 203, + 203, 203, 299, 299, 303, 291, 300, 310, 349, 349, + 320, 299, 252, 243, 326, 729, 243, 355, 326, 203, + 203, 203, 203, 203, 203, 339, 252, 355, 392, 367, + 339, 392, 303, 308, 308, 308, 310, 566, 566, 731, + 308, 308, 308, 308, 308, 308, 377, 381, 398, 406, + 377, 381, 418, 398, 443, 416, 528, 416, 732, 443, + 529, 584, 627, 308, 308, 308, 308, 308, 308, 530, + + 635, 635, 670, 733, 530, 670, 339, 406, 628, 629, + 418, 339, 416, 528, 416, 417, 417, 417, 529, 629, + 627, 734, 417, 417, 417, 417, 417, 417, 584, 633, + 703, 628, 704, 704, 722, 633, 707, 703, 735, 736, + 704, 737, 707, 738, 704, 417, 417, 417, 417, 417, + 417, 739, 740, 741, 742, 743, 744, 745, 746, 748, + 749, 750, 722, 751, 752, 753, 754, 755, 756, 757, + 753, 758, 759, 760, 761, 764, 765, 766, 767, 770, + 771, 772, 773, 774, 775, 776, 777, 774, 778, 779, + 780, 782, 783, 784, 785, 786, 787, 788, 789, 790, + + 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, + 801, 802, 803, 804, 805, 806, 807, 809, 810, 811, + 812, 813, 814, 815, 816, 817, 819, 820, 821, 822, + 823, 825, 826, 827, 828, 829, 830, 831, 832, 833, + 834, 835, 836, 837, 838, 840, 841, 842, 843, 844, + 820, 845, 846, 819, 847, 848, 850, 851, 852, 853, + 854, 856, 857, 858, 859, 860, 861, 862, 863, 864, + 865, 866, 867, 868, 869, 870, 871, 872, 873, 875, + 876, 877, 878, 880, 881, 882, 883, 884, 872, 885, + 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, + + 896, 898, 899, 900, 901, 902, 903, 904, 905, 906, + 907, 908, 909, 910, 912, 853, 911, 913, 914, 915, + 916, 918, 919, 920, 921, 922, 923, 924, 925, 927, + 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, + 938, 910, 939, 911, 940, 942, 943, 944, 945, 946, + 942, 947, 948, 949, 950, 951, 952, 953, 954, 955, + 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, + 967, 968, 969, 970, 971, 972, 973, 974, 975, 976, + 977, 979, 980, 982, 983, 984, 985, 986, 943, 987, + 988, 989, 990, 991, 992, 993, 995, 996, 997, 998, + + 999, 1000, 1002, 1003, 1004, 1005, 1006, 1007, 1010, 1011, + 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, + 996, 1022, 1023, 1026, 1028, 1029, 997, 1030, 1031, 1032, + 1033, 1034, 1035, 1037, 1038, 1039, 1040, 1042, 1043, 1044, + 1045, 1046, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, + 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1066, 1067, + 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, + 1078, 1079, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, + 1089, 1090, 1091, 1092, 1094, 1095, 1096, 1097, 1098, 1099, + 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1077, 1107, 1108, + + 1109, 1110, 1111, 1059, 1113, 1116, 1117, 1118, 1109, 1119, + 1120, 1121, 1122, 1123, 1124, 1082, 1125, 1127, 1128, 1129, + 1130, 1131, 1132, 1133, 1135, 1137, 1140, 1142, 1144, 1145, + 1146, 1147, 1148, 1150, 1151, 1146, 1153, 1154, 1155, 1156, + 1157, 1158, 1159, 1160, 1162, 1163, 1164, 1165, 1166, 1167, + 1168, 1169, 1170, 1171, 1172, 1148, 1175, 1177, 1178, 1179, + 1180, 1181, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1191, + 1192, 1194, 1195, 1196, 1197, 1199, 1200, 1201, 1202, 1203, + 1204, 1206, 1208, 1210, 1211, 1212, 1213, 1214, 1215, 1216, + 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, + + 1227, 1228, 1229, 1229, 1230, 1231, 1232, 1233, 1234, 1235, + 1210, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1245, + 1246, 1247, 1248, 1249, 1250, 1251, 1253, 1254, 1256, 1257, + 1258, 1259, 1260, 1264, 1265, 1268, 1269, 1272, 1273, 1274, + 1275, 1276, 1277, 1278, 1279, 1281, 1282, 1284, 1286, 1287, + 1288, 1289, 1290, 1292, 1293, 1294, 1295, 1296, 1297, 1259, + 1230, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1306, 1307, + 1308, 1309, 1311, 1312, 1313, 1314, 1315, 1316, 1318, 1319, + 1320, 1322, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, + 1332, 1333, 1334, 1336, 1337, 1341, 1344, 1346, 1348, 1349, + + 1351, 1352, 1353, 1354, 1355, 1356, 1358, 1360, 1361, 1362, + 1363, 1364, 1365, 1366, 1367, 1369, 1370, 1371, 1372, 1373, + 1374, 1375, 1376, 1379, 1380, 1381, 1382, 1383, 1385, 1386, + 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, + 1398, 1400, 1402, 1403, 1404, 1405, 1406, 1408, 1409, 1410, + 1412, 1413, 1415, 1416, 1419, 1420, 1421, 1422, 1423, 1424, + 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, + 1435, 1436, 1437, 1438, 1439, 1440, 1441, 1442, 1443, 1445, + 1447, 1448, 1449, 1450, 1451, 1452, 1456, 1457, 1458, 1459, + 1461, 1462, 1464, 1465, 1466, 1467, 1468, 1470, 1471, 1474, + + 1474, 1474, 1474, 1474, 1475, 1475, 1475, 1475, 1475, 1476, + 1482, 1476, 1476, 1476, 1477, 1483, 1477, 1484, 1477, 1478, + 1478, 1478, 1478, 1478, 1479, 1479, 1479, 1479, 1479, 1480, + 1485, 1480, 1480, 1480, 1481, 1481, 1481, 721, 719, 718, + 717, 716, 715, 714, 713, 712, 711, 710, 709, 706, + 705, 702, 701, 700, 699, 698, 697, 696, 695, 694, + 693, 692, 691, 690, 689, 688, 687, 686, 685, 684, + 683, 682, 680, 679, 678, 677, 676, 675, 674, 673, + 671, 669, 668, 667, 666, 665, 664, 663, 662, 661, + 660, 659, 658, 657, 656, 655, 654, 652, 651, 650, + + 649, 648, 647, 646, 645, 644, 643, 642, 641, 640, + 639, 638, 637, 636, 634, 632, 631, 630, 626, 625, + 624, 622, 621, 619, 618, 617, 616, 615, 614, 611, + 610, 609, 608, 607, 606, 605, 604, 603, 602, 601, + 600, 598, 597, 596, 595, 594, 593, 592, 591, 590, + 588, 587, 586, 585, 583, 582, 581, 580, 579, 578, + 577, 575, 574, 573, 572, 571, 570, 569, 568, 567, + 565, 564, 563, 562, 561, 560, 559, 558, 557, 556, + 555, 554, 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, 539, 538, 537, 536, 535, - 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, - 519, 517, 514, 513, 512, 511, 509, 508, 507, 505, - 504, 501, 500, 499, 498, 497, 496, 495, 494, 493, + 534, 533, 532, 526, 524, 521, 520, 519, 518, 516, + 515, 514, 512, 511, 508, 507, 506, 505, 504, 503, + 502, 501, 500, 499, 498, 497, 496, 495, 494, 493, 492, 491, 490, 489, 488, 487, 486, 485, 484, 483, - 482, 481, 480, 479, 478, 477, 475, 473, 472, 471, - 470, 469, 468, 467, 466, 465, 464, 463, 462, 460, + 481, 479, 478, 477, 476, 475, 474, 473, 472, 471, + 470, 469, 468, 466, 465, 464, 463, 462, 461, 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, - 449, 448, 447, 446, 445, 444, 443, 441, 440, 439, - 438, 436, 435, 434, 433, 432, 430, 429, 427, 426, - 424, 423, 422, 421, 420, 419, 417, 416, 415, 414, - 409, 408, 406, 405, 404, 403, 402, 400, 399, 397, - 394, 392, 391, 389, 388, 386, 385, 384, 383, 382, - - 381, 380, 379, 378, 377, 375, 374, 373, 371, 370, - 369, 368, 366, 365, 364, 362, 361, 360, 359, 358, - 357, 356, 355, 354, 352, 350, 349, 348, 347, 346, - 344, 343, 342, 341, 340, 339, 338, 337, 336, 334, - 333, 332, 331, 330, 329, 328, 327, 326, 325, 324, - 323, 321, 320, 319, 318, 315, 314, 313, 312, 311, - 310, 309, 308, 304, 302, 299, 298, 295, 291, 284, - 282, 281, 280, 279, 277, 276, 275, 274, 273, 272, - 271, 270, 269, 268, 267, 266, 265, 264, 262, 261, - 260, 259, 258, 257, 256, 255, 254, 253, 252, 251, - - 249, 248, 247, 246, 245, 244, 243, 242, 240, 239, - 238, 237, 236, 235, 234, 233, 231, 230, 229, 228, + 449, 447, 446, 445, 444, 442, 441, 440, 439, 438, + 436, 435, 433, 432, 430, 429, 428, 427, 426, 425, + 423, 422, 421, 420, 419, 414, 413, 411, 410, 409, + + 408, 407, 405, 404, 402, 399, 397, 396, 394, 393, + 391, 390, 389, 388, 387, 386, 385, 384, 383, 382, + 380, 379, 378, 376, 375, 374, 373, 371, 370, 369, + 368, 366, 365, 364, 363, 362, 361, 360, 359, 358, + 356, 354, 353, 352, 351, 350, 348, 347, 346, 345, + 344, 343, 342, 341, 340, 338, 337, 336, 335, 334, + 333, 332, 331, 330, 329, 328, 327, 325, 324, 323, + 322, 319, 318, 317, 316, 315, 314, 313, 312, 311, + 307, 305, 302, 301, 298, 294, 287, 285, 284, 283, + 282, 280, 279, 278, 277, 276, 275, 274, 273, 272, + + 271, 270, 269, 268, 267, 265, 264, 263, 262, 261, + 260, 259, 258, 257, 256, 255, 254, 253, 251, 250, + 249, 248, 247, 246, 245, 244, 242, 241, 240, 239, + 238, 237, 236, 235, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, 218, - 217, 216, 215, 214, 213, 212, 210, 209, 208, 207, - 206, 205, 203, 200, 198, 196, 194, 191, 190, 188, - 185, 177, 176, 175, 173, 172, 170, 169, 168, 167, - 163, 162, 160, 158, 157, 156, 155, 154, 152, 151, - 150, 149, 147, 146, 145, 144, 143, 142, 141, 140, - 139, 137, 136, 134, 132, 131, 130, 129, 127, 126, - 125, 123, 122, 121, 120, 116, 110, 107, 106, 104, - - 99, 98, 79, 74, 68, 60, 53, 50, 49, 47, - 43, 41, 39, 38, 24, 14, 11, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, - 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453, 1453 + 217, 216, 215, 214, 212, 211, 210, 209, 208, 207, + 206, 204, 201, 199, 197, 195, 192, 191, 189, 186, + 178, 177, 176, 174, 173, 171, 170, 169, 168, 164, + 161, 159, 158, 157, 156, 155, 153, 152, 151, 150, + 148, 147, 146, 145, 144, 143, 142, 141, 140, 138, + + 137, 135, 133, 132, 131, 130, 128, 127, 126, 124, + 123, 122, 121, 120, 116, 110, 107, 106, 104, 99, + 98, 79, 74, 68, 60, 53, 50, 49, 47, 43, + 41, 39, 38, 24, 14, 11, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, + + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473 } ; static yy_state_type yy_last_accepting_state; @@ -1666,7 +1678,7 @@ static char *yy_last_accepting_cpos; extern int yy_flex_debug; int yy_flex_debug = 1; -static const flex_int16_t yy_rule_linenum[174] = +static const flex_int16_t yy_rule_linenum[176] = { 0, 145, 147, 149, 154, 155, 160, 161, 162, 174, 177, 182, 189, 198, 207, 216, 225, 234, 243, 253, 262, @@ -1674,19 +1686,19 @@ static const flex_int16_t yy_rule_linenum[174] = 364, 373, 382, 391, 400, 411, 422, 433, 444, 454, 464, 475, 486, 497, 508, 519, 530, 541, 552, 563, 574, 585, 594, 603, 613, 622, 632, 646, 662, 671, - 680, 689, 698, 718, 738, 747, 757, 766, 776, 785, - 794, 803, 812, 821, 831, 840, 849, 858, 867, 876, - 885, 894, 903, 912, 921, 931, 942, 954, 963, 972, - 982, 992, 1002, 1012, 1022, 1032, 1041, 1051, 1060, 1069, - - 1078, 1087, 1097, 1107, 1116, 1126, 1135, 1144, 1153, 1162, - 1171, 1180, 1189, 1198, 1207, 1216, 1225, 1234, 1243, 1252, - 1261, 1270, 1279, 1288, 1297, 1306, 1315, 1324, 1333, 1342, - 1351, 1360, 1369, 1378, 1387, 1396, 1406, 1416, 1426, 1436, - 1446, 1456, 1466, 1476, 1486, 1495, 1504, 1513, 1522, 1531, - 1540, 1549, 1560, 1573, 1586, 1601, 1700, 1705, 1710, 1715, - 1716, 1717, 1718, 1719, 1720, 1722, 1740, 1753, 1758, 1762, - 1764, 1766, 1768 + 680, 689, 698, 719, 740, 749, 759, 768, 778, 787, + 796, 805, 814, 823, 833, 842, 851, 860, 869, 878, + 887, 896, 905, 914, 923, 933, 944, 956, 965, 974, + 984, 994, 1004, 1014, 1024, 1034, 1043, 1053, 1062, 1071, + + 1080, 1089, 1099, 1109, 1118, 1128, 1137, 1146, 1155, 1164, + 1173, 1182, 1191, 1200, 1209, 1218, 1227, 1236, 1245, 1254, + 1263, 1272, 1281, 1290, 1299, 1308, 1317, 1326, 1335, 1344, + 1353, 1362, 1371, 1380, 1389, 1398, 1407, 1416, 1426, 1436, + 1446, 1456, 1466, 1476, 1486, 1496, 1506, 1515, 1524, 1533, + 1542, 1551, 1560, 1569, 1580, 1593, 1606, 1621, 1720, 1725, + 1730, 1735, 1736, 1737, 1738, 1739, 1740, 1742, 1760, 1773, + 1778, 1782, 1784, 1786, 1788 } ; /* The intent behind this definition is that it'll catch @@ -1739,7 +1751,7 @@ using namespace isc::dhcp; /* To avoid the call to exit... oops! */ #define YY_FATAL_ERROR(msg) isc::dhcp::Parser4Context::fatal(msg) -#line 1743 "dhcp4_lexer.cc" +#line 1755 "dhcp4_lexer.cc" /* noyywrap disables automatic rewinding for the next file to parse. Since we always parse only a single string, there's no need to do any wraps. And using yywrap requires linking with -lfl, which provides the default yywrap @@ -1765,8 +1777,8 @@ using namespace isc::dhcp; by moving it ahead by yyleng bytes. yyleng specifies the length of the currently matched token. */ #define YY_USER_ACTION driver.loc_.columns(yyleng); -#line 1769 "dhcp4_lexer.cc" -#line 1770 "dhcp4_lexer.cc" +#line 1781 "dhcp4_lexer.cc" +#line 1782 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -2094,7 +2106,7 @@ YY_DECL } -#line 2098 "dhcp4_lexer.cc" +#line 2110 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2123,13 +2135,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1454 ) + if ( yy_current_state >= 1474 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 1453 ); + while ( yy_current_state != 1473 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -2148,13 +2160,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 174 ) + else if ( yy_act < 176 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], yytext ); - else if ( yy_act == 174 ) + else if ( yy_act == 176 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", yytext ); - else if ( yy_act == 175 ) + else if ( yy_act == 177 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -2935,6 +2947,7 @@ YY_RULE_SETUP case isc::dhcp::Parser4Context::RESERVATIONS: case isc::dhcp::Parser4Context::CLIENT_CLASSES: case isc::dhcp::Parser4Context::CONTROL_SOCKET: + case isc::dhcp::Parser4Context::QUEUE_CONTROL: case isc::dhcp::Parser4Context::LOGGERS: case isc::dhcp::Parser4Context::DHCP_DDNS: return isc::dhcp::Dhcp4Parser::make_USER_CONTEXT(driver.loc_); @@ -2945,7 +2958,7 @@ YY_RULE_SETUP YY_BREAK case 64: YY_RULE_SETUP -#line 718 "dhcp4_lexer.ll" +#line 719 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2958,6 +2971,7 @@ YY_RULE_SETUP case isc::dhcp::Parser4Context::RESERVATIONS: case isc::dhcp::Parser4Context::CLIENT_CLASSES: case isc::dhcp::Parser4Context::CONTROL_SOCKET: + case isc::dhcp::Parser4Context::QUEUE_CONTROL: case isc::dhcp::Parser4Context::LOGGERS: case isc::dhcp::Parser4Context::DHCP_DDNS: return isc::dhcp::Dhcp4Parser::make_COMMENT(driver.loc_); @@ -2968,7 +2982,7 @@ YY_RULE_SETUP YY_BREAK case 65: YY_RULE_SETUP -#line 738 "dhcp4_lexer.ll" +#line 740 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2980,7 +2994,7 @@ YY_RULE_SETUP YY_BREAK case 66: YY_RULE_SETUP -#line 747 "dhcp4_lexer.ll" +#line 749 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2993,7 +3007,7 @@ YY_RULE_SETUP YY_BREAK case 67: YY_RULE_SETUP -#line 757 "dhcp4_lexer.ll" +#line 759 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3005,7 +3019,7 @@ YY_RULE_SETUP YY_BREAK case 68: YY_RULE_SETUP -#line 766 "dhcp4_lexer.ll" +#line 768 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3018,7 +3032,7 @@ YY_RULE_SETUP YY_BREAK case 69: YY_RULE_SETUP -#line 776 "dhcp4_lexer.ll" +#line 778 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATION_MODE: @@ -3030,7 +3044,7 @@ YY_RULE_SETUP YY_BREAK case 70: YY_RULE_SETUP -#line 785 "dhcp4_lexer.ll" +#line 787 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATION_MODE: @@ -3042,7 +3056,7 @@ YY_RULE_SETUP YY_BREAK case 71: YY_RULE_SETUP -#line 794 "dhcp4_lexer.ll" +#line 796 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATION_MODE: @@ -3054,7 +3068,7 @@ YY_RULE_SETUP YY_BREAK case 72: YY_RULE_SETUP -#line 803 "dhcp4_lexer.ll" +#line 805 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATION_MODE: @@ -3066,7 +3080,7 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 812 "dhcp4_lexer.ll" +#line 814 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATION_MODE: @@ -3078,7 +3092,7 @@ YY_RULE_SETUP YY_BREAK case 74: YY_RULE_SETUP -#line 821 "dhcp4_lexer.ll" +#line 823 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -3091,7 +3105,7 @@ YY_RULE_SETUP YY_BREAK case 75: YY_RULE_SETUP -#line 831 "dhcp4_lexer.ll" +#line 833 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3103,7 +3117,7 @@ YY_RULE_SETUP YY_BREAK case 76: YY_RULE_SETUP -#line 840 "dhcp4_lexer.ll" +#line 842 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3115,7 +3129,7 @@ YY_RULE_SETUP YY_BREAK case 77: YY_RULE_SETUP -#line 849 "dhcp4_lexer.ll" +#line 851 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGING: @@ -3127,7 +3141,7 @@ YY_RULE_SETUP YY_BREAK case 78: YY_RULE_SETUP -#line 858 "dhcp4_lexer.ll" +#line 860 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -3139,7 +3153,7 @@ YY_RULE_SETUP YY_BREAK case 79: YY_RULE_SETUP -#line 867 "dhcp4_lexer.ll" +#line 869 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -3151,7 +3165,7 @@ YY_RULE_SETUP YY_BREAK case 80: YY_RULE_SETUP -#line 876 "dhcp4_lexer.ll" +#line 878 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -3163,7 +3177,7 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 885 "dhcp4_lexer.ll" +#line 887 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -3175,7 +3189,7 @@ YY_RULE_SETUP YY_BREAK case 82: YY_RULE_SETUP -#line 894 "dhcp4_lexer.ll" +#line 896 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -3187,7 +3201,7 @@ YY_RULE_SETUP YY_BREAK case 83: YY_RULE_SETUP -#line 903 "dhcp4_lexer.ll" +#line 905 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -3199,7 +3213,7 @@ YY_RULE_SETUP YY_BREAK case 84: YY_RULE_SETUP -#line 912 "dhcp4_lexer.ll" +#line 914 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -3211,7 +3225,7 @@ YY_RULE_SETUP YY_BREAK case 85: YY_RULE_SETUP -#line 921 "dhcp4_lexer.ll" +#line 923 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3224,7 +3238,7 @@ YY_RULE_SETUP YY_BREAK case 86: YY_RULE_SETUP -#line 931 "dhcp4_lexer.ll" +#line 933 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3238,7 +3252,7 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 942 "dhcp4_lexer.ll" +#line 944 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3253,7 +3267,7 @@ YY_RULE_SETUP YY_BREAK case 88: YY_RULE_SETUP -#line 954 "dhcp4_lexer.ll" +#line 956 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CLIENT_CLASSES: @@ -3265,7 +3279,7 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 963 "dhcp4_lexer.ll" +#line 965 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CLIENT_CLASSES: @@ -3277,7 +3291,7 @@ YY_RULE_SETUP YY_BREAK case 90: YY_RULE_SETUP -#line 972 "dhcp4_lexer.ll" +#line 974 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3290,7 +3304,7 @@ YY_RULE_SETUP YY_BREAK case 91: YY_RULE_SETUP -#line 982 "dhcp4_lexer.ll" +#line 984 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -3303,7 +3317,7 @@ YY_RULE_SETUP YY_BREAK case 92: YY_RULE_SETUP -#line 992 "dhcp4_lexer.ll" +#line 994 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -3316,7 +3330,7 @@ YY_RULE_SETUP YY_BREAK case 93: YY_RULE_SETUP -#line 1002 "dhcp4_lexer.ll" +#line 1004 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -3329,7 +3343,7 @@ YY_RULE_SETUP YY_BREAK case 94: YY_RULE_SETUP -#line 1012 "dhcp4_lexer.ll" +#line 1014 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -3342,7 +3356,7 @@ YY_RULE_SETUP YY_BREAK case 95: YY_RULE_SETUP -#line 1022 "dhcp4_lexer.ll" +#line 1024 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -3355,7 +3369,7 @@ YY_RULE_SETUP YY_BREAK case 96: YY_RULE_SETUP -#line 1032 "dhcp4_lexer.ll" +#line 1034 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATIONS: @@ -3367,7 +3381,7 @@ YY_RULE_SETUP YY_BREAK case 97: YY_RULE_SETUP -#line 1041 "dhcp4_lexer.ll" +#line 1043 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -3380,7 +3394,7 @@ YY_RULE_SETUP YY_BREAK case 98: YY_RULE_SETUP -#line 1051 "dhcp4_lexer.ll" +#line 1053 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -3392,7 +3406,7 @@ YY_RULE_SETUP YY_BREAK case 99: YY_RULE_SETUP -#line 1060 "dhcp4_lexer.ll" +#line 1062 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -3404,7 +3418,7 @@ YY_RULE_SETUP YY_BREAK case 100: YY_RULE_SETUP -#line 1069 "dhcp4_lexer.ll" +#line 1071 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -3416,7 +3430,7 @@ YY_RULE_SETUP YY_BREAK case 101: YY_RULE_SETUP -#line 1078 "dhcp4_lexer.ll" +#line 1080 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -3428,7 +3442,7 @@ YY_RULE_SETUP YY_BREAK case 102: YY_RULE_SETUP -#line 1087 "dhcp4_lexer.ll" +#line 1089 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -3441,7 +3455,7 @@ YY_RULE_SETUP YY_BREAK case 103: YY_RULE_SETUP -#line 1097 "dhcp4_lexer.ll" +#line 1099 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RELAY: @@ -3454,7 +3468,7 @@ YY_RULE_SETUP YY_BREAK case 104: YY_RULE_SETUP -#line 1107 "dhcp4_lexer.ll" +#line 1109 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RELAY: @@ -3466,7 +3480,7 @@ YY_RULE_SETUP YY_BREAK case 105: YY_RULE_SETUP -#line 1116 "dhcp4_lexer.ll" +#line 1118 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3478,7 +3492,7 @@ YY_RULE_SETUP YY_BREAK case 106: YY_RULE_SETUP -#line 1126 "dhcp4_lexer.ll" +#line 1128 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -3490,7 +3504,7 @@ YY_RULE_SETUP YY_BREAK case 107: YY_RULE_SETUP -#line 1135 "dhcp4_lexer.ll" +#line 1137 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -3502,7 +3516,7 @@ YY_RULE_SETUP YY_BREAK case 108: YY_RULE_SETUP -#line 1144 "dhcp4_lexer.ll" +#line 1146 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3514,7 +3528,7 @@ YY_RULE_SETUP YY_BREAK case 109: YY_RULE_SETUP -#line 1153 "dhcp4_lexer.ll" +#line 1155 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3526,7 +3540,7 @@ YY_RULE_SETUP YY_BREAK case 110: YY_RULE_SETUP -#line 1162 "dhcp4_lexer.ll" +#line 1164 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3538,7 +3552,7 @@ YY_RULE_SETUP YY_BREAK case 111: YY_RULE_SETUP -#line 1171 "dhcp4_lexer.ll" +#line 1173 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3550,7 +3564,7 @@ YY_RULE_SETUP YY_BREAK case 112: YY_RULE_SETUP -#line 1180 "dhcp4_lexer.ll" +#line 1182 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3562,7 +3576,7 @@ YY_RULE_SETUP YY_BREAK case 113: YY_RULE_SETUP -#line 1189 "dhcp4_lexer.ll" +#line 1191 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3574,7 +3588,7 @@ YY_RULE_SETUP YY_BREAK case 114: YY_RULE_SETUP -#line 1198 "dhcp4_lexer.ll" +#line 1200 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: @@ -3586,7 +3600,7 @@ YY_RULE_SETUP YY_BREAK case 115: YY_RULE_SETUP -#line 1207 "dhcp4_lexer.ll" +#line 1209 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3598,7 +3612,7 @@ YY_RULE_SETUP YY_BREAK case 116: YY_RULE_SETUP -#line 1216 "dhcp4_lexer.ll" +#line 1218 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3610,7 +3624,7 @@ YY_RULE_SETUP YY_BREAK case 117: YY_RULE_SETUP -#line 1225 "dhcp4_lexer.ll" +#line 1227 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -3622,7 +3636,7 @@ YY_RULE_SETUP YY_BREAK case 118: YY_RULE_SETUP -#line 1234 "dhcp4_lexer.ll" +#line 1236 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -3634,7 +3648,31 @@ YY_RULE_SETUP YY_BREAK case 119: YY_RULE_SETUP -#line 1243 "dhcp4_lexer.ll" +#line 1245 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP4: + return isc::dhcp::Dhcp4Parser::make_QUEUE_CONTROL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("queue-control", driver.loc_); + } +} + YY_BREAK +case 120: +YY_RULE_SETUP +#line 1254 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::QUEUE_CONTROL: + return isc::dhcp::Dhcp4Parser::make_CAPACITY(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("capacity", driver.loc_); + } +} + YY_BREAK +case 121: +YY_RULE_SETUP +#line 1263 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3644,9 +3682,9 @@ YY_RULE_SETUP } } YY_BREAK -case 120: +case 122: YY_RULE_SETUP -#line 1252 "dhcp4_lexer.ll" +#line 1272 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3656,9 +3694,9 @@ YY_RULE_SETUP } } YY_BREAK -case 121: +case 123: YY_RULE_SETUP -#line 1261 "dhcp4_lexer.ll" +#line 1281 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3668,9 +3706,9 @@ YY_RULE_SETUP } } YY_BREAK -case 122: +case 124: YY_RULE_SETUP -#line 1270 "dhcp4_lexer.ll" +#line 1290 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3680,9 +3718,9 @@ YY_RULE_SETUP } } YY_BREAK -case 123: +case 125: YY_RULE_SETUP -#line 1279 "dhcp4_lexer.ll" +#line 1299 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3692,9 +3730,9 @@ YY_RULE_SETUP } } YY_BREAK -case 124: +case 126: YY_RULE_SETUP -#line 1288 "dhcp4_lexer.ll" +#line 1308 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3704,9 +3742,9 @@ YY_RULE_SETUP } } YY_BREAK -case 125: +case 127: YY_RULE_SETUP -#line 1297 "dhcp4_lexer.ll" +#line 1317 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3716,9 +3754,9 @@ YY_RULE_SETUP } } YY_BREAK -case 126: +case 128: YY_RULE_SETUP -#line 1306 "dhcp4_lexer.ll" +#line 1326 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3728,9 +3766,9 @@ YY_RULE_SETUP } } YY_BREAK -case 127: +case 129: YY_RULE_SETUP -#line 1315 "dhcp4_lexer.ll" +#line 1335 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3740,9 +3778,9 @@ YY_RULE_SETUP } } YY_BREAK -case 128: +case 130: YY_RULE_SETUP -#line 1324 "dhcp4_lexer.ll" +#line 1344 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3752,9 +3790,9 @@ YY_RULE_SETUP } } YY_BREAK -case 129: +case 131: YY_RULE_SETUP -#line 1333 "dhcp4_lexer.ll" +#line 1353 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3764,9 +3802,9 @@ YY_RULE_SETUP } } YY_BREAK -case 130: +case 132: YY_RULE_SETUP -#line 1342 "dhcp4_lexer.ll" +#line 1362 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3776,9 +3814,9 @@ YY_RULE_SETUP } } YY_BREAK -case 131: +case 133: YY_RULE_SETUP -#line 1351 "dhcp4_lexer.ll" +#line 1371 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3788,9 +3826,9 @@ YY_RULE_SETUP } } YY_BREAK -case 132: +case 134: YY_RULE_SETUP -#line 1360 "dhcp4_lexer.ll" +#line 1380 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3800,9 +3838,9 @@ YY_RULE_SETUP } } YY_BREAK -case 133: +case 135: YY_RULE_SETUP -#line 1369 "dhcp4_lexer.ll" +#line 1389 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3812,9 +3850,9 @@ YY_RULE_SETUP } } YY_BREAK -case 134: +case 136: YY_RULE_SETUP -#line 1378 "dhcp4_lexer.ll" +#line 1398 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3824,9 +3862,9 @@ YY_RULE_SETUP } } YY_BREAK -case 135: +case 137: YY_RULE_SETUP -#line 1387 "dhcp4_lexer.ll" +#line 1407 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP_DDNS: @@ -3836,9 +3874,9 @@ YY_RULE_SETUP } } YY_BREAK -case 136: +case 138: YY_RULE_SETUP -#line 1396 "dhcp4_lexer.ll" +#line 1416 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { @@ -3849,9 +3887,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 137: +case 139: YY_RULE_SETUP -#line 1406 "dhcp4_lexer.ll" +#line 1426 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { @@ -3862,9 +3900,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 138: +case 140: YY_RULE_SETUP -#line 1416 "dhcp4_lexer.ll" +#line 1436 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { @@ -3875,9 +3913,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 139: +case 141: YY_RULE_SETUP -#line 1426 "dhcp4_lexer.ll" +#line 1446 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3888,9 +3926,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 140: +case 142: YY_RULE_SETUP -#line 1436 "dhcp4_lexer.ll" +#line 1456 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3901,9 +3939,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 141: +case 143: YY_RULE_SETUP -#line 1446 "dhcp4_lexer.ll" +#line 1466 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3914,9 +3952,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 142: +case 144: YY_RULE_SETUP -#line 1456 "dhcp4_lexer.ll" +#line 1476 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3927,9 +3965,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 143: +case 145: YY_RULE_SETUP -#line 1466 "dhcp4_lexer.ll" +#line 1486 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3940,9 +3978,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 144: +case 146: YY_RULE_SETUP -#line 1476 "dhcp4_lexer.ll" +#line 1496 "dhcp4_lexer.ll" { /* dhcp-ddns value keywords are case insensitive */ if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { @@ -3953,9 +3991,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); } YY_BREAK -case 145: +case 147: YY_RULE_SETUP -#line 1486 "dhcp4_lexer.ll" +#line 1506 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3965,9 +4003,9 @@ YY_RULE_SETUP } } YY_BREAK -case 146: +case 148: YY_RULE_SETUP -#line 1495 "dhcp4_lexer.ll" +#line 1515 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3977,9 +4015,9 @@ YY_RULE_SETUP } } YY_BREAK -case 147: +case 149: YY_RULE_SETUP -#line 1504 "dhcp4_lexer.ll" +#line 1524 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -3989,9 +4027,9 @@ YY_RULE_SETUP } } YY_BREAK -case 148: +case 150: YY_RULE_SETUP -#line 1513 "dhcp4_lexer.ll" +#line 1533 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -4001,9 +4039,9 @@ YY_RULE_SETUP } } YY_BREAK -case 149: +case 151: YY_RULE_SETUP -#line 1522 "dhcp4_lexer.ll" +#line 1542 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -4013,9 +4051,9 @@ YY_RULE_SETUP } } YY_BREAK -case 150: +case 152: YY_RULE_SETUP -#line 1531 "dhcp4_lexer.ll" +#line 1551 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -4025,9 +4063,9 @@ YY_RULE_SETUP } } YY_BREAK -case 151: +case 153: YY_RULE_SETUP -#line 1540 "dhcp4_lexer.ll" +#line 1560 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -4037,9 +4075,9 @@ YY_RULE_SETUP } } YY_BREAK -case 152: +case 154: YY_RULE_SETUP -#line 1549 "dhcp4_lexer.ll" +#line 1569 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -4051,9 +4089,9 @@ YY_RULE_SETUP } } YY_BREAK -case 153: +case 155: YY_RULE_SETUP -#line 1560 "dhcp4_lexer.ll" +#line 1580 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -4067,9 +4105,9 @@ YY_RULE_SETUP } } YY_BREAK -case 154: +case 156: YY_RULE_SETUP -#line 1573 "dhcp4_lexer.ll" +#line 1593 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -4083,9 +4121,9 @@ YY_RULE_SETUP } } YY_BREAK -case 155: +case 157: YY_RULE_SETUP -#line 1586 "dhcp4_lexer.ll" +#line 1606 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -4099,9 +4137,9 @@ YY_RULE_SETUP } } YY_BREAK -case 156: +case 158: YY_RULE_SETUP -#line 1601 "dhcp4_lexer.ll" +#line 1621 "dhcp4_lexer.ll" { /* 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. @@ -4201,65 +4239,65 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 157: -/* rule 157 can match eol */ +case 159: +/* rule 159 can match eol */ YY_RULE_SETUP -#line 1700 "dhcp4_lexer.ll" +#line 1720 "dhcp4_lexer.ll" { /* Bad string with a forbidden control character inside */ driver.error(driver.loc_, "Invalid control in " + std::string(yytext)); } YY_BREAK -case 158: -/* rule 158 can match eol */ +case 160: +/* rule 160 can match eol */ YY_RULE_SETUP -#line 1705 "dhcp4_lexer.ll" +#line 1725 "dhcp4_lexer.ll" { /* Bad string with a bad escape inside */ driver.error(driver.loc_, "Bad escape in " + std::string(yytext)); } YY_BREAK -case 159: +case 161: YY_RULE_SETUP -#line 1710 "dhcp4_lexer.ll" +#line 1730 "dhcp4_lexer.ll" { /* Bad string with an open escape at the end */ driver.error(driver.loc_, "Overflow escape in " + std::string(yytext)); } YY_BREAK -case 160: +case 162: YY_RULE_SETUP -#line 1715 "dhcp4_lexer.ll" +#line 1735 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 161: +case 163: YY_RULE_SETUP -#line 1716 "dhcp4_lexer.ll" +#line 1736 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 162: +case 164: YY_RULE_SETUP -#line 1717 "dhcp4_lexer.ll" +#line 1737 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK -case 163: +case 165: YY_RULE_SETUP -#line 1718 "dhcp4_lexer.ll" +#line 1738 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK -case 164: +case 166: YY_RULE_SETUP -#line 1719 "dhcp4_lexer.ll" +#line 1739 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); } YY_BREAK -case 165: +case 167: YY_RULE_SETUP -#line 1720 "dhcp4_lexer.ll" +#line 1740 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); } YY_BREAK -case 166: +case 168: YY_RULE_SETUP -#line 1722 "dhcp4_lexer.ll" +#line 1742 "dhcp4_lexer.ll" { /* An integer was found. */ std::string tmp(yytext); @@ -4278,9 +4316,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 167: +case 169: YY_RULE_SETUP -#line 1740 "dhcp4_lexer.ll" +#line 1760 "dhcp4_lexer.ll" { /* A floating point was found. */ std::string tmp(yytext); @@ -4294,43 +4332,43 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 168: +case 170: YY_RULE_SETUP -#line 1753 "dhcp4_lexer.ll" +#line 1773 "dhcp4_lexer.ll" { string tmp(yytext); return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 169: +case 171: YY_RULE_SETUP -#line 1758 "dhcp4_lexer.ll" +#line 1778 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 170: +case 172: YY_RULE_SETUP -#line 1762 "dhcp4_lexer.ll" +#line 1782 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK -case 171: +case 173: YY_RULE_SETUP -#line 1764 "dhcp4_lexer.ll" +#line 1784 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK -case 172: +case 174: YY_RULE_SETUP -#line 1766 "dhcp4_lexer.ll" +#line 1786 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK -case 173: +case 175: YY_RULE_SETUP -#line 1768 "dhcp4_lexer.ll" +#line 1788 "dhcp4_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(yytext)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1770 "dhcp4_lexer.ll" +#line 1790 "dhcp4_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp4Parser::make_END(driver.loc_); @@ -4354,12 +4392,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 174: +case 176: YY_RULE_SETUP -#line 1793 "dhcp4_lexer.ll" +#line 1813 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 4363 "dhcp4_lexer.cc" +#line 4401 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { @@ -4678,7 +4716,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1454 ) + if ( yy_current_state >= 1474 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -4711,11 +4749,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1454 ) + if ( yy_current_state >= 1474 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 1453); + yy_is_jam = (yy_current_state == 1473); return yy_is_jam ? 0 : yy_current_state; } @@ -5464,7 +5502,7 @@ void yyfree (void * ptr ) /* %ok-for-header */ -#line 1793 "dhcp4_lexer.ll" +#line 1813 "dhcp4_lexer.ll" using namespace isc::dhcp; diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll index 2daf7dd60d..e5642c1f20 100644 --- a/src/bin/dhcp4/dhcp4_lexer.ll +++ b/src/bin/dhcp4/dhcp4_lexer.ll @@ -706,6 +706,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} case isc::dhcp::Parser4Context::RESERVATIONS: case isc::dhcp::Parser4Context::CLIENT_CLASSES: case isc::dhcp::Parser4Context::CONTROL_SOCKET: + case isc::dhcp::Parser4Context::QUEUE_CONTROL: case isc::dhcp::Parser4Context::LOGGERS: case isc::dhcp::Parser4Context::DHCP_DDNS: return isc::dhcp::Dhcp4Parser::make_USER_CONTEXT(driver.loc_); @@ -726,6 +727,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} case isc::dhcp::Parser4Context::RESERVATIONS: case isc::dhcp::Parser4Context::CLIENT_CLASSES: case isc::dhcp::Parser4Context::CONTROL_SOCKET: + case isc::dhcp::Parser4Context::QUEUE_CONTROL: case isc::dhcp::Parser4Context::LOGGERS: case isc::dhcp::Parser4Context::DHCP_DDNS: return isc::dhcp::Dhcp4Parser::make_COMMENT(driver.loc_); @@ -1239,6 +1241,24 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } } +\"queue-control\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP4: + return isc::dhcp::Dhcp4Parser::make_QUEUE_CONTROL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("queue-control", driver.loc_); + } +} + +\"capacity\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::QUEUE_CONTROL: + return isc::dhcp::Dhcp4Parser::make_CAPACITY(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("capacity", driver.loc_); + } +} + \"dhcp-ddns\" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: diff --git a/src/bin/dhcp4/dhcp4_lexer.yy b/src/bin/dhcp4/dhcp4_lexer.yy deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index 92b9fddcfa..2d7fbbeca8 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -253,30 +253,30 @@ namespace isc { namespace dhcp { { switch (that.type_get ()) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.move< ElementPtr > (that.value); break; - case 167: // "boolean" + case 169: // "boolean" value.move< bool > (that.value); break; - case 166: // "floating point" + case 168: // "floating point" value.move< double > (that.value); break; - case 165: // "integer" + case 167: // "integer" value.move< int64_t > (that.value); break; - case 164: // "constant string" + case 166: // "constant string" value.move< std::string > (that.value); break; @@ -295,30 +295,30 @@ namespace isc { namespace dhcp { state = that.state; switch (that.type_get ()) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.copy< ElementPtr > (that.value); break; - case 167: // "boolean" + case 169: // "boolean" value.copy< bool > (that.value); break; - case 166: // "floating point" + case 168: // "floating point" value.copy< double > (that.value); break; - case 165: // "integer" + case 167: // "integer" value.copy< int64_t > (that.value); break; - case 164: // "constant string" + case 166: // "constant string" value.copy< std::string > (that.value); break; @@ -358,86 +358,86 @@ namespace isc { namespace dhcp { << yysym.location << ": "; switch (yytype) { - case 164: // "constant string" + case 166: // "constant string" -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } #line 366 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 165: // "integer" + case 167: // "integer" -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int64_t > (); } #line 373 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 166: // "floating point" + case 168: // "floating point" -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< double > (); } #line 380 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 167: // "boolean" + case 169: // "boolean" -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< bool > (); } #line 387 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 184: // value + case 186: // value -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 394 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 188: // map_value + case 190: // map_value -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 401 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 228: // socket_type + case 230: // socket_type -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 408 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 231: // outbound_interface_value + case 233: // outbound_interface_value -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 415 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 253: // db_type + case 255: // db_type -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 422 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 335: // hr_mode + case 337: // hr_mode -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 429 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 482: // ncr_protocol_value + case 489: // ncr_protocol_value -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 436 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 490: // replace_client_name_value + case 497: // replace_client_name_value -#line 243 "dhcp4_parser.yy" // lalr1.cc:636 +#line 246 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } #line 443 "dhcp4_parser.cc" // lalr1.cc:636 break; @@ -639,30 +639,30 @@ namespace isc { namespace dhcp { when using variants. */ switch (yyr1_[yyn]) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value yylhs.value.build< ElementPtr > (); break; - case 167: // "boolean" + case 169: // "boolean" yylhs.value.build< bool > (); break; - case 166: // "floating point" + case 168: // "floating point" yylhs.value.build< double > (); break; - case 165: // "integer" + case 167: // "integer" yylhs.value.build< int64_t > (); break; - case 164: // "constant string" + case 166: // "constant string" yylhs.value.build< std::string > (); break; @@ -684,133 +684,133 @@ namespace isc { namespace dhcp { switch (yyn) { case 2: -#line 252 "dhcp4_parser.yy" // lalr1.cc:859 +#line 255 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.NO_KEYWORD; } #line 690 "dhcp4_parser.cc" // lalr1.cc:859 break; case 4: -#line 253 "dhcp4_parser.yy" // lalr1.cc:859 +#line 256 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG; } #line 696 "dhcp4_parser.cc" // lalr1.cc:859 break; case 6: -#line 254 "dhcp4_parser.yy" // lalr1.cc:859 +#line 257 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP4; } #line 702 "dhcp4_parser.cc" // lalr1.cc:859 break; case 8: -#line 255 "dhcp4_parser.yy" // lalr1.cc:859 +#line 258 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.INTERFACES_CONFIG; } #line 708 "dhcp4_parser.cc" // lalr1.cc:859 break; case 10: -#line 256 "dhcp4_parser.yy" // lalr1.cc:859 +#line 259 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.SUBNET4; } #line 714 "dhcp4_parser.cc" // lalr1.cc:859 break; case 12: -#line 257 "dhcp4_parser.yy" // lalr1.cc:859 +#line 260 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.POOLS; } #line 720 "dhcp4_parser.cc" // lalr1.cc:859 break; case 14: -#line 258 "dhcp4_parser.yy" // lalr1.cc:859 +#line 261 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.RESERVATIONS; } #line 726 "dhcp4_parser.cc" // lalr1.cc:859 break; case 16: -#line 259 "dhcp4_parser.yy" // lalr1.cc:859 +#line 262 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP4; } #line 732 "dhcp4_parser.cc" // lalr1.cc:859 break; case 18: -#line 260 "dhcp4_parser.yy" // lalr1.cc:859 +#line 263 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DEF; } #line 738 "dhcp4_parser.cc" // lalr1.cc:859 break; case 20: -#line 261 "dhcp4_parser.yy" // lalr1.cc:859 +#line 264 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DATA; } #line 744 "dhcp4_parser.cc" // lalr1.cc:859 break; case 22: -#line 262 "dhcp4_parser.yy" // lalr1.cc:859 +#line 265 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } #line 750 "dhcp4_parser.cc" // lalr1.cc:859 break; case 24: -#line 263 "dhcp4_parser.yy" // lalr1.cc:859 +#line 266 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP_DDNS; } #line 756 "dhcp4_parser.cc" // lalr1.cc:859 break; case 26: -#line 264 "dhcp4_parser.yy" // lalr1.cc:859 +#line 267 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.LOGGING; } #line 762 "dhcp4_parser.cc" // lalr1.cc:859 break; case 28: -#line 265 "dhcp4_parser.yy" // lalr1.cc:859 +#line 268 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG_CONTROL; } #line 768 "dhcp4_parser.cc" // lalr1.cc:859 break; case 30: -#line 273 "dhcp4_parser.yy" // lalr1.cc:859 +#line 276 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } #line 774 "dhcp4_parser.cc" // lalr1.cc:859 break; case 31: -#line 274 "dhcp4_parser.yy" // lalr1.cc:859 +#line 277 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } #line 780 "dhcp4_parser.cc" // lalr1.cc:859 break; case 32: -#line 275 "dhcp4_parser.yy" // lalr1.cc:859 +#line 278 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } #line 786 "dhcp4_parser.cc" // lalr1.cc:859 break; case 33: -#line 276 "dhcp4_parser.yy" // lalr1.cc:859 +#line 279 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } #line 792 "dhcp4_parser.cc" // lalr1.cc:859 break; case 34: -#line 277 "dhcp4_parser.yy" // lalr1.cc:859 +#line 280 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } #line 798 "dhcp4_parser.cc" // lalr1.cc:859 break; case 35: -#line 278 "dhcp4_parser.yy" // lalr1.cc:859 +#line 281 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 804 "dhcp4_parser.cc" // lalr1.cc:859 break; case 36: -#line 279 "dhcp4_parser.yy" // lalr1.cc:859 +#line 282 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 810 "dhcp4_parser.cc" // lalr1.cc:859 break; case 37: -#line 282 "dhcp4_parser.yy" // lalr1.cc:859 +#line 285 "dhcp4_parser.yy" // lalr1.cc:859 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); @@ -819,7 +819,7 @@ namespace isc { namespace dhcp { break; case 38: -#line 287 "dhcp4_parser.yy" // lalr1.cc:859 +#line 290 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -830,7 +830,7 @@ namespace isc { namespace dhcp { break; case 39: -#line 292 "dhcp4_parser.yy" // lalr1.cc:859 +#line 295 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -840,13 +840,13 @@ namespace isc { namespace dhcp { break; case 40: -#line 298 "dhcp4_parser.yy" // lalr1.cc:859 +#line 301 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } #line 846 "dhcp4_parser.cc" // lalr1.cc:859 break; case 43: -#line 305 "dhcp4_parser.yy" // lalr1.cc:859 +#line 308 "dhcp4_parser.yy" // lalr1.cc:859 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); @@ -855,7 +855,7 @@ namespace isc { namespace dhcp { break; case 44: -#line 309 "dhcp4_parser.yy" // lalr1.cc:859 +#line 312 "dhcp4_parser.yy" // lalr1.cc:859 { // map consisting of a shorter map followed by // comma and string:value @@ -865,7 +865,7 @@ namespace isc { namespace dhcp { break; case 45: -#line 316 "dhcp4_parser.yy" // lalr1.cc:859 +#line 319 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(l); @@ -874,7 +874,7 @@ namespace isc { namespace dhcp { break; case 46: -#line 319 "dhcp4_parser.yy" // lalr1.cc:859 +#line 322 "dhcp4_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here } @@ -882,7 +882,7 @@ namespace isc { namespace dhcp { break; case 49: -#line 327 "dhcp4_parser.yy" // lalr1.cc:859 +#line 330 "dhcp4_parser.yy" // lalr1.cc:859 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -891,7 +891,7 @@ namespace isc { namespace dhcp { break; case 50: -#line 331 "dhcp4_parser.yy" // lalr1.cc:859 +#line 334 "dhcp4_parser.yy" // lalr1.cc:859 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); @@ -900,7 +900,7 @@ namespace isc { namespace dhcp { break; case 51: -#line 338 "dhcp4_parser.yy" // lalr1.cc:859 +#line 341 "dhcp4_parser.yy" // lalr1.cc:859 { // List parsing about to start } @@ -908,7 +908,7 @@ namespace isc { namespace dhcp { break; case 52: -#line 340 "dhcp4_parser.yy" // lalr1.cc:859 +#line 343 "dhcp4_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here //ctx.stack_.pop_back(); @@ -917,7 +917,7 @@ namespace isc { namespace dhcp { break; case 55: -#line 349 "dhcp4_parser.yy" // lalr1.cc:859 +#line 352 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -926,7 +926,7 @@ namespace isc { namespace dhcp { break; case 56: -#line 353 "dhcp4_parser.yy" // lalr1.cc:859 +#line 356 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(s); @@ -935,7 +935,7 @@ namespace isc { namespace dhcp { break; case 57: -#line 364 "dhcp4_parser.yy" // lalr1.cc:859 +#line 367 "dhcp4_parser.yy" // lalr1.cc:859 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); @@ -946,7 +946,7 @@ namespace isc { namespace dhcp { break; case 58: -#line 374 "dhcp4_parser.yy" // lalr1.cc:859 +#line 377 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -957,7 +957,7 @@ namespace isc { namespace dhcp { break; case 59: -#line 379 "dhcp4_parser.yy" // lalr1.cc:859 +#line 382 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -970,7 +970,7 @@ namespace isc { namespace dhcp { break; case 68: -#line 403 "dhcp4_parser.yy" // lalr1.cc:859 +#line 406 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -983,7 +983,7 @@ namespace isc { namespace dhcp { break; case 69: -#line 410 "dhcp4_parser.yy" // lalr1.cc:859 +#line 413 "dhcp4_parser.yy" // lalr1.cc:859 { // No global parameter is required ctx.stack_.pop_back(); @@ -993,7 +993,7 @@ namespace isc { namespace dhcp { break; case 70: -#line 418 "dhcp4_parser.yy" // lalr1.cc:859 +#line 421 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the Dhcp4 map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1003,7 +1003,7 @@ namespace isc { namespace dhcp { break; case 71: -#line 422 "dhcp4_parser.yy" // lalr1.cc:859 +#line 425 "dhcp4_parser.yy" // lalr1.cc:859 { // No global parameter is required // parsing completed @@ -1011,8 +1011,8 @@ namespace isc { namespace dhcp { #line 1012 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 105: -#line 466 "dhcp4_parser.yy" // lalr1.cc:859 + case 106: +#line 470 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("valid-lifetime", prf); @@ -1020,8 +1020,8 @@ namespace isc { namespace dhcp { #line 1021 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 106: -#line 471 "dhcp4_parser.yy" // lalr1.cc:859 + case 107: +#line 475 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("renew-timer", prf); @@ -1029,8 +1029,8 @@ namespace isc { namespace dhcp { #line 1030 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 107: -#line 476 "dhcp4_parser.yy" // lalr1.cc:859 + case 108: +#line 480 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rebind-timer", prf); @@ -1038,8 +1038,8 @@ namespace isc { namespace dhcp { #line 1039 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 108: -#line 481 "dhcp4_parser.yy" // lalr1.cc:859 + case 109: +#line 485 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("decline-probation-period", dpp); @@ -1047,16 +1047,16 @@ namespace isc { namespace dhcp { #line 1048 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 109: -#line 486 "dhcp4_parser.yy" // lalr1.cc:859 + case 110: +#line 490 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1056 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 110: -#line 488 "dhcp4_parser.yy" // lalr1.cc:859 + case 111: +#line 492 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr stag(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-tag", stag); @@ -1065,8 +1065,8 @@ namespace isc { namespace dhcp { #line 1066 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 111: -#line 494 "dhcp4_parser.yy" // lalr1.cc:859 + case 112: +#line 498 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("echo-client-id", echo); @@ -1074,8 +1074,8 @@ namespace isc { namespace dhcp { #line 1075 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 112: -#line 499 "dhcp4_parser.yy" // lalr1.cc:859 + case 113: +#line 503 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("match-client-id", match); @@ -1083,8 +1083,8 @@ namespace isc { namespace dhcp { #line 1084 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 113: -#line 505 "dhcp4_parser.yy" // lalr1.cc:859 + case 114: +#line 509 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces-config", i); @@ -1094,8 +1094,8 @@ namespace isc { namespace dhcp { #line 1095 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 114: -#line 510 "dhcp4_parser.yy" // lalr1.cc:859 + case 115: +#line 514 "dhcp4_parser.yy" // lalr1.cc:859 { // No interfaces config param is required ctx.stack_.pop_back(); @@ -1104,8 +1104,8 @@ namespace isc { namespace dhcp { #line 1105 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 124: -#line 529 "dhcp4_parser.yy" // lalr1.cc:859 + case 125: +#line 533 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the interfaces-config map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1114,8 +1114,8 @@ namespace isc { namespace dhcp { #line 1115 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 125: -#line 533 "dhcp4_parser.yy" // lalr1.cc:859 + case 126: +#line 537 "dhcp4_parser.yy" // lalr1.cc:859 { // No interfaces config param is required // parsing completed @@ -1123,8 +1123,8 @@ namespace isc { namespace dhcp { #line 1124 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 126: -#line 538 "dhcp4_parser.yy" // lalr1.cc:859 + case 127: +#line 542 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces", l); @@ -1134,8 +1134,8 @@ namespace isc { namespace dhcp { #line 1135 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 127: -#line 543 "dhcp4_parser.yy" // lalr1.cc:859 + case 128: +#line 547 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1143,16 +1143,16 @@ namespace isc { namespace dhcp { #line 1144 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 128: -#line 548 "dhcp4_parser.yy" // lalr1.cc:859 + case 129: +#line 552 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.DHCP_SOCKET_TYPE); } #line 1152 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 129: -#line 550 "dhcp4_parser.yy" // lalr1.cc:859 + case 130: +#line 554 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1160,28 +1160,28 @@ namespace isc { namespace dhcp { #line 1161 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 130: -#line 555 "dhcp4_parser.yy" // lalr1.cc:859 + case 131: +#line 559 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); } #line 1167 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 131: -#line 556 "dhcp4_parser.yy" // lalr1.cc:859 + case 132: +#line 560 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); } #line 1173 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 132: -#line 559 "dhcp4_parser.yy" // lalr1.cc:859 + case 133: +#line 563 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.OUTBOUND_INTERFACE); } #line 1181 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 133: -#line 561 "dhcp4_parser.yy" // lalr1.cc:859 + case 134: +#line 565 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("outbound-interface", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1189,24 +1189,24 @@ namespace isc { namespace dhcp { #line 1190 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 134: -#line 566 "dhcp4_parser.yy" // lalr1.cc:859 + case 135: +#line 570 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("same-as-inbound", ctx.loc2pos(yystack_[0].location))); } #line 1198 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 135: -#line 568 "dhcp4_parser.yy" // lalr1.cc:859 + case 136: +#line 572 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("use-routing", ctx.loc2pos(yystack_[0].location))); } #line 1206 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 136: -#line 572 "dhcp4_parser.yy" // lalr1.cc:859 + case 137: +#line 576 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("re-detect", b); @@ -1214,8 +1214,8 @@ namespace isc { namespace dhcp { #line 1215 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 137: -#line 578 "dhcp4_parser.yy" // lalr1.cc:859 + case 138: +#line 582 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lease-database", i); @@ -1225,8 +1225,8 @@ namespace isc { namespace dhcp { #line 1226 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 138: -#line 583 "dhcp4_parser.yy" // lalr1.cc:859 + case 139: +#line 587 "dhcp4_parser.yy" // lalr1.cc:859 { // The type parameter is required ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location)); @@ -1236,8 +1236,8 @@ namespace isc { namespace dhcp { #line 1237 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 139: -#line 590 "dhcp4_parser.yy" // lalr1.cc:859 + case 140: +#line 594 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sanity-checks", m); @@ -1247,8 +1247,8 @@ namespace isc { namespace dhcp { #line 1248 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 140: -#line 595 "dhcp4_parser.yy" // lalr1.cc:859 + case 141: +#line 599 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1256,16 +1256,16 @@ namespace isc { namespace dhcp { #line 1257 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 144: -#line 605 "dhcp4_parser.yy" // lalr1.cc:859 + case 145: +#line 609 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1265 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 145: -#line 607 "dhcp4_parser.yy" // lalr1.cc:859 + case 146: +#line 611 "dhcp4_parser.yy" // lalr1.cc:859 { if ( (string(yystack_[0].value.as< std::string > ()) == "none") || @@ -1284,8 +1284,8 @@ namespace isc { namespace dhcp { #line 1285 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 146: -#line 623 "dhcp4_parser.yy" // lalr1.cc:859 + case 147: +#line 627 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-database", i); @@ -1295,8 +1295,8 @@ namespace isc { namespace dhcp { #line 1296 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 147: -#line 628 "dhcp4_parser.yy" // lalr1.cc:859 + case 148: +#line 632 "dhcp4_parser.yy" // lalr1.cc:859 { // The type parameter is required ctx.require("type", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location)); @@ -1306,8 +1306,8 @@ namespace isc { namespace dhcp { #line 1307 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 148: -#line 635 "dhcp4_parser.yy" // lalr1.cc:859 + case 149: +#line 639 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-databases", l); @@ -1317,8 +1317,8 @@ namespace isc { namespace dhcp { #line 1318 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 149: -#line 640 "dhcp4_parser.yy" // lalr1.cc:859 + case 150: +#line 644 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1326,8 +1326,8 @@ namespace isc { namespace dhcp { #line 1327 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 154: -#line 653 "dhcp4_parser.yy" // lalr1.cc:859 + case 155: +#line 657 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -1336,8 +1336,8 @@ namespace isc { namespace dhcp { #line 1337 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 155: -#line 657 "dhcp4_parser.yy" // lalr1.cc:859 + case 156: +#line 661 "dhcp4_parser.yy" // lalr1.cc:859 { // The type parameter is required ctx.require("type", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -1346,16 +1346,16 @@ namespace isc { namespace dhcp { #line 1347 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 176: -#line 687 "dhcp4_parser.yy" // lalr1.cc:859 + case 177: +#line 691 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.DATABASE_TYPE); } #line 1355 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 177: -#line 689 "dhcp4_parser.yy" // lalr1.cc:859 + case 178: +#line 693 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1363,40 +1363,40 @@ namespace isc { namespace dhcp { #line 1364 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 178: -#line 694 "dhcp4_parser.yy" // lalr1.cc:859 + case 179: +#line 698 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("memfile", ctx.loc2pos(yystack_[0].location))); } #line 1370 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 179: -#line 695 "dhcp4_parser.yy" // lalr1.cc:859 + case 180: +#line 699 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("mysql", ctx.loc2pos(yystack_[0].location))); } #line 1376 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 180: -#line 696 "dhcp4_parser.yy" // lalr1.cc:859 + case 181: +#line 700 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("postgresql", ctx.loc2pos(yystack_[0].location))); } #line 1382 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 181: -#line 697 "dhcp4_parser.yy" // lalr1.cc:859 + case 182: +#line 701 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("cql", ctx.loc2pos(yystack_[0].location))); } #line 1388 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 182: -#line 700 "dhcp4_parser.yy" // lalr1.cc:859 + case 183: +#line 704 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1396 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 183: -#line 702 "dhcp4_parser.yy" // lalr1.cc:859 + case 184: +#line 706 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("user", user); @@ -1405,16 +1405,16 @@ namespace isc { namespace dhcp { #line 1406 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 184: -#line 708 "dhcp4_parser.yy" // lalr1.cc:859 + case 185: +#line 712 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1414 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 185: -#line 710 "dhcp4_parser.yy" // lalr1.cc:859 + case 186: +#line 714 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("password", pwd); @@ -1423,16 +1423,16 @@ namespace isc { namespace dhcp { #line 1424 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 186: -#line 716 "dhcp4_parser.yy" // lalr1.cc:859 + case 187: +#line 720 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1432 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 187: -#line 718 "dhcp4_parser.yy" // lalr1.cc:859 + case 188: +#line 722 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host", h); @@ -1441,8 +1441,8 @@ namespace isc { namespace dhcp { #line 1442 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 188: -#line 724 "dhcp4_parser.yy" // lalr1.cc:859 + case 189: +#line 728 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr p(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("port", p); @@ -1450,16 +1450,16 @@ namespace isc { namespace dhcp { #line 1451 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 189: -#line 729 "dhcp4_parser.yy" // lalr1.cc:859 + case 190: +#line 733 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1459 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 190: -#line 731 "dhcp4_parser.yy" // lalr1.cc:859 + case 191: +#line 735 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("name", name); @@ -1468,8 +1468,8 @@ namespace isc { namespace dhcp { #line 1469 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 191: -#line 737 "dhcp4_parser.yy" // lalr1.cc:859 + case 192: +#line 741 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("persist", n); @@ -1477,8 +1477,8 @@ namespace isc { namespace dhcp { #line 1478 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 192: -#line 742 "dhcp4_parser.yy" // lalr1.cc:859 + case 193: +#line 746 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lfc-interval", n); @@ -1486,8 +1486,8 @@ namespace isc { namespace dhcp { #line 1487 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 193: -#line 747 "dhcp4_parser.yy" // lalr1.cc:859 + case 194: +#line 751 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("readonly", n); @@ -1495,8 +1495,8 @@ namespace isc { namespace dhcp { #line 1496 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 194: -#line 752 "dhcp4_parser.yy" // lalr1.cc:859 + case 195: +#line 756 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("connect-timeout", n); @@ -1504,8 +1504,8 @@ namespace isc { namespace dhcp { #line 1505 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 195: -#line 757 "dhcp4_parser.yy" // lalr1.cc:859 + case 196: +#line 761 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("request-timeout", n); @@ -1513,8 +1513,8 @@ namespace isc { namespace dhcp { #line 1514 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 196: -#line 762 "dhcp4_parser.yy" // lalr1.cc:859 + case 197: +#line 766 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("tcp-keepalive", n); @@ -1522,8 +1522,8 @@ namespace isc { namespace dhcp { #line 1523 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 197: -#line 767 "dhcp4_parser.yy" // lalr1.cc:859 + case 198: +#line 771 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("tcp-nodelay", n); @@ -1531,16 +1531,16 @@ namespace isc { namespace dhcp { #line 1532 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 198: -#line 772 "dhcp4_parser.yy" // lalr1.cc:859 + case 199: +#line 776 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1540 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 199: -#line 774 "dhcp4_parser.yy" // lalr1.cc:859 + case 200: +#line 778 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr cp(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("contact-points", cp); @@ -1549,16 +1549,16 @@ namespace isc { namespace dhcp { #line 1550 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 200: -#line 780 "dhcp4_parser.yy" // lalr1.cc:859 + case 201: +#line 784 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1558 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 201: -#line 782 "dhcp4_parser.yy" // lalr1.cc:859 + case 202: +#line 786 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr ks(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("keyspace", ks); @@ -1567,8 +1567,8 @@ namespace isc { namespace dhcp { #line 1568 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 202: -#line 788 "dhcp4_parser.yy" // lalr1.cc:859 + case 203: +#line 792 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reconnect-tries", n); @@ -1576,8 +1576,8 @@ namespace isc { namespace dhcp { #line 1577 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 203: -#line 793 "dhcp4_parser.yy" // lalr1.cc:859 + case 204: +#line 797 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reconnect-wait-time", n); @@ -1585,8 +1585,8 @@ namespace isc { namespace dhcp { #line 1586 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 204: -#line 798 "dhcp4_parser.yy" // lalr1.cc:859 + case 205: +#line 802 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host-reservation-identifiers", l); @@ -1596,8 +1596,8 @@ namespace isc { namespace dhcp { #line 1597 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 205: -#line 803 "dhcp4_parser.yy" // lalr1.cc:859 + case 206: +#line 807 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1605,8 +1605,8 @@ namespace isc { namespace dhcp { #line 1606 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 213: -#line 819 "dhcp4_parser.yy" // lalr1.cc:859 + case 214: +#line 823 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); @@ -1614,8 +1614,8 @@ namespace isc { namespace dhcp { #line 1615 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 214: -#line 824 "dhcp4_parser.yy" // lalr1.cc:859 + case 215: +#line 828 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(hwaddr); @@ -1623,8 +1623,8 @@ namespace isc { namespace dhcp { #line 1624 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 215: -#line 829 "dhcp4_parser.yy" // lalr1.cc:859 + case 216: +#line 833 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(circuit); @@ -1632,8 +1632,8 @@ namespace isc { namespace dhcp { #line 1633 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 216: -#line 834 "dhcp4_parser.yy" // lalr1.cc:859 + case 217: +#line 838 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(client); @@ -1641,8 +1641,8 @@ namespace isc { namespace dhcp { #line 1642 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 217: -#line 839 "dhcp4_parser.yy" // lalr1.cc:859 + case 218: +#line 843 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr flex_id(new StringElement("flex-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(flex_id); @@ -1650,8 +1650,8 @@ namespace isc { namespace dhcp { #line 1651 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 218: -#line 844 "dhcp4_parser.yy" // lalr1.cc:859 + case 219: +#line 848 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); @@ -1661,8 +1661,8 @@ namespace isc { namespace dhcp { #line 1662 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 219: -#line 849 "dhcp4_parser.yy" // lalr1.cc:859 + case 220: +#line 853 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1670,8 +1670,8 @@ namespace isc { namespace dhcp { #line 1671 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 224: -#line 862 "dhcp4_parser.yy" // lalr1.cc:859 + case 225: +#line 866 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -1680,8 +1680,8 @@ namespace isc { namespace dhcp { #line 1681 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 225: -#line 866 "dhcp4_parser.yy" // lalr1.cc:859 + case 226: +#line 870 "dhcp4_parser.yy" // lalr1.cc:859 { // The library hooks parameter is required ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -1690,8 +1690,8 @@ namespace isc { namespace dhcp { #line 1691 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 226: -#line 872 "dhcp4_parser.yy" // lalr1.cc:859 + case 227: +#line 876 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the hooks-libraries list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1700,8 +1700,8 @@ namespace isc { namespace dhcp { #line 1701 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 227: -#line 876 "dhcp4_parser.yy" // lalr1.cc:859 + case 228: +#line 880 "dhcp4_parser.yy" // lalr1.cc:859 { // The library hooks parameter is required ctx.require("library", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -1710,16 +1710,16 @@ namespace isc { namespace dhcp { #line 1711 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 233: -#line 891 "dhcp4_parser.yy" // lalr1.cc:859 + case 234: +#line 895 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1719 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 234: -#line 893 "dhcp4_parser.yy" // lalr1.cc:859 + case 235: +#line 897 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); @@ -1728,16 +1728,16 @@ namespace isc { namespace dhcp { #line 1729 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 235: -#line 899 "dhcp4_parser.yy" // lalr1.cc:859 + case 236: +#line 903 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1737 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 236: -#line 901 "dhcp4_parser.yy" // lalr1.cc:859 + case 237: +#line 905 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -1745,8 +1745,8 @@ namespace isc { namespace dhcp { #line 1746 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 237: -#line 907 "dhcp4_parser.yy" // lalr1.cc:859 + case 238: +#line 911 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("expired-leases-processing", m); @@ -1756,8 +1756,8 @@ namespace isc { namespace dhcp { #line 1757 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 238: -#line 912 "dhcp4_parser.yy" // lalr1.cc:859 + case 239: +#line 916 "dhcp4_parser.yy" // lalr1.cc:859 { // No expired lease parameter is required ctx.stack_.pop_back(); @@ -1766,8 +1766,8 @@ namespace isc { namespace dhcp { #line 1767 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 247: -#line 930 "dhcp4_parser.yy" // lalr1.cc:859 + case 248: +#line 934 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reclaim-timer-wait-time", value); @@ -1775,8 +1775,8 @@ namespace isc { namespace dhcp { #line 1776 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 248: -#line 935 "dhcp4_parser.yy" // lalr1.cc:859 + case 249: +#line 939 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value); @@ -1784,8 +1784,8 @@ namespace isc { namespace dhcp { #line 1785 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 249: -#line 940 "dhcp4_parser.yy" // lalr1.cc:859 + case 250: +#line 944 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hold-reclaimed-time", value); @@ -1793,8 +1793,8 @@ namespace isc { namespace dhcp { #line 1794 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 250: -#line 945 "dhcp4_parser.yy" // lalr1.cc:859 + case 251: +#line 949 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-leases", value); @@ -1802,8 +1802,8 @@ namespace isc { namespace dhcp { #line 1803 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 251: -#line 950 "dhcp4_parser.yy" // lalr1.cc:859 + case 252: +#line 954 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-reclaim-time", value); @@ -1811,8 +1811,8 @@ namespace isc { namespace dhcp { #line 1812 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 252: -#line 955 "dhcp4_parser.yy" // lalr1.cc:859 + case 253: +#line 959 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("unwarned-reclaim-cycles", value); @@ -1820,8 +1820,8 @@ namespace isc { namespace dhcp { #line 1821 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 253: -#line 963 "dhcp4_parser.yy" // lalr1.cc:859 + case 254: +#line 967 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet4", l); @@ -1831,8 +1831,8 @@ namespace isc { namespace dhcp { #line 1832 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 254: -#line 968 "dhcp4_parser.yy" // lalr1.cc:859 + case 255: +#line 972 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -1840,8 +1840,8 @@ namespace isc { namespace dhcp { #line 1841 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 259: -#line 988 "dhcp4_parser.yy" // lalr1.cc:859 + case 260: +#line 992 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -1850,8 +1850,8 @@ namespace isc { namespace dhcp { #line 1851 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 260: -#line 992 "dhcp4_parser.yy" // lalr1.cc:859 + case 261: +#line 996 "dhcp4_parser.yy" // lalr1.cc:859 { // Once we reached this place, the subnet parsing is now complete. // If we want to, we can implement default values here. @@ -1876,8 +1876,8 @@ namespace isc { namespace dhcp { #line 1877 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 261: -#line 1014 "dhcp4_parser.yy" // lalr1.cc:859 + case 262: +#line 1018 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the subnet4 list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -1886,8 +1886,8 @@ namespace isc { namespace dhcp { #line 1887 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 262: -#line 1018 "dhcp4_parser.yy" // lalr1.cc:859 + case 263: +#line 1022 "dhcp4_parser.yy" // lalr1.cc:859 { // The subnet subnet4 parameter is required ctx.require("subnet", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -1896,16 +1896,16 @@ namespace isc { namespace dhcp { #line 1897 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 288: -#line 1055 "dhcp4_parser.yy" // lalr1.cc:859 + case 289: +#line 1059 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1905 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 289: -#line 1057 "dhcp4_parser.yy" // lalr1.cc:859 + case 290: +#line 1061 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet", subnet); @@ -1914,16 +1914,16 @@ namespace isc { namespace dhcp { #line 1915 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 290: -#line 1063 "dhcp4_parser.yy" // lalr1.cc:859 + case 291: +#line 1067 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1923 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 291: -#line 1065 "dhcp4_parser.yy" // lalr1.cc:859 + case 292: +#line 1069 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface", iface); @@ -1932,16 +1932,16 @@ namespace isc { namespace dhcp { #line 1933 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 292: -#line 1071 "dhcp4_parser.yy" // lalr1.cc:859 + case 293: +#line 1075 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1941 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 293: -#line 1073 "dhcp4_parser.yy" // lalr1.cc:859 + case 294: +#line 1077 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface-id", iface); @@ -1950,16 +1950,16 @@ namespace isc { namespace dhcp { #line 1951 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 294: -#line 1079 "dhcp4_parser.yy" // lalr1.cc:859 + case 295: +#line 1083 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1959 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 295: -#line 1081 "dhcp4_parser.yy" // lalr1.cc:859 + case 296: +#line 1085 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-subnet", iface); @@ -1968,16 +1968,16 @@ namespace isc { namespace dhcp { #line 1969 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 296: -#line 1087 "dhcp4_parser.yy" // lalr1.cc:859 + case 297: +#line 1091 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1977 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 297: -#line 1089 "dhcp4_parser.yy" // lalr1.cc:859 + case 298: +#line 1093 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface", iface); @@ -1986,16 +1986,16 @@ namespace isc { namespace dhcp { #line 1987 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 298: -#line 1095 "dhcp4_parser.yy" // lalr1.cc:859 + case 299: +#line 1099 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 1995 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 299: -#line 1097 "dhcp4_parser.yy" // lalr1.cc:859 + case 300: +#line 1101 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-class", cls); @@ -2004,8 +2004,8 @@ namespace isc { namespace dhcp { #line 2005 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 300: -#line 1103 "dhcp4_parser.yy" // lalr1.cc:859 + case 301: +#line 1107 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("require-client-classes", c); @@ -2015,8 +2015,8 @@ namespace isc { namespace dhcp { #line 2016 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 301: -#line 1108 "dhcp4_parser.yy" // lalr1.cc:859 + case 302: +#line 1112 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2024,16 +2024,16 @@ namespace isc { namespace dhcp { #line 2025 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 302: -#line 1113 "dhcp4_parser.yy" // lalr1.cc:859 + case 303: +#line 1117 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.RESERVATION_MODE); } #line 2033 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 303: -#line 1115 "dhcp4_parser.yy" // lalr1.cc:859 + case 304: +#line 1119 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("reservation-mode", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); @@ -2041,32 +2041,32 @@ namespace isc { namespace dhcp { #line 2042 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 304: -#line 1120 "dhcp4_parser.yy" // lalr1.cc:859 + case 305: +#line 1124 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("disabled", ctx.loc2pos(yystack_[0].location))); } #line 2048 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 305: -#line 1121 "dhcp4_parser.yy" // lalr1.cc:859 + case 306: +#line 1125 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("out-of-pool", ctx.loc2pos(yystack_[0].location))); } #line 2054 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 306: -#line 1122 "dhcp4_parser.yy" // lalr1.cc:859 + case 307: +#line 1126 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("global", ctx.loc2pos(yystack_[0].location))); } #line 2060 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 307: -#line 1123 "dhcp4_parser.yy" // lalr1.cc:859 + case 308: +#line 1127 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("all", ctx.loc2pos(yystack_[0].location))); } #line 2066 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 308: -#line 1126 "dhcp4_parser.yy" // lalr1.cc:859 + case 309: +#line 1130 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("id", id); @@ -2074,8 +2074,8 @@ namespace isc { namespace dhcp { #line 2075 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 309: -#line 1133 "dhcp4_parser.yy" // lalr1.cc:859 + case 310: +#line 1137 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("shared-networks", l); @@ -2085,8 +2085,8 @@ namespace isc { namespace dhcp { #line 2086 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 310: -#line 1138 "dhcp4_parser.yy" // lalr1.cc:859 + case 311: +#line 1142 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2094,8 +2094,8 @@ namespace isc { namespace dhcp { #line 2095 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 315: -#line 1153 "dhcp4_parser.yy" // lalr1.cc:859 + case 316: +#line 1157 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2104,16 +2104,16 @@ namespace isc { namespace dhcp { #line 2105 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 316: -#line 1157 "dhcp4_parser.yy" // lalr1.cc:859 + case 317: +#line 1161 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } #line 2113 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 337: -#line 1189 "dhcp4_parser.yy" // lalr1.cc:859 + case 338: +#line 1193 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-def", l); @@ -2123,8 +2123,8 @@ namespace isc { namespace dhcp { #line 2124 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 338: -#line 1194 "dhcp4_parser.yy" // lalr1.cc:859 + case 339: +#line 1198 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2132,8 +2132,8 @@ namespace isc { namespace dhcp { #line 2133 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 339: -#line 1202 "dhcp4_parser.yy" // lalr1.cc:859 + case 340: +#line 1206 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); @@ -2141,16 +2141,16 @@ namespace isc { namespace dhcp { #line 2142 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 340: -#line 1205 "dhcp4_parser.yy" // lalr1.cc:859 + case 341: +#line 1209 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } #line 2150 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 345: -#line 1221 "dhcp4_parser.yy" // lalr1.cc:859 + case 346: +#line 1225 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2159,8 +2159,8 @@ namespace isc { namespace dhcp { #line 2160 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 346: -#line 1225 "dhcp4_parser.yy" // lalr1.cc:859 + case 347: +#line 1229 "dhcp4_parser.yy" // lalr1.cc:859 { // The name, code and type option def parameters are required. ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -2171,8 +2171,8 @@ namespace isc { namespace dhcp { #line 2172 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 347: -#line 1236 "dhcp4_parser.yy" // lalr1.cc:859 + case 348: +#line 1240 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-def list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -2181,8 +2181,8 @@ namespace isc { namespace dhcp { #line 2182 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 348: -#line 1240 "dhcp4_parser.yy" // lalr1.cc:859 + case 349: +#line 1244 "dhcp4_parser.yy" // lalr1.cc:859 { // The name, code and type option def parameters are required. ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -2193,8 +2193,8 @@ namespace isc { namespace dhcp { #line 2194 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 364: -#line 1272 "dhcp4_parser.yy" // lalr1.cc:859 + case 365: +#line 1276 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("code", code); @@ -2202,16 +2202,16 @@ namespace isc { namespace dhcp { #line 2203 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 366: -#line 1279 "dhcp4_parser.yy" // lalr1.cc:859 + case 367: +#line 1283 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2211 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 367: -#line 1281 "dhcp4_parser.yy" // lalr1.cc:859 + case 368: +#line 1285 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("type", prf); @@ -2220,16 +2220,16 @@ namespace isc { namespace dhcp { #line 2221 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 368: -#line 1287 "dhcp4_parser.yy" // lalr1.cc:859 + case 369: +#line 1291 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2229 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 369: -#line 1289 "dhcp4_parser.yy" // lalr1.cc:859 + case 370: +#line 1293 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("record-types", rtypes); @@ -2238,16 +2238,16 @@ namespace isc { namespace dhcp { #line 2239 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 370: -#line 1295 "dhcp4_parser.yy" // lalr1.cc:859 + case 371: +#line 1299 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2247 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 371: -#line 1297 "dhcp4_parser.yy" // lalr1.cc:859 + case 372: +#line 1301 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("space", space); @@ -2256,16 +2256,16 @@ namespace isc { namespace dhcp { #line 2257 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 373: -#line 1305 "dhcp4_parser.yy" // lalr1.cc:859 + case 374: +#line 1309 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2265 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 374: -#line 1307 "dhcp4_parser.yy" // lalr1.cc:859 + case 375: +#line 1311 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("encapsulate", encap); @@ -2274,8 +2274,8 @@ namespace isc { namespace dhcp { #line 2275 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 375: -#line 1313 "dhcp4_parser.yy" // lalr1.cc:859 + case 376: +#line 1317 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("array", array); @@ -2283,8 +2283,8 @@ namespace isc { namespace dhcp { #line 2284 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 376: -#line 1322 "dhcp4_parser.yy" // lalr1.cc:859 + case 377: +#line 1326 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-data", l); @@ -2294,8 +2294,8 @@ namespace isc { namespace dhcp { #line 2295 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 377: -#line 1327 "dhcp4_parser.yy" // lalr1.cc:859 + case 378: +#line 1331 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2303,8 +2303,8 @@ namespace isc { namespace dhcp { #line 2304 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 382: -#line 1346 "dhcp4_parser.yy" // lalr1.cc:859 + case 383: +#line 1350 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2313,8 +2313,8 @@ namespace isc { namespace dhcp { #line 2314 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 383: -#line 1350 "dhcp4_parser.yy" // lalr1.cc:859 + case 384: +#line 1354 "dhcp4_parser.yy" // lalr1.cc:859 { /// @todo: the code or name parameters are required. ctx.stack_.pop_back(); @@ -2322,8 +2322,8 @@ namespace isc { namespace dhcp { #line 2323 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 384: -#line 1358 "dhcp4_parser.yy" // lalr1.cc:859 + case 385: +#line 1362 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-data list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -2332,8 +2332,8 @@ namespace isc { namespace dhcp { #line 2333 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 385: -#line 1362 "dhcp4_parser.yy" // lalr1.cc:859 + case 386: +#line 1366 "dhcp4_parser.yy" // lalr1.cc:859 { /// @todo: the code or name parameters are required. // parsing completed @@ -2341,16 +2341,16 @@ namespace isc { namespace dhcp { #line 2342 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 400: -#line 1395 "dhcp4_parser.yy" // lalr1.cc:859 + case 401: +#line 1399 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2350 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 401: -#line 1397 "dhcp4_parser.yy" // lalr1.cc:859 + case 402: +#line 1401 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("data", data); @@ -2359,8 +2359,8 @@ namespace isc { namespace dhcp { #line 2360 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 404: -#line 1407 "dhcp4_parser.yy" // lalr1.cc:859 + case 405: +#line 1411 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("csv-format", space); @@ -2368,8 +2368,8 @@ namespace isc { namespace dhcp { #line 2369 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 405: -#line 1412 "dhcp4_parser.yy" // lalr1.cc:859 + case 406: +#line 1416 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr persist(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("always-send", persist); @@ -2377,8 +2377,8 @@ namespace isc { namespace dhcp { #line 2378 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 406: -#line 1420 "dhcp4_parser.yy" // lalr1.cc:859 + case 407: +#line 1424 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pools", l); @@ -2388,8 +2388,8 @@ namespace isc { namespace dhcp { #line 2389 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 407: -#line 1425 "dhcp4_parser.yy" // lalr1.cc:859 + case 408: +#line 1429 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2397,8 +2397,8 @@ namespace isc { namespace dhcp { #line 2398 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 412: -#line 1440 "dhcp4_parser.yy" // lalr1.cc:859 + case 413: +#line 1444 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2407,8 +2407,8 @@ namespace isc { namespace dhcp { #line 2408 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 413: -#line 1444 "dhcp4_parser.yy" // lalr1.cc:859 + case 414: +#line 1448 "dhcp4_parser.yy" // lalr1.cc:859 { // The pool parameter is required. ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -2417,8 +2417,8 @@ namespace isc { namespace dhcp { #line 2418 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 414: -#line 1450 "dhcp4_parser.yy" // lalr1.cc:859 + case 415: +#line 1454 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -2427,8 +2427,8 @@ namespace isc { namespace dhcp { #line 2428 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 415: -#line 1454 "dhcp4_parser.yy" // lalr1.cc:859 + case 416: +#line 1458 "dhcp4_parser.yy" // lalr1.cc:859 { // The pool parameter is required. ctx.require("pool", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -2437,16 +2437,16 @@ namespace isc { namespace dhcp { #line 2438 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 425: -#line 1473 "dhcp4_parser.yy" // lalr1.cc:859 + case 426: +#line 1477 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2446 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 426: -#line 1475 "dhcp4_parser.yy" // lalr1.cc:859 + case 427: +#line 1479 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pool", pool); @@ -2455,16 +2455,16 @@ namespace isc { namespace dhcp { #line 2456 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 427: -#line 1481 "dhcp4_parser.yy" // lalr1.cc:859 + case 428: +#line 1485 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2464 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 428: -#line 1483 "dhcp4_parser.yy" // lalr1.cc:859 + case 429: +#line 1487 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr parent = ctx.stack_.back(); ElementPtr user_context = yystack_[0].value.as< ElementPtr > (); @@ -2490,16 +2490,16 @@ namespace isc { namespace dhcp { #line 2491 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 429: -#line 1506 "dhcp4_parser.yy" // lalr1.cc:859 + case 430: +#line 1510 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2499 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 430: -#line 1508 "dhcp4_parser.yy" // lalr1.cc:859 + case 431: +#line 1512 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr parent = ctx.stack_.back(); ElementPtr user_context(new MapElement(ctx.loc2pos(yystack_[3].location))); @@ -2527,8 +2527,8 @@ namespace isc { namespace dhcp { #line 2528 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 431: -#line 1536 "dhcp4_parser.yy" // lalr1.cc:859 + case 432: +#line 1540 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservations", l); @@ -2538,8 +2538,8 @@ namespace isc { namespace dhcp { #line 2539 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 432: -#line 1541 "dhcp4_parser.yy" // lalr1.cc:859 + case 433: +#line 1545 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2547,8 +2547,8 @@ namespace isc { namespace dhcp { #line 2548 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 437: -#line 1554 "dhcp4_parser.yy" // lalr1.cc:859 + case 438: +#line 1558 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2557,8 +2557,8 @@ namespace isc { namespace dhcp { #line 2558 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 438: -#line 1558 "dhcp4_parser.yy" // lalr1.cc:859 + case 439: +#line 1562 "dhcp4_parser.yy" // lalr1.cc:859 { /// @todo: an identifier parameter is required. ctx.stack_.pop_back(); @@ -2566,8 +2566,8 @@ namespace isc { namespace dhcp { #line 2567 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 439: -#line 1563 "dhcp4_parser.yy" // lalr1.cc:859 + case 440: +#line 1567 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the reservations list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); @@ -2576,8 +2576,8 @@ namespace isc { namespace dhcp { #line 2577 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 440: -#line 1567 "dhcp4_parser.yy" // lalr1.cc:859 + case 441: +#line 1571 "dhcp4_parser.yy" // lalr1.cc:859 { /// @todo: an identifier parameter is required. // parsing completed @@ -2585,16 +2585,16 @@ namespace isc { namespace dhcp { #line 2586 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 460: -#line 1598 "dhcp4_parser.yy" // lalr1.cc:859 + case 461: +#line 1602 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2594 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 461: -#line 1600 "dhcp4_parser.yy" // lalr1.cc:859 + case 462: +#line 1604 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("next-server", next_server); @@ -2603,16 +2603,16 @@ namespace isc { namespace dhcp { #line 2604 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 462: -#line 1606 "dhcp4_parser.yy" // lalr1.cc:859 + case 463: +#line 1610 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2612 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 463: -#line 1608 "dhcp4_parser.yy" // lalr1.cc:859 + case 464: +#line 1612 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-hostname", srv); @@ -2621,16 +2621,16 @@ namespace isc { namespace dhcp { #line 2622 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 464: -#line 1614 "dhcp4_parser.yy" // lalr1.cc:859 + case 465: +#line 1618 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2630 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 465: -#line 1616 "dhcp4_parser.yy" // lalr1.cc:859 + case 466: +#line 1620 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("boot-file-name", bootfile); @@ -2639,16 +2639,16 @@ namespace isc { namespace dhcp { #line 2640 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 466: -#line 1622 "dhcp4_parser.yy" // lalr1.cc:859 + case 467: +#line 1626 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2648 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 467: -#line 1624 "dhcp4_parser.yy" // lalr1.cc:859 + case 468: +#line 1628 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", addr); @@ -2657,8 +2657,8 @@ namespace isc { namespace dhcp { #line 2658 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 468: -#line 1630 "dhcp4_parser.yy" // lalr1.cc:859 + case 469: +#line 1634 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-addresses", l); @@ -2668,8 +2668,8 @@ namespace isc { namespace dhcp { #line 2669 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 469: -#line 1635 "dhcp4_parser.yy" // lalr1.cc:859 + case 470: +#line 1639 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2677,16 +2677,16 @@ namespace isc { namespace dhcp { #line 2678 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 470: -#line 1640 "dhcp4_parser.yy" // lalr1.cc:859 + case 471: +#line 1644 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2686 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 471: -#line 1642 "dhcp4_parser.yy" // lalr1.cc:859 + case 472: +#line 1646 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("duid", d); @@ -2695,16 +2695,16 @@ namespace isc { namespace dhcp { #line 2696 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 472: -#line 1648 "dhcp4_parser.yy" // lalr1.cc:859 + case 473: +#line 1652 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2704 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 473: -#line 1650 "dhcp4_parser.yy" // lalr1.cc:859 + case 474: +#line 1654 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hw-address", hw); @@ -2713,16 +2713,16 @@ namespace isc { namespace dhcp { #line 2714 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 474: -#line 1656 "dhcp4_parser.yy" // lalr1.cc:859 + case 475: +#line 1660 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2722 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 475: -#line 1658 "dhcp4_parser.yy" // lalr1.cc:859 + case 476: +#line 1662 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-id", hw); @@ -2731,16 +2731,16 @@ namespace isc { namespace dhcp { #line 2732 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 476: -#line 1664 "dhcp4_parser.yy" // lalr1.cc:859 + case 477: +#line 1668 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2740 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 477: -#line 1666 "dhcp4_parser.yy" // lalr1.cc:859 + case 478: +#line 1670 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("circuit-id", hw); @@ -2749,16 +2749,16 @@ namespace isc { namespace dhcp { #line 2750 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 478: -#line 1672 "dhcp4_parser.yy" // lalr1.cc:859 + case 479: +#line 1676 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2758 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 479: -#line 1674 "dhcp4_parser.yy" // lalr1.cc:859 + case 480: +#line 1678 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flex-id", hw); @@ -2767,16 +2767,16 @@ namespace isc { namespace dhcp { #line 2768 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 480: -#line 1680 "dhcp4_parser.yy" // lalr1.cc:859 + case 481: +#line 1684 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2776 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 481: -#line 1682 "dhcp4_parser.yy" // lalr1.cc:859 + case 482: +#line 1686 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname", host); @@ -2785,8 +2785,8 @@ namespace isc { namespace dhcp { #line 2786 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 482: -#line 1688 "dhcp4_parser.yy" // lalr1.cc:859 + case 483: +#line 1692 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", c); @@ -2796,8 +2796,8 @@ namespace isc { namespace dhcp { #line 2797 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 483: -#line 1693 "dhcp4_parser.yy" // lalr1.cc:859 + case 484: +#line 1697 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2805,8 +2805,8 @@ namespace isc { namespace dhcp { #line 2806 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 484: -#line 1701 "dhcp4_parser.yy" // lalr1.cc:859 + case 485: +#line 1705 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay", m); @@ -2816,8 +2816,8 @@ namespace isc { namespace dhcp { #line 2817 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 485: -#line 1706 "dhcp4_parser.yy" // lalr1.cc:859 + case 486: +#line 1710 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2825,8 +2825,8 @@ namespace isc { namespace dhcp { #line 2826 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 488: -#line 1718 "dhcp4_parser.yy" // lalr1.cc:859 + case 489: +#line 1722 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", l); @@ -2836,8 +2836,8 @@ namespace isc { namespace dhcp { #line 2837 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 489: -#line 1723 "dhcp4_parser.yy" // lalr1.cc:859 + case 490: +#line 1727 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2845,8 +2845,8 @@ namespace isc { namespace dhcp { #line 2846 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 492: -#line 1732 "dhcp4_parser.yy" // lalr1.cc:859 + case 493: +#line 1736 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); @@ -2855,8 +2855,8 @@ namespace isc { namespace dhcp { #line 2856 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 493: -#line 1736 "dhcp4_parser.yy" // lalr1.cc:859 + case 494: +#line 1740 "dhcp4_parser.yy" // lalr1.cc:859 { // The name client class parameter is required. ctx.require("name", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); @@ -2865,16 +2865,16 @@ namespace isc { namespace dhcp { #line 2866 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 510: -#line 1765 "dhcp4_parser.yy" // lalr1.cc:859 + case 511: +#line 1769 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2874 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 511: -#line 1767 "dhcp4_parser.yy" // lalr1.cc:859 + case 512: +#line 1771 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("test", test); @@ -2883,8 +2883,8 @@ namespace isc { namespace dhcp { #line 2884 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 512: -#line 1773 "dhcp4_parser.yy" // lalr1.cc:859 + case 513: +#line 1777 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("only-if-required", b); @@ -2892,8 +2892,8 @@ namespace isc { namespace dhcp { #line 2893 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 513: -#line 1782 "dhcp4_parser.yy" // lalr1.cc:859 + case 514: +#line 1786 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4o6-port", time); @@ -2901,8 +2901,8 @@ namespace isc { namespace dhcp { #line 2902 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 514: -#line 1789 "dhcp4_parser.yy" // lalr1.cc:859 + case 515: +#line 1793 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); @@ -2912,8 +2912,8 @@ namespace isc { namespace dhcp { #line 2913 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 515: -#line 1794 "dhcp4_parser.yy" // lalr1.cc:859 + case 516: +#line 1798 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); @@ -2921,16 +2921,16 @@ namespace isc { namespace dhcp { #line 2922 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 523: -#line 1810 "dhcp4_parser.yy" // lalr1.cc:859 + case 524: +#line 1814 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2930 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 524: -#line 1812 "dhcp4_parser.yy" // lalr1.cc:859 + case 525: +#line 1816 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-type", stype); @@ -2939,16 +2939,16 @@ namespace isc { namespace dhcp { #line 2940 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 525: -#line 1818 "dhcp4_parser.yy" // lalr1.cc:859 + case 526: +#line 1822 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } #line 2948 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 526: -#line 1820 "dhcp4_parser.yy" // lalr1.cc:859 + case 527: +#line 1824 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-name", name); @@ -2957,641 +2957,671 @@ namespace isc { namespace dhcp { #line 2958 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 527: -#line 1828 "dhcp4_parser.yy" // lalr1.cc:859 + case 528: +#line 1833 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("queue-control", m); + ctx.stack_.push_back(m); + ctx.enter(ctx.QUEUE_CONTROL); +} +#line 2969 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 529: +#line 1838 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.require("capacity", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location)); + ctx.stack_.pop_back(); + ctx.leave(); +} +#line 2979 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 536: +#line 1854 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("capacity", i); +} +#line 2988 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 537: +#line 1861 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); ctx.enter(ctx.DHCP_DDNS); } -#line 2969 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2999 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 528: -#line 1833 "dhcp4_parser.yy" // lalr1.cc:859 + case 538: +#line 1866 "dhcp4_parser.yy" // lalr1.cc:859 { // The enable updates DHCP DDNS parameter is required. ctx.require("enable-updates", ctx.loc2pos(yystack_[2].location), ctx.loc2pos(yystack_[0].location)); ctx.stack_.pop_back(); ctx.leave(); } -#line 2980 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3010 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 529: -#line 1840 "dhcp4_parser.yy" // lalr1.cc:859 + case 539: +#line 1873 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the dhcp-ddns map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2990 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3020 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 530: -#line 1844 "dhcp4_parser.yy" // lalr1.cc:859 + case 540: +#line 1877 "dhcp4_parser.yy" // lalr1.cc:859 { // The enable updates DHCP DDNS parameter is required. ctx.require("enable-updates", ctx.loc2pos(yystack_[3].location), ctx.loc2pos(yystack_[0].location)); // parsing completed } -#line 3000 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3030 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 552: -#line 1875 "dhcp4_parser.yy" // lalr1.cc:859 + case 562: +#line 1908 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("enable-updates", b); } -#line 3009 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3039 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 553: -#line 1880 "dhcp4_parser.yy" // lalr1.cc:859 + case 563: +#line 1913 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3017 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3047 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 554: -#line 1882 "dhcp4_parser.yy" // lalr1.cc:859 + case 564: +#line 1915 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("qualifying-suffix", s); ctx.leave(); } -#line 3027 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3057 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 555: -#line 1888 "dhcp4_parser.yy" // lalr1.cc:859 + case 565: +#line 1921 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3035 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3065 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 556: -#line 1890 "dhcp4_parser.yy" // lalr1.cc:859 + case 566: +#line 1923 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-ip", s); ctx.leave(); } -#line 3045 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3075 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 557: -#line 1896 "dhcp4_parser.yy" // lalr1.cc:859 + case 567: +#line 1929 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-port", i); } -#line 3054 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3084 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 558: -#line 1901 "dhcp4_parser.yy" // lalr1.cc:859 + case 568: +#line 1934 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3062 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3092 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 559: -#line 1903 "dhcp4_parser.yy" // lalr1.cc:859 + case 569: +#line 1936 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-ip", s); ctx.leave(); } -#line 3072 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3102 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 560: -#line 1909 "dhcp4_parser.yy" // lalr1.cc:859 + case 570: +#line 1942 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("sender-port", i); } -#line 3081 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3111 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 561: -#line 1914 "dhcp4_parser.yy" // lalr1.cc:859 + case 571: +#line 1947 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("max-queue-size", i); } -#line 3090 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3120 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 562: -#line 1919 "dhcp4_parser.yy" // lalr1.cc:859 + case 572: +#line 1952 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NCR_PROTOCOL); } -#line 3098 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3128 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 563: -#line 1921 "dhcp4_parser.yy" // lalr1.cc:859 + case 573: +#line 1954 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 3107 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3137 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 564: -#line 1927 "dhcp4_parser.yy" // lalr1.cc:859 + case 574: +#line 1960 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } -#line 3113 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3143 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 565: -#line 1928 "dhcp4_parser.yy" // lalr1.cc:859 + case 575: +#line 1961 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } -#line 3119 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3149 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 566: -#line 1931 "dhcp4_parser.yy" // lalr1.cc:859 + case 576: +#line 1964 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NCR_FORMAT); } -#line 3127 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3157 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 567: -#line 1933 "dhcp4_parser.yy" // lalr1.cc:859 + case 577: +#line 1966 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ncr-format", json); ctx.leave(); } -#line 3137 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3167 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 568: -#line 1939 "dhcp4_parser.yy" // lalr1.cc:859 + case 578: +#line 1972 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("always-include-fqdn", b); } -#line 3146 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3176 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 569: -#line 1944 "dhcp4_parser.yy" // lalr1.cc:859 + case 579: +#line 1977 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("override-no-update", b); } -#line 3155 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3185 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 570: -#line 1949 "dhcp4_parser.yy" // lalr1.cc:859 + case 580: +#line 1982 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("override-client-update", b); } -#line 3164 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3194 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 571: -#line 1954 "dhcp4_parser.yy" // lalr1.cc:859 + case 581: +#line 1987 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.REPLACE_CLIENT_NAME); } -#line 3172 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3202 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 572: -#line 1956 "dhcp4_parser.yy" // lalr1.cc:859 + case 582: +#line 1989 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 3181 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3211 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 573: -#line 1962 "dhcp4_parser.yy" // lalr1.cc:859 + case 583: +#line 1995 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); } -#line 3189 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3219 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 574: -#line 1965 "dhcp4_parser.yy" // lalr1.cc:859 + case 584: +#line 1998 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); } -#line 3197 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3227 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 575: -#line 1968 "dhcp4_parser.yy" // lalr1.cc:859 + case 585: +#line 2001 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); } -#line 3205 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3235 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 576: -#line 1971 "dhcp4_parser.yy" // lalr1.cc:859 + case 586: +#line 2004 "dhcp4_parser.yy" // lalr1.cc:859 { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); } -#line 3213 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3243 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 577: -#line 1974 "dhcp4_parser.yy" // lalr1.cc:859 + case 587: +#line 2007 "dhcp4_parser.yy" // lalr1.cc:859 { error(yystack_[0].location, "boolean values for the replace-client-name are " "no longer supported"); } -#line 3222 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3252 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 578: -#line 1980 "dhcp4_parser.yy" // lalr1.cc:859 + case 588: +#line 2013 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3230 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3260 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 579: -#line 1982 "dhcp4_parser.yy" // lalr1.cc:859 + case 589: +#line 2015 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("generated-prefix", s); ctx.leave(); } -#line 3240 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3270 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 580: -#line 1988 "dhcp4_parser.yy" // lalr1.cc:859 + case 590: +#line 2021 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3248 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3278 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 581: -#line 1990 "dhcp4_parser.yy" // lalr1.cc:859 + case 591: +#line 2023 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname-char-set", s); ctx.leave(); } -#line 3258 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3288 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 582: -#line 1996 "dhcp4_parser.yy" // lalr1.cc:859 + case 592: +#line 2029 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3266 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3296 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 583: -#line 1998 "dhcp4_parser.yy" // lalr1.cc:859 + case 593: +#line 2031 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname-char-replacement", s); ctx.leave(); } -#line 3276 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3306 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 584: -#line 2007 "dhcp4_parser.yy" // lalr1.cc:859 + case 594: +#line 2040 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3284 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3314 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 585: -#line 2009 "dhcp4_parser.yy" // lalr1.cc:859 + case 595: +#line 2042 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 3293 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3323 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 586: -#line 2014 "dhcp4_parser.yy" // lalr1.cc:859 + case 596: +#line 2047 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3301 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3331 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 587: -#line 2016 "dhcp4_parser.yy" // lalr1.cc:859 + case 597: +#line 2049 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 3310 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3340 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 588: -#line 2021 "dhcp4_parser.yy" // lalr1.cc:859 + case 598: +#line 2054 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3318 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3348 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 589: -#line 2023 "dhcp4_parser.yy" // lalr1.cc:859 + case 599: +#line 2056 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("Control-agent", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 3327 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3357 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 590: -#line 2028 "dhcp4_parser.yy" // lalr1.cc:859 + case 600: +#line 2061 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 3337 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3367 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 591: -#line 2032 "dhcp4_parser.yy" // lalr1.cc:859 + case 601: +#line 2065 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 3345 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3375 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 592: -#line 2037 "dhcp4_parser.yy" // lalr1.cc:859 + case 602: +#line 2070 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("config-control", i); ctx.stack_.push_back(i); ctx.enter(ctx.CONFIG_CONTROL); } -#line 3356 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3386 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 593: -#line 2042 "dhcp4_parser.yy" // lalr1.cc:859 + case 603: +#line 2075 "dhcp4_parser.yy" // lalr1.cc:859 { // No config control params are required ctx.stack_.pop_back(); ctx.leave(); } -#line 3366 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3396 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 594: -#line 2048 "dhcp4_parser.yy" // lalr1.cc:859 + case 604: +#line 2081 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the config-control map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 3376 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3406 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 595: -#line 2052 "dhcp4_parser.yy" // lalr1.cc:859 + case 605: +#line 2085 "dhcp4_parser.yy" // lalr1.cc:859 { // No config_control params are required // parsing completed } -#line 3385 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3415 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 600: -#line 2067 "dhcp4_parser.yy" // lalr1.cc:859 + case 610: +#line 2100 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("config-databases", l); ctx.stack_.push_back(l); ctx.enter(ctx.CONFIG_DATABASE); } -#line 3396 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3426 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 601: -#line 2072 "dhcp4_parser.yy" // lalr1.cc:859 + case 611: +#line 2105 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 3405 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3435 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 602: -#line 2082 "dhcp4_parser.yy" // lalr1.cc:859 + case 612: +#line 2115 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("Logging", m); ctx.stack_.push_back(m); ctx.enter(ctx.LOGGING); } -#line 3416 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3446 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 603: -#line 2087 "dhcp4_parser.yy" // lalr1.cc:859 + case 613: +#line 2120 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 3425 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3455 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 604: -#line 2092 "dhcp4_parser.yy" // lalr1.cc:859 + case 614: +#line 2125 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the Logging map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 3435 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3465 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 605: -#line 2096 "dhcp4_parser.yy" // lalr1.cc:859 + case 615: +#line 2129 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 3443 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3473 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 609: -#line 2112 "dhcp4_parser.yy" // lalr1.cc:859 + case 619: +#line 2145 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("loggers", l); ctx.stack_.push_back(l); ctx.enter(ctx.LOGGERS); } -#line 3454 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3484 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 610: -#line 2117 "dhcp4_parser.yy" // lalr1.cc:859 + case 620: +#line 2150 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 3463 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3493 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 613: -#line 2129 "dhcp4_parser.yy" // lalr1.cc:859 + case 623: +#line 2162 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(l); ctx.stack_.push_back(l); } -#line 3473 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3503 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 614: -#line 2133 "dhcp4_parser.yy" // lalr1.cc:859 + case 624: +#line 2166 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 3481 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3511 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 624: -#line 2150 "dhcp4_parser.yy" // lalr1.cc:859 + case 634: +#line 2183 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("debuglevel", dl); } -#line 3490 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3520 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 625: -#line 2155 "dhcp4_parser.yy" // lalr1.cc:859 + case 635: +#line 2188 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3498 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3528 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 626: -#line 2157 "dhcp4_parser.yy" // lalr1.cc:859 + case 636: +#line 2190 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 3508 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3538 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 627: -#line 2163 "dhcp4_parser.yy" // lalr1.cc:859 + case 637: +#line 2196 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output_options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } -#line 3519 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3549 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 628: -#line 2168 "dhcp4_parser.yy" // lalr1.cc:859 + case 638: +#line 2201 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 3528 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3558 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 631: -#line 2177 "dhcp4_parser.yy" // lalr1.cc:859 + case 641: +#line 2210 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 3538 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3568 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 632: -#line 2181 "dhcp4_parser.yy" // lalr1.cc:859 + case 642: +#line 2214 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 3546 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3576 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 639: -#line 2195 "dhcp4_parser.yy" // lalr1.cc:859 + case 649: +#line 2228 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 3554 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3584 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 640: -#line 2197 "dhcp4_parser.yy" // lalr1.cc:859 + case 650: +#line 2230 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 3564 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3594 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 641: -#line 2203 "dhcp4_parser.yy" // lalr1.cc:859 + case 651: +#line 2236 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr flush(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("flush", flush); } -#line 3573 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3603 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 642: -#line 2208 "dhcp4_parser.yy" // lalr1.cc:859 + case 652: +#line 2241 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr maxsize(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("maxsize", maxsize); } -#line 3582 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3612 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 643: -#line 2213 "dhcp4_parser.yy" // lalr1.cc:859 + case 653: +#line 2246 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr maxver(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("maxver", maxver); } -#line 3591 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3621 "dhcp4_parser.cc" // lalr1.cc:859 break; -#line 3595 "dhcp4_parser.cc" // lalr1.cc:859 +#line 3625 "dhcp4_parser.cc" // lalr1.cc:859 default: break; } @@ -3846,117 +3876,119 @@ namespace isc { namespace dhcp { } - const short int Dhcp4Parser::yypact_ninf_ = -794; + const short int Dhcp4Parser::yypact_ninf_ = -811; const signed char Dhcp4Parser::yytable_ninf_ = -1; const short int Dhcp4Parser::yypact_[] = { - 328, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, 38, 24, 42, 53, 57, - 105, 129, 143, 150, 152, 161, 173, 186, 188, 196, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, 24, -9, - 13, 52, 70, 148, 185, 223, 125, 391, 35, -49, - 450, 66, 34, -794, 205, 189, 215, 212, 226, -794, - -794, -794, -794, -794, 227, -794, 86, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, 233, 244, -794, - -794, -794, -794, -794, -794, 260, 261, 270, 276, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, 279, -794, -794, -794, 87, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - 282, -794, 113, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, 283, -794, -794, -794, - -794, -794, -794, -794, -794, -794, 146, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, 162, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, 222, 290, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, 292, -794, -794, 297, -794, -794, -794, 303, - -794, -794, 302, 308, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, 334, 337, -794, - -794, -794, -794, 340, 339, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, 163, -794, -794, - -794, 346, -794, -794, 347, -794, 349, 352, -794, -794, - 353, 354, 356, -794, -794, -794, -794, -794, -794, -794, - 175, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, 176, - -794, -794, -794, -794, 179, -794, -794, -794, 24, 24, - -794, 197, 364, 366, 367, 370, 373, -794, 13, -794, - 34, 374, 378, 379, 217, 218, 384, 387, 389, 390, - 393, 394, 235, 240, 242, 246, 408, 415, 416, 417, - 421, 422, 424, 443, 448, 449, 451, 455, 300, 464, - 465, 52, -794, 466, 467, 468, 306, 70, -794, 470, - 471, 488, 489, 490, 491, 331, 493, 494, 495, 496, - 148, -794, 497, 185, -794, 498, 499, 501, 503, 504, - 505, 506, 508, -794, 223, -794, 509, 510, 350, 514, - 515, 516, 355, -794, 391, 517, 357, 360, -794, 35, - 524, 526, -55, -794, 368, 527, 530, 371, 533, 375, - 376, 534, 535, 380, 381, 382, 538, 542, 546, 547, - 450, -794, 549, 66, -794, 550, 34, -794, -794, -794, - 552, 551, 553, 24, 24, 24, -794, 201, 554, 555, - 556, -794, -794, 418, 419, 420, 573, 574, 580, -794, - -794, -794, -794, 425, 583, 585, 586, 587, 588, 429, - 589, 591, 592, 593, 594, -794, 595, 596, -794, 599, - 80, 67, -794, -794, 435, 436, 441, 601, 444, 445, - -794, 252, 599, 446, 600, -794, 447, -794, 599, 452, - 453, 454, 456, 457, 458, 459, -794, 460, 461, -794, - 462, 463, 469, -794, -794, 472, -794, -794, -794, 473, - 24, -794, -794, 474, 475, -794, 476, -794, -794, 28, - 426, -794, -794, -794, -15, 477, 478, 479, -794, 607, - -794, 608, -794, 24, 52, 66, -794, -794, -794, -794, - 34, 70, 605, -794, -794, -794, 395, 395, 612, -794, - 622, 623, 624, 625, -794, -794, -794, 47, 627, 628, - 637, 147, 17, 450, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, 638, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -28, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, 639, - 612, -794, 210, 214, 237, 255, -794, 259, -794, -794, - -794, -794, -794, -794, 611, 643, 644, 645, 646, -794, - -794, 647, 648, 649, 650, 651, -794, 263, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, 273, -794, 652, 653, - -794, -794, 654, 656, -794, -794, 655, 659, -794, -794, - 657, 661, -794, -794, 660, 662, -794, -794, -794, -794, - -794, -794, 55, -794, -794, -794, -794, -794, -794, -794, - 119, -794, -794, 663, 664, -794, -794, 665, 667, -794, - 668, 669, 670, 671, 672, 673, 274, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, 281, - -794, -794, -794, 287, 518, -794, 674, 675, -794, -794, - -794, -794, 676, -794, 120, -794, 677, -794, -794, -794, - -794, 681, 605, -794, 682, 683, 684, 685, 492, 512, - 525, 528, 529, 687, 688, 531, 532, 536, 537, 539, - 395, -794, -794, 395, -794, 612, 148, -794, 622, 391, - -794, 623, 35, -794, 624, 216, -794, 625, 47, -794, - 388, 627, -794, 223, -794, 628, -49, -794, 637, 540, - 543, 544, 545, 548, 557, 147, -794, 689, 694, 17, - -794, -794, -794, 693, 678, 185, -794, 638, 696, -794, - 72, 639, -794, -794, 559, -794, 311, 560, 561, 562, - -794, -794, -794, -794, -794, 563, 564, -794, -794, -794, - -794, -794, -794, 294, -794, 305, -794, 695, -794, 699, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, 320, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, 700, -794, -794, -794, -794, -794, - -794, -794, -794, -794, 703, 709, -794, -794, -794, -794, - -794, 706, -794, 321, -794, -794, -794, -794, -794, -794, - -794, -794, 565, 566, -794, -794, 567, 322, -794, 599, - -794, 711, -794, -794, -794, -794, -794, 323, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, 216, -794, - 712, 568, -794, 388, -794, -794, -794, -794, -794, -794, - -794, 713, 569, 714, 72, -794, -794, 572, -794, -794, - 715, -794, 575, -794, -794, 725, -794, -794, 166, -794, - -12, 725, -794, -794, 717, 729, 733, 329, -794, -794, - -794, -794, -794, -794, 734, 577, 576, 582, -12, -794, - 578, -794, -794, -794, -794, -794 + 155, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, 55, 21, 24, 52, 74, + 78, 121, 123, 130, 141, 156, 163, 187, 193, 195, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, 21, -83, + 42, 64, 47, 179, 37, 188, 83, 230, 159, -52, + 434, 45, 32, -811, 205, 225, 238, 221, 248, -811, + -811, -811, -811, -811, 249, -811, 76, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, 271, 274, -811, + -811, -811, -811, -811, -811, 284, 294, 298, 325, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, 333, -811, -811, -811, -811, 79, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, 337, -811, 107, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, 359, -811, + -811, -811, -811, -811, -811, -811, -811, -811, 126, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, 154, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + 253, 276, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, 332, -811, -811, 362, -811, -811, + -811, 364, -811, -811, 341, 368, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, 369, + 370, -811, -811, -811, -811, 377, 374, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, 158, + -811, -811, -811, 384, -811, -811, 387, -811, 391, 394, + -811, -811, 398, 399, 404, -811, -811, -811, -811, -811, + -811, -811, 161, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, 164, -811, -811, -811, -811, 170, -811, -811, -811, + 21, 21, -811, 243, 407, 409, 411, 412, 418, -811, + 42, -811, 32, 419, 420, 422, 258, 269, 435, 436, + 453, 454, 455, 460, 245, 299, 300, 302, 468, 469, + 470, 471, 472, 473, 474, 475, 476, 477, 478, 481, + 322, 483, 486, 487, 64, -811, 488, 489, 490, 327, + 47, -811, 493, 495, 496, 497, 498, 499, 338, 500, + 507, 508, 509, 179, -811, 510, 37, -811, 512, 513, + 514, 515, 518, 519, 520, 521, -811, 188, -811, 522, + 524, 365, 525, 527, 529, 366, -811, 230, 530, 371, + 372, -811, 159, 535, 538, -30, -811, 375, 539, 541, + 379, 547, 400, 410, 562, 571, 413, 414, 415, 572, + 574, 575, 576, 434, -811, 577, 45, -811, 581, 32, + -811, -811, -811, 582, 580, 583, 21, 21, 21, -811, + 209, 584, 585, 586, -811, -811, 423, 428, 429, 589, + 590, 593, -811, -811, -811, -811, 433, 596, 597, 598, + 599, 600, 439, 601, 603, 604, 605, 606, -811, 607, + 608, 609, -811, 612, 92, 190, -811, -811, 445, 446, + 452, 614, 456, 457, -811, 137, 612, 458, 613, -811, + 459, -811, 612, 461, 462, 463, 464, 465, 466, 467, + -811, 479, 480, -811, 482, 484, 485, -811, -811, 491, + -811, -811, -811, 492, 21, -811, -811, 494, 501, -811, + 502, -811, -811, 28, 503, -811, -811, -811, -34, 504, + 505, 506, -811, 616, -811, 621, -811, 21, 64, 45, + -811, -811, -811, -811, 32, 47, 565, -811, -811, -811, + 405, 405, 627, -811, 628, 630, 631, 632, -811, -811, + -811, 59, 633, 634, 635, 226, 29, 31, 434, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + 636, -811, -811, -811, -811, -811, -811, -811, -811, -811, + 84, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, 637, 627, -811, 237, 240, 241, + 257, -811, 264, -811, -811, -811, -811, -811, -811, 643, + 645, 648, 649, 650, -811, -811, 651, 652, 655, 657, + 658, -811, 265, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, 268, -811, 659, 660, -811, -811, 663, 661, -811, + -811, 667, 671, -811, -811, 669, 673, -811, -811, 672, + 674, -811, -811, -811, -811, -811, -811, 60, -811, -811, + -811, -811, -811, -811, -811, 135, -811, -811, 675, 676, + -811, -811, 677, 679, -811, 662, 680, 681, 682, 683, + 684, 283, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, 286, -811, -811, -811, 685, -811, + -811, -811, 289, -811, -811, 318, 526, -811, 687, 688, + -811, -811, -811, -811, 686, -811, 168, -811, 689, -811, + -811, -811, -811, 692, 565, -811, 693, 694, 695, 696, + 523, 511, 534, 533, 536, 700, 701, 540, 542, 543, + 544, 537, 405, -811, -811, 405, -811, 627, 179, -811, + 628, 230, -811, 630, 159, -811, 631, 408, -811, 632, + 59, -811, 70, 633, -811, 188, -811, 634, -52, -811, + 635, 545, 546, 548, 549, 550, 551, 226, -811, 704, + 710, 29, -811, 552, 31, -811, -811, -811, 714, 718, + 37, -811, 636, 719, -811, 275, 637, -811, -811, 556, + -811, 347, 558, 559, 560, -811, -811, -811, -811, -811, + 561, 563, -811, -811, -811, -811, -811, -811, 319, -811, + 320, -811, 720, -811, 722, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, 336, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, 727, + -811, -811, -811, -811, -811, -811, -811, -811, -811, 724, + 730, -811, -811, -811, -811, -811, 726, -811, 344, -811, + -811, -811, -811, -811, -811, -811, -811, 569, 570, -811, + -811, -811, -811, 573, 345, -811, 612, -811, 733, -811, + -811, -811, -811, -811, 353, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, 408, -811, 734, 578, -811, + 70, -811, -811, -811, -811, -811, -811, -811, 736, 579, + 737, 275, -811, -811, 587, -811, -811, 738, -811, 588, + -811, -811, 735, -811, -811, 174, -811, -90, 735, -811, + -811, 740, 741, 744, 356, -811, -811, -811, -811, -811, + -811, 745, 591, 592, 602, -90, -811, 617, -811, -811, + -811, -811, -811 }; const unsigned short int @@ -3966,149 +3998,151 @@ namespace isc { namespace dhcp { 20, 22, 24, 26, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 45, 38, 34, 33, 30, 31, 32, 37, 3, - 35, 36, 58, 5, 70, 7, 124, 9, 261, 11, - 414, 13, 439, 15, 339, 17, 347, 19, 384, 21, - 226, 23, 529, 25, 604, 27, 594, 29, 47, 41, - 0, 0, 0, 0, 0, 441, 0, 349, 386, 0, + 35, 36, 58, 5, 70, 7, 125, 9, 262, 11, + 415, 13, 440, 15, 340, 17, 348, 19, 385, 21, + 227, 23, 539, 25, 614, 27, 604, 29, 47, 41, + 0, 0, 0, 0, 0, 442, 0, 350, 387, 0, 0, 0, 0, 49, 0, 48, 0, 0, 42, 68, - 602, 584, 586, 588, 0, 67, 0, 60, 62, 64, - 65, 66, 63, 590, 592, 113, 139, 0, 0, 460, - 462, 464, 137, 146, 148, 0, 0, 0, 0, 109, - 253, 337, 376, 309, 427, 429, 204, 488, 431, 218, - 237, 0, 514, 527, 104, 0, 72, 74, 75, 76, - 77, 103, 93, 94, 80, 81, 100, 82, 83, 84, - 88, 89, 78, 79, 86, 87, 98, 99, 101, 95, - 96, 97, 85, 90, 91, 92, 102, 126, 128, 132, - 0, 123, 0, 115, 117, 118, 119, 120, 121, 122, - 290, 292, 294, 406, 288, 296, 0, 302, 300, 298, - 484, 287, 265, 266, 267, 278, 0, 263, 270, 282, - 283, 284, 271, 273, 274, 276, 272, 268, 269, 285, - 286, 275, 279, 280, 281, 277, 425, 424, 420, 421, - 419, 0, 416, 418, 422, 423, 482, 470, 472, 476, - 474, 480, 478, 466, 459, 453, 457, 458, 0, 442, - 443, 454, 455, 456, 450, 445, 451, 447, 448, 449, - 452, 446, 0, 366, 189, 0, 370, 368, 373, 0, - 362, 363, 0, 350, 351, 353, 365, 354, 355, 356, - 372, 357, 358, 359, 360, 361, 400, 0, 0, 398, - 399, 402, 403, 0, 387, 388, 390, 391, 392, 393, - 394, 395, 396, 397, 233, 235, 230, 0, 228, 231, - 232, 0, 553, 555, 0, 558, 0, 0, 562, 566, - 0, 0, 0, 571, 578, 580, 582, 551, 549, 550, - 0, 531, 533, 534, 535, 536, 537, 538, 539, 540, - 541, 542, 543, 544, 545, 546, 547, 548, 609, 0, - 606, 608, 600, 599, 0, 596, 598, 46, 0, 0, - 39, 0, 0, 0, 0, 0, 0, 57, 0, 59, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 612, 594, 596, 598, 0, 67, 0, 60, 62, 64, + 65, 66, 63, 600, 602, 114, 140, 0, 0, 461, + 463, 465, 138, 147, 149, 0, 0, 0, 0, 110, + 254, 338, 377, 310, 428, 430, 205, 489, 432, 219, + 238, 0, 515, 528, 537, 105, 0, 72, 74, 75, + 76, 77, 104, 94, 95, 80, 81, 101, 82, 83, + 84, 88, 89, 78, 79, 86, 87, 99, 100, 102, + 96, 97, 98, 85, 90, 91, 92, 93, 103, 127, + 129, 133, 0, 124, 0, 116, 118, 119, 120, 121, + 122, 123, 291, 293, 295, 407, 289, 297, 0, 303, + 301, 299, 485, 288, 266, 267, 268, 279, 0, 264, + 271, 283, 284, 285, 272, 274, 275, 277, 273, 269, + 270, 286, 287, 276, 280, 281, 282, 278, 426, 425, + 421, 422, 420, 0, 417, 419, 423, 424, 483, 471, + 473, 477, 475, 481, 479, 467, 460, 454, 458, 459, + 0, 443, 444, 455, 456, 457, 451, 446, 452, 448, + 449, 450, 453, 447, 0, 367, 190, 0, 371, 369, + 374, 0, 363, 364, 0, 351, 352, 354, 366, 355, + 356, 357, 373, 358, 359, 360, 361, 362, 401, 0, + 0, 399, 400, 403, 404, 0, 388, 389, 391, 392, + 393, 394, 395, 396, 397, 398, 234, 236, 231, 0, + 229, 232, 233, 0, 563, 565, 0, 568, 0, 0, + 572, 576, 0, 0, 0, 581, 588, 590, 592, 561, + 559, 560, 0, 541, 543, 544, 545, 546, 547, 548, + 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, + 619, 0, 616, 618, 610, 609, 0, 606, 608, 46, + 0, 0, 39, 0, 0, 0, 0, 0, 0, 57, + 0, 59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 71, 0, 0, 0, 0, 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 262, 0, 0, 415, 0, 0, 0, 0, 0, - 0, 0, 0, 440, 0, 340, 0, 0, 0, 0, - 0, 0, 0, 348, 0, 0, 0, 0, 385, 0, - 0, 0, 0, 227, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, + 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 263, 0, 0, 416, 0, 0, + 0, 0, 0, 0, 0, 0, 441, 0, 341, 0, + 0, 0, 0, 0, 0, 0, 349, 0, 0, 0, + 0, 386, 0, 0, 0, 0, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 530, 0, 0, 605, 0, 0, 595, 50, 43, - 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, - 0, 111, 112, 0, 0, 0, 0, 0, 0, 105, - 106, 107, 108, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 513, 0, 0, 73, 0, - 0, 0, 136, 116, 0, 0, 0, 0, 0, 0, - 308, 0, 0, 0, 0, 264, 0, 417, 0, 0, - 0, 0, 0, 0, 0, 0, 444, 0, 0, 364, - 0, 0, 0, 375, 352, 0, 404, 405, 389, 0, - 0, 229, 552, 0, 0, 557, 0, 560, 561, 0, - 0, 568, 569, 570, 0, 0, 0, 0, 532, 0, - 607, 0, 597, 0, 0, 0, 585, 587, 589, 591, - 0, 0, 0, 461, 463, 465, 0, 0, 150, 110, - 255, 341, 378, 311, 40, 428, 430, 0, 0, 433, - 220, 0, 0, 0, 51, 127, 130, 131, 129, 134, - 135, 133, 291, 293, 295, 408, 289, 297, 304, 305, - 306, 307, 303, 301, 299, 0, 426, 483, 471, 473, - 477, 475, 481, 479, 467, 367, 190, 371, 369, 374, - 401, 234, 236, 554, 556, 559, 564, 565, 563, 567, - 573, 574, 575, 576, 577, 572, 579, 581, 583, 0, - 150, 44, 0, 0, 0, 0, 144, 0, 141, 143, - 176, 182, 184, 186, 0, 0, 0, 0, 0, 198, - 200, 0, 0, 0, 0, 0, 175, 0, 156, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 171, - 172, 173, 168, 174, 169, 170, 0, 154, 0, 151, - 152, 259, 0, 256, 257, 345, 0, 342, 343, 382, - 0, 379, 380, 315, 0, 312, 313, 213, 214, 215, - 216, 217, 0, 206, 208, 209, 210, 211, 212, 492, - 0, 490, 437, 0, 434, 435, 224, 0, 221, 222, - 0, 0, 0, 0, 0, 0, 0, 239, 241, 242, - 243, 244, 245, 246, 523, 525, 522, 520, 521, 0, - 516, 518, 519, 0, 53, 412, 0, 409, 410, 468, - 486, 487, 0, 613, 0, 611, 0, 69, 603, 593, - 114, 0, 0, 140, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 540, 0, 0, 615, 0, 0, + 605, 50, 43, 0, 0, 0, 0, 0, 0, 61, + 0, 0, 0, 0, 112, 113, 0, 0, 0, 0, + 0, 0, 106, 107, 108, 109, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 514, 0, + 0, 0, 73, 0, 0, 0, 137, 117, 0, 0, + 0, 0, 0, 0, 309, 0, 0, 0, 0, 265, + 0, 418, 0, 0, 0, 0, 0, 0, 0, 0, + 445, 0, 0, 365, 0, 0, 0, 376, 353, 0, + 405, 406, 390, 0, 0, 230, 562, 0, 0, 567, + 0, 570, 571, 0, 0, 578, 579, 580, 0, 0, + 0, 0, 542, 0, 617, 0, 607, 0, 0, 0, + 595, 597, 599, 601, 0, 0, 0, 462, 464, 466, + 0, 0, 151, 111, 256, 342, 379, 312, 40, 429, + 431, 0, 0, 434, 221, 0, 0, 0, 0, 51, + 128, 131, 132, 130, 135, 136, 134, 292, 294, 296, + 409, 290, 298, 305, 306, 307, 308, 304, 302, 300, + 0, 427, 484, 472, 474, 478, 476, 482, 480, 468, + 368, 191, 372, 370, 375, 402, 235, 237, 564, 566, + 569, 574, 575, 573, 577, 583, 584, 585, 586, 587, + 582, 589, 591, 593, 0, 151, 44, 0, 0, 0, + 0, 145, 0, 142, 144, 177, 183, 185, 187, 0, + 0, 0, 0, 0, 199, 201, 0, 0, 0, 0, + 0, 176, 0, 157, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 172, 173, 174, 169, 175, 170, + 171, 0, 155, 0, 152, 153, 260, 0, 257, 258, + 346, 0, 343, 344, 383, 0, 380, 381, 316, 0, + 313, 314, 214, 215, 216, 217, 218, 0, 207, 209, + 210, 211, 212, 213, 493, 0, 491, 438, 0, 435, + 436, 225, 0, 222, 223, 0, 0, 0, 0, 0, + 0, 0, 240, 242, 243, 244, 245, 246, 247, 524, + 526, 523, 521, 522, 0, 517, 519, 520, 0, 535, + 533, 534, 0, 530, 532, 0, 53, 413, 0, 410, + 411, 469, 487, 488, 0, 623, 0, 621, 0, 69, + 613, 603, 115, 0, 0, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 138, 147, 0, 149, 0, 0, 254, 0, 349, - 338, 0, 386, 377, 0, 0, 310, 0, 0, 205, - 494, 0, 489, 441, 432, 0, 0, 219, 0, 0, - 0, 0, 0, 0, 0, 0, 238, 0, 0, 0, - 515, 528, 55, 0, 54, 0, 407, 0, 0, 485, - 0, 0, 610, 601, 0, 142, 0, 0, 0, 0, - 188, 191, 192, 193, 194, 0, 0, 202, 203, 195, - 196, 197, 157, 0, 153, 0, 258, 0, 344, 0, - 381, 336, 333, 322, 323, 325, 319, 320, 321, 331, - 332, 330, 0, 317, 324, 334, 335, 326, 327, 328, - 329, 314, 207, 510, 0, 508, 509, 501, 502, 506, - 507, 503, 504, 505, 0, 495, 496, 498, 499, 500, - 491, 0, 436, 0, 223, 247, 248, 249, 250, 251, - 252, 240, 0, 0, 517, 52, 0, 0, 411, 0, - 627, 0, 625, 623, 617, 621, 622, 0, 615, 619, - 620, 618, 612, 145, 178, 179, 180, 181, 177, 183, - 185, 187, 199, 201, 155, 260, 346, 383, 0, 316, - 0, 0, 493, 0, 438, 225, 524, 526, 56, 413, - 469, 0, 0, 0, 0, 614, 318, 0, 512, 497, - 0, 624, 0, 616, 511, 0, 626, 631, 0, 629, - 0, 0, 628, 639, 0, 0, 0, 0, 633, 635, - 636, 637, 638, 630, 0, 0, 0, 0, 0, 632, - 0, 641, 642, 643, 634, 640 + 0, 0, 0, 139, 148, 0, 150, 0, 0, 255, + 0, 350, 339, 0, 387, 378, 0, 0, 311, 0, + 0, 206, 495, 0, 490, 442, 433, 0, 0, 220, + 0, 0, 0, 0, 0, 0, 0, 0, 239, 0, + 0, 0, 516, 0, 0, 529, 538, 55, 0, 54, + 0, 408, 0, 0, 486, 0, 0, 620, 611, 0, + 143, 0, 0, 0, 0, 189, 192, 193, 194, 195, + 0, 0, 203, 204, 196, 197, 198, 158, 0, 154, + 0, 259, 0, 345, 0, 382, 337, 334, 323, 324, + 326, 320, 321, 322, 332, 333, 331, 0, 318, 325, + 335, 336, 327, 328, 329, 330, 315, 208, 511, 0, + 509, 510, 502, 503, 507, 508, 504, 505, 506, 0, + 496, 497, 499, 500, 501, 492, 0, 437, 0, 224, + 248, 249, 250, 251, 252, 253, 241, 0, 0, 518, + 536, 531, 52, 0, 0, 412, 0, 637, 0, 635, + 633, 627, 631, 632, 0, 625, 629, 630, 628, 622, + 146, 179, 180, 181, 182, 178, 184, 186, 188, 200, + 202, 156, 261, 347, 384, 0, 317, 0, 0, 494, + 0, 439, 226, 525, 527, 56, 414, 470, 0, 0, + 0, 0, 624, 319, 0, 513, 498, 0, 634, 0, + 626, 512, 0, 636, 641, 0, 639, 0, 0, 638, + 649, 0, 0, 0, 0, 643, 645, 646, 647, 648, + 640, 0, 0, 0, 0, 0, 642, 0, 651, 652, + 653, 644, 650 }; const short int Dhcp4Parser::yypgoto_[] = { - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -44, -794, 170, -794, - -794, -794, -794, -794, -794, -794, -794, -501, -794, -794, - -794, -70, -794, -794, -794, 361, -794, -794, -794, -794, - 171, 359, -48, -45, -43, -794, -794, -794, -794, -11, - -794, -794, 167, 362, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -41, -794, -794, -794, -794, -794, -794, 93, -794, -61, - -794, -581, -53, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -26, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -54, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -68, -794, -794, -794, -50, 341, -794, -794, -794, - -794, -794, -794, -794, -69, -794, -794, -794, -794, -794, - -794, -793, -794, -794, -794, -30, -794, -794, -794, -27, - 396, -794, -794, -794, -794, -794, -794, -794, -794, -784, - -794, -24, -794, -4, -794, -782, -794, -794, -794, -794, - -794, -794, -794, -33, -794, -794, -178, -65, -794, -794, - -794, -794, -794, -13, -794, -794, -794, -16, -794, 386, - -794, -66, -794, -794, -794, -794, -794, -60, -794, -794, - -794, -794, -794, -18, -794, -794, -794, 4, -794, -794, - -794, 7, -794, 397, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -25, -794, -794, -794, -42, - 427, -794, -794, -58, -794, -38, -794, -47, -794, -794, - -794, 3, -794, -794, -794, 2, -794, 423, -7, -794, - -6, -794, 0, -794, 219, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -781, -794, -794, -794, -794, -794, 8, -794, - -794, -794, -142, -794, -794, -794, -794, -794, -794, -794, - -794, -3, -794, -794, -794, -794, -794, -794, -794, -794, - 239, 383, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -794, -794, -794, -794, -794, -794, -794, -794, -794, -794, - -347, 392, -794, -794, -794, -794, -794, -794, 275, 385, - -794, -794, -794, -8, -794, -794, -149, -794, -794, -794, - -794, -794, -794, -162, -794, -794, -176, -794, -794, -794, - -794, -794 + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -47, -811, 250, -811, + -811, -811, -811, -811, -811, -811, -811, -503, -811, -811, + -811, -70, -811, -811, -811, 390, -811, -811, -811, -811, + 178, 363, -27, -19, -13, -811, -811, -811, -811, -3, + -811, -811, 180, 382, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -41, -811, -811, -811, -811, -811, -811, 101, -811, -53, + -811, -578, -51, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -45, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -55, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -62, -811, -811, -811, -50, 350, -811, -811, -811, + -811, -811, -811, -811, -49, -811, -811, -811, -811, -811, + -811, -810, -811, -811, -811, -17, -811, -811, -811, -8, + 427, -811, -811, -811, -811, -811, -811, -811, -811, -799, + -811, -56, -811, -10, -811, -796, -811, -811, -811, -811, + -811, -811, -811, -18, -811, -811, -167, -65, -811, -811, + -811, -811, -811, 2, -811, -811, -811, 10, -811, 416, + -811, -72, -811, -811, -811, -811, -811, -66, -811, -811, + -811, -811, -811, -26, -811, -811, -811, 9, -811, -811, + -811, 14, -811, 417, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -23, -811, -811, -811, -16, + 440, -811, -811, -58, -811, -38, -811, -48, -811, -811, + -811, 4, -811, -811, -811, 7, -811, 430, -6, -811, + 1, -811, 5, -811, 228, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -794, -811, -811, -811, -811, -811, 12, -811, + -811, -811, -139, -811, -811, -811, -811, -811, -811, -811, + -811, 3, -811, -811, -811, -811, -811, -811, -811, -2, + -811, -811, -811, -811, -811, 255, 402, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -811, -811, -811, -811, -811, + -811, -811, -811, -811, -811, -338, 397, -811, -811, -811, + -811, -811, -811, 288, 403, -811, -811, -811, -5, -811, + -811, -143, -811, -811, -811, -811, -811, -811, -158, -811, + -811, -173, -811, -811, -811, -811, -811 }; const short int @@ -4116,429 +4150,436 @@ namespace isc { namespace dhcp { { -1, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 38, 39, 40, 69, - 595, 87, 88, 41, 68, 84, 85, 605, 774, 853, - 854, 343, 43, 70, 96, 97, 98, 352, 45, 71, - 135, 136, 137, 138, 139, 140, 141, 376, 142, 143, - 144, 362, 172, 173, 47, 72, 174, 393, 175, 394, - 608, 176, 395, 611, 177, 145, 369, 146, 363, 667, - 668, 669, 791, 147, 370, 148, 371, 708, 709, 710, - 813, 687, 688, 689, 794, 968, 690, 795, 691, 796, - 692, 797, 693, 694, 427, 695, 696, 697, 698, 699, - 700, 701, 702, 803, 703, 804, 704, 705, 149, 383, - 732, 733, 734, 735, 736, 737, 738, 150, 386, 747, - 748, 749, 836, 61, 79, 297, 298, 299, 440, 300, - 441, 151, 387, 756, 757, 758, 759, 760, 761, 762, - 763, 152, 377, 712, 713, 714, 816, 49, 73, 196, - 197, 198, 403, 199, 399, 200, 400, 201, 401, 202, - 404, 203, 408, 204, 407, 205, 406, 622, 206, 153, - 380, 724, 725, 726, 825, 902, 903, 154, 378, 55, - 76, 716, 717, 718, 819, 57, 77, 262, 263, 264, - 265, 266, 267, 268, 426, 269, 430, 270, 429, 271, - 272, 431, 273, 155, 379, 720, 721, 722, 822, 59, - 78, 283, 284, 285, 286, 287, 435, 288, 289, 290, - 291, 208, 402, 776, 777, 778, 855, 51, 74, 221, - 222, 223, 412, 156, 381, 157, 382, 158, 385, 743, - 744, 745, 833, 53, 75, 238, 239, 240, 159, 366, - 160, 367, 161, 368, 244, 422, 781, 858, 245, 416, - 246, 417, 247, 419, 248, 418, 249, 421, 250, 420, - 251, 415, 215, 409, 782, 162, 384, 740, 741, 830, - 924, 925, 926, 927, 928, 980, 929, 163, 164, 389, - 769, 770, 771, 847, 772, 848, 165, 390, 63, 80, - 320, 321, 322, 323, 445, 324, 446, 325, 326, 448, - 327, 328, 329, 451, 648, 330, 452, 331, 332, 333, - 334, 456, 655, 335, 457, 336, 458, 337, 459, 99, - 354, 100, 355, 101, 356, 166, 360, 361, 67, 82, - 344, 345, 346, 465, 102, 353, 65, 81, 339, 340, - 341, 462, 784, 785, 860, 957, 958, 959, 960, 993, - 961, 991, 1008, 1009, 1010, 1017, 1018, 1019, 1024, 1020, - 1021, 1022 + 599, 87, 88, 41, 68, 84, 85, 610, 786, 868, + 869, 345, 43, 70, 96, 97, 98, 354, 45, 71, + 136, 137, 138, 139, 140, 141, 142, 378, 143, 144, + 145, 364, 174, 175, 47, 72, 176, 396, 177, 397, + 613, 178, 398, 616, 179, 146, 371, 147, 365, 672, + 673, 674, 803, 148, 372, 149, 373, 713, 714, 715, + 825, 692, 693, 694, 806, 985, 695, 807, 696, 808, + 697, 809, 698, 699, 430, 700, 701, 702, 703, 704, + 705, 706, 707, 815, 708, 816, 709, 710, 150, 385, + 737, 738, 739, 740, 741, 742, 743, 151, 388, 752, + 753, 754, 848, 61, 79, 299, 300, 301, 443, 302, + 444, 152, 389, 761, 762, 763, 764, 765, 766, 767, + 768, 153, 379, 717, 718, 719, 828, 49, 73, 198, + 199, 200, 406, 201, 402, 202, 403, 203, 404, 204, + 407, 205, 411, 206, 410, 207, 409, 627, 208, 154, + 382, 729, 730, 731, 837, 917, 918, 155, 380, 55, + 76, 721, 722, 723, 831, 57, 77, 264, 265, 266, + 267, 268, 269, 270, 429, 271, 433, 272, 432, 273, + 274, 434, 275, 156, 381, 725, 726, 727, 834, 59, + 78, 285, 286, 287, 288, 289, 438, 290, 291, 292, + 293, 210, 405, 788, 789, 790, 870, 51, 74, 223, + 224, 225, 415, 157, 383, 158, 384, 159, 387, 748, + 749, 750, 845, 53, 75, 240, 241, 242, 160, 368, + 161, 369, 162, 370, 246, 425, 793, 873, 247, 419, + 248, 420, 249, 422, 250, 421, 251, 424, 252, 423, + 253, 418, 217, 412, 794, 163, 386, 745, 746, 842, + 939, 940, 941, 942, 943, 997, 944, 164, 165, 391, + 774, 775, 776, 859, 777, 860, 166, 392, 782, 783, + 784, 167, 393, 63, 80, 322, 323, 324, 325, 448, + 326, 449, 327, 328, 451, 329, 330, 331, 454, 653, + 332, 455, 333, 334, 335, 336, 459, 660, 337, 460, + 338, 461, 339, 462, 99, 356, 100, 357, 101, 358, + 168, 362, 363, 67, 82, 346, 347, 348, 468, 102, + 355, 65, 81, 341, 342, 343, 465, 796, 797, 875, + 974, 975, 976, 977, 1010, 978, 1008, 1025, 1026, 1027, + 1034, 1035, 1036, 1041, 1037, 1038, 1039 }; const unsigned short int Dhcp4Parser::yytable_[] = { - 95, 134, 171, 191, 217, 234, 706, 260, 279, 296, - 317, 252, 281, 477, 178, 209, 224, 236, 282, 274, - 292, 623, 318, 89, 83, 192, 211, 627, 193, 31, - 194, 32, 897, 33, 179, 210, 225, 237, 30, 275, - 293, 898, 319, 901, 910, 646, 342, 294, 295, 42, - 218, 261, 280, 294, 295, 207, 220, 235, 828, 103, - 44, 829, 195, 104, 46, 105, 212, 213, 241, 242, - 219, 233, 779, 214, 106, 243, 107, 108, 109, 110, - 111, 112, 113, 114, 167, 168, 609, 610, 169, 358, - 391, 170, 124, 125, 359, 392, 606, 607, 254, 276, - 255, 256, 277, 278, 115, 116, 117, 118, 119, 120, - 124, 125, 48, 121, 122, 94, 397, 650, 651, 652, - 653, 398, 831, 861, 123, 832, 862, 124, 125, 1013, - 764, 765, 1014, 1015, 1016, 254, 50, 126, 127, 727, - 728, 729, 730, 128, 731, 124, 125, 124, 125, 410, - 52, 90, 654, 129, 411, 86, 130, 54, 647, 56, - 91, 92, 93, 131, 132, 413, 442, 133, 58, 1011, - 414, 443, 1012, 108, 109, 110, 111, 94, 460, 463, - 60, 94, 466, 461, 464, 897, 121, 467, 34, 35, - 36, 37, 348, 62, 898, 64, 901, 910, 94, 94, - 115, 116, 117, 66, 466, 338, 180, 181, 182, 579, - 122, 347, 950, 391, 951, 952, 94, 463, 787, 349, - 350, 183, 788, 124, 125, 184, 185, 186, 187, 351, - 423, 357, 883, 664, 94, 188, 94, 364, 189, 128, - 466, 108, 109, 110, 111, 789, 190, 122, 365, 109, - 110, 111, 750, 751, 752, 753, 754, 755, 397, 216, - 124, 125, 792, 790, 372, 373, 810, 793, 115, 116, - 117, 811, 188, 120, 374, 189, 810, 845, 122, 254, - 375, 812, 846, 388, 849, 122, 396, 405, 95, 850, - 460, 124, 125, 424, 185, 851, 187, 810, 124, 125, - 425, 428, 974, 188, 468, 469, 189, 432, 410, 226, - 433, 434, 94, 975, 190, 227, 228, 229, 230, 231, - 232, 134, 233, 978, 442, 413, 994, 171, 979, 985, - 989, 995, 1028, 618, 619, 620, 621, 1029, 436, 178, - 191, 437, 439, 217, 964, 965, 966, 967, 438, 94, - 444, 447, 209, 449, 234, 224, 450, 453, 454, 179, - 455, 470, 192, 211, 260, 193, 236, 194, 471, 279, - 472, 473, 210, 281, 474, 225, 274, 475, 478, 282, - 94, 292, 479, 480, 481, 482, 237, 94, 483, 218, - 317, 484, 207, 485, 486, 220, 275, 487, 488, 195, - 489, 293, 318, 212, 213, 490, 235, 491, 261, 219, - 214, 492, 493, 280, 109, 110, 111, 241, 242, 494, - 495, 496, 319, 253, 243, 497, 498, 670, 499, 576, - 577, 578, 671, 672, 673, 674, 675, 676, 677, 678, - 679, 680, 681, 682, 683, 684, 685, 500, 990, 121, - 122, 254, 501, 502, 254, 503, 255, 256, 254, 504, - 257, 258, 259, 124, 125, 505, 124, 125, 506, 507, - 509, 510, 511, 512, 514, 515, 913, 914, 1, 2, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 516, 517, 518, 519, 520, 521, 522, 523, - 524, 526, 528, 529, 134, 530, 642, 531, 532, 533, - 534, 171, 535, 537, 538, 539, 686, 686, 540, 541, - 542, 545, 543, 178, 546, 124, 125, 547, 549, 661, - 550, 553, 766, 317, 554, 552, 555, 556, 559, 560, - 557, 558, 564, 179, 767, 318, 565, 561, 562, 563, - 566, 567, 94, 569, 571, 94, 573, 649, 574, 94, - 575, 580, 581, 582, 768, 319, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 586, 587, 583, 584, 585, 588, 315, 316, 590, 589, - 591, 592, 593, 596, 597, 32, 598, 599, 600, 612, - 613, 601, 602, 603, 604, 614, 615, 625, 616, 617, - 624, 626, 659, 660, 94, 798, 628, 629, 630, 707, - 631, 632, 633, 634, 635, 636, 637, 638, 666, 711, - 715, 719, 723, 639, 739, 742, 640, 641, 643, 644, - 645, 656, 657, 658, 746, 775, 783, 799, 800, 801, - 802, 805, 806, 807, 808, 809, 815, 870, 814, 818, - 817, 820, 821, 823, 824, 827, 826, 835, 594, 834, - 838, 837, 839, 840, 841, 842, 843, 844, 857, 871, - 856, 946, 852, 863, 859, 864, 866, 867, 868, 869, - 872, 875, 876, 942, 874, 873, 877, 878, 943, 945, - 949, 879, 880, 976, 981, 935, 881, 977, 936, 937, - 938, 982, 983, 939, 984, 992, 997, 1000, 1002, 476, - 1005, 1025, 940, 963, 969, 970, 971, 972, 973, 986, - 987, 988, 1007, 1026, 1001, 998, 1004, 1027, 1030, 1006, - 686, 1032, 1035, 686, 1031, 662, 191, 1033, 665, 260, - 508, 865, 279, 786, 884, 891, 281, 882, 209, 513, - 915, 274, 282, 234, 292, 917, 296, 905, 192, 211, - 934, 193, 919, 194, 912, 236, 941, 892, 210, 766, - 893, 275, 894, 551, 293, 217, 933, 906, 886, 885, - 953, 767, 920, 261, 911, 237, 280, 224, 207, 896, - 996, 899, 955, 887, 916, 195, 525, 904, 888, 212, - 213, 768, 918, 947, 895, 235, 214, 225, 907, 908, - 544, 900, 956, 921, 922, 909, 241, 242, 890, 889, - 923, 218, 948, 243, 954, 931, 548, 220, 932, 930, - 527, 999, 773, 568, 780, 1003, 944, 536, 570, 1023, - 663, 219, 1034, 962, 0, 0, 0, 0, 572, 0, + 95, 135, 173, 193, 219, 236, 283, 262, 281, 298, + 319, 254, 284, 711, 180, 211, 226, 238, 220, 276, + 294, 83, 320, 628, 480, 213, 31, 912, 32, 632, + 33, 42, 263, 282, 181, 212, 227, 239, 913, 277, + 295, 916, 321, 925, 344, 651, 194, 209, 222, 237, + 296, 297, 89, 1030, 195, 30, 1031, 1032, 1033, 44, + 196, 169, 170, 840, 221, 171, 841, 214, 172, 243, + 197, 103, 296, 297, 215, 104, 244, 105, 216, 360, + 245, 46, 394, 86, 361, 48, 106, 395, 107, 108, + 109, 110, 111, 112, 113, 114, 109, 110, 111, 122, + 655, 656, 657, 658, 124, 125, 124, 125, 611, 612, + 400, 218, 124, 125, 94, 401, 115, 116, 117, 118, + 119, 120, 124, 125, 190, 121, 122, 191, 50, 413, + 52, 121, 122, 256, 414, 659, 123, 54, 843, 124, + 125, 844, 769, 770, 121, 124, 125, 778, 56, 126, + 127, 732, 733, 734, 735, 128, 736, 416, 928, 929, + 652, 445, 417, 58, 463, 129, 446, 466, 130, 464, + 60, 876, 467, 469, 877, 131, 132, 1028, 470, 133, + 1029, 134, 90, 235, 791, 912, 340, 34, 35, 36, + 37, 91, 92, 93, 62, 94, 913, 94, 94, 916, + 64, 925, 66, 94, 108, 109, 110, 111, 94, 614, + 615, 349, 469, 94, 109, 110, 111, 583, 623, 624, + 625, 626, 256, 278, 257, 258, 279, 280, 350, 352, + 94, 115, 116, 117, 124, 125, 94, 182, 183, 184, + 394, 122, 351, 466, 469, 799, 669, 898, 800, 801, + 122, 353, 185, 359, 124, 125, 186, 187, 188, 189, + 400, 426, 255, 124, 125, 802, 190, 804, 822, 191, + 128, 822, 805, 823, 228, 366, 824, 192, 367, 427, + 229, 230, 231, 232, 233, 234, 857, 235, 374, 861, + 95, 858, 864, 256, 862, 257, 258, 865, 375, 259, + 260, 261, 376, 471, 472, 124, 125, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 463, 822, 413, 135, 94, 866, 991, 992, 377, + 173, 755, 756, 757, 758, 759, 760, 390, 256, 995, + 428, 399, 180, 193, 996, 94, 219, 445, 416, 436, + 124, 125, 1002, 1006, 94, 211, 1011, 236, 226, 1045, + 220, 1012, 181, 408, 1046, 213, 431, 262, 435, 238, + 283, 437, 281, 439, 440, 212, 284, 442, 227, 276, + 981, 982, 983, 984, 294, 441, 194, 209, 447, 239, + 222, 450, 263, 319, 195, 452, 94, 282, 453, 277, + 196, 237, 456, 457, 295, 320, 221, 214, 458, 473, + 197, 474, 492, 475, 215, 476, 477, 967, 216, 968, + 969, 243, 478, 481, 482, 321, 483, 484, 244, 580, + 581, 582, 245, 108, 109, 110, 111, 675, 485, 486, + 487, 94, 676, 677, 678, 679, 680, 681, 682, 683, + 684, 685, 686, 687, 688, 689, 690, 488, 489, 490, + 115, 116, 117, 1007, 491, 120, 493, 494, 256, 495, + 122, 256, 496, 497, 498, 499, 500, 501, 502, 503, + 504, 505, 506, 124, 125, 507, 187, 509, 189, 508, + 510, 511, 513, 514, 515, 190, 516, 518, 191, 519, + 520, 521, 522, 523, 525, 524, 192, 647, 135, 124, + 125, 526, 527, 528, 530, 173, 532, 533, 534, 535, + 691, 691, 536, 537, 538, 539, 541, 180, 542, 544, + 666, 545, 543, 546, 549, 547, 771, 779, 319, 553, + 550, 551, 554, 557, 556, 558, 559, 181, 772, 780, + 320, 560, 303, 304, 305, 306, 307, 308, 309, 310, + 311, 312, 313, 314, 315, 316, 563, 561, 773, 781, + 321, 94, 317, 318, 94, 564, 568, 562, 569, 570, + 571, 573, 565, 566, 567, 575, 577, 578, 671, 587, + 579, 584, 585, 586, 588, 589, 590, 591, 592, 593, + 94, 594, 595, 596, 597, 600, 601, 32, 602, 603, + 604, 617, 618, 605, 606, 607, 608, 609, 619, 620, + 630, 664, 621, 622, 629, 631, 665, 633, 634, 635, + 636, 637, 638, 639, 712, 716, 654, 720, 724, 728, + 744, 747, 751, 787, 795, 640, 641, 810, 642, 811, + 643, 644, 812, 813, 814, 817, 818, 645, 646, 819, + 648, 820, 821, 827, 830, 826, 851, 649, 650, 829, + 661, 662, 663, 832, 833, 835, 836, 839, 838, 847, + 886, 846, 850, 849, 852, 853, 854, 855, 856, 863, + 885, 872, 867, 871, 874, 878, 879, 881, 882, 883, + 884, 887, 888, 889, 890, 891, 896, 892, 957, 893, + 894, 895, 950, 951, 958, 952, 953, 954, 955, 960, + 962, 963, 980, 966, 986, 987, 988, 989, 993, 990, + 994, 998, 999, 1000, 1001, 1003, 1004, 1009, 1014, 1005, + 1017, 1019, 1024, 1022, 1042, 1043, 1018, 1015, 1044, 1047, + 479, 598, 691, 1021, 1023, 691, 667, 512, 193, 1049, + 1048, 262, 283, 880, 281, 670, 798, 906, 284, 1050, + 211, 897, 930, 276, 899, 236, 294, 932, 298, 920, + 213, 914, 517, 1052, 934, 927, 263, 238, 949, 282, + 212, 771, 911, 277, 779, 555, 295, 931, 948, 921, + 219, 194, 209, 772, 935, 970, 780, 239, 956, 195, + 907, 919, 226, 901, 220, 196, 933, 972, 908, 237, + 900, 926, 214, 773, 909, 197, 781, 915, 1013, 215, + 971, 922, 227, 216, 910, 903, 936, 973, 923, 243, + 529, 902, 924, 937, 222, 905, 244, 938, 904, 965, + 245, 947, 946, 548, 964, 945, 531, 540, 792, 552, + 221, 1016, 961, 785, 959, 572, 576, 668, 1020, 574, + 1040, 979, 1051, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 891, 0, - 0, 0, 0, 915, 0, 0, 0, 0, 917, 0, - 905, 0, 0, 0, 953, 919, 0, 0, 0, 0, - 892, 0, 0, 893, 0, 894, 955, 0, 0, 0, - 906, 0, 0, 0, 0, 920, 0, 0, 0, 0, - 0, 0, 896, 0, 899, 0, 956, 916, 0, 0, - 904, 0, 0, 0, 0, 918, 0, 895, 954, 0, - 0, 907, 908, 0, 900, 0, 921, 922, 909, 0, - 0, 0, 0, 923 + 0, 0, 0, 0, 0, 906, 0, 0, 0, 0, + 930, 0, 0, 0, 0, 932, 0, 920, 0, 914, + 0, 970, 934, 0, 0, 0, 0, 0, 0, 0, + 911, 0, 0, 972, 0, 931, 0, 921, 0, 0, + 0, 0, 935, 0, 0, 0, 971, 0, 907, 919, + 0, 0, 0, 973, 933, 0, 908, 0, 0, 0, + 0, 0, 909, 0, 0, 915, 0, 0, 0, 922, + 0, 0, 910, 0, 936, 0, 923, 0, 0, 0, + 924, 937, 0, 0, 0, 938 }; const short int Dhcp4Parser::yycheck_[] = { - 70, 71, 72, 73, 74, 75, 587, 77, 78, 79, - 80, 76, 78, 360, 72, 73, 74, 75, 78, 77, - 78, 522, 80, 10, 68, 73, 73, 528, 73, 5, - 73, 7, 825, 9, 72, 73, 74, 75, 0, 77, - 78, 825, 80, 825, 825, 17, 12, 102, 103, 7, - 74, 77, 78, 102, 103, 73, 74, 75, 3, 7, - 7, 6, 73, 11, 7, 13, 73, 73, 75, 75, - 74, 99, 100, 73, 22, 75, 24, 25, 26, 27, - 28, 29, 30, 31, 14, 15, 19, 20, 18, 3, - 3, 21, 75, 76, 8, 8, 16, 17, 63, 64, - 65, 66, 67, 68, 52, 53, 54, 55, 56, 57, - 75, 76, 7, 61, 62, 164, 3, 132, 133, 134, - 135, 8, 3, 3, 72, 6, 6, 75, 76, 141, - 113, 114, 144, 145, 146, 63, 7, 85, 86, 92, - 93, 94, 95, 91, 97, 75, 76, 75, 76, 3, - 7, 138, 167, 101, 8, 164, 104, 7, 130, 7, - 147, 148, 149, 111, 112, 3, 3, 115, 7, 3, - 8, 8, 6, 25, 26, 27, 28, 164, 3, 3, - 7, 164, 3, 8, 8, 978, 61, 8, 164, 165, - 166, 167, 3, 7, 978, 7, 978, 978, 164, 164, - 52, 53, 54, 7, 3, 139, 58, 59, 60, 8, - 62, 6, 140, 3, 142, 143, 164, 3, 8, 4, - 8, 73, 8, 75, 76, 77, 78, 79, 80, 3, - 8, 4, 813, 580, 164, 87, 164, 4, 90, 91, - 3, 25, 26, 27, 28, 8, 98, 62, 4, 26, - 27, 28, 105, 106, 107, 108, 109, 110, 3, 74, - 75, 76, 3, 8, 4, 4, 3, 8, 52, 53, - 54, 8, 87, 57, 4, 90, 3, 3, 62, 63, - 4, 8, 8, 4, 3, 62, 4, 4, 358, 8, - 3, 75, 76, 3, 78, 8, 80, 3, 75, 76, - 8, 4, 8, 87, 348, 349, 90, 4, 3, 86, - 8, 3, 164, 8, 98, 92, 93, 94, 95, 96, - 97, 391, 99, 3, 3, 3, 3, 397, 8, 8, - 8, 8, 3, 81, 82, 83, 84, 8, 4, 397, - 410, 4, 3, 413, 33, 34, 35, 36, 8, 164, - 4, 4, 410, 4, 424, 413, 4, 4, 4, 397, - 4, 164, 410, 410, 434, 410, 424, 410, 4, 439, - 4, 4, 410, 439, 4, 413, 434, 4, 4, 439, - 164, 439, 4, 4, 167, 167, 424, 164, 4, 413, - 460, 4, 410, 4, 4, 413, 434, 4, 4, 410, - 165, 439, 460, 410, 410, 165, 424, 165, 434, 413, - 410, 165, 4, 439, 26, 27, 28, 424, 424, 4, - 4, 4, 460, 32, 424, 4, 4, 32, 4, 473, - 474, 475, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 4, 949, 61, - 62, 63, 4, 4, 63, 4, 65, 66, 63, 4, - 69, 70, 71, 75, 76, 165, 75, 76, 4, 4, - 4, 4, 4, 167, 4, 4, 88, 89, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 4, 4, 4, 4, 165, 4, 4, 4, - 4, 4, 4, 4, 574, 4, 550, 4, 4, 4, - 4, 581, 4, 4, 4, 165, 586, 587, 4, 4, - 4, 4, 167, 581, 167, 75, 76, 167, 4, 573, - 4, 4, 602, 603, 4, 167, 165, 4, 4, 4, - 165, 165, 4, 581, 602, 603, 4, 167, 167, 167, - 4, 4, 164, 4, 4, 164, 4, 131, 7, 164, - 7, 7, 7, 7, 602, 603, 116, 117, 118, 119, - 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 7, 7, 164, 164, 164, 5, 136, 137, 5, 164, - 5, 5, 5, 164, 5, 7, 5, 5, 5, 164, - 164, 7, 7, 7, 5, 164, 5, 7, 164, 164, - 164, 164, 5, 5, 164, 4, 164, 164, 164, 7, - 164, 164, 164, 164, 164, 164, 164, 164, 23, 7, - 7, 7, 7, 164, 7, 7, 164, 164, 164, 164, - 164, 164, 164, 164, 7, 7, 7, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 3, 165, 6, 3, - 6, 6, 3, 6, 3, 3, 6, 3, 498, 6, - 3, 6, 4, 4, 4, 4, 4, 4, 3, 167, - 6, 3, 164, 6, 8, 4, 4, 4, 4, 4, - 165, 4, 4, 4, 165, 167, 165, 165, 4, 6, - 4, 165, 165, 8, 4, 165, 167, 8, 165, 165, - 165, 8, 3, 165, 8, 4, 4, 4, 4, 358, - 5, 4, 165, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 7, 4, 165, 167, 164, 4, 4, 164, - 810, 165, 164, 813, 167, 574, 816, 165, 581, 819, - 391, 792, 822, 660, 815, 825, 822, 810, 816, 397, - 830, 819, 822, 833, 822, 830, 836, 825, 816, 816, - 838, 816, 830, 816, 828, 833, 845, 825, 816, 849, - 825, 819, 825, 442, 822, 855, 836, 825, 818, 816, - 860, 849, 830, 819, 827, 833, 822, 855, 816, 825, - 978, 825, 860, 819, 830, 816, 410, 825, 821, 816, - 816, 849, 830, 855, 825, 833, 816, 855, 825, 825, - 434, 825, 860, 830, 830, 825, 833, 833, 824, 822, - 830, 855, 857, 833, 860, 833, 439, 855, 835, 831, - 413, 983, 603, 460, 625, 994, 849, 424, 463, 1011, - 575, 855, 1028, 861, -1, -1, -1, -1, 466, -1, + 70, 71, 72, 73, 74, 75, 78, 77, 78, 79, + 80, 76, 78, 591, 72, 73, 74, 75, 74, 77, + 78, 68, 80, 526, 362, 73, 5, 837, 7, 532, + 9, 7, 77, 78, 72, 73, 74, 75, 837, 77, + 78, 837, 80, 837, 12, 17, 73, 73, 74, 75, + 102, 103, 10, 143, 73, 0, 146, 147, 148, 7, + 73, 14, 15, 3, 74, 18, 6, 73, 21, 75, + 73, 7, 102, 103, 73, 11, 75, 13, 73, 3, + 75, 7, 3, 166, 8, 7, 22, 8, 24, 25, + 26, 27, 28, 29, 30, 31, 26, 27, 28, 62, + 134, 135, 136, 137, 75, 76, 75, 76, 16, 17, + 3, 74, 75, 76, 166, 8, 52, 53, 54, 55, + 56, 57, 75, 76, 87, 61, 62, 90, 7, 3, + 7, 61, 62, 63, 8, 169, 72, 7, 3, 75, + 76, 6, 113, 114, 61, 75, 76, 116, 7, 85, + 86, 92, 93, 94, 95, 91, 97, 3, 88, 89, + 132, 3, 8, 7, 3, 101, 8, 3, 104, 8, + 7, 3, 8, 3, 6, 111, 112, 3, 8, 115, + 6, 117, 140, 99, 100, 995, 141, 166, 167, 168, + 169, 149, 150, 151, 7, 166, 995, 166, 166, 995, + 7, 995, 7, 166, 25, 26, 27, 28, 166, 19, + 20, 6, 3, 166, 26, 27, 28, 8, 81, 82, + 83, 84, 63, 64, 65, 66, 67, 68, 3, 8, + 166, 52, 53, 54, 75, 76, 166, 58, 59, 60, + 3, 62, 4, 3, 3, 8, 584, 825, 8, 8, + 62, 3, 73, 4, 75, 76, 77, 78, 79, 80, + 3, 8, 32, 75, 76, 8, 87, 3, 3, 90, + 91, 3, 8, 8, 86, 4, 8, 98, 4, 3, + 92, 93, 94, 95, 96, 97, 3, 99, 4, 3, + 360, 8, 3, 63, 8, 65, 66, 8, 4, 69, + 70, 71, 4, 350, 351, 75, 76, 152, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 3, 3, 3, 394, 166, 8, 8, 8, 4, + 400, 105, 106, 107, 108, 109, 110, 4, 63, 3, + 8, 4, 400, 413, 8, 166, 416, 3, 3, 8, + 75, 76, 8, 8, 166, 413, 3, 427, 416, 3, + 416, 8, 400, 4, 8, 413, 4, 437, 4, 427, + 442, 3, 442, 4, 4, 413, 442, 3, 416, 437, + 33, 34, 35, 36, 442, 8, 413, 413, 4, 427, + 416, 4, 437, 463, 413, 4, 166, 442, 4, 437, + 413, 427, 4, 4, 442, 463, 416, 413, 4, 166, + 413, 4, 167, 4, 413, 4, 4, 142, 413, 144, + 145, 427, 4, 4, 4, 463, 4, 169, 427, 476, + 477, 478, 427, 25, 26, 27, 28, 32, 169, 4, + 4, 166, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 4, 4, 4, + 52, 53, 54, 966, 4, 57, 167, 167, 63, 167, + 62, 63, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 75, 76, 4, 78, 4, 80, 167, + 4, 4, 4, 4, 4, 87, 169, 4, 90, 4, + 4, 4, 4, 4, 4, 167, 98, 554, 578, 75, + 76, 4, 4, 4, 4, 585, 4, 4, 4, 4, + 590, 591, 4, 4, 4, 4, 4, 585, 4, 4, + 577, 4, 167, 4, 4, 169, 606, 607, 608, 4, + 169, 169, 4, 4, 169, 4, 167, 585, 606, 607, + 608, 4, 118, 119, 120, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 4, 167, 606, 607, + 608, 166, 138, 139, 166, 4, 4, 167, 4, 4, + 4, 4, 169, 169, 169, 4, 4, 7, 23, 166, + 7, 7, 7, 7, 166, 166, 7, 7, 5, 166, + 166, 5, 5, 5, 5, 166, 5, 7, 5, 5, + 5, 166, 166, 7, 7, 7, 7, 5, 166, 5, + 7, 5, 166, 166, 166, 166, 5, 166, 166, 166, + 166, 166, 166, 166, 7, 7, 133, 7, 7, 7, + 7, 7, 7, 7, 7, 166, 166, 4, 166, 4, + 166, 166, 4, 4, 4, 4, 4, 166, 166, 4, + 166, 4, 4, 3, 3, 6, 4, 166, 166, 6, + 166, 166, 166, 6, 3, 6, 3, 3, 6, 3, + 169, 6, 3, 6, 4, 4, 4, 4, 4, 4, + 167, 3, 166, 6, 8, 6, 4, 4, 4, 4, + 4, 167, 169, 167, 4, 4, 169, 167, 4, 167, + 167, 167, 167, 167, 4, 167, 167, 167, 167, 167, + 6, 3, 166, 4, 166, 166, 166, 166, 8, 166, + 8, 4, 8, 3, 8, 166, 166, 4, 4, 166, + 4, 4, 7, 5, 4, 4, 167, 169, 4, 4, + 360, 501, 822, 166, 166, 825, 578, 394, 828, 167, + 169, 831, 834, 804, 834, 585, 665, 837, 834, 167, + 828, 822, 842, 831, 827, 845, 834, 842, 848, 837, + 828, 837, 400, 166, 842, 840, 831, 845, 850, 834, + 828, 861, 837, 831, 864, 445, 834, 842, 848, 837, + 870, 828, 828, 861, 842, 875, 864, 845, 857, 828, + 837, 837, 870, 830, 870, 828, 842, 875, 837, 845, + 828, 839, 828, 861, 837, 828, 864, 837, 995, 828, + 875, 837, 870, 828, 837, 833, 842, 875, 837, 845, + 413, 831, 837, 842, 870, 836, 845, 842, 834, 872, + 845, 847, 845, 437, 870, 843, 416, 427, 630, 442, + 870, 1000, 864, 608, 861, 463, 469, 579, 1011, 466, + 1028, 876, 1045, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 978, -1, - -1, -1, -1, 983, -1, -1, -1, -1, 983, -1, - 978, -1, -1, -1, 994, 983, -1, -1, -1, -1, - 978, -1, -1, 978, -1, 978, 994, -1, -1, -1, - 978, -1, -1, -1, -1, 983, -1, -1, -1, -1, - -1, -1, 978, -1, 978, -1, 994, 983, -1, -1, - 978, -1, -1, -1, -1, 983, -1, 978, 994, -1, - -1, 978, 978, -1, 978, -1, 983, 983, 978, -1, - -1, -1, -1, 983 + -1, -1, -1, -1, -1, 995, -1, -1, -1, -1, + 1000, -1, -1, -1, -1, 1000, -1, 995, -1, 995, + -1, 1011, 1000, -1, -1, -1, -1, -1, -1, -1, + 995, -1, -1, 1011, -1, 1000, -1, 995, -1, -1, + -1, -1, 1000, -1, -1, -1, 1011, -1, 995, 995, + -1, -1, -1, 1011, 1000, -1, 995, -1, -1, -1, + -1, -1, 995, -1, -1, 995, -1, -1, -1, 995, + -1, -1, 995, -1, 1000, -1, 995, -1, -1, -1, + 995, 1000, -1, -1, -1, 1000 }; const unsigned short int Dhcp4Parser::yystos_[] = { - 0, 150, 151, 152, 153, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 169, 170, 171, 172, 173, - 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, - 0, 5, 7, 9, 164, 165, 166, 167, 184, 185, - 186, 191, 7, 200, 7, 206, 7, 222, 7, 315, - 7, 395, 7, 411, 7, 347, 7, 353, 7, 377, - 7, 291, 7, 466, 7, 514, 7, 506, 192, 187, - 201, 207, 223, 316, 396, 412, 348, 354, 378, 292, - 467, 515, 507, 184, 193, 194, 164, 189, 190, 10, - 138, 147, 148, 149, 164, 199, 202, 203, 204, 497, - 499, 501, 512, 7, 11, 13, 22, 24, 25, 26, + 0, 152, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 171, 172, 173, 174, 175, + 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, + 0, 5, 7, 9, 166, 167, 168, 169, 186, 187, + 188, 193, 7, 202, 7, 208, 7, 224, 7, 317, + 7, 397, 7, 413, 7, 349, 7, 355, 7, 379, + 7, 293, 7, 473, 7, 521, 7, 513, 194, 189, + 203, 209, 225, 318, 398, 414, 350, 356, 380, 294, + 474, 522, 514, 186, 195, 196, 166, 191, 192, 10, + 140, 149, 150, 151, 166, 201, 204, 205, 206, 504, + 506, 508, 519, 7, 11, 13, 22, 24, 25, 26, 27, 28, 29, 30, 31, 52, 53, 54, 55, 56, 57, 61, 62, 72, 75, 76, 85, 86, 91, 101, - 104, 111, 112, 115, 199, 208, 209, 210, 211, 212, - 213, 214, 216, 217, 218, 233, 235, 241, 243, 276, - 285, 299, 309, 337, 345, 371, 401, 403, 405, 416, - 418, 420, 443, 455, 456, 464, 503, 14, 15, 18, - 21, 199, 220, 221, 224, 226, 229, 232, 401, 403, - 58, 59, 60, 73, 77, 78, 79, 80, 87, 90, - 98, 199, 210, 211, 212, 217, 317, 318, 319, 321, - 323, 325, 327, 329, 331, 333, 336, 371, 389, 401, - 403, 405, 416, 418, 420, 440, 74, 199, 329, 331, - 371, 397, 398, 399, 401, 403, 86, 92, 93, 94, - 95, 96, 97, 99, 199, 371, 401, 403, 413, 414, - 415, 416, 418, 420, 422, 426, 428, 430, 432, 434, - 436, 438, 345, 32, 63, 65, 66, 69, 70, 71, - 199, 261, 355, 356, 357, 358, 359, 360, 361, 363, - 365, 367, 368, 370, 401, 403, 64, 67, 68, 199, - 261, 359, 365, 379, 380, 381, 382, 383, 385, 386, - 387, 388, 401, 403, 102, 103, 199, 293, 294, 295, - 297, 116, 117, 118, 119, 120, 121, 122, 123, 124, - 125, 126, 127, 128, 129, 136, 137, 199, 401, 403, - 468, 469, 470, 471, 473, 475, 476, 478, 479, 480, - 483, 485, 486, 487, 488, 491, 493, 495, 139, 516, - 517, 518, 12, 199, 508, 509, 510, 6, 3, 4, - 8, 3, 205, 513, 498, 500, 502, 4, 3, 8, - 504, 505, 219, 236, 4, 4, 417, 419, 421, 234, - 242, 244, 4, 4, 4, 4, 215, 310, 346, 372, - 338, 402, 404, 277, 444, 406, 286, 300, 4, 457, - 465, 3, 8, 225, 227, 230, 4, 3, 8, 322, - 324, 326, 390, 320, 328, 4, 334, 332, 330, 441, - 3, 8, 400, 3, 8, 439, 427, 429, 433, 431, - 437, 435, 423, 8, 3, 8, 362, 262, 4, 366, - 364, 369, 4, 8, 3, 384, 4, 4, 8, 3, - 296, 298, 3, 8, 4, 472, 474, 4, 477, 4, - 4, 481, 484, 4, 4, 4, 489, 492, 494, 496, - 3, 8, 519, 3, 8, 511, 3, 8, 184, 184, - 164, 4, 4, 4, 4, 4, 203, 508, 4, 4, - 4, 167, 167, 4, 4, 4, 4, 4, 4, 165, - 165, 165, 165, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 165, 4, 4, 209, 4, - 4, 4, 167, 221, 4, 4, 4, 4, 4, 4, - 165, 4, 4, 4, 4, 318, 4, 398, 4, 4, - 4, 4, 4, 4, 4, 4, 415, 4, 4, 165, - 4, 4, 4, 167, 357, 4, 167, 167, 381, 4, - 4, 294, 167, 4, 4, 165, 4, 165, 165, 4, - 4, 167, 167, 167, 4, 4, 4, 4, 469, 4, - 517, 4, 509, 4, 7, 7, 184, 184, 184, 8, - 7, 7, 7, 164, 164, 164, 7, 7, 5, 164, - 5, 5, 5, 5, 186, 188, 164, 5, 5, 5, - 5, 7, 7, 7, 5, 195, 16, 17, 228, 19, - 20, 231, 164, 164, 164, 5, 164, 164, 81, 82, - 83, 84, 335, 195, 164, 7, 164, 195, 164, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 164, 184, 164, 164, 164, 17, 130, 482, 131, - 132, 133, 134, 135, 167, 490, 164, 164, 164, 5, - 5, 184, 208, 516, 508, 220, 23, 237, 238, 239, - 32, 37, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 199, 249, 250, 251, - 254, 256, 258, 260, 261, 263, 264, 265, 266, 267, - 268, 269, 270, 272, 274, 275, 249, 7, 245, 246, - 247, 7, 311, 312, 313, 7, 349, 350, 351, 7, - 373, 374, 375, 7, 339, 340, 341, 92, 93, 94, - 95, 97, 278, 279, 280, 281, 282, 283, 284, 7, - 445, 446, 7, 407, 408, 409, 7, 287, 288, 289, - 105, 106, 107, 108, 109, 110, 301, 302, 303, 304, - 305, 306, 307, 308, 113, 114, 199, 401, 403, 458, - 459, 460, 462, 468, 196, 7, 391, 392, 393, 100, - 422, 424, 442, 7, 520, 521, 245, 8, 8, 8, - 8, 240, 3, 8, 252, 255, 257, 259, 4, 4, - 4, 4, 4, 271, 273, 4, 4, 4, 4, 4, - 3, 8, 8, 248, 6, 3, 314, 6, 3, 352, - 6, 3, 376, 6, 3, 342, 6, 3, 3, 6, - 447, 3, 6, 410, 6, 3, 290, 6, 3, 4, - 4, 4, 4, 4, 4, 3, 8, 461, 463, 3, - 8, 8, 164, 197, 198, 394, 6, 3, 425, 8, - 522, 3, 6, 6, 4, 238, 4, 4, 4, 4, - 165, 167, 165, 167, 165, 4, 4, 165, 165, 165, - 165, 167, 250, 249, 247, 317, 313, 355, 351, 379, - 375, 199, 210, 211, 212, 217, 261, 309, 327, 329, - 331, 333, 343, 344, 371, 401, 403, 416, 418, 420, - 440, 341, 279, 88, 89, 199, 261, 345, 371, 401, - 403, 416, 418, 420, 448, 449, 450, 451, 452, 454, - 446, 413, 409, 293, 289, 165, 165, 165, 165, 165, - 165, 302, 4, 4, 459, 6, 3, 397, 393, 4, - 140, 142, 143, 199, 261, 401, 403, 523, 524, 525, - 526, 528, 521, 164, 33, 34, 35, 36, 253, 164, - 164, 164, 164, 164, 8, 8, 8, 8, 3, 8, - 453, 4, 8, 3, 8, 8, 164, 164, 164, 8, - 195, 529, 4, 527, 3, 8, 344, 4, 167, 450, - 4, 165, 4, 524, 164, 5, 164, 7, 530, 531, - 532, 3, 6, 141, 144, 145, 146, 533, 534, 535, - 537, 538, 539, 531, 536, 4, 4, 4, 3, 8, - 4, 167, 165, 165, 534, 164 + 104, 111, 112, 115, 117, 201, 210, 211, 212, 213, + 214, 215, 216, 218, 219, 220, 235, 237, 243, 245, + 278, 287, 301, 311, 339, 347, 373, 403, 405, 407, + 418, 420, 422, 445, 457, 458, 466, 471, 510, 14, + 15, 18, 21, 201, 222, 223, 226, 228, 231, 234, + 403, 405, 58, 59, 60, 73, 77, 78, 79, 80, + 87, 90, 98, 201, 212, 213, 214, 219, 319, 320, + 321, 323, 325, 327, 329, 331, 333, 335, 338, 373, + 391, 403, 405, 407, 418, 420, 422, 442, 74, 201, + 331, 333, 373, 399, 400, 401, 403, 405, 86, 92, + 93, 94, 95, 96, 97, 99, 201, 373, 403, 405, + 415, 416, 417, 418, 420, 422, 424, 428, 430, 432, + 434, 436, 438, 440, 347, 32, 63, 65, 66, 69, + 70, 71, 201, 263, 357, 358, 359, 360, 361, 362, + 363, 365, 367, 369, 370, 372, 403, 405, 64, 67, + 68, 201, 263, 361, 367, 381, 382, 383, 384, 385, + 387, 388, 389, 390, 403, 405, 102, 103, 201, 295, + 296, 297, 299, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 138, 139, 201, + 403, 405, 475, 476, 477, 478, 480, 482, 483, 485, + 486, 487, 490, 492, 493, 494, 495, 498, 500, 502, + 141, 523, 524, 525, 12, 201, 515, 516, 517, 6, + 3, 4, 8, 3, 207, 520, 505, 507, 509, 4, + 3, 8, 511, 512, 221, 238, 4, 4, 419, 421, + 423, 236, 244, 246, 4, 4, 4, 4, 217, 312, + 348, 374, 340, 404, 406, 279, 446, 408, 288, 302, + 4, 459, 467, 472, 3, 8, 227, 229, 232, 4, + 3, 8, 324, 326, 328, 392, 322, 330, 4, 336, + 334, 332, 443, 3, 8, 402, 3, 8, 441, 429, + 431, 435, 433, 439, 437, 425, 8, 3, 8, 364, + 264, 4, 368, 366, 371, 4, 8, 3, 386, 4, + 4, 8, 3, 298, 300, 3, 8, 4, 479, 481, + 4, 484, 4, 4, 488, 491, 4, 4, 4, 496, + 499, 501, 503, 3, 8, 526, 3, 8, 518, 3, + 8, 186, 186, 166, 4, 4, 4, 4, 4, 205, + 515, 4, 4, 4, 169, 169, 4, 4, 4, 4, + 4, 4, 167, 167, 167, 167, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 167, 4, + 4, 4, 211, 4, 4, 4, 169, 223, 4, 4, + 4, 4, 4, 4, 167, 4, 4, 4, 4, 320, + 4, 400, 4, 4, 4, 4, 4, 4, 4, 4, + 417, 4, 4, 167, 4, 4, 4, 169, 359, 4, + 169, 169, 383, 4, 4, 296, 169, 4, 4, 167, + 4, 167, 167, 4, 4, 169, 169, 169, 4, 4, + 4, 4, 476, 4, 524, 4, 516, 4, 7, 7, + 186, 186, 186, 8, 7, 7, 7, 166, 166, 166, + 7, 7, 5, 166, 5, 5, 5, 5, 188, 190, + 166, 5, 5, 5, 5, 7, 7, 7, 7, 5, + 197, 16, 17, 230, 19, 20, 233, 166, 166, 166, + 5, 166, 166, 81, 82, 83, 84, 337, 197, 166, + 7, 166, 197, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 186, 166, 166, + 166, 17, 132, 489, 133, 134, 135, 136, 137, 169, + 497, 166, 166, 166, 5, 5, 186, 210, 523, 515, + 222, 23, 239, 240, 241, 32, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 201, 251, 252, 253, 256, 258, 260, 262, 263, + 265, 266, 267, 268, 269, 270, 271, 272, 274, 276, + 277, 251, 7, 247, 248, 249, 7, 313, 314, 315, + 7, 351, 352, 353, 7, 375, 376, 377, 7, 341, + 342, 343, 92, 93, 94, 95, 97, 280, 281, 282, + 283, 284, 285, 286, 7, 447, 448, 7, 409, 410, + 411, 7, 289, 290, 291, 105, 106, 107, 108, 109, + 110, 303, 304, 305, 306, 307, 308, 309, 310, 113, + 114, 201, 403, 405, 460, 461, 462, 464, 116, 201, + 403, 405, 468, 469, 470, 475, 198, 7, 393, 394, + 395, 100, 424, 426, 444, 7, 527, 528, 247, 8, + 8, 8, 8, 242, 3, 8, 254, 257, 259, 261, + 4, 4, 4, 4, 4, 273, 275, 4, 4, 4, + 4, 4, 3, 8, 8, 250, 6, 3, 316, 6, + 3, 354, 6, 3, 378, 6, 3, 344, 6, 3, + 3, 6, 449, 3, 6, 412, 6, 3, 292, 6, + 3, 4, 4, 4, 4, 4, 4, 3, 8, 463, + 465, 3, 8, 4, 3, 8, 8, 166, 199, 200, + 396, 6, 3, 427, 8, 529, 3, 6, 6, 4, + 240, 4, 4, 4, 4, 167, 169, 167, 169, 167, + 4, 4, 167, 167, 167, 167, 169, 252, 251, 249, + 319, 315, 357, 353, 381, 377, 201, 212, 213, 214, + 219, 263, 311, 329, 331, 333, 335, 345, 346, 373, + 403, 405, 418, 420, 422, 442, 343, 281, 88, 89, + 201, 263, 347, 373, 403, 405, 418, 420, 422, 450, + 451, 452, 453, 454, 456, 448, 415, 411, 295, 291, + 167, 167, 167, 167, 167, 167, 304, 4, 4, 461, + 167, 469, 6, 3, 399, 395, 4, 142, 144, 145, + 201, 263, 403, 405, 530, 531, 532, 533, 535, 528, + 166, 33, 34, 35, 36, 255, 166, 166, 166, 166, + 166, 8, 8, 8, 8, 3, 8, 455, 4, 8, + 3, 8, 8, 166, 166, 166, 8, 197, 536, 4, + 534, 3, 8, 346, 4, 169, 452, 4, 167, 4, + 531, 166, 5, 166, 7, 537, 538, 539, 3, 6, + 143, 146, 147, 148, 540, 541, 542, 544, 545, 546, + 538, 543, 4, 4, 4, 3, 8, 4, 169, 167, + 167, 541, 166 }; const unsigned short int Dhcp4Parser::yyr1_[] = { - 0, 168, 170, 169, 171, 169, 172, 169, 173, 169, - 174, 169, 175, 169, 176, 169, 177, 169, 178, 169, - 179, 169, 180, 169, 181, 169, 182, 169, 183, 169, - 184, 184, 184, 184, 184, 184, 184, 185, 187, 186, - 188, 189, 189, 190, 190, 192, 191, 193, 193, 194, - 194, 196, 195, 197, 197, 198, 198, 199, 201, 200, - 202, 202, 203, 203, 203, 203, 203, 203, 205, 204, - 207, 206, 208, 208, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 209, 210, 211, 212, 213, 215, - 214, 216, 217, 219, 218, 220, 220, 221, 221, 221, - 221, 221, 221, 221, 223, 222, 225, 224, 227, 226, - 228, 228, 230, 229, 231, 231, 232, 234, 233, 236, - 235, 237, 237, 238, 240, 239, 242, 241, 244, 243, - 245, 245, 246, 246, 248, 247, 249, 249, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 252, 251, 253, 253, - 253, 253, 255, 254, 257, 256, 259, 258, 260, 262, - 261, 263, 264, 265, 266, 267, 268, 269, 271, 270, - 273, 272, 274, 275, 277, 276, 278, 278, 279, 279, - 279, 279, 279, 280, 281, 282, 283, 284, 286, 285, - 287, 287, 288, 288, 290, 289, 292, 291, 293, 293, - 293, 294, 294, 296, 295, 298, 297, 300, 299, 301, - 301, 302, 302, 302, 302, 302, 302, 303, 304, 305, - 306, 307, 308, 310, 309, 311, 311, 312, 312, 314, - 313, 316, 315, 317, 317, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 318, 318, 318, 318, 318, 318, 318, 320, 319, - 322, 321, 324, 323, 326, 325, 328, 327, 330, 329, - 332, 331, 334, 333, 335, 335, 335, 335, 336, 338, - 337, 339, 339, 340, 340, 342, 341, 343, 343, 344, - 344, 344, 344, 344, 344, 344, 344, 344, 344, 344, - 344, 344, 344, 344, 344, 344, 344, 346, 345, 348, - 347, 349, 349, 350, 350, 352, 351, 354, 353, 355, - 355, 356, 356, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 358, 359, 360, 362, 361, 364, 363, - 366, 365, 367, 369, 368, 370, 372, 371, 373, 373, - 374, 374, 376, 375, 378, 377, 379, 379, 380, 380, - 381, 381, 381, 381, 381, 381, 381, 381, 381, 382, - 384, 383, 385, 386, 387, 388, 390, 389, 391, 391, - 392, 392, 394, 393, 396, 395, 397, 397, 398, 398, - 398, 398, 398, 398, 398, 400, 399, 402, 401, 404, - 403, 406, 405, 407, 407, 408, 408, 410, 409, 412, - 411, 413, 413, 414, 414, 415, 415, 415, 415, 415, - 415, 415, 415, 415, 415, 415, 415, 415, 415, 415, - 417, 416, 419, 418, 421, 420, 423, 422, 425, 424, - 427, 426, 429, 428, 431, 430, 433, 432, 435, 434, - 437, 436, 439, 438, 441, 440, 442, 442, 444, 443, - 445, 445, 447, 446, 448, 448, 449, 449, 450, 450, - 450, 450, 450, 450, 450, 450, 450, 450, 450, 451, - 453, 452, 454, 455, 457, 456, 458, 458, 459, 459, - 459, 459, 459, 461, 460, 463, 462, 465, 464, 467, - 466, 468, 468, 469, 469, 469, 469, 469, 469, 469, - 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, - 469, 469, 470, 472, 471, 474, 473, 475, 477, 476, - 478, 479, 481, 480, 482, 482, 484, 483, 485, 486, - 487, 489, 488, 490, 490, 490, 490, 490, 492, 491, - 494, 493, 496, 495, 498, 497, 500, 499, 502, 501, - 504, 503, 505, 503, 507, 506, 508, 508, 509, 509, - 511, 510, 513, 512, 515, 514, 516, 516, 517, 519, - 518, 520, 520, 522, 521, 523, 523, 524, 524, 524, - 524, 524, 524, 524, 525, 527, 526, 529, 528, 530, - 530, 532, 531, 533, 533, 534, 534, 534, 534, 536, - 535, 537, 538, 539 + 0, 170, 172, 171, 173, 171, 174, 171, 175, 171, + 176, 171, 177, 171, 178, 171, 179, 171, 180, 171, + 181, 171, 182, 171, 183, 171, 184, 171, 185, 171, + 186, 186, 186, 186, 186, 186, 186, 187, 189, 188, + 190, 191, 191, 192, 192, 194, 193, 195, 195, 196, + 196, 198, 197, 199, 199, 200, 200, 201, 203, 202, + 204, 204, 205, 205, 205, 205, 205, 205, 207, 206, + 209, 208, 210, 210, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 211, 211, 211, 211, + 211, 211, 211, 211, 211, 211, 212, 213, 214, 215, + 217, 216, 218, 219, 221, 220, 222, 222, 223, 223, + 223, 223, 223, 223, 223, 225, 224, 227, 226, 229, + 228, 230, 230, 232, 231, 233, 233, 234, 236, 235, + 238, 237, 239, 239, 240, 242, 241, 244, 243, 246, + 245, 247, 247, 248, 248, 250, 249, 251, 251, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, + 252, 252, 252, 252, 252, 252, 252, 254, 253, 255, + 255, 255, 255, 257, 256, 259, 258, 261, 260, 262, + 264, 263, 265, 266, 267, 268, 269, 270, 271, 273, + 272, 275, 274, 276, 277, 279, 278, 280, 280, 281, + 281, 281, 281, 281, 282, 283, 284, 285, 286, 288, + 287, 289, 289, 290, 290, 292, 291, 294, 293, 295, + 295, 295, 296, 296, 298, 297, 300, 299, 302, 301, + 303, 303, 304, 304, 304, 304, 304, 304, 305, 306, + 307, 308, 309, 310, 312, 311, 313, 313, 314, 314, + 316, 315, 318, 317, 319, 319, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, + 320, 320, 320, 320, 320, 320, 320, 320, 320, 322, + 321, 324, 323, 326, 325, 328, 327, 330, 329, 332, + 331, 334, 333, 336, 335, 337, 337, 337, 337, 338, + 340, 339, 341, 341, 342, 342, 344, 343, 345, 345, + 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + 346, 346, 346, 346, 346, 346, 346, 346, 348, 347, + 350, 349, 351, 351, 352, 352, 354, 353, 356, 355, + 357, 357, 358, 358, 359, 359, 359, 359, 359, 359, + 359, 359, 359, 359, 360, 361, 362, 364, 363, 366, + 365, 368, 367, 369, 371, 370, 372, 374, 373, 375, + 375, 376, 376, 378, 377, 380, 379, 381, 381, 382, + 382, 383, 383, 383, 383, 383, 383, 383, 383, 383, + 384, 386, 385, 387, 388, 389, 390, 392, 391, 393, + 393, 394, 394, 396, 395, 398, 397, 399, 399, 400, + 400, 400, 400, 400, 400, 400, 402, 401, 404, 403, + 406, 405, 408, 407, 409, 409, 410, 410, 412, 411, + 414, 413, 415, 415, 416, 416, 417, 417, 417, 417, + 417, 417, 417, 417, 417, 417, 417, 417, 417, 417, + 417, 419, 418, 421, 420, 423, 422, 425, 424, 427, + 426, 429, 428, 431, 430, 433, 432, 435, 434, 437, + 436, 439, 438, 441, 440, 443, 442, 444, 444, 446, + 445, 447, 447, 449, 448, 450, 450, 451, 451, 452, + 452, 452, 452, 452, 452, 452, 452, 452, 452, 452, + 453, 455, 454, 456, 457, 459, 458, 460, 460, 461, + 461, 461, 461, 461, 463, 462, 465, 464, 467, 466, + 468, 468, 469, 469, 469, 469, 470, 472, 471, 474, + 473, 475, 475, 476, 476, 476, 476, 476, 476, 476, + 476, 476, 476, 476, 476, 476, 476, 476, 476, 476, + 476, 476, 477, 479, 478, 481, 480, 482, 484, 483, + 485, 486, 488, 487, 489, 489, 491, 490, 492, 493, + 494, 496, 495, 497, 497, 497, 497, 497, 499, 498, + 501, 500, 503, 502, 505, 504, 507, 506, 509, 508, + 511, 510, 512, 510, 514, 513, 515, 515, 516, 516, + 518, 517, 520, 519, 522, 521, 523, 523, 524, 526, + 525, 527, 527, 529, 528, 530, 530, 531, 531, 531, + 531, 531, 531, 531, 532, 534, 533, 536, 535, 537, + 537, 539, 538, 540, 540, 541, 541, 541, 541, 543, + 542, 544, 545, 546 }; const unsigned char @@ -4554,49 +4595,50 @@ namespace isc { namespace dhcp { 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 3, 3, 3, 0, - 4, 3, 3, 0, 6, 1, 3, 1, 1, 1, - 1, 1, 1, 1, 0, 4, 0, 4, 0, 4, - 1, 1, 0, 4, 1, 1, 3, 0, 6, 0, - 6, 1, 3, 1, 0, 4, 0, 6, 0, 6, - 0, 1, 1, 3, 0, 4, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 4, 1, 1, - 1, 1, 0, 4, 0, 4, 0, 4, 3, 0, - 4, 3, 3, 3, 3, 3, 3, 3, 0, 4, + 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 0, 4, 3, 3, 0, 6, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 6, - 0, 1, 1, 3, 0, 4, 0, 4, 1, 3, - 1, 1, 1, 0, 4, 0, 4, 0, 6, 1, - 3, 1, 1, 1, 1, 1, 1, 3, 3, 3, - 3, 3, 3, 0, 6, 0, 1, 1, 3, 0, - 4, 0, 4, 1, 3, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 1, 1, 1, 1, 3, 0, + 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, + 4, 1, 1, 0, 4, 1, 1, 3, 0, 6, + 0, 6, 1, 3, 1, 0, 4, 0, 6, 0, 6, 0, 1, 1, 3, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 6, 0, - 4, 0, 1, 1, 3, 0, 4, 0, 4, 0, - 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 0, 4, 0, 4, - 0, 4, 1, 0, 4, 3, 0, 6, 0, 1, - 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, + 1, 1, 1, 1, 1, 1, 1, 0, 4, 1, + 1, 1, 1, 0, 4, 0, 4, 0, 4, 3, + 0, 4, 3, 3, 3, 3, 3, 3, 3, 0, + 4, 0, 4, 3, 3, 0, 6, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 6, 0, 1, 1, 3, 0, 4, 0, 4, 1, + 3, 1, 1, 1, 0, 4, 0, 4, 0, 6, + 1, 3, 1, 1, 1, 1, 1, 1, 3, 3, + 3, 3, 3, 3, 0, 6, 0, 1, 1, 3, + 0, 4, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 1, 1, 3, 3, 0, 6, 0, 1, - 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, - 4, 0, 6, 0, 1, 1, 3, 0, 4, 0, - 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 1, 1, 1, 1, 3, + 0, 6, 0, 1, 1, 3, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 6, 1, 1, 0, 6, - 1, 3, 0, 4, 0, 1, 1, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 6, + 0, 4, 0, 1, 1, 3, 0, 4, 0, 4, + 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 3, 1, 0, 4, 0, + 4, 0, 4, 1, 0, 4, 3, 0, 6, 0, + 1, 1, 3, 0, 4, 0, 4, 0, 1, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 1, 1, 3, 3, 0, 6, 0, + 1, 1, 3, 0, 4, 0, 4, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 0, 4, 0, 4, + 0, 4, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 3, 3, 0, 6, 1, 3, 1, 1, - 1, 1, 1, 0, 4, 0, 4, 0, 6, 0, + 1, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 0, 6, 1, 1, 0, + 6, 1, 3, 0, 4, 0, 1, 1, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 3, 3, 0, 6, 1, 3, 1, + 1, 1, 1, 1, 0, 4, 0, 4, 0, 6, + 1, 3, 1, 1, 1, 1, 3, 0, 6, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 0, 4, 0, 4, 3, 0, 4, @@ -4651,13 +4693,14 @@ namespace isc { namespace dhcp { "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"", "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", "\"dhcp4o6-port\"", "\"control-socket\"", "\"socket-type\"", - "\"socket-name\"", "\"dhcp-ddns\"", "\"enable-updates\"", - "\"qualifying-suffix\"", "\"server-ip\"", "\"server-port\"", - "\"sender-ip\"", "\"sender-port\"", "\"max-queue-size\"", - "\"ncr-protocol\"", "\"ncr-format\"", "\"always-include-fqdn\"", - "\"override-no-update\"", "\"override-client-update\"", - "\"replace-client-name\"", "\"generated-prefix\"", "\"tcp\"", "\"JSON\"", - "\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"", + "\"socket-name\"", "\"queue-control\"", "\"capacity\"", "\"dhcp-ddns\"", + "\"enable-updates\"", "\"qualifying-suffix\"", "\"server-ip\"", + "\"server-port\"", "\"sender-ip\"", "\"sender-port\"", + "\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"", + "\"always-include-fqdn\"", "\"override-no-update\"", + "\"override-client-update\"", "\"replace-client-name\"", + "\"generated-prefix\"", "\"tcp\"", "\"JSON\"", "\"when-present\"", + "\"never\"", "\"always\"", "\"when-not-present\"", "\"hostname-char-set\"", "\"hostname-char-replacement\"", "\"Logging\"", "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"Dhcp6\"", @@ -4735,24 +4778,25 @@ namespace isc { namespace dhcp { "client_class_param", "client_class_name", "client_class_test", "$@96", "only_if_required", "dhcp4o6_port", "control_socket", "$@97", "control_socket_params", "control_socket_param", "control_socket_type", - "$@98", "control_socket_name", "$@99", "dhcp_ddns", "$@100", - "sub_dhcp_ddns", "$@101", "dhcp_ddns_params", "dhcp_ddns_param", - "enable_updates", "qualifying_suffix", "$@102", "server_ip", "$@103", - "server_port", "sender_ip", "$@104", "sender_port", "max_queue_size", - "ncr_protocol", "$@105", "ncr_protocol_value", "ncr_format", "$@106", + "$@98", "control_socket_name", "$@99", "queue_control", "$@100", + "queue_control_params", "queue_control_param", "capacity", "dhcp_ddns", + "$@101", "sub_dhcp_ddns", "$@102", "dhcp_ddns_params", "dhcp_ddns_param", + "enable_updates", "qualifying_suffix", "$@103", "server_ip", "$@104", + "server_port", "sender_ip", "$@105", "sender_port", "max_queue_size", + "ncr_protocol", "$@106", "ncr_protocol_value", "ncr_format", "$@107", "always_include_fqdn", "override_no_update", "override_client_update", - "replace_client_name", "$@107", "replace_client_name_value", - "generated_prefix", "$@108", "hostname_char_set", "$@109", - "hostname_char_replacement", "$@110", "dhcp6_json_object", "$@111", - "dhcpddns_json_object", "$@112", "control_agent_json_object", "$@113", - "config_control", "$@114", "$@115", "sub_config_control", "$@116", + "replace_client_name", "$@108", "replace_client_name_value", + "generated_prefix", "$@109", "hostname_char_set", "$@110", + "hostname_char_replacement", "$@111", "dhcp6_json_object", "$@112", + "dhcpddns_json_object", "$@113", "control_agent_json_object", "$@114", + "config_control", "$@115", "$@116", "sub_config_control", "$@117", "config_control_params", "config_control_param", "config_databases", - "$@117", "logging_object", "$@118", "sub_logging", "$@119", - "logging_params", "logging_param", "loggers", "$@120", "loggers_entries", - "logger_entry", "$@121", "logger_params", "logger_param", "debuglevel", - "severity", "$@122", "output_options_list", "$@123", - "output_options_list_content", "output_entry", "$@124", - "output_params_list", "output_params", "output", "$@125", "flush", + "$@118", "logging_object", "$@119", "sub_logging", "$@120", + "logging_params", "logging_param", "loggers", "$@121", "loggers_entries", + "logger_entry", "$@122", "logger_params", "logger_param", "debuglevel", + "severity", "$@123", "output_options_list", "$@124", + "output_options_list_content", "output_entry", "$@125", + "output_params_list", "output_params", "output", "$@126", "flush", "maxsize", "maxver", YY_NULLPTR }; @@ -4760,71 +4804,72 @@ namespace isc { namespace dhcp { const unsigned short int Dhcp4Parser::yyrline_[] = { - 0, 252, 252, 252, 253, 253, 254, 254, 255, 255, - 256, 256, 257, 257, 258, 258, 259, 259, 260, 260, - 261, 261, 262, 262, 263, 263, 264, 264, 265, 265, - 273, 274, 275, 276, 277, 278, 279, 282, 287, 287, - 298, 301, 302, 305, 309, 316, 316, 323, 324, 327, - 331, 338, 338, 345, 346, 349, 353, 364, 374, 374, - 390, 391, 395, 396, 397, 398, 399, 400, 403, 403, - 418, 418, 427, 428, 433, 434, 435, 436, 437, 438, - 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, - 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, - 459, 460, 461, 462, 463, 466, 471, 476, 481, 486, - 486, 494, 499, 505, 505, 516, 517, 520, 521, 522, - 523, 524, 525, 526, 529, 529, 538, 538, 548, 548, - 555, 556, 559, 559, 566, 568, 572, 578, 578, 590, - 590, 600, 601, 603, 605, 605, 623, 623, 635, 635, - 645, 646, 649, 650, 653, 653, 663, 664, 667, 668, - 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, - 679, 680, 681, 682, 683, 684, 687, 687, 694, 695, - 696, 697, 700, 700, 708, 708, 716, 716, 724, 729, - 729, 737, 742, 747, 752, 757, 762, 767, 772, 772, - 780, 780, 788, 793, 798, 798, 808, 809, 812, 813, - 814, 815, 816, 819, 824, 829, 834, 839, 844, 844, - 854, 855, 858, 859, 862, 862, 872, 872, 882, 883, - 884, 887, 888, 891, 891, 899, 899, 907, 907, 918, - 919, 922, 923, 924, 925, 926, 927, 930, 935, 940, - 945, 950, 955, 963, 963, 976, 977, 980, 981, 988, - 988, 1014, 1014, 1025, 1026, 1030, 1031, 1032, 1033, 1034, - 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, - 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1055, 1055, - 1063, 1063, 1071, 1071, 1079, 1079, 1087, 1087, 1095, 1095, - 1103, 1103, 1113, 1113, 1120, 1121, 1122, 1123, 1126, 1133, - 1133, 1144, 1145, 1149, 1150, 1153, 1153, 1161, 1162, 1165, - 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, - 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1189, 1189, 1202, - 1202, 1211, 1212, 1215, 1216, 1221, 1221, 1236, 1236, 1250, - 1251, 1254, 1255, 1258, 1259, 1260, 1261, 1262, 1263, 1264, - 1265, 1266, 1267, 1270, 1272, 1277, 1279, 1279, 1287, 1287, - 1295, 1295, 1303, 1305, 1305, 1313, 1322, 1322, 1334, 1335, - 1340, 1341, 1346, 1346, 1358, 1358, 1370, 1371, 1376, 1377, - 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1393, - 1395, 1395, 1403, 1405, 1407, 1412, 1420, 1420, 1432, 1433, - 1436, 1437, 1440, 1440, 1450, 1450, 1460, 1461, 1464, 1465, - 1466, 1467, 1468, 1469, 1470, 1473, 1473, 1481, 1481, 1506, - 1506, 1536, 1536, 1546, 1547, 1550, 1551, 1554, 1554, 1563, - 1563, 1572, 1573, 1576, 1577, 1581, 1582, 1583, 1584, 1585, - 1586, 1587, 1588, 1589, 1590, 1591, 1592, 1593, 1594, 1595, - 1598, 1598, 1606, 1606, 1614, 1614, 1622, 1622, 1630, 1630, - 1640, 1640, 1648, 1648, 1656, 1656, 1664, 1664, 1672, 1672, - 1680, 1680, 1688, 1688, 1701, 1701, 1711, 1712, 1718, 1718, - 1728, 1729, 1732, 1732, 1742, 1743, 1746, 1747, 1750, 1751, - 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759, 1760, 1763, - 1765, 1765, 1773, 1782, 1789, 1789, 1799, 1800, 1803, 1804, - 1805, 1806, 1807, 1810, 1810, 1818, 1818, 1828, 1828, 1840, - 1840, 1850, 1851, 1854, 1855, 1856, 1857, 1858, 1859, 1860, - 1861, 1862, 1863, 1864, 1865, 1866, 1867, 1868, 1869, 1870, - 1871, 1872, 1875, 1880, 1880, 1888, 1888, 1896, 1901, 1901, - 1909, 1914, 1919, 1919, 1927, 1928, 1931, 1931, 1939, 1944, - 1949, 1954, 1954, 1962, 1965, 1968, 1971, 1974, 1980, 1980, - 1988, 1988, 1996, 1996, 2007, 2007, 2014, 2014, 2021, 2021, - 2028, 2028, 2037, 2037, 2048, 2048, 2058, 2059, 2063, 2064, - 2067, 2067, 2082, 2082, 2092, 2092, 2103, 2104, 2108, 2112, - 2112, 2124, 2125, 2129, 2129, 2137, 2138, 2141, 2142, 2143, - 2144, 2145, 2146, 2147, 2150, 2155, 2155, 2163, 2163, 2173, - 2174, 2177, 2177, 2185, 2186, 2189, 2190, 2191, 2192, 2195, - 2195, 2203, 2208, 2213 + 0, 255, 255, 255, 256, 256, 257, 257, 258, 258, + 259, 259, 260, 260, 261, 261, 262, 262, 263, 263, + 264, 264, 265, 265, 266, 266, 267, 267, 268, 268, + 276, 277, 278, 279, 280, 281, 282, 285, 290, 290, + 301, 304, 305, 308, 312, 319, 319, 326, 327, 330, + 334, 341, 341, 348, 349, 352, 356, 367, 377, 377, + 393, 394, 398, 399, 400, 401, 402, 403, 406, 406, + 421, 421, 430, 431, 436, 437, 438, 439, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, + 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, + 462, 463, 464, 465, 466, 467, 470, 475, 480, 485, + 490, 490, 498, 503, 509, 509, 520, 521, 524, 525, + 526, 527, 528, 529, 530, 533, 533, 542, 542, 552, + 552, 559, 560, 563, 563, 570, 572, 576, 582, 582, + 594, 594, 604, 605, 607, 609, 609, 627, 627, 639, + 639, 649, 650, 653, 654, 657, 657, 667, 668, 671, + 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, + 682, 683, 684, 685, 686, 687, 688, 691, 691, 698, + 699, 700, 701, 704, 704, 712, 712, 720, 720, 728, + 733, 733, 741, 746, 751, 756, 761, 766, 771, 776, + 776, 784, 784, 792, 797, 802, 802, 812, 813, 816, + 817, 818, 819, 820, 823, 828, 833, 838, 843, 848, + 848, 858, 859, 862, 863, 866, 866, 876, 876, 886, + 887, 888, 891, 892, 895, 895, 903, 903, 911, 911, + 922, 923, 926, 927, 928, 929, 930, 931, 934, 939, + 944, 949, 954, 959, 967, 967, 980, 981, 984, 985, + 992, 992, 1018, 1018, 1029, 1030, 1034, 1035, 1036, 1037, + 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, + 1048, 1049, 1050, 1051, 1052, 1053, 1054, 1055, 1056, 1059, + 1059, 1067, 1067, 1075, 1075, 1083, 1083, 1091, 1091, 1099, + 1099, 1107, 1107, 1117, 1117, 1124, 1125, 1126, 1127, 1130, + 1137, 1137, 1148, 1149, 1153, 1154, 1157, 1157, 1165, 1166, + 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, + 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1193, 1193, + 1206, 1206, 1215, 1216, 1219, 1220, 1225, 1225, 1240, 1240, + 1254, 1255, 1258, 1259, 1262, 1263, 1264, 1265, 1266, 1267, + 1268, 1269, 1270, 1271, 1274, 1276, 1281, 1283, 1283, 1291, + 1291, 1299, 1299, 1307, 1309, 1309, 1317, 1326, 1326, 1338, + 1339, 1344, 1345, 1350, 1350, 1362, 1362, 1374, 1375, 1380, + 1381, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, + 1397, 1399, 1399, 1407, 1409, 1411, 1416, 1424, 1424, 1436, + 1437, 1440, 1441, 1444, 1444, 1454, 1454, 1464, 1465, 1468, + 1469, 1470, 1471, 1472, 1473, 1474, 1477, 1477, 1485, 1485, + 1510, 1510, 1540, 1540, 1550, 1551, 1554, 1555, 1558, 1558, + 1567, 1567, 1576, 1577, 1580, 1581, 1585, 1586, 1587, 1588, + 1589, 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, + 1599, 1602, 1602, 1610, 1610, 1618, 1618, 1626, 1626, 1634, + 1634, 1644, 1644, 1652, 1652, 1660, 1660, 1668, 1668, 1676, + 1676, 1684, 1684, 1692, 1692, 1705, 1705, 1715, 1716, 1722, + 1722, 1732, 1733, 1736, 1736, 1746, 1747, 1750, 1751, 1754, + 1755, 1756, 1757, 1758, 1759, 1760, 1761, 1762, 1763, 1764, + 1767, 1769, 1769, 1777, 1786, 1793, 1793, 1803, 1804, 1807, + 1808, 1809, 1810, 1811, 1814, 1814, 1822, 1822, 1833, 1833, + 1844, 1845, 1848, 1849, 1850, 1851, 1854, 1861, 1861, 1873, + 1873, 1883, 1884, 1887, 1888, 1889, 1890, 1891, 1892, 1893, + 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1902, 1903, + 1904, 1905, 1908, 1913, 1913, 1921, 1921, 1929, 1934, 1934, + 1942, 1947, 1952, 1952, 1960, 1961, 1964, 1964, 1972, 1977, + 1982, 1987, 1987, 1995, 1998, 2001, 2004, 2007, 2013, 2013, + 2021, 2021, 2029, 2029, 2040, 2040, 2047, 2047, 2054, 2054, + 2061, 2061, 2070, 2070, 2081, 2081, 2091, 2092, 2096, 2097, + 2100, 2100, 2115, 2115, 2125, 2125, 2136, 2137, 2141, 2145, + 2145, 2157, 2158, 2162, 2162, 2170, 2171, 2174, 2175, 2176, + 2177, 2178, 2179, 2180, 2183, 2188, 2188, 2196, 2196, 2206, + 2207, 2210, 2210, 2218, 2219, 2222, 2223, 2224, 2225, 2228, + 2228, 2236, 2241, 2246 }; // Print the state stack on the debug stream. @@ -4859,8 +4904,8 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:1167 } } // isc::dhcp -#line 4863 "dhcp4_parser.cc" // lalr1.cc:1167 -#line 2218 "dhcp4_parser.yy" // lalr1.cc:1168 +#line 4908 "dhcp4_parser.cc" // lalr1.cc:1167 +#line 2251 "dhcp4_parser.yy" // lalr1.cc:1168 void diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h index c485d92c27..fbbf42f154 100644 --- a/src/bin/dhcp4/dhcp4_parser.h +++ b/src/bin/dhcp4/dhcp4_parser.h @@ -460,59 +460,61 @@ namespace isc { namespace dhcp { TOKEN_CONTROL_SOCKET = 367, TOKEN_SOCKET_TYPE = 368, TOKEN_SOCKET_NAME = 369, - TOKEN_DHCP_DDNS = 370, - TOKEN_ENABLE_UPDATES = 371, - TOKEN_QUALIFYING_SUFFIX = 372, - TOKEN_SERVER_IP = 373, - TOKEN_SERVER_PORT = 374, - TOKEN_SENDER_IP = 375, - TOKEN_SENDER_PORT = 376, - TOKEN_MAX_QUEUE_SIZE = 377, - TOKEN_NCR_PROTOCOL = 378, - TOKEN_NCR_FORMAT = 379, - TOKEN_ALWAYS_INCLUDE_FQDN = 380, - TOKEN_OVERRIDE_NO_UPDATE = 381, - TOKEN_OVERRIDE_CLIENT_UPDATE = 382, - TOKEN_REPLACE_CLIENT_NAME = 383, - TOKEN_GENERATED_PREFIX = 384, - TOKEN_TCP = 385, - TOKEN_JSON = 386, - TOKEN_WHEN_PRESENT = 387, - TOKEN_NEVER = 388, - TOKEN_ALWAYS = 389, - TOKEN_WHEN_NOT_PRESENT = 390, - TOKEN_HOSTNAME_CHAR_SET = 391, - TOKEN_HOSTNAME_CHAR_REPLACEMENT = 392, - TOKEN_LOGGING = 393, - TOKEN_LOGGERS = 394, - TOKEN_OUTPUT_OPTIONS = 395, - TOKEN_OUTPUT = 396, - TOKEN_DEBUGLEVEL = 397, - TOKEN_SEVERITY = 398, - TOKEN_FLUSH = 399, - TOKEN_MAXSIZE = 400, - TOKEN_MAXVER = 401, - TOKEN_DHCP6 = 402, - TOKEN_DHCPDDNS = 403, - TOKEN_CONTROL_AGENT = 404, - TOKEN_TOPLEVEL_JSON = 405, - TOKEN_TOPLEVEL_DHCP4 = 406, - TOKEN_SUB_DHCP4 = 407, - TOKEN_SUB_INTERFACES4 = 408, - TOKEN_SUB_SUBNET4 = 409, - TOKEN_SUB_POOL4 = 410, - TOKEN_SUB_RESERVATION = 411, - TOKEN_SUB_OPTION_DEFS = 412, - TOKEN_SUB_OPTION_DEF = 413, - TOKEN_SUB_OPTION_DATA = 414, - TOKEN_SUB_HOOKS_LIBRARY = 415, - TOKEN_SUB_DHCP_DDNS = 416, - TOKEN_SUB_LOGGING = 417, - TOKEN_SUB_CONFIG_CONTROL = 418, - TOKEN_STRING = 419, - TOKEN_INTEGER = 420, - TOKEN_FLOAT = 421, - TOKEN_BOOLEAN = 422 + TOKEN_QUEUE_CONTROL = 370, + TOKEN_CAPACITY = 371, + TOKEN_DHCP_DDNS = 372, + TOKEN_ENABLE_UPDATES = 373, + TOKEN_QUALIFYING_SUFFIX = 374, + TOKEN_SERVER_IP = 375, + TOKEN_SERVER_PORT = 376, + TOKEN_SENDER_IP = 377, + TOKEN_SENDER_PORT = 378, + TOKEN_MAX_QUEUE_SIZE = 379, + TOKEN_NCR_PROTOCOL = 380, + TOKEN_NCR_FORMAT = 381, + TOKEN_ALWAYS_INCLUDE_FQDN = 382, + TOKEN_OVERRIDE_NO_UPDATE = 383, + TOKEN_OVERRIDE_CLIENT_UPDATE = 384, + TOKEN_REPLACE_CLIENT_NAME = 385, + TOKEN_GENERATED_PREFIX = 386, + TOKEN_TCP = 387, + TOKEN_JSON = 388, + TOKEN_WHEN_PRESENT = 389, + TOKEN_NEVER = 390, + TOKEN_ALWAYS = 391, + TOKEN_WHEN_NOT_PRESENT = 392, + TOKEN_HOSTNAME_CHAR_SET = 393, + TOKEN_HOSTNAME_CHAR_REPLACEMENT = 394, + TOKEN_LOGGING = 395, + TOKEN_LOGGERS = 396, + TOKEN_OUTPUT_OPTIONS = 397, + TOKEN_OUTPUT = 398, + TOKEN_DEBUGLEVEL = 399, + TOKEN_SEVERITY = 400, + TOKEN_FLUSH = 401, + TOKEN_MAXSIZE = 402, + TOKEN_MAXVER = 403, + TOKEN_DHCP6 = 404, + TOKEN_DHCPDDNS = 405, + TOKEN_CONTROL_AGENT = 406, + TOKEN_TOPLEVEL_JSON = 407, + TOKEN_TOPLEVEL_DHCP4 = 408, + TOKEN_SUB_DHCP4 = 409, + TOKEN_SUB_INTERFACES4 = 410, + TOKEN_SUB_SUBNET4 = 411, + TOKEN_SUB_POOL4 = 412, + TOKEN_SUB_RESERVATION = 413, + TOKEN_SUB_OPTION_DEFS = 414, + TOKEN_SUB_OPTION_DEF = 415, + TOKEN_SUB_OPTION_DATA = 416, + TOKEN_SUB_HOOKS_LIBRARY = 417, + TOKEN_SUB_DHCP_DDNS = 418, + TOKEN_SUB_LOGGING = 419, + TOKEN_SUB_CONFIG_CONTROL = 420, + TOKEN_STRING = 421, + TOKEN_INTEGER = 422, + TOKEN_FLOAT = 423, + TOKEN_BOOLEAN = 424 }; }; @@ -1079,6 +1081,14 @@ namespace isc { namespace dhcp { symbol_type make_SOCKET_NAME (const location_type& l); + static inline + symbol_type + make_QUEUE_CONTROL (const location_type& l); + + static inline + symbol_type + make_CAPACITY (const location_type& l); + static inline symbol_type make_DHCP_DDNS (const location_type& l); @@ -1496,12 +1506,12 @@ namespace isc { namespace dhcp { enum { yyeof_ = 0, - yylast_ = 983, ///< Last index in yytable_. - yynnts_ = 372, ///< Number of nonterminal symbols. + yylast_ = 1005, ///< Last index in yytable_. + yynnts_ = 377, ///< Number of nonterminal symbols. yyfinal_ = 30, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 168 ///< Number of tokens. + yyntokens_ = 170 ///< Number of tokens. }; @@ -1560,9 +1570,9 @@ namespace isc { namespace dhcp { 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167 + 165, 166, 167, 168, 169 }; - const unsigned int user_token_number_max_ = 422; + const unsigned int user_token_number_max_ = 424; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1595,30 +1605,30 @@ namespace isc { namespace dhcp { { switch (other.type_get ()) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.copy< ElementPtr > (other.value); break; - case 167: // "boolean" + case 169: // "boolean" value.copy< bool > (other.value); break; - case 166: // "floating point" + case 168: // "floating point" value.copy< double > (other.value); break; - case 165: // "integer" + case 167: // "integer" value.copy< int64_t > (other.value); break; - case 164: // "constant string" + case 166: // "constant string" value.copy< std::string > (other.value); break; @@ -1639,30 +1649,30 @@ namespace isc { namespace dhcp { (void) v; switch (this->type_get ()) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.copy< ElementPtr > (v); break; - case 167: // "boolean" + case 169: // "boolean" value.copy< bool > (v); break; - case 166: // "floating point" + case 168: // "floating point" value.copy< double > (v); break; - case 165: // "integer" + case 167: // "integer" value.copy< int64_t > (v); break; - case 164: // "constant string" + case 166: // "constant string" value.copy< std::string > (v); break; @@ -1742,30 +1752,30 @@ namespace isc { namespace dhcp { // Type destructor. switch (yytype) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.template destroy< ElementPtr > (); break; - case 167: // "boolean" + case 169: // "boolean" value.template destroy< bool > (); break; - case 166: // "floating point" + case 168: // "floating point" value.template destroy< double > (); break; - case 165: // "integer" + case 167: // "integer" value.template destroy< int64_t > (); break; - case 164: // "constant string" + case 166: // "constant string" value.template destroy< std::string > (); break; @@ -1792,30 +1802,30 @@ namespace isc { namespace dhcp { super_type::move(s); switch (this->type_get ()) { - case 184: // value - case 188: // map_value - case 228: // socket_type - case 231: // outbound_interface_value - case 253: // db_type - case 335: // hr_mode - case 482: // ncr_protocol_value - case 490: // replace_client_name_value + case 186: // value + case 190: // map_value + case 230: // socket_type + case 233: // outbound_interface_value + case 255: // db_type + case 337: // hr_mode + case 489: // ncr_protocol_value + case 497: // replace_client_name_value value.move< ElementPtr > (s.value); break; - case 167: // "boolean" + case 169: // "boolean" value.move< bool > (s.value); break; - case 166: // "floating point" + case 168: // "floating point" value.move< double > (s.value); break; - case 165: // "integer" + case 167: // "integer" value.move< int64_t > (s.value); break; - case 164: // "constant string" + case 166: // "constant string" value.move< std::string > (s.value); break; @@ -1890,7 +1900,7 @@ namespace isc { namespace dhcp { 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 417, 418, 419, 420, 421, 422 + 415, 416, 417, 418, 419, 420, 421, 422, 423, 424 }; return static_cast (yytoken_number_[type]); } @@ -2573,6 +2583,18 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_SOCKET_NAME, l); } + Dhcp4Parser::symbol_type + Dhcp4Parser::make_QUEUE_CONTROL (const location_type& l) + { + return symbol_type (token::TOKEN_QUEUE_CONTROL, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_CAPACITY (const location_type& l) + { + return symbol_type (token::TOKEN_CAPACITY, l); + } + Dhcp4Parser::symbol_type Dhcp4Parser::make_DHCP_DDNS (const location_type& l) { @@ -2894,7 +2916,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:377 } } // isc::dhcp -#line 2898 "dhcp4_parser.h" // lalr1.cc:377 +#line 2920 "dhcp4_parser.h" // lalr1.cc:377 diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index 1ec2c8a823..19a5b5ec4d 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -170,6 +170,9 @@ using namespace std; SOCKET_TYPE "socket-type" SOCKET_NAME "socket-name" + QUEUE_CONTROL "queue-control" + CAPACITY "capacity" + DHCP_DDNS "dhcp-ddns" ENABLE_UPDATES "enable-updates" QUALIFYING_SUFFIX "qualifying-suffix" @@ -448,6 +451,7 @@ global_param: valid_lifetime | expired_leases_processing | dhcp4o6_port | control_socket + | queue_control | dhcp_ddns | echo_client_id | match_client_id @@ -1823,6 +1827,35 @@ control_socket_name: SOCKET_NAME { ctx.leave(); }; + +// --- queue control --------------------------------------------- + +queue_control: QUEUE_CONTROL { + ElementPtr m(new MapElement(ctx.loc2pos(@1))); + ctx.stack_.back()->set("queue-control", m); + ctx.stack_.push_back(m); + ctx.enter(ctx.QUEUE_CONTROL); +} COLON LCURLY_BRACKET queue_control_params RCURLY_BRACKET { + ctx.require("capacity", ctx.loc2pos(@4), ctx.loc2pos(@6)); + ctx.stack_.pop_back(); + ctx.leave(); +}; + +queue_control_params: queue_control_param + | queue_control_params COMMA queue_control_param + ; + +queue_control_param: capacity + | user_context + | comment + | unknown_map_entry + ; + +capacity: CAPACITY COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("capacity", i); +}; + // --- dhcp ddns --------------------------------------------- dhcp_ddns: DHCP_DDNS { diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index 654a0c4f68..8f5fddece5 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -380,6 +381,13 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set, continue; } + if (config_pair.first == "queue-control") { + QueueControlParser parser(AF_INET); + QueueControlPtr queue_control = parser.parse(config_pair.second); + srv_cfg->setQueueControlInfo(queue_control); + continue; + } + if (config_pair.first == "host-reservation-identifiers") { HostReservationIdsParser4 parser; parser.parse(config_pair.second); diff --git a/src/bin/dhcp4/parser_context.cc b/src/bin/dhcp4/parser_context.cc index 6cee5fc567..a48bec015a 100644 --- a/src/bin/dhcp4/parser_context.cc +++ b/src/bin/dhcp4/parser_context.cc @@ -174,6 +174,8 @@ Parser4Context::contextName() return ("server-id"); case CONTROL_SOCKET: return ("control-socket"); + case QUEUE_CONTROL: + return ("queue-control"); case POOLS: return ("pools"); case RESERVATIONS: diff --git a/src/bin/dhcp4/parser_context.h b/src/bin/dhcp4/parser_context.h index 9c7dd782e8..cc99b86f85 100644 --- a/src/bin/dhcp4/parser_context.h +++ b/src/bin/dhcp4/parser_context.h @@ -267,6 +267,9 @@ public: /// Used while parsing Dhcp4/control-socket structures. CONTROL_SOCKET, + /// Used while parsing Dhcp4/queue-control structures. + QUEUE_CONTROL, + /// Used while parsing Dhcp4/subnet4/pools structures. POOLS, diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 4168b309d4..d84eeba580 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -6337,4 +6337,103 @@ TEST_F(Dhcp4ParserTest, serverTag) { ASSERT_THROW(parseDHCP4(bad_tag), std::exception); } +// Check whether it is possible to configure server-tag +TEST_F(Dhcp4ParserTest, queueControl) { + // Config without server-tag + string config_no_queue = "{ " + genIfaceConfig() + "," + + "\"subnet4\": [ ] " + "}"; + + string config_with_queue = + "{ " + genIfaceConfig() + ", \n" + + " \"subnet4\": [ ], \n" + " \"queue-control\": { \n" + " \"capacity\": 75 \n" + " } \n" + "} \n"; + + string config_with_context = + "{ " + genIfaceConfig() + ", \n" + + " \"subnet4\": [ ], \n" + " \"queue-control\": { \n" + " \"capacity\": 90, \n" + " \"user-context\": { \"comment\": \"some text\" } \n" + " } \n" + "} \n"; + + // Let's check the default. It should be empty. + ConstQueueControlPtr control; + control = CfgMgr::instance().getStagingCfg()->getQueueControlInfo(); + ASSERT_FALSE(control); + + // Configuration with no queue should default to an emtpy control. + configure(config_no_queue, CONTROL_RESULT_SUCCESS, ""); + control = CfgMgr::instance().getStagingCfg()->getQueueControlInfo(); + ASSERT_FALSE(control); + + // Clear the config + CfgMgr::instance().clear(); + + // Configuration with queue should be valid. + configure(config_with_queue, CONTROL_RESULT_SUCCESS, ""); + control = CfgMgr::instance().getStagingCfg()->getQueueControlInfo(); + ASSERT_TRUE(control); + EXPECT_EQ(75, control->getCapacity()); + EXPECT_FALSE(control->getContext()); + + CfgMgr::instance().clear(); + + // Configuration with queue with context should be valid. + configure(config_with_context, CONTROL_RESULT_SUCCESS, ""); + control = CfgMgr::instance().getStagingCfg()->getQueueControlInfo(); + ASSERT_TRUE(control); + EXPECT_EQ(90, control->getCapacity()); + EXPECT_TRUE(control->getContext()); +} + +// Check whether it is possible to configure server-tag +TEST_F(Dhcp4ParserTest, queueControlInvalid) { + struct Scenario { + std::string description_; + std::string json_; + }; + + std::vector scenarios = { + { + "not a map", + "{ " + genIfaceConfig() + ", \n" + + " \"subnet4\": [ ], \n" + " \"queue-control\": 75 \n" + "} \n" + }, + { + "capacity missing", + "{ " + genIfaceConfig() + ", \n" + + " \"subnet4\": [ ], \n" + " \"queue-control\": {} \n" + "} \n" + }, + { + "capacity not an int", + "{ " + genIfaceConfig() + ", \n" + + " \"subnet4\": [ ], \n" + " \"queue-control\": { \n" + " \"capacity\": \"ninety\", \n" + " } \n" + "} \n" + } + }; + + // Iterate over the incorrect scenarios and verify they + // fail as expected. Note, we use parseDHCP4() directly + // as all of the errors above are enforced by the grammar. + for (auto scenario : scenarios) { + SCOPED_TRACE((scenario).description_); + { + EXPECT_THROW(parseDHCP4((scenario).json_), Dhcp4ParseError); + } + } +} + + } diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am index 54dc2d4500..fdad707825 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -52,6 +52,7 @@ libkea_dhcp___la_SOURCES += pkt_filter.h pkt_filter.cc libkea_dhcp___la_SOURCES += pkt_filter6.h pkt_filter6.cc libkea_dhcp___la_SOURCES += pkt_filter_inet.cc pkt_filter_inet.h libkea_dhcp___la_SOURCES += pkt_filter_inet6.cc pkt_filter_inet6.h +libkea_dhcp___la_SOURCES += queue_control.cc queue_control.h libkea_dhcp___la_SOURCES += socket_info.h # Utilize Linux Packet Filtering on Linux. @@ -122,6 +123,7 @@ libkea_dhcp___include_HEADERS = \ option_string.h \ option_vendor.h \ option_vendor_class.h \ + packet_queue.h \ pkt.h \ pkt4.h \ pkt4o6.h \ @@ -130,7 +132,9 @@ libkea_dhcp___include_HEADERS = \ pkt_filter6.h \ pkt_filter_inet.h \ pkt_filter_inet6.h \ + queue_control.h \ protocol_util.h \ + socket_info.h \ std_option_defs.h if OS_LINUX diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc index b9309172f9..6653dd07e8 100644 --- a/src/lib/dhcp/iface_mgr.cc +++ b/src/lib/dhcp/iface_mgr.cc @@ -1481,24 +1481,24 @@ IfaceMgr::setPacketQueue6(PacketQueue6Ptr& packet_queue6) { packet_queue6_ = packet_queue6; } -size_t -IfaceMgr::getPacketQueueCapacity4() const { - return (packet_queue4_->getCapacity()); +ConstQueueControlPtr +IfaceMgr::getPacketQueueControl4() const { + return (packet_queue4_->getQueueControl()); } void -IfaceMgr::setPacketQueueCapacity4(const size_t new_capacity) { - packet_queue4_->setCapacity(new_capacity); +IfaceMgr::setPacketQueueControl4(ConstQueueControlPtr queue_control) { + packet_queue4_->setQueueControl(queue_control); } -size_t -IfaceMgr::getPacketQueueCapacity6() const { - return (packet_queue6_->getCapacity()); +ConstQueueControlPtr +IfaceMgr::getPacketQueueControl6() const { + return (packet_queue6_->getQueueControl()); } void -IfaceMgr::setPacketQueueCapacity6(const size_t new_capacity) { - packet_queue6_->setCapacity(new_capacity); +IfaceMgr::setPacketQueueControl6(ConstQueueControlPtr queue_control) { + packet_queue6_->setQueueControl(queue_control); } } // end of namespace isc::dhcp diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h index 2b235e120c..485982c606 100644 --- a/src/lib/dhcp/iface_mgr.h +++ b/src/lib/dhcp/iface_mgr.h @@ -1059,21 +1059,23 @@ public: /// @throw BadValue if given an empty pointer void setPacketQueue6(PacketQueue6Ptr& packet_queue6); - /// @brief Returns the current capacity of the DHCPv4 packet queue buffer. - size_t getPacketQueueCapacity4() const; + /// @brief Returns the current queue control information + /// for the DHCPv4 packet queue buffer. + ConstQueueControlPtr getPacketQueueControl4() const; - /// @brief Set the capacity of the DHCPv4 packet queue buffer. + /// @brief Set the queue controls for the DHCPv4 packet queue buffer. /// - /// @param new_capacity New capacity of the buffer. - void setPacketQueueCapacity4(const size_t new_capacity); + /// @param new queue controls to use + void setPacketQueueControl4(ConstQueueControlPtr queue_control); - /// @brief Returns the current capacity of the DHCPv6 packet queue buffer. - size_t getPacketQueueCapacity6() const; + /// @brief Returns the current queue control information + /// for the DHCPv6 packet queue buffer. + ConstQueueControlPtr getPacketQueueControl6() const; - /// @brief Set the capacity of the DHCPv6 packet queue buffer. + /// @brief Set the queue controls for the DHCPv6 packet queue buffer. /// - /// @param new_capacity New capacity of the buffer. - void setPacketQueueCapacity6(const size_t new_capacity); + /// @param new queue controls to use + void setPacketQueueControl6(ConstQueueControlPtr queue_control); /// @brief Starts DHCP packet receiver. /// diff --git a/src/lib/dhcp/packet_queue.h b/src/lib/dhcp/packet_queue.h index d0d80dc154..c61def567f 100644 --- a/src/lib/dhcp/packet_queue.h +++ b/src/lib/dhcp/packet_queue.h @@ -7,6 +7,7 @@ #ifndef PACKET_QUEUE_H #define PACKET_QUEUE_H +#include #include #include #include @@ -132,6 +133,14 @@ public: /// @brief return True if the queue is empty. virtual bool empty() const = 0; + /// @brief Fetches the current queue control parameters + virtual ConstQueueControlPtr getQueueControl() const = 0; + + /// @brief Sets queue control parameters from the given control structure. + /// + /// @param queue_control new control parameters to implement + virtual void setQueueControl(ConstQueueControlPtr queue_control) = 0; + /// @brief Returns the maximum number of packets allowed in the buffer. virtual size_t getCapacity() const = 0; @@ -143,6 +152,9 @@ public: /// @brief Discards all packets currently in the buffer. virtual void clear() = 0; + + /// @brief Sets queue control parameters to their default values. + virtual void useDefaults() = 0; }; /// @brief Defines pointer to the DHCPv4 queue interface used at the application level. @@ -160,7 +172,6 @@ public: /// @brief Constructor /// /// @param queue_capacity maximum number of packets the queue can hold - /// Defaults to DEFAULT_RING_CAPACITY. PacketQueueRing(size_t capacity) { queue_.set_capacity(capacity); } @@ -224,6 +235,26 @@ public: return(queue_.empty()); } + /// @brief Fetches the current queue control parameters + virtual ConstQueueControlPtr getQueueControl() const { + QueueControlPtr queue_control(new QueueControl()); + queue_control->setCapacity(getCapacity()); + return (queue_control); + } + + /// @brief Sets queue control parameters from the given control structure. + /// + /// @param queue_control new control parameters to implement. If it is + /// an empty pointer we reset to default values. + virtual void setQueueControl(ConstQueueControlPtr queue_control) { + if (!queue_control) { + useDefaults(); + return; + } + + setCapacity(queue_control->getCapacity()); + } + /// @brief Returns the maximum number of packets allowed in the buffer. virtual size_t getCapacity() const { return (queue_.capacity()); @@ -253,6 +284,11 @@ public: queue_.clear(); } + /// @brief Sets capacity for default value of MIN_RING_CAPACITY + virtual void useDefaults() { + setCapacity(MIN_RING_CAPACITY); + } + private: /// @brief Packet queue @@ -273,7 +309,11 @@ public: }; /// @brief virtual Destructor - virtual ~PacketQueueRing4(){}; + virtual ~PacketQueueRing4(){} + + virtual void useDefaults(){ + setCapacity(DEFAULT_RING_CAPACITY); + } }; /// @brief Default DHCPv6 packet queue buffer implementation @@ -289,7 +329,11 @@ public: }; /// @brief virtual Destructor - virtual ~PacketQueueRing6(){}; + virtual ~PacketQueueRing6(){} + + virtual void useDefaults() { + setCapacity(DEFAULT_RING_CAPACITY); + } }; diff --git a/src/lib/dhcp/queue_control.cc b/src/lib/dhcp/queue_control.cc new file mode 100644 index 0000000000..ef15d1576f --- /dev/null +++ b/src/lib/dhcp/queue_control.cc @@ -0,0 +1,38 @@ +// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include +#include + +using namespace isc::data; + +namespace isc { +namespace dhcp { + +QueueControl::QueueControl() + : capacity_(0) { +} + +bool +QueueControl::equals(const QueueControl& other) const { + return (capacity_ == other.capacity_); +} + +ElementPtr +QueueControl::toElement() const { + ElementPtr result = Element::createMap(); + + // Set user context + contextToElement(result); + + // Add "capacity" + result->set("capacity", Element::create(static_cast(capacity_))); + + return (result); +} + +} // end of isc::dhcp namespace +} // end of isc namespace diff --git a/src/lib/dhcp/queue_control.h b/src/lib/dhcp/queue_control.h new file mode 100644 index 0000000000..ee7346f4c4 --- /dev/null +++ b/src/lib/dhcp/queue_control.h @@ -0,0 +1,86 @@ +// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#ifndef QUEUE_CONTROL_H +#define QUEUE_CONTROL_H + +#include +#include +#include + +namespace isc { +namespace dhcp { + +/// @brief Represents DHCP packet queue controls +/// +/// This class manages the configurable parameters used to tailor the +/// behavior of DHCP packet queueing. +class QueueControl : public isc::data::UserContext, public isc::data::CfgToElement { +public: + + /// @brief Constructor. + QueueControl(); + + /// @brief Destructor + ~QueueControl(){}; + + /// @return true if objects are equal, false otherwise. + bool equals(const QueueControl& other) const; + + /// @brief Fetches the maximum number of packets that the queue may hold. + /// + /// @return the current capacity of the packet queue. + size_t getCapacity() const { + return (capacity_); + } + + /// @brief Set the capacity of the DHCPv4 packet queue buffer. + /// + /// Sets the maximum number of packets that the queue may hold. + /// + /// @param capacity new value for the queue capacity + void setCapacity(const size_t capacity) { + capacity_ = capacity; + } + + /// @brief Equality operator. + /// + /// @param other Object to be compared with this object. + /// + /// @return true if objects are equal, false otherwise. + bool operator==(const QueueControl& other) const { + return (equals(other)); + } + + /// @brief Inequality operator. + /// + /// @param other Object to be compared with this object. + /// + /// @return true if objects are not equal, false otherwise. + bool operator!=(const QueueControl& other) const { + return (!equals(other)); + } + + /// @brief Unparse a configuration object + /// + /// @return a pointer to unparsed configuration + virtual isc::data::ElementPtr toElement() const; + +private: + /// @brief A set of interface names specified by the user. + size_t capacity_; +}; + +/// @brief A pointer to the @c QueueControl . +typedef boost::shared_ptr QueueControlPtr; + +/// @brief A pointer to the const @c QueueControl. +typedef boost::shared_ptr ConstQueueControlPtr; + +} +} + +#endif // QUEUE_CONTROL_H diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am index da596e4360..2ae13e842c 100644 --- a/src/lib/dhcp/tests/Makefile.am +++ b/src/lib/dhcp/tests/Makefile.am @@ -82,6 +82,7 @@ libdhcp___unittests_SOURCES += pkt_filter_test_stub.cc pkt_filter_test_stub.h libdhcp___unittests_SOURCES += pkt_filter6_test_stub.cc pkt_filter_test_stub.h libdhcp___unittests_SOURCES += pkt_filter_test_utils.h pkt_filter_test_utils.cc libdhcp___unittests_SOURCES += pkt_filter6_test_utils.h pkt_filter6_test_utils.cc +libdhcp___unittests_SOURCES += queue_control_unittest.cc # Utilize Linux Packet Filtering on Linux. if OS_LINUX diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc index a3771bcca4..798defdf1c 100644 --- a/src/lib/dhcp/tests/iface_mgr_unittest.cc +++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc @@ -646,7 +646,11 @@ TEST_F(IfaceMgrTest, packetQueue4) { // Verify the default packet queue exists and has the default capacity. size_t default_cap = PacketQueueRing4::DEFAULT_RING_CAPACITY; - EXPECT_EQ(default_cap, ifacemgr.getPacketQueueCapacity4()); + + ConstQueueControlPtr control; + ASSERT_NO_THROW(control = ifacemgr.getPacketQueueControl4()); + ASSERT_TRUE(control); + EXPECT_EQ(default_cap, control->getCapacity()); PacketQueue4Ptr myQueue; // Verify we cannot set the queue to an empty pointer. @@ -657,16 +661,23 @@ TEST_F(IfaceMgrTest, packetQueue4) { ASSERT_NO_THROW(ifacemgr.setPacketQueue4(myQueue)); // Verify the new queue has the expected capacity. - EXPECT_EQ(default_cap + 1, ifacemgr.getPacketQueueCapacity4()); + control = ifacemgr.getPacketQueueControl4(); + ASSERT_TRUE(control); + EXPECT_EQ(default_cap + 1, control->getCapacity()); // Verify we can't set the capacity to an invalid value. - ASSERT_THROW(ifacemgr.setPacketQueueCapacity4(0), BadValue); + QueueControlPtr new_control(new QueueControl()); + new_control->setCapacity(0); + ASSERT_THROW(ifacemgr.setPacketQueueControl4(new_control), BadValue); // Verify we can set the capacity to an invalid value. - ASSERT_NO_THROW(ifacemgr.setPacketQueueCapacity4(default_cap + 2)); - EXPECT_EQ(default_cap + 2, ifacemgr.getPacketQueueCapacity4()); + new_control->setCapacity(default_cap + 2); + ASSERT_NO_THROW(ifacemgr.setPacketQueueControl4(new_control)); + ASSERT_NO_THROW(control = ifacemgr.getPacketQueueControl4()); + EXPECT_EQ(default_cap + 2, control->getCapacity()); } +#if 0 // Verify that we can manipulate the DHCPv6 packet queue. TEST_F(IfaceMgrTest, packetQueue6) { NakedIfaceMgr ifacemgr; @@ -693,6 +704,7 @@ TEST_F(IfaceMgrTest, packetQueue6) { ASSERT_NO_THROW(ifacemgr.setPacketQueueCapacity6(default_cap + 2)); EXPECT_EQ(default_cap + 2, ifacemgr.getPacketQueueCapacity6()); } +#endif TEST_F(IfaceMgrTest, receiveTimeout6) { using namespace boost::posix_time; diff --git a/src/lib/dhcp/tests/packet_queue4_unittest.cc b/src/lib/dhcp/tests/packet_queue4_unittest.cc index 61ea4c62f6..0014a1d5ec 100644 --- a/src/lib/dhcp/tests/packet_queue4_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue4_unittest.cc @@ -6,7 +6,6 @@ #include -#include #include #include @@ -20,7 +19,6 @@ namespace { class TestQueue4 : public PacketQueueRing { public: - /// @brief Constructor /// /// @param queue_size maximum number of packets the queue can hold @@ -70,23 +68,56 @@ public: return (eaten); } + virtual void useDefaults() { + setCapacity(411); + } + bool drop_enabled_; int eat_count_; }; +// Verifies basic use onf PacketQueue interface: +// 1. Construction +// 2. Manipulation of configurable parameters TEST(TestQueue4, interfaceBasics) { - PacketQueue4Ptr q4(new TestQueue4(100)); + // Use minimum allowed + size_t min = TestQueue4::MIN_RING_CAPACITY; + + PacketQueue4Ptr q4(new TestQueue4(min)); ASSERT_TRUE(q4); EXPECT_TRUE(q4->empty()); - EXPECT_EQ(100, q4->getCapacity()); - EXPECT_EQ(0, q4->getSize()); - size_t min = TestQueue4::MIN_RING_CAPACITY; - ASSERT_THROW(q4->setCapacity(min - 1), BadValue); - ASSERT_NO_THROW(q4->setCapacity(min)); + ConstQueueControlPtr orig_control = q4->getQueueControl(); + ASSERT_TRUE(orig_control); + EXPECT_EQ(min, orig_control->getCapacity()); EXPECT_EQ(min, q4->getCapacity()); + EXPECT_EQ(0, q4->getSize()); + + // Verify we cannot violate minium. + QueueControlPtr new_control(new QueueControl()); + new_control->setCapacity(min - 1); + ASSERT_THROW(q4->setQueueControl(new_control), BadValue); + + // Verify original control values remain + EXPECT_TRUE(*(q4->getQueueControl()) == *orig_control); + + // Verify we can update to a valid value. + new_control->setCapacity(min + 10); + ASSERT_NO_THROW(q4->setQueueControl(new_control)); + ConstQueueControlPtr control = q4->getQueueControl(); + ASSERT_TRUE(control); + EXPECT_TRUE(*control == *new_control); + EXPECT_EQ(min + 10, control->getCapacity()); + EXPECT_EQ(min + 10, q4->getCapacity()); + + ASSERT_NO_THROW(q4->setQueueControl(ConstQueueControlPtr())); + control = q4->getQueueControl(); + ASSERT_TRUE(control); + EXPECT_EQ(411, control->getCapacity()); } +// Verifies the basic mechanics of the adding and +// removing packets to and from the ring buffer. TEST(TestQueue4, ringTest) { PacketQueue4Ptr q4(new TestQueue4(3)); @@ -156,6 +187,8 @@ TEST(TestQueue4, ringTest) { EXPECT_EQ(0, q4->getSize()); } +// Verifies the higher level functions of queueing and +// dequeueing with drop and skip logic disabled. TEST(TestQueue4, enqueueDequeueTest) { PacketQueue4Ptr q4(new TestQueue4(100)); EXPECT_TRUE(q4->empty()); @@ -197,6 +230,7 @@ TEST(TestQueue4, enqueueDequeueTest) { ASSERT_FALSE(pkt); } +// Verifies enqueuing operations when drop logic is enabled. TEST(TestQueue4, dropPacketTest) { TestQueue4 q4(100); EXPECT_TRUE(q4.empty()); @@ -252,7 +286,7 @@ TEST(TestQueue4, dropPacketTest) { ASSERT_NO_THROW(pkt = q4.dequeuePacket()); ASSERT_FALSE(pkt); } - +// Verifies dequeuing operations when eat packets is enabled. TEST(TestQueue4, eatPacketsTest) { TestQueue4 q4(100); EXPECT_TRUE(q4.empty()); diff --git a/src/lib/dhcp/tests/packet_queue6_unittest.cc b/src/lib/dhcp/tests/packet_queue6_unittest.cc index 5d2f91c0f0..a97458ed48 100644 --- a/src/lib/dhcp/tests/packet_queue6_unittest.cc +++ b/src/lib/dhcp/tests/packet_queue6_unittest.cc @@ -78,19 +78,43 @@ public: int eat_count_; }; +// Verifies basic operation of the PacketQueue interface: +// 1. Construction +// 2. Manipulation of configurable parameters TEST(TestQueue6, interfaceBasics) { - PacketQueue6Ptr q6(new TestQueue6(100)); + // Use minimum allowed + size_t min = TestQueue6::MIN_RING_CAPACITY; + + PacketQueue6Ptr q6(new TestQueue6(min)); ASSERT_TRUE(q6); EXPECT_TRUE(q6->empty()); - EXPECT_EQ(100, q6->getCapacity()); - EXPECT_EQ(0, q6->getSize()); - size_t min = TestQueue6::MIN_RING_CAPACITY; - ASSERT_THROW(q6->setCapacity(min - 1), BadValue); - ASSERT_NO_THROW(q6->setCapacity(min)); + ConstQueueControlPtr orig_control = q6->getQueueControl(); + ASSERT_TRUE(orig_control); + EXPECT_EQ(min, orig_control->getCapacity()); EXPECT_EQ(min, q6->getCapacity()); + EXPECT_EQ(0, q6->getSize()); + + // Verify we cannot violate minium. + QueueControlPtr new_control(new QueueControl()); + new_control->setCapacity(min - 1); + ASSERT_THROW(q6->setQueueControl(new_control), BadValue); + + // Verify original control values remain + EXPECT_TRUE(*(q6->getQueueControl()) == *orig_control); + + // Verify we can update to a valid value. + new_control->setCapacity(min + 10); + ASSERT_NO_THROW(q6->setQueueControl(new_control)); + ConstQueueControlPtr control = q6->getQueueControl(); + ASSERT_TRUE(control); + EXPECT_TRUE(*control == *new_control); + EXPECT_EQ(min + 10, control->getCapacity()); + EXPECT_EQ(min + 10, q6->getCapacity()); } +// Verifies the basic mechanics of the adding and +// removing packets to and from the ring buffer. TEST(TestQueue6, ringTest) { PacketQueue6Ptr q6(new TestQueue6(3)); @@ -160,6 +184,8 @@ TEST(TestQueue6, ringTest) { EXPECT_EQ(0, q6->getSize()); } +// Verifies the higher level functions of queueing and +// dequeueing with drop and skip logic disabled. TEST(TestQueue6, enqueueDequeueTest) { PacketQueue6Ptr q6(new TestQueue6(100)); EXPECT_TRUE(q6->empty()); @@ -201,6 +227,7 @@ TEST(TestQueue6, enqueueDequeueTest) { ASSERT_FALSE(pkt); } +// Verifies enqueuing operations when drop logic is enabled. TEST(TestQueue6, dropPacketTest) { TestQueue6 q6(100); EXPECT_TRUE(q6.empty()); @@ -257,6 +284,7 @@ TEST(TestQueue6, dropPacketTest) { ASSERT_FALSE(pkt); } +// Verifies dequeuing operations when eat packets is enabled. TEST(TestQueue6, eatPacketsTest) { TestQueue6 q6(100); EXPECT_TRUE(q6.empty()); diff --git a/src/lib/dhcp/tests/queue_control_unittest.cc b/src/lib/dhcp/tests/queue_control_unittest.cc new file mode 100644 index 0000000000..56aa0c9c54 --- /dev/null +++ b/src/lib/dhcp/tests/queue_control_unittest.cc @@ -0,0 +1,63 @@ +// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include + +#include +#include + +#include +#include + +using namespace std; +using namespace isc; +using namespace isc::dhcp; + +namespace { + +// Verifies QueueControl essentials +TEST(QueueControl, basics) { + QueueControlPtr control1; + QueueControlPtr control2; + + ASSERT_NO_THROW(control1.reset(new QueueControl())); + EXPECT_EQ(0, control1->getCapacity()); + + control1->setCapacity(100); + EXPECT_EQ(100, control1->getCapacity()); + + ASSERT_NO_THROW(control2.reset(new QueueControl())); + control2->setCapacity(200); + EXPECT_EQ(200, control2->getCapacity()); + + EXPECT_FALSE(*control1 == *control2); + EXPECT_TRUE(*control1 != *control2); + + control2->setCapacity(100); + EXPECT_TRUE(*control1 == *control2); + EXPECT_FALSE(*control1 != *control2); +} + +// Verifies QueueControl::toElement +TEST(QueueControl, toElement) { + QueueControlPtr control; + ASSERT_NO_THROW(control.reset(new QueueControl())); + control->setCapacity(100); + + data::ElementPtr exp_elements; + std::string json = "{ \"capacity\": 100 }"; + + ASSERT_NO_THROW(exp_elements = data::Element::fromJSON(json)) + << "invalid JSON, test is broken"; + + data::ElementPtr elements; + ASSERT_NO_THROW(elements = control->toElement()); + + ASSERT_TRUE(elements); + EXPECT_TRUE(elements->equals(*exp_elements)); +} + +} diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index 936f71d18b..fc44707d84 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -47,6 +47,8 @@ EXTRA_DIST += parsers/simple_parser4.cc EXTRA_DIST += parsers/simple_parser4.h EXTRA_DIST += parsers/simple_parser6.cc EXTRA_DIST += parsers/simple_parser6.h +EXTRA_DIST += parsers/queue_control_parser.cc +EXTRA_DIST += parsers/queue_control_parser.h # Devel guide diagrams EXTRA_DIST += images/pgsql_host_data_source.svg @@ -180,6 +182,8 @@ libkea_dhcpsrv_la_SOURCES += parsers/ifaces_config_parser.cc libkea_dhcpsrv_la_SOURCES += parsers/ifaces_config_parser.h libkea_dhcpsrv_la_SOURCES += parsers/option_data_parser.cc libkea_dhcpsrv_la_SOURCES += parsers/option_data_parser.h +libkea_dhcpsrv_la_SOURCES += parsers/queue_control_parser.cc +libkea_dhcpsrv_la_SOURCES += parsers/queue_control_parser.h libkea_dhcpsrv_la_SOURCES += parsers/sanity_checks_parser.cc libkea_dhcpsrv_la_SOURCES += parsers/sanity_checks_parser.h libkea_dhcpsrv_la_SOURCES += parsers/shared_network_parser.cc @@ -338,11 +342,11 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ parsers/host_reservations_list_parser.h \ parsers/ifaces_config_parser.h \ parsers/option_data_parser.h \ + parsers/queue_control_parser.h \ parsers/shared_network_parser.h \ parsers/shared_networks_list_parser.h \ parsers/simple_parser4.h \ parsers/simple_parser6.h - install-data-local: $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) diff --git a/src/lib/dhcpsrv/parsers/queue_control_parser.cc b/src/lib/dhcpsrv/parsers/queue_control_parser.cc new file mode 100644 index 0000000000..448c2acea8 --- /dev/null +++ b/src/lib/dhcpsrv/parsers/queue_control_parser.cc @@ -0,0 +1,55 @@ +// Copyright (C) 2015-2018 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace isc::data; + +namespace isc { +namespace dhcp { + +QueueControlParser::QueueControlParser(const uint16_t family) + : family_(family) { + // @todo Not sure we need family but just in case. + if (family_ != AF_INET && family_ != AF_INET6) { + isc_throw(BadValue, "QueueControlParser - invalid family: " + << family_ << ", must be AF_INET or AF_INET6"); + } +} + +QueueControlPtr +QueueControlParser::parse(const isc::data::ConstElementPtr& queue_elem) { + QueueControlPtr queue_control(new QueueControl()); + + if (queue_elem->getType() != Element::map) { + isc_throw(DhcpConfigError, "queue-control must be a map"); + } + + try { + size_t capacity = getInteger(queue_elem, "capacity"); + queue_control->setCapacity(capacity); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, ex.what() + << " (" << getPosition("ip-addresses", queue_elem) << ")"); + } + + ConstElementPtr user_context = queue_elem->get("user-context"); + if (user_context) { + queue_control->setContext(user_context); + } + + return (queue_control); +} + +} // end of namespace isc::dhcp +} // end of namespace isc diff --git a/src/lib/dhcpsrv/parsers/queue_control_parser.h b/src/lib/dhcpsrv/parsers/queue_control_parser.h new file mode 100644 index 0000000000..dfa5b2db75 --- /dev/null +++ b/src/lib/dhcpsrv/parsers/queue_control_parser.h @@ -0,0 +1,51 @@ +// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#ifndef QUEUE_CONTROL_PARSER_H +#define QUEUE_CONTROL_PARSER_H + +#include +#include +#include +#include + +namespace isc { +namespace dhcp { + +/// @brief Parser for the configuration of DHCP packet queue controls +/// +/// This parser parses the "queue-control" parameter which holds the +/// the configurable parameters that tailor DHCP packet queue behavior. +/// +/// This parser is used in both DHCPv4 and DHCPv6. Derived parsers +/// are not needed. +class QueueControlParser : public isc::data::SimpleParser { +public: + + /// @brief Constructor + /// + /// @param family AF_INET for DHCPv4 and AF_INET6 for DHCPv6. + explicit QueueControlParser(const uint16_t family); + + /// @brief Parses content of the "queue-control". + /// + /// @param values pointer to the content of parsed values + /// + /// @return A pointer to a newly constructed QueueControl populated + /// with the parsed values + /// + /// @throw DhcpConfigError if any of the values are invalid. + QueueControlPtr parse(const isc::data::ConstElementPtr& values); + +private: + /// @brief AF_INET for DHCPv4 and AF_INET6 for DHCPv6. + int family_; +}; + +} +} // end of namespace isc + +#endif // QUEUE_CONTROL_PARSER_H diff --git a/src/lib/dhcpsrv/srv_config.cc b/src/lib/dhcpsrv/srv_config.cc index 967d021553..9c3f12c84a 100644 --- a/src/lib/dhcpsrv/srv_config.cc +++ b/src/lib/dhcpsrv/srv_config.cc @@ -392,6 +392,12 @@ SrvConfig::toElement() const { dhcp->set("config-control", info_elem); } + // Set queue-control (if it exists) + ConstQueueControlPtr queue_control = getQueueControlInfo(); + if (queue_control) { + dhcp->set("queue-control", queue_control->toElement()); + } + return (result); } diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h index 3f317f0ba3..e5c8d98592 100644 --- a/src/lib/dhcpsrv/srv_config.h +++ b/src/lib/dhcpsrv/srv_config.h @@ -8,6 +8,7 @@ #define DHCPSRV_CONFIG_H #include +#include #include #include #include @@ -360,6 +361,18 @@ public: control_socket_ = control_socket; } + /// @brief Returns queue control information + /// @return pointer to a queue control information + const isc::dhcp::ConstQueueControlPtr getQueueControlInfo() const { + return (queue_control_); + } + + /// @brief Sets information about the queue control + /// @param new queue control information + void setQueueControlInfo(const isc::dhcp::ConstQueueControlPtr& queue_control) { + queue_control_ = queue_control; + } + /// @brief Returns pointer to the dictionary of global client /// class definitions ClientClassDictionaryPtr getClientClassDictionary() { @@ -651,6 +664,9 @@ private: /// @brief Pointer to the control-socket information isc::data::ConstElementPtr control_socket_; + /// @brief Pointer to the queue-control information + isc::dhcp::ConstQueueControlPtr queue_control_; + /// @brief Pointer to the dictionary of global client class definitions ClientClassDictionaryPtr class_dictionary_;