diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index 9e53c7ed33..766ed88851 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -511,12 +511,12 @@ static yyconst flex_int16_t yy_accept[1918] = 0, 0, 0, 204, 202, 0, 201, 200, 0, 0, 0, 0, 0, 0, 0, 169, 0, 168, 0, 0, - 93, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 35, 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, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, @@ -555,7 +555,7 @@ static yyconst flex_int16_t yy_accept[1918] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 92, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, @@ -580,7 +580,7 @@ static yyconst flex_int16_t yy_accept[1918] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, 0, 0, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -620,7 +620,7 @@ static yyconst flex_int16_t yy_accept[1918] = 125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 183, 0, 74, 91, 0, 0, + 0, 0, 0, 0, 183, 0, 74, 88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 158, 0, 0, 156, 0, 147, 146, 0, 0, 0, 49, 0, 0, 21, @@ -660,7 +660,7 @@ static yyconst flex_int16_t yy_accept[1918] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 165, 0, 0, 0, 0, 0, 0, 0, 138, 0, 0, 0, 114, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 88, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 85, 0, 0, 0, 0, 0, 0, 143, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, @@ -672,17 +672,17 @@ static yyconst flex_int16_t yy_accept[1918] = 0, 0, 0, 0, 0, 0, 0, 45, 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 136, 0, 0, 0, 51, 0, - 0, 46, 164, 0, 87, 0, 0, 0, 71, 0, + 0, 46, 164, 0, 91, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 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, 29, 0, 0, 67, 0, 0, 0, - 142, 0, 0, 0, 0, 186, 163, 0, 111, 86, + 142, 0, 0, 0, 0, 186, 163, 0, 111, 92, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 134, 0, 0, 139, 0, 65, 0, 58, - 0, 0, 0, 0, 85, 0, 0, 0, 133, 0, + 0, 0, 0, 0, 93, 0, 0, 0, 133, 0, 0, 167, 0, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 69, 0, 95, 61, @@ -1711,8 +1711,8 @@ static yyconst flex_int16_t yy_rule_linenum[206] = 574, 585, 594, 605, 616, 627, 638, 649, 658, 667, 676, 685, 696, 707, 718, 729, 740, 751, 762, 773, 783, 794, 803, 813, 827, 843, 852, 861, 870, 879, - 901, 923, 932, 942, 951, 962, 973, 984, 995, 1004, - 1013, 1022, 1031, 1040, 1050, 1059, 1070, 1081, 1092, 1103, + 901, 923, 932, 942, 951, 962, 971, 980, 989, 998, + 1007, 1018, 1029, 1040, 1050, 1059, 1070, 1081, 1092, 1103, 1115, 1124, 1133, 1142, 1151, 1160, 1169, 1178, 1187, 1196, 1206, 1217, 1229, 1238, 1247, 1257, 1267, 1277, 1287, 1297, @@ -3281,9 +3281,9 @@ YY_RULE_SETUP case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::SUBNET4: case isc::dhcp::Parser4Context::SHARED_NETWORK: - return isc::dhcp::Dhcp4Parser::make_RESERVATIONS_OUT_OF_POOL(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_RESERVATION_MODE(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("reservations-out-of-pool", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("reservation-mode", driver.loc_); } } YY_BREAK @@ -3292,18 +3292,64 @@ YY_RULE_SETUP #line 962 "dhcp4_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP4: - case isc::dhcp::Parser4Context::SUBNET4: - case isc::dhcp::Parser4Context::SHARED_NETWORK: - return isc::dhcp::Dhcp4Parser::make_RESERVATIONS_IN_SUBNET(driver.loc_); + case isc::dhcp::Parser4Context::RESERVATION_MODE: + return isc::dhcp::Dhcp4Parser::make_DISABLED(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("reservations-in-subnet", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("disabled", driver.loc_); } } YY_BREAK case 87: YY_RULE_SETUP -#line 973 "dhcp4_lexer.ll" +#line 971 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::RESERVATION_MODE: + return isc::dhcp::Dhcp4Parser::make_DISABLED(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("off", driver.loc_); + } +} + YY_BREAK +case 88: +YY_RULE_SETUP +#line 980 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::RESERVATION_MODE: + return isc::dhcp::Dhcp4Parser::make_OUT_OF_POOL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("out-of-pool", driver.loc_); + } +} + YY_BREAK +case 89: +YY_RULE_SETUP +#line 989 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::RESERVATION_MODE: + return isc::dhcp::Dhcp4Parser::make_GLOBAL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("global", driver.loc_); + } +} + YY_BREAK +case 90: +YY_RULE_SETUP +#line 998 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::RESERVATION_MODE: + return isc::dhcp::Dhcp4Parser::make_ALL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("all", driver.loc_); + } +} + YY_BREAK +case 91: +YY_RULE_SETUP +#line 1007 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -3315,77 +3361,31 @@ YY_RULE_SETUP } } YY_BREAK -case 88: +case 92: YY_RULE_SETUP -#line 984 "dhcp4_lexer.ll" +#line 1018 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: case isc::dhcp::Parser4Context::SUBNET4: case isc::dhcp::Parser4Context::SHARED_NETWORK: - return isc::dhcp::Dhcp4Parser::make_RESERVATION_MODE(driver.loc_); + return isc::dhcp::Dhcp4Parser::make_RESERVATIONS_IN_SUBNET(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("reservation-mode", driver.loc_); - } -} - YY_BREAK -case 89: -YY_RULE_SETUP -#line 995 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::RESERVATION_MODE: - return isc::dhcp::Dhcp4Parser::make_DISABLED(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("disabled", driver.loc_); - } -} - YY_BREAK -case 90: -YY_RULE_SETUP -#line 1004 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::RESERVATION_MODE: - return isc::dhcp::Dhcp4Parser::make_DISABLED(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("off", driver.loc_); - } -} - YY_BREAK -case 91: -YY_RULE_SETUP -#line 1013 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::RESERVATION_MODE: - return isc::dhcp::Dhcp4Parser::make_OUT_OF_POOL(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("out-of-pool", driver.loc_); - } -} - YY_BREAK -case 92: -YY_RULE_SETUP -#line 1022 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::RESERVATION_MODE: - return isc::dhcp::Dhcp4Parser::make_GLOBAL(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("global", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("reservations-in-subnet", driver.loc_); } } YY_BREAK case 93: YY_RULE_SETUP -#line 1031 "dhcp4_lexer.ll" +#line 1029 "dhcp4_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser4Context::RESERVATION_MODE: - return isc::dhcp::Dhcp4Parser::make_ALL(driver.loc_); + case isc::dhcp::Parser4Context::DHCP4: + case isc::dhcp::Parser4Context::SUBNET4: + case isc::dhcp::Parser4Context::SHARED_NETWORK: + return isc::dhcp::Dhcp4Parser::make_RESERVATIONS_OUT_OF_POOL(driver.loc_); default: - return isc::dhcp::Dhcp4Parser::make_STRING("all", driver.loc_); + return isc::dhcp::Dhcp4Parser::make_STRING("reservations-out-of-pool", driver.loc_); } } YY_BREAK diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index 385e9a7767..c690bb4d39 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -2541,12 +2541,12 @@ namespace isc { namespace dhcp { #line 2542 "dhcp4_parser.cc" break; - case 396: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean" + case 396: // reservations_global: "reservations-global" ":" "boolean" #line 1475 "dhcp4_parser.yy" - { - ctx.unique("reservations-out-of-pool", ctx.loc2pos(yystack_[2].location)); + { + ctx.unique("reservations-global", ctx.loc2pos(yystack_[2].location)); ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reservations-out-of-pool", b); + ctx.stack_.back()->set("reservations-global", b); } #line 2552 "dhcp4_parser.cc" break; @@ -2561,12 +2561,12 @@ namespace isc { namespace dhcp { #line 2562 "dhcp4_parser.cc" break; - case 398: // reservations_global: "reservations-global" ":" "boolean" + case 398: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean" #line 1487 "dhcp4_parser.yy" - { - ctx.unique("reservations-global", ctx.loc2pos(yystack_[2].location)); + { + ctx.unique("reservations-out-of-pool", ctx.loc2pos(yystack_[2].location)); ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reservations-global", b); + ctx.stack_.back()->set("reservations-out-of-pool", b); } #line 2572 "dhcp4_parser.cc" break; @@ -4509,128 +4509,128 @@ namespace isc { namespace dhcp { const short Dhcp4Parser::yypact_[] = { - 396, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, 49, 41, 57, 59, 66, 68, - 74, 86, 104, 108, 122, 129, 131, 188, -930, -930, + 549, -930, -930, -930, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, 33, 41, 49, 57, 70, 72, + 74, 96, 100, 104, 114, 121, 137, 149, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, 41, -161, 97, 114, 67, 239, - 36, 249, -44, 70, 289, -98, 588, 202, -930, 116, - 158, 39, 69, 201, -930, 215, -930, -930, -930, 235, - 246, 256, -930, -930, -930, -930, -930, -930, 268, 302, - 303, 305, 315, 319, 326, 329, 332, 345, 358, -930, - 362, 369, 398, 399, 413, -930, -930, -930, 414, 415, - 416, -930, -930, -930, -930, -930, -930, -930, 417, 419, - 420, -930, -930, -930, -930, -930, 424, -930, -930, -930, - -930, -930, -930, 427, -930, 428, -930, 34, -930, -930, + -930, -930, -930, -930, 41, -157, 195, 122, 67, 605, + 198, 225, -37, 180, 71, -86, 424, 54, -930, 206, + 212, 215, 218, 219, -930, 239, -930, -930, -930, 244, + 252, 280, -930, -930, -930, -930, -930, -930, 283, 311, + 321, 323, 337, 338, 345, 354, 355, 367, 368, -930, + 369, 381, 391, 402, 405, -930, -930, -930, 407, 412, + 414, -930, -930, -930, -930, -930, -930, -930, 417, 419, + 420, -930, -930, -930, -930, -930, 429, -930, -930, -930, + -930, -930, -930, 431, -930, 433, -930, 94, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, 431, -930, 53, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, 433, -930, -930, + -930, 435, -930, 97, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, -930, -930, -930, 436, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, 64, -930, -930, -930, -930, + -930, -930, -930, -930, -930, 107, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, 71, -930, -930, -930, -930, -930, -930, + -930, -930, -930, 115, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - 382, 244, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, 385, -930, -930, 435, -930, -930, - -930, 436, -930, -930, 434, 441, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, -930, 443, - 452, -930, -930, -930, -930, 437, 455, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, -930, 82, - -930, -930, -930, 456, -930, -930, 459, -930, 465, 466, - -930, -930, 468, 469, -930, -930, -930, -930, -930, -930, - -930, 84, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, -930, 470, - 94, -930, -930, -930, -930, 41, 41, -930, -147, 471, - -930, 473, 475, 480, 262, 288, 296, 482, 490, 491, - 493, 494, 495, 306, 309, 310, 311, 314, 316, 320, - 321, 324, 317, 327, 519, 330, 333, 334, 338, 341, - 537, 538, 539, 348, 349, 352, 549, 551, 552, 553, - 554, 586, 587, 395, 397, 400, 589, 591, 592, 594, - 595, 405, 597, 598, 600, 603, 604, 606, 412, 607, - -930, 114, -930, 608, 609, 610, 418, 67, -930, 612, - 614, 615, 616, 618, 619, 429, 621, 622, 623, 239, - -930, 624, 36, -930, 625, 626, 632, 633, 634, 637, - 639, 640, -930, 249, -930, 641, 642, 453, 643, 645, - 646, 454, -930, 70, 648, 457, 462, -930, 289, 649, - 656, 93, -930, 476, 668, 670, 497, 671, 498, 499, - 684, 685, 502, 503, 697, 698, 701, 703, 588, -930, - 708, 518, 202, -930, -930, -930, 711, 517, 709, 710, - 712, -930, -930, -930, 526, 528, 529, 717, 718, 721, + 250, 220, -930, -930, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, 297, -930, -930, 438, -930, -930, + -930, 439, -930, -930, 310, 226, -930, -930, -930, -930, + -930, -930, -930, -930, -930, -930, -930, -930, -930, 440, + 441, -930, -930, -930, -930, 379, 299, -930, -930, -930, + -930, -930, -930, -930, -930, -930, -930, -930, -930, 126, + -930, -930, -930, 443, -930, -930, 449, -930, 452, 454, + -930, -930, 455, 456, -930, -930, -930, -930, -930, -930, + -930, 208, -930, -930, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, -930, -930, -930, -930, -930, 459, + 210, -930, -930, -930, -930, 41, 41, -930, -143, 465, + -930, 466, 468, 471, -136, 282, 286, 473, 476, 480, + 481, 482, 487, 302, 306, 309, 317, 322, 296, 303, + 313, 320, 325, 329, 490, 330, 333, 308, 316, 334, + 491, 502, 531, 341, 344, 346, 538, 541, 542, 568, + 569, 583, 584, 356, 392, 393, 587, 588, 591, 592, + 593, 403, 595, 596, 598, 600, 602, 603, 411, 606, + -930, 122, -930, 607, 608, 609, 418, 67, -930, 610, + 612, 615, 616, 618, 619, 430, 620, 622, 623, 605, + -930, 624, 198, -930, 625, 626, 632, 633, 634, 637, + 639, 640, -930, 225, -930, 641, 642, 453, 643, 645, + 646, 457, -930, 180, 647, 462, 463, -930, 71, 648, + 649, 35, -930, 475, 669, 670, 494, 671, 496, 497, + 681, 689, 503, 505, 690, 695, 706, 707, 424, -930, + 708, 521, 54, -930, -930, -930, 713, 712, 716, 717, + 718, -930, -930, -930, 415, 526, 532, 720, 721, 738, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, 533, -930, -930, -930, -930, -930, -113, 534, 536, - -930, -930, -930, 726, 727, 728, 729, 730, 541, 291, - -930, -930, -930, 731, 746, 747, 748, 749, -930, 752, - 753, 754, 755, 560, 561, -930, 758, -930, 759, 253, - 260, -930, -930, 571, 572, 573, 763, 575, 576, -930, - 759, 577, 765, -930, 579, -930, 759, 582, 583, 584, - 585, 590, 593, 596, -930, 599, 601, -930, 602, 611, - 613, -930, -930, 617, -930, -930, -930, 620, 730, -930, - -930, 627, 628, -930, 629, -930, -930, 33, 630, -930, - -930, -113, 631, 635, 636, -930, 775, -930, -930, 41, - 114, 202, 67, 757, -930, -930, -930, 520, 520, 776, - -930, -930, -930, -930, -930, -930, -930, -930, -930, 778, - 779, 781, 782, -930, -930, -930, -930, -930, -930, -930, - -930, 87, 784, 785, 790, 157, 134, 286, 259, 588, - -930, -930, 791, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, 793, -930, -930, -930, -930, 169, + -930, 550, -930, -930, -930, -930, -930, -93, 551, 552, + -930, -930, -930, 742, 743, 744, 745, 746, 557, 294, + -930, -930, -930, 747, 749, 750, 751, 752, -930, 753, + 754, 755, 756, 563, 564, -930, 759, -930, 760, 160, + 183, -930, -930, 572, 573, 574, 764, 576, 577, -930, + 760, 578, 766, -930, 582, -930, 760, 585, 586, 589, + 590, 594, 597, 599, -930, 601, 604, -930, 611, 613, + 614, -930, -930, 617, -930, -930, -930, 621, 746, -930, + -930, 627, 628, -930, 629, -930, -930, 12, 630, -930, + -930, -93, 631, 635, 636, -930, 772, -930, -930, 41, + 122, 54, 67, 757, -930, -930, -930, 515, 515, 771, + -930, -930, -930, -930, -930, -930, -930, -930, -930, 775, + 778, 779, 780, -930, -930, -930, -930, -930, -930, -930, + -930, 53, 782, 783, 785, 6, 69, -59, 142, 424, + -930, -930, 789, -930, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, 790, -930, -930, -930, -930, 213, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, 776, -930, - 100, 102, 115, -930, 145, -930, -930, -930, -930, -930, - -930, 797, 798, 799, 800, 802, -930, -930, -930, -930, - 804, 805, 806, 808, 809, 811, -930, 147, -930, -930, + -930, -930, -930, -930, -930, -930, -930, -930, 771, -930, + 242, 243, 254, -930, 267, -930, -930, -930, -930, -930, + -930, 796, 797, 798, 799, 800, -930, -930, -930, -930, + 802, 805, 806, 808, 809, 810, -930, 274, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, -930, 208, - -930, 810, 814, -930, -930, 812, 816, -930, -930, 818, - 817, -930, -930, 820, 824, -930, -930, 822, 828, -930, - -930, -930, -930, -930, -930, 148, -930, -930, -930, -930, - -930, -930, -930, 154, -930, -930, 826, 830, -930, -930, - 829, 831, -930, 832, 833, 834, 835, 836, 837, 226, + -930, -930, -930, -930, -930, -930, -930, -930, -930, 277, + -930, 811, 813, -930, -930, 812, 816, -930, -930, 814, + 821, -930, -930, 820, 824, -930, -930, 822, 828, -930, + -930, -930, -930, -930, -930, 84, -930, -930, -930, -930, + -930, -930, -930, 90, -930, -930, 826, 830, -930, -930, + 829, 831, -930, 832, 833, 834, 835, 836, 837, 278, -930, -930, -930, -930, -930, -930, -930, 838, 839, 840, - -930, 237, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, 240, -930, -930, -930, 841, -930, 842, - -930, -930, -930, 250, -930, -930, -930, -930, -930, 254, - -930, 164, -930, 653, -930, 843, 845, -930, -930, -930, + -930, 298, -930, -930, -930, -930, -930, -930, -930, -930, + -930, -930, -930, 300, -930, -930, -930, 841, -930, 842, + -930, -930, -930, 301, -930, -930, -930, -930, -930, 314, + -930, 119, -930, 653, -930, 843, 845, -930, -930, -930, -930, 844, 847, -930, -930, -930, 846, 757, -930, 850, - 851, 852, 853, 663, 654, 664, 665, 666, 856, 859, - 860, 861, 672, 673, 674, 675, 669, 676, 520, -930, - -930, 520, -930, 776, 239, -930, 778, 70, -930, 779, - 289, -930, 781, 605, -930, 782, 87, -930, 297, 784, - -930, 249, -930, 785, -98, -930, 790, 677, 678, 679, - 680, 681, 683, 157, -930, 682, 686, 687, 134, -930, - 881, 888, 286, -930, 704, 896, 722, 901, 259, -930, - -930, 156, 791, -930, -930, 915, 919, 36, -930, 793, - 930, -930, -930, 741, -930, 378, 744, 762, 819, -930, - -930, -930, -930, -930, 823, 825, 827, 848, -930, -930, - -930, -930, -930, -930, -930, 279, -930, 343, -930, 933, + 851, 852, 853, 656, 661, 664, 663, 666, 858, 859, + 860, 861, 672, 673, 674, 675, 676, 677, 515, -930, + -930, 515, -930, 771, 605, -930, 775, 180, -930, 778, + 71, -930, 779, 304, -930, 780, 53, -930, 214, 782, + -930, 225, -930, 783, -86, -930, 785, 679, 680, 683, + 684, 686, 687, 6, -930, 688, 697, 705, 69, -930, + 862, 867, -59, -930, 704, 872, 710, 913, 142, -930, + -930, 221, 789, -930, -930, 915, 919, 198, -930, 790, + 930, -930, -930, 741, -930, 394, 762, 763, 765, -930, + -930, -930, -930, -930, 818, 819, 823, 825, -930, -930, + -930, -930, -930, -930, -930, 318, -930, 332, -930, 933, -930, 940, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -930, 356, -930, -930, -930, - -930, -930, -930, -930, -930, -930, -930, -930, 945, -930, - -930, -930, -930, -930, -930, -930, -930, -930, 949, 956, - -930, -930, -930, -930, -930, 1002, -930, 357, -930, -930, + -930, -930, -930, -930, -930, -930, 348, -930, -930, -930, + -930, -930, -930, -930, -930, -930, -930, -930, 934, -930, + -930, -930, -930, -930, -930, -930, -930, -930, 941, 1007, + -930, -930, -930, -930, -930, 1010, -930, 349, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - 849, 854, -930, -930, 855, -930, 41, -930, -930, 1008, - -930, -930, -930, -930, -930, 383, -930, -930, -930, -930, - -930, -930, 857, 386, -930, 759, -930, -930, -930, -930, + 827, 848, -930, -930, 849, -930, 41, -930, -930, 1016, + -930, -930, -930, -930, -930, 352, -930, -930, -930, -930, + -930, -930, 854, 383, -930, 760, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, 605, -930, 1014, 858, -930, 297, -930, - -930, -930, -930, -930, -930, 1016, 862, 1018, 156, -930, - -930, -930, -930, -930, 864, -930, -930, 1019, -930, 865, - -930, -930, 1020, -930, -930, 243, -930, 23, 1020, -930, - -930, 1021, 1022, 1024, -930, 389, -930, -930, -930, -930, - -930, -930, -930, 1025, 863, 866, 867, 1026, 23, -930, - 869, -930, -930, -930, 871, -930, -930, -930 + -930, -930, -930, 304, -930, 1018, 855, -930, 214, -930, + -930, -930, -930, -930, -930, 1019, 856, 1020, 221, -930, + -930, -930, -930, -930, 863, -930, -930, 1021, -930, 864, + -930, -930, 1022, -930, -930, 140, -930, -125, 1022, -930, + -930, 1023, 1024, 1026, -930, 385, -930, -930, -930, -930, + -930, -930, -930, 1027, 857, 865, 866, 1028, -125, -930, + 868, -930, -930, -930, 869, -930, -930, -930 }; const short @@ -4764,46 +4764,46 @@ namespace isc { namespace dhcp { Dhcp4Parser::yypgoto_[] = { -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, -52, -930, -548, -930, 375, + -930, -930, -930, -930, -930, -52, -930, -556, -930, 377, -930, -930, -930, -930, -930, -930, -605, -930, -930, -930, - -67, -930, -930, -930, -930, -930, -930, 361, 562, -40, + -67, -930, -930, -930, -930, -930, -930, 363, 565, -40, -28, -24, -1, 1, 11, 19, 22, 25, 26, -930, -930, -930, -930, 29, 30, 32, 37, 40, 43, -930, - 371, 44, -930, 45, -930, 47, 48, 50, -930, 51, - -930, 55, -930, -930, -930, -930, -930, 363, 557, -930, + 373, 44, -930, 45, -930, 47, 48, 50, -930, 51, + -930, 55, -930, -930, -930, -930, -930, 365, 558, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, 119, -930, -930, -930, -930, - -930, -930, 280, -930, 96, -930, -665, 99, -930, -930, + -930, -930, -930, -930, -930, 123, -930, -930, -930, -930, + -930, -930, 281, -930, 95, -930, -665, 103, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -63, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, 85, -930, -930, -930, -930, -930, -930, -930, -930, - 72, -930, -930, -930, -930, -930, -930, -930, 78, -930, - -930, -930, 76, 524, -930, -930, -930, -930, -930, -930, - -930, 73, -930, -930, -930, -930, -930, -930, -929, -930, - -930, -930, 101, -930, -930, -930, 110, 563, -930, -930, + -930, 88, -930, -930, -930, -930, -930, -930, -930, -930, + 68, -930, -930, -930, -930, -930, -930, -930, 79, -930, + -930, -930, 83, 528, -930, -930, -930, -930, -930, -930, + -930, 77, -930, -930, -930, -930, -930, -930, -929, -930, + -930, -930, 109, -930, -930, -930, 112, 570, -930, -930, -930, -930, -930, -930, -930, -930, -926, -930, -65, -930, 56, -930, 58, 61, 62, 63, -930, -930, -930, -930, - -930, -930, -930, 111, -930, -930, -97, -46, -930, -930, - -930, -930, -930, 118, -930, -930, -930, 121, -930, 556, + -930, -930, -930, 110, -930, -930, -87, -46, -930, -930, + -930, -930, -930, 118, -930, -930, -930, 124, -930, 555, -930, -42, -930, -930, -930, -930, -930, -36, -930, -930, - -930, -930, -930, -35, -930, -930, -930, 120, -930, -930, - -930, 123, -930, 558, -930, -930, -930, -930, -930, -930, - -930, -930, -930, -930, -930, 75, -930, -930, -930, 80, - 578, -930, -930, -51, -930, -11, -930, -25, -930, -930, - -930, 112, -930, -930, -930, 117, -930, 568, -55, -930, + -930, -930, -930, -35, -930, -930, -930, 117, -930, -930, + -930, 120, -930, 554, -930, -930, -930, -930, -930, -930, + -930, -930, -930, -930, -930, 75, -930, -930, -930, 76, + 638, -930, -930, -51, -930, -11, -930, -25, -930, -930, + -930, 113, -930, -930, -930, 116, -930, 575, -55, -930, 0, -930, 7, -930, 350, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, -930, -925, -930, -930, -930, -930, -930, 124, -930, - -930, -930, -78, -930, -930, -930, -930, -930, -930, -930, - -930, 103, -930, -930, -930, -930, -930, -930, -930, 105, + -930, -930, -925, -930, -930, -930, -930, -930, 125, -930, + -930, -930, -83, -930, -930, -930, -930, -930, -930, -930, + -930, 98, -930, -930, -930, -930, -930, -930, -930, 93, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - 372, 544, -930, -930, -930, -930, -930, -930, -930, -930, + 374, 544, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, -930, - -930, 421, 542, -930, -930, -930, -930, -930, -930, 95, - -930, -930, -79, -930, -930, -930, -930, -930, -930, -94, - -930, -930, -112, -930, -930, -930, -930, -930, -930, -930 + -930, 416, 543, -930, -930, -930, -930, -930, -930, 101, + -930, -930, -79, -930, -930, -930, -930, -930, -930, -96, + -930, -930, -114, -930, -930, -930, -930, -930, -930, -930 }; const short @@ -4858,117 +4858,117 @@ namespace isc { namespace dhcp { 146, 212, 231, 279, 296, 280, 322, 341, 358, 378, 323, 342, 78, 809, 274, 727, 303, 219, 271, 286, 298, 731, 336, 354, 1058, 379, 314, 1059, 1074, 232, - 356, 357, 343, 81, 269, 282, 297, 471, 344, 693, - 122, 233, 472, 406, 273, 234, 29, 546, 30, 28, - 31, 750, 681, 682, 683, 684, 477, 220, 272, 287, - 299, 478, 337, 355, 40, 380, 42, 489, 235, 275, - 236, 304, 490, 44, 492, 46, 276, 407, 305, 493, - 237, 48, 208, 209, 685, 521, 210, 538, 238, 211, - 522, 239, 539, 50, 240, 241, 145, 542, 242, 243, - 693, 244, 543, 471, 315, 542, 245, 84, 913, 246, - 914, 52, 247, 248, 249, 54, 250, 251, 477, 252, - 253, 123, 404, 915, 254, 86, 281, 264, 87, 56, - 265, 266, 267, 278, 125, 126, 58, 88, 60, 89, - 90, 91, 92, 93, 94, 95, 96, 97, 917, 228, - 938, 956, 229, 918, 957, 939, 316, 959, 317, 318, - 960, 405, 319, 320, 321, 125, 126, 992, 125, 126, - 993, 98, 99, 100, 101, 102, 103, 104, 105, 106, - 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 121, 62, 751, 1190, 122, 123, - 1191, 1192, 1193, 1194, 408, 830, 831, 832, 833, 124, - 834, 938, 125, 126, 398, 399, 940, 127, 128, 129, - 130, 356, 357, 410, 1058, 131, 132, 1059, 1074, 973, - 145, 133, 125, 126, 974, 32, 33, 34, 35, 414, - 978, 134, 316, 982, 135, 979, 1188, 503, 983, 1189, - 415, 136, 137, 988, 125, 126, 138, 538, 989, 139, - 416, 145, 990, 140, 145, 90, 91, 92, 93, 94, - 715, 716, 423, 867, 868, 869, 1025, 92, 93, 94, - 718, 719, 938, 141, 142, 143, 144, 1149, 853, 854, - 855, 856, 857, 858, 295, 908, 98, 99, 100, 101, - 102, 103, 104, 105, 106, 107, 424, 425, 145, 426, - 112, 113, 114, 115, 116, 117, 118, 119, 120, 427, - 221, 222, 223, 428, 123, 92, 93, 94, 145, 1118, - 429, 1119, 1120, 430, 123, 224, 431, 125, 126, 225, - 226, 227, 127, 128, 129, 130, 489, 125, 126, 432, - 145, 1150, 228, 544, 545, 229, 133, 125, 126, 1153, - 521, 288, 433, 230, 1154, 1160, 435, 289, 290, 291, - 292, 293, 294, 436, 295, 316, 338, 317, 318, 339, - 340, 122, 123, 316, 125, 126, 1168, 125, 126, 492, - 502, 1169, 1208, 504, 1171, 125, 126, 1209, 696, 697, - 698, 699, 437, 438, 146, 887, 888, 889, 141, 142, - 212, 1077, 1078, 1137, 1138, 1139, 1140, 439, 443, 444, - 445, 453, 231, 454, 455, 279, 219, 280, 461, 878, - 879, 468, 470, 145, 274, 476, 296, 485, 271, 507, - 511, 286, 512, 145, 513, 517, 322, 515, 303, 232, - 323, 341, 298, 890, 269, 342, 516, 282, 518, 551, - 523, 233, 336, 526, 273, 234, 220, 354, 297, 528, - 529, 378, 532, 533, 541, 547, 343, 548, 272, 549, - 145, 287, 344, 145, 550, 552, 554, 379, 235, 275, - 236, 145, 299, 553, 555, 556, 276, 557, 558, 559, - 237, 560, 337, 304, 561, 562, 563, 355, 238, 564, - 305, 239, 569, 565, 240, 241, 566, 567, 242, 243, - 568, 244, 570, 571, 670, 572, 245, 380, 573, 246, - 1172, 574, 247, 248, 249, 575, 250, 251, 576, 252, - 253, 577, 578, 579, 254, 580, 581, 264, 281, 582, - 265, 266, 267, 583, 767, 584, 585, 586, 587, 768, - 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, - 779, 780, 781, 782, 783, 784, 785, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 588, 589, 590, 593, 591, 594, 595, 592, 596, 597, - 598, 599, 600, 146, 601, 212, 316, 602, 603, 605, - 604, 606, 608, 609, 610, 611, 613, 759, 614, 615, - 616, 219, 617, 618, 619, 620, 621, 622, 624, 626, + 750, 693, 343, 28, 269, 282, 297, 81, 344, 125, + 126, 233, 356, 357, 273, 234, 29, 122, 30, 1190, + 31, 546, 1191, 1192, 1193, 1194, 40, 220, 272, 287, + 299, 551, 337, 355, 42, 380, 398, 399, 235, 275, + 236, 304, 681, 682, 683, 684, 276, 44, 305, 46, + 237, 48, 208, 209, 878, 879, 210, 956, 238, 211, + 957, 239, 693, 959, 240, 241, 960, 471, 242, 243, + 477, 244, 472, 50, 685, 478, 245, 52, 145, 246, + 489, 54, 247, 248, 249, 490, 250, 251, 492, 252, + 253, 56, 992, 493, 254, 993, 281, 264, 58, 521, + 265, 266, 267, 86, 522, 145, 87, 853, 854, 855, + 856, 857, 858, 1188, 60, 88, 1189, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 62, 316, 338, 317, + 318, 339, 340, 356, 357, 125, 126, 125, 126, 125, + 126, 830, 831, 832, 833, 751, 834, 715, 716, 98, + 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 718, 719, 84, 122, 123, 867, 868, + 869, 538, 404, 542, 315, 405, 539, 124, 543, 406, + 125, 126, 408, 503, 1058, 127, 407, 1059, 1074, 513, + 128, 129, 130, 131, 132, 32, 33, 34, 35, 133, + 125, 126, 92, 93, 94, 471, 542, 410, 414, 134, + 913, 914, 135, 92, 93, 94, 415, 477, 502, 136, + 137, 145, 915, 145, 138, 145, 316, 139, 317, 318, + 917, 140, 319, 320, 321, 918, 1025, 938, 125, 126, + 938, 973, 939, 123, 416, 940, 974, 423, 887, 888, + 889, 141, 142, 143, 144, 278, 125, 126, 122, 123, + 316, 978, 518, 982, 988, 504, 979, 316, 983, 989, + 123, 228, 125, 126, 229, 424, 145, 538, 512, 125, + 126, 938, 990, 125, 126, 425, 1149, 426, 1077, 1078, + 90, 91, 92, 93, 94, 489, 890, 288, 295, 908, + 1150, 427, 428, 289, 290, 291, 292, 293, 294, 429, + 295, 1153, 521, 544, 545, 1168, 1154, 1160, 430, 431, + 1169, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 107, 432, 433, 435, 145, 112, 113, 114, 115, 116, + 117, 118, 119, 120, 121, 436, 492, 517, 1208, 123, + 316, 1171, 145, 1209, 1118, 437, 1119, 1120, 696, 697, + 698, 699, 125, 126, 146, 226, 438, 127, 145, 439, + 212, 443, 128, 129, 130, 145, 444, 228, 445, 145, + 229, 453, 231, 454, 455, 279, 219, 280, 230, 1137, + 1138, 1139, 1140, 461, 274, 468, 296, 470, 271, 476, + 485, 286, 507, 511, 515, 516, 322, 523, 303, 232, + 323, 341, 298, 526, 269, 342, 528, 282, 529, 532, + 533, 233, 336, 541, 273, 234, 220, 354, 297, 547, + 548, 378, 549, 141, 142, 550, 343, 554, 272, 552, + 555, 287, 344, 553, 556, 557, 558, 379, 235, 275, + 236, 559, 299, 565, 571, 577, 276, 560, 145, 566, + 237, 561, 337, 304, 562, 574, 578, 355, 238, 567, + 305, 239, 563, 575, 240, 241, 568, 564, 242, 243, + 569, 244, 125, 126, 570, 572, 245, 380, 573, 246, + 1172, 576, 247, 248, 249, 579, 250, 251, 580, 252, + 253, 581, 583, 582, 254, 584, 585, 264, 281, 767, + 265, 266, 267, 590, 768, 769, 770, 771, 772, 773, + 774, 775, 776, 777, 778, 779, 780, 781, 782, 783, + 784, 785, 586, 587, 363, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 588, 589, 591, + 592, 593, 594, 376, 377, 595, 596, 597, 598, 599, + 600, 316, 601, 146, 602, 212, 603, 604, 605, 674, + 606, 608, 609, 610, 613, 611, 614, 759, 145, 615, + 616, 219, 617, 618, 620, 619, 621, 622, 624, 626, 627, 90, 91, 92, 93, 94, 628, 629, 630, 870, 880, 631, 378, 632, 633, 635, 636, 638, 637, 639, - 640, 641, 643, 647, 644, 876, 881, 891, 379, 645, - 648, 220, 98, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 651, 650, 652, 654, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 125, 126, 657, 658, - 123, 316, 653, 655, 656, 877, 882, 892, 380, 659, - 660, 661, 662, 125, 126, 663, 226, 664, 127, 128, - 129, 130, 666, 667, 145, 669, 671, 672, 228, 673, - 674, 229, 675, 676, 677, 678, 679, 680, 687, 230, - 688, 689, 690, 691, 692, 695, 701, 30, 363, 364, - 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - 375, 702, 703, 704, 710, 711, 705, 376, 377, 706, - 707, 708, 709, 712, 713, 721, 722, 723, 724, 725, - 726, 728, 729, 730, 141, 142, 732, 733, 734, 735, - 758, 763, 145, 810, 736, 814, 818, 737, 822, 826, - 738, 842, 845, 739, 753, 740, 741, 849, 900, 145, - 904, 923, 924, 925, 926, 742, 927, 743, 932, 933, - 934, 744, 935, 936, 745, 937, 942, 943, 945, 946, - 949, 747, 748, 749, 948, 755, 951, 952, 954, 756, + 640, 643, 647, 648, 641, 876, 881, 891, 379, 644, + 645, 220, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 650, 651, 652, 654, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 657, 221, 222, 223, 653, + 123, 655, 656, 658, 661, 877, 882, 892, 380, 662, + 659, 224, 660, 125, 126, 225, 226, 227, 127, 145, + 663, 664, 666, 128, 129, 130, 667, 669, 228, 670, + 675, 229, 133, 671, 672, 673, 676, 677, 678, 230, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 679, 680, 687, 688, 689, 690, 691, + 692, 695, 701, 30, 702, 703, 704, 710, 711, 705, + 706, 707, 708, 709, 712, 713, 721, 722, 723, 724, + 725, 726, 728, 729, 141, 142, 730, 758, 810, 732, + 733, 763, 814, 734, 735, 818, 822, 826, 736, 842, + 845, 737, 849, 738, 753, 739, 900, 904, 740, 145, + 923, 924, 925, 926, 927, 741, 932, 742, 743, 933, + 934, 744, 935, 936, 937, 745, 943, 942, 945, 946, + 948, 747, 748, 749, 949, 755, 951, 952, 954, 756, 757, 955, 962, 963, 966, 965, 967, 968, 969, 970, 971, 972, 975, 976, 977, 984, 986, 994, 999, 998, - 1003, 1010, 1001, 1002, 1005, 1006, 1007, 1008, 1009, 1011, - 1014, 1013, 1012, 1015, 1016, 1017, 1022, 1018, 1019, 1020, - 1021, 1023, 1099, 1100, 1101, 1102, 1103, 231, 1104, 1106, - 322, 1107, 1108, 341, 323, 1110, 1033, 342, 1060, 274, - 1057, 1079, 1111, 271, 296, 1080, 336, 358, 1071, 354, - 1114, 1113, 1069, 1085, 232, 1116, 303, 1083, 343, 269, - 298, 870, 1081, 1034, 344, 880, 233, 1115, 1068, 273, + 1003, 1009, 1001, 1002, 1005, 1006, 1007, 1008, 1010, 1011, + 1012, 1013, 1014, 1015, 1016, 1017, 1110, 1018, 1019, 1020, + 1021, 1111, 1023, 1022, 1099, 1100, 1114, 231, 1101, 1102, + 322, 1103, 1104, 341, 323, 1106, 1033, 342, 1060, 274, + 1057, 1079, 1107, 271, 296, 1080, 336, 358, 1071, 354, + 1108, 1113, 1069, 1085, 232, 1115, 303, 1083, 343, 269, + 298, 870, 1081, 1034, 344, 880, 233, 1116, 1068, 273, 234, 1131, 1132, 1082, 1121, 1035, 297, 876, 1122, 1036, - 279, 881, 280, 272, 1135, 1136, 337, 891, 1142, 355, - 1123, 1151, 1070, 235, 275, 236, 286, 1084, 1152, 1156, - 299, 276, 1037, 1072, 1038, 237, 1143, 1157, 1086, 1158, + 279, 881, 280, 272, 1135, 1136, 337, 891, 1156, 355, + 1123, 1151, 1070, 235, 275, 236, 286, 1084, 1152, 1157, + 299, 276, 1037, 1072, 1038, 237, 1142, 1143, 1086, 1144, 1073, 304, 282, 238, 1039, 1087, 239, 877, 305, 240, 241, 882, 1040, 242, 243, 1041, 244, 892, 1042, 1043, 1124, 245, 1044, 1045, 246, 1046, 287, 247, 248, 249, 1047, 250, 251, 1048, 252, 253, 1049, 1050, 1051, 254, 1052, 1053, 264, 1054, 1055, 265, 266, 267, 1056, 1061, - 1159, 1062, 1166, 1144, 1063, 1064, 1065, 1145, 1174, 1146, - 1177, 1147, 1179, 746, 1182, 1204, 1205, 1184, 1206, 1210, - 1214, 760, 754, 607, 612, 762, 1004, 1024, 912, 1026, - 1097, 1076, 1148, 1161, 1098, 649, 1105, 1028, 1162, 1163, - 1109, 1170, 623, 281, 1027, 1175, 1173, 1178, 1181, 1183, - 1211, 1212, 1213, 1216, 1164, 1217, 1075, 1030, 1029, 642, - 625, 634, 1032, 1031, 1134, 1096, 646, 1133, 1095, 909, - 1176, 899, 665, 1094, 668, 1112, 1033, 1130, 1060, 1180, - 1057, 1079, 761, 1117, 1202, 1080, 1215, 0, 1071, 0, + 1158, 1062, 1145, 1146, 1063, 1064, 1065, 1147, 1159, 1148, + 1166, 1161, 1174, 1177, 1179, 746, 1182, 1204, 1205, 1184, + 1206, 1210, 1214, 760, 754, 612, 607, 762, 1026, 912, + 1004, 1024, 1162, 1163, 1076, 1098, 1109, 1097, 1170, 649, + 1105, 1178, 1175, 281, 1211, 1028, 1027, 1181, 1183, 623, + 1212, 1213, 1216, 1217, 1164, 1075, 1173, 1030, 642, 1032, + 1031, 1029, 646, 1133, 1134, 1176, 1096, 1095, 634, 909, + 1112, 1117, 665, 899, 1094, 668, 1033, 761, 1060, 1180, + 1057, 1079, 1202, 1130, 1215, 1080, 0, 0, 1071, 0, 0, 1121, 1069, 1085, 0, 1122, 0, 1083, 0, 0, 0, 0, 1081, 1034, 0, 0, 0, 1123, 1068, 0, 0, 0, 0, 1082, 0, 1035, 0, 0, 0, 1036, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 625, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1070, 0, 0, 0, 0, 1084, 0, 0, 0, 0, 1037, 1072, 1038, 0, 0, 1124, 1086, 0, 1073, 0, 0, 0, 1039, 1087, 0, 0, 0, 0, @@ -4985,117 +4985,117 @@ namespace isc { namespace dhcp { 67, 68, 69, 70, 71, 70, 73, 74, 75, 76, 73, 74, 64, 678, 69, 620, 71, 68, 69, 70, 71, 626, 73, 74, 953, 76, 72, 953, 953, 69, - 128, 129, 74, 194, 69, 70, 71, 3, 74, 587, - 84, 69, 8, 4, 69, 69, 5, 194, 7, 0, - 9, 18, 165, 166, 167, 168, 3, 68, 69, 70, - 71, 8, 73, 74, 7, 76, 7, 3, 69, 69, - 69, 71, 8, 7, 3, 7, 69, 8, 71, 8, - 69, 7, 15, 16, 197, 3, 19, 3, 69, 22, - 8, 69, 8, 7, 69, 69, 194, 3, 69, 69, - 648, 69, 8, 3, 34, 3, 69, 10, 8, 69, - 8, 7, 69, 69, 69, 7, 69, 69, 3, 69, - 69, 85, 6, 8, 69, 11, 70, 69, 14, 7, - 69, 69, 69, 97, 98, 99, 7, 23, 7, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 3, 113, - 3, 3, 116, 8, 6, 8, 86, 3, 88, 89, - 6, 3, 92, 93, 94, 98, 99, 3, 98, 99, - 6, 57, 58, 59, 60, 61, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 7, 163, 174, 84, 85, - 177, 178, 179, 180, 3, 118, 119, 120, 121, 95, - 123, 3, 98, 99, 12, 13, 8, 103, 104, 105, - 106, 128, 129, 8, 1153, 111, 112, 1153, 1153, 3, - 194, 117, 98, 99, 8, 194, 195, 196, 197, 4, - 3, 127, 86, 3, 130, 8, 3, 3, 8, 6, - 4, 137, 138, 3, 98, 99, 142, 3, 8, 145, - 4, 194, 8, 149, 194, 26, 27, 28, 29, 30, - 17, 18, 4, 139, 140, 141, 941, 28, 29, 30, - 20, 21, 3, 169, 170, 171, 172, 8, 131, 132, - 133, 134, 135, 136, 125, 126, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 4, 4, 194, 4, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 4, - 81, 82, 83, 4, 85, 28, 29, 30, 194, 173, - 4, 175, 176, 4, 85, 96, 4, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 3, 98, 99, 4, - 194, 8, 113, 405, 406, 116, 117, 98, 99, 3, - 3, 112, 4, 124, 8, 8, 4, 118, 119, 120, - 121, 122, 123, 4, 125, 86, 87, 88, 89, 90, - 91, 84, 85, 86, 98, 99, 3, 98, 99, 3, - 8, 8, 3, 8, 8, 98, 99, 8, 107, 108, - 109, 110, 4, 4, 471, 146, 147, 148, 169, 170, - 477, 114, 115, 35, 36, 37, 38, 4, 4, 4, - 4, 4, 489, 4, 4, 492, 477, 492, 4, 143, - 144, 4, 4, 194, 489, 4, 503, 4, 489, 4, - 4, 492, 8, 194, 3, 8, 513, 4, 503, 489, - 513, 518, 503, 194, 489, 518, 4, 492, 3, 197, + 18, 587, 74, 0, 69, 70, 71, 194, 74, 98, + 99, 69, 128, 129, 69, 69, 5, 84, 7, 174, + 9, 194, 177, 178, 179, 180, 7, 68, 69, 70, + 71, 197, 73, 74, 7, 76, 12, 13, 69, 69, + 69, 71, 165, 166, 167, 168, 69, 7, 71, 7, + 69, 7, 15, 16, 143, 144, 19, 3, 69, 22, + 6, 69, 648, 3, 69, 69, 6, 3, 69, 69, + 3, 69, 8, 7, 197, 8, 69, 7, 194, 69, + 3, 7, 69, 69, 69, 8, 69, 69, 3, 69, + 69, 7, 3, 8, 69, 6, 70, 69, 7, 3, + 69, 69, 69, 11, 8, 194, 14, 131, 132, 133, + 134, 135, 136, 3, 7, 23, 6, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 7, 86, 87, 88, + 89, 90, 91, 128, 129, 98, 99, 98, 99, 98, + 99, 118, 119, 120, 121, 163, 123, 17, 18, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 20, 21, 10, 84, 85, 139, 140, + 141, 3, 6, 3, 34, 3, 8, 95, 8, 4, + 98, 99, 3, 3, 1153, 103, 8, 1153, 1153, 3, + 108, 109, 110, 111, 112, 194, 195, 196, 197, 117, + 98, 99, 28, 29, 30, 3, 3, 8, 4, 127, + 8, 8, 130, 28, 29, 30, 4, 3, 8, 137, + 138, 194, 8, 194, 142, 194, 86, 145, 88, 89, + 3, 149, 92, 93, 94, 8, 941, 3, 98, 99, + 3, 3, 8, 85, 4, 8, 8, 4, 146, 147, + 148, 169, 170, 171, 172, 97, 98, 99, 84, 85, + 86, 3, 3, 3, 3, 8, 8, 86, 8, 8, + 85, 113, 98, 99, 116, 4, 194, 3, 8, 98, + 99, 3, 8, 98, 99, 4, 8, 4, 114, 115, + 26, 27, 28, 29, 30, 3, 194, 112, 125, 126, + 8, 4, 4, 118, 119, 120, 121, 122, 123, 4, + 125, 3, 3, 405, 406, 3, 8, 8, 4, 4, + 8, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 4, 4, 4, 194, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 80, 4, 3, 8, 3, 85, + 86, 8, 194, 8, 173, 4, 175, 176, 104, 105, + 106, 107, 98, 99, 471, 101, 4, 103, 194, 4, + 477, 4, 108, 109, 110, 194, 4, 113, 4, 194, + 116, 4, 489, 4, 4, 492, 477, 492, 124, 35, + 36, 37, 38, 4, 489, 4, 503, 4, 489, 4, + 4, 492, 4, 4, 4, 4, 513, 4, 503, 489, + 513, 518, 503, 4, 489, 518, 4, 492, 4, 4, 4, 489, 513, 4, 489, 489, 477, 518, 503, 4, - 4, 538, 4, 4, 4, 4, 518, 4, 489, 4, - 194, 492, 518, 194, 4, 197, 4, 538, 489, 489, - 489, 194, 503, 197, 4, 4, 489, 4, 4, 4, - 489, 195, 513, 503, 195, 195, 195, 518, 489, 195, - 503, 489, 195, 197, 489, 489, 196, 196, 489, 489, - 196, 489, 195, 4, 7, 195, 489, 538, 195, 489, - 1135, 197, 489, 489, 489, 197, 489, 489, 197, 489, - 489, 4, 4, 4, 489, 197, 197, 489, 492, 197, - 489, 489, 489, 4, 34, 4, 4, 4, 4, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 181, 182, 183, - 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, - 4, 4, 197, 4, 197, 4, 4, 197, 4, 4, - 195, 4, 4, 670, 4, 672, 86, 4, 4, 197, - 4, 4, 4, 4, 4, 197, 4, 669, 4, 4, - 4, 672, 4, 4, 195, 4, 4, 4, 4, 4, + 4, 538, 4, 169, 170, 4, 518, 4, 489, 197, + 4, 492, 518, 197, 4, 4, 4, 538, 489, 489, + 489, 4, 503, 197, 4, 4, 489, 195, 194, 196, + 489, 195, 513, 503, 195, 197, 4, 518, 489, 196, + 503, 489, 195, 197, 489, 489, 196, 195, 489, 489, + 195, 489, 98, 99, 195, 195, 489, 538, 195, 489, + 1135, 197, 489, 489, 489, 4, 489, 489, 197, 489, + 489, 197, 4, 197, 489, 4, 4, 489, 492, 34, + 489, 489, 489, 197, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 4, 4, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 162, 4, 4, 197, + 197, 4, 4, 169, 170, 4, 4, 4, 195, 4, + 4, 86, 4, 670, 4, 672, 4, 4, 197, 194, + 4, 4, 4, 4, 4, 197, 4, 669, 194, 4, + 4, 672, 4, 4, 4, 195, 4, 4, 4, 4, 4, 26, 27, 28, 29, 30, 4, 4, 4, 706, 707, 4, 709, 4, 4, 4, 4, 4, 195, 4, - 4, 197, 4, 4, 197, 706, 707, 708, 709, 197, - 4, 672, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 4, 197, 4, 4, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 98, 99, 4, 4, - 85, 86, 195, 195, 195, 706, 707, 708, 709, 197, - 197, 4, 4, 98, 99, 4, 101, 4, 103, 104, - 105, 106, 4, 195, 194, 4, 7, 7, 113, 7, - 194, 116, 194, 194, 7, 7, 5, 194, 194, 124, - 194, 5, 5, 5, 5, 194, 5, 7, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 5, 5, 5, 194, 194, 7, 169, 170, 7, - 7, 7, 7, 5, 5, 194, 194, 194, 5, 194, - 194, 194, 7, 194, 169, 170, 194, 194, 194, 194, - 5, 24, 194, 7, 194, 7, 7, 194, 7, 7, - 194, 7, 7, 194, 164, 194, 194, 7, 7, 194, - 7, 4, 4, 4, 4, 194, 4, 194, 4, 4, - 4, 194, 4, 4, 194, 4, 6, 3, 6, 3, - 3, 194, 194, 194, 6, 194, 6, 3, 6, 194, + 4, 4, 4, 4, 197, 706, 707, 708, 709, 197, + 197, 672, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 197, 4, 4, 4, 71, 72, 73, 74, + 75, 76, 77, 78, 79, 4, 81, 82, 83, 195, + 85, 195, 195, 4, 4, 706, 707, 708, 709, 4, + 197, 96, 197, 98, 99, 100, 101, 102, 103, 194, + 4, 4, 4, 108, 109, 110, 195, 4, 113, 7, + 194, 116, 117, 7, 7, 7, 194, 7, 7, 124, + 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 5, 194, 194, 194, 5, 5, 5, + 5, 194, 5, 7, 5, 5, 5, 194, 194, 7, + 7, 7, 7, 7, 5, 5, 194, 194, 194, 5, + 194, 194, 194, 7, 169, 170, 194, 5, 7, 194, + 194, 24, 7, 194, 194, 7, 7, 7, 194, 7, + 7, 194, 7, 194, 164, 194, 7, 7, 194, 194, + 4, 4, 4, 4, 4, 194, 4, 194, 194, 4, + 4, 194, 4, 4, 4, 194, 3, 6, 6, 3, + 6, 194, 194, 194, 3, 194, 6, 3, 6, 194, 194, 3, 6, 3, 3, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 194, 3, 6, - 4, 197, 8, 6, 4, 4, 4, 4, 195, 195, - 4, 195, 197, 4, 4, 4, 197, 195, 195, 195, - 195, 195, 195, 195, 195, 195, 195, 944, 195, 197, - 947, 195, 195, 950, 947, 4, 953, 950, 953, 944, - 953, 958, 4, 944, 961, 958, 947, 964, 953, 950, - 4, 197, 953, 958, 944, 4, 961, 958, 950, 944, - 961, 978, 958, 953, 950, 982, 944, 195, 953, 944, + 4, 195, 8, 6, 4, 4, 4, 4, 197, 195, + 197, 195, 4, 4, 4, 4, 4, 195, 195, 195, + 195, 4, 195, 197, 195, 195, 4, 944, 195, 195, + 947, 195, 195, 950, 947, 197, 953, 950, 953, 944, + 953, 958, 195, 944, 961, 958, 947, 964, 953, 950, + 195, 197, 953, 958, 944, 195, 961, 958, 950, 944, + 961, 978, 958, 953, 950, 982, 944, 4, 953, 944, 944, 6, 3, 958, 991, 953, 961, 978, 991, 953, - 997, 982, 997, 944, 4, 194, 947, 988, 194, 950, - 991, 8, 953, 944, 944, 944, 997, 958, 8, 4, - 961, 944, 953, 953, 953, 944, 194, 8, 958, 3, + 997, 982, 997, 944, 4, 194, 947, 988, 4, 950, + 991, 8, 953, 944, 944, 944, 997, 958, 8, 8, + 961, 944, 953, 953, 953, 944, 194, 194, 958, 194, 953, 961, 997, 944, 953, 958, 944, 978, 961, 944, 944, 982, 953, 944, 944, 953, 944, 988, 953, 953, 991, 944, 953, 953, 944, 953, 997, 944, 944, 944, 953, 944, 944, 953, 944, 944, 953, 953, 953, 944, 953, 953, 944, 953, 953, 944, 944, 944, 953, 953, - 8, 953, 4, 194, 953, 953, 953, 194, 4, 194, - 4, 194, 4, 648, 5, 4, 4, 7, 4, 4, - 4, 670, 661, 471, 477, 672, 917, 938, 758, 943, - 964, 956, 194, 194, 966, 521, 973, 946, 194, 194, - 978, 194, 489, 997, 944, 197, 1153, 195, 194, 194, - 197, 195, 195, 194, 1116, 194, 955, 949, 947, 513, - 492, 503, 952, 950, 999, 963, 518, 997, 961, 729, - 1158, 709, 538, 959, 542, 982, 1153, 992, 1153, 1168, - 1153, 1158, 671, 988, 1188, 1158, 1208, -1, 1153, -1, + 3, 953, 194, 194, 953, 953, 953, 194, 8, 194, + 4, 194, 4, 4, 4, 648, 5, 4, 4, 7, + 4, 4, 4, 670, 661, 477, 471, 672, 943, 758, + 917, 938, 194, 194, 956, 966, 978, 964, 194, 521, + 973, 195, 197, 997, 197, 946, 944, 194, 194, 489, + 195, 195, 194, 194, 1116, 955, 1153, 949, 513, 952, + 950, 947, 518, 997, 999, 1158, 963, 961, 503, 729, + 982, 988, 538, 709, 959, 542, 1153, 671, 1153, 1168, + 1153, 1158, 1188, 992, 1208, 1158, -1, -1, 1153, -1, -1, 1168, 1153, 1158, -1, 1168, -1, 1158, -1, -1, -1, -1, 1158, 1153, -1, -1, -1, 1168, 1153, -1, -1, -1, -1, 1158, -1, 1153, -1, -1, -1, 1153, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 492, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1153, -1, -1, -1, -1, 1158, -1, -1, -1, -1, 1153, 1153, 1153, -1, -1, 1168, 1158, -1, 1153, -1, -1, -1, 1153, 1158, -1, -1, -1, -1, @@ -5121,8 +5121,8 @@ namespace isc { namespace dhcp { 26, 27, 28, 29, 30, 31, 32, 33, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 84, 85, 95, 98, 99, 103, 104, 105, - 106, 111, 112, 117, 127, 130, 137, 138, 142, 145, + 79, 80, 84, 85, 95, 98, 99, 103, 108, 109, + 110, 111, 112, 117, 127, 130, 137, 138, 142, 145, 149, 169, 170, 171, 172, 194, 228, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 250, 251, 252, 253, 254, 255, 256, 259, 261, @@ -5178,7 +5178,7 @@ namespace isc { namespace dhcp { 197, 4, 4, 4, 4, 549, 4, 195, 580, 4, 7, 7, 7, 7, 194, 194, 194, 7, 7, 5, 194, 165, 166, 167, 168, 197, 258, 194, 194, 5, - 5, 5, 5, 215, 217, 194, 107, 108, 109, 110, + 5, 5, 5, 215, 217, 194, 104, 105, 106, 107, 405, 5, 5, 5, 5, 7, 7, 7, 7, 7, 194, 194, 5, 5, 224, 17, 18, 283, 20, 21, 286, 194, 194, 194, 5, 194, 194, 224, 194, 7, @@ -5436,16 +5436,15 @@ namespace isc { namespace dhcp { "\"csv-format\"", "\"always-send\"", "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"shared-networks\"", "\"pools\"", "\"pool\"", "\"user-context\"", "\"comment\"", "\"subnet\"", - "\"interface\"", "\"id\"", "\"reservation-mode\"", - "\"reservations-out-of-pool\"", "\"reservations-in-subnet\"", - "\"reservations-global\"", "\"disabled\"", "\"out-of-pool\"", - "\"global\"", "\"all\"", "\"host-reservation-identifiers\"", - "\"client-classes\"", "\"require-client-classes\"", "\"test\"", - "\"only-if-required\"", "\"client-class\"", "\"reservations\"", - "\"duid\"", "\"hw-address\"", "\"circuit-id\"", "\"client-id\"", - "\"hostname\"", "\"flex-id\"", "\"relay\"", "\"ip-address\"", - "\"ip-addresses\"", "\"hooks-libraries\"", "\"library\"", - "\"parameters\"", "\"expired-leases-processing\"", + "\"interface\"", "\"id\"", "\"reservation-mode\"", "\"disabled\"", + "\"out-of-pool\"", "\"global\"", "\"all\"", "\"reservations-global\"", + "\"reservations-in-subnet\"", "\"reservations-out-of-pool\"", + "\"host-reservation-identifiers\"", "\"client-classes\"", + "\"require-client-classes\"", "\"test\"", "\"only-if-required\"", + "\"client-class\"", "\"reservations\"", "\"duid\"", "\"hw-address\"", + "\"circuit-id\"", "\"client-id\"", "\"hostname\"", "\"flex-id\"", + "\"relay\"", "\"ip-address\"", "\"ip-addresses\"", "\"hooks-libraries\"", + "\"library\"", "\"parameters\"", "\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"", "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", @@ -5517,8 +5516,8 @@ namespace isc { namespace dhcp { "sub_subnet4", "$@56", "subnet4_params", "subnet4_param", "subnet", "$@57", "subnet_4o6_interface", "$@58", "subnet_4o6_interface_id", "$@59", "subnet_4o6_subnet", "$@60", "interface", "$@61", "client_class", - "$@62", "require_client_classes", "$@63", "reservations_out_of_pool", - "reservations_in_subnet", "reservations_global", "reservation_mode", + "$@62", "require_client_classes", "$@63", "reservations_global", + "reservations_in_subnet", "reservations_out_of_pool", "reservation_mode", "$@64", "hr_mode", "id", "shared_networks", "$@65", "shared_networks_content", "shared_networks_list", "shared_network", "$@66", "shared_network_params", "shared_network_param", @@ -5686,7 +5685,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" } } // isc::dhcp -#line 5690 "dhcp4_parser.cc" +#line 5689 "dhcp4_parser.cc" #line 2673 "dhcp4_parser.yy" diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h index 10ec46a238..a210e90dd1 100644 --- a/src/bin/dhcp4/dhcp4_parser.h +++ b/src/bin/dhcp4/dhcp4_parser.h @@ -587,13 +587,13 @@ namespace isc { namespace dhcp { TOKEN_INTERFACE = 356, // "interface" TOKEN_ID = 357, // "id" TOKEN_RESERVATION_MODE = 358, // "reservation-mode" - TOKEN_RESERVATIONS_OUT_OF_POOL = 359, // "reservations-out-of-pool" - TOKEN_RESERVATIONS_IN_SUBNET = 360, // "reservations-in-subnet" - TOKEN_RESERVATIONS_GLOBAL = 361, // "reservations-global" - TOKEN_DISABLED = 362, // "disabled" - TOKEN_OUT_OF_POOL = 363, // "out-of-pool" - TOKEN_GLOBAL = 364, // "global" - TOKEN_ALL = 365, // "all" + TOKEN_DISABLED = 359, // "disabled" + TOKEN_OUT_OF_POOL = 360, // "out-of-pool" + TOKEN_GLOBAL = 361, // "global" + TOKEN_ALL = 362, // "all" + TOKEN_RESERVATIONS_GLOBAL = 363, // "reservations-global" + TOKEN_RESERVATIONS_IN_SUBNET = 364, // "reservations-in-subnet" + TOKEN_RESERVATIONS_OUT_OF_POOL = 365, // "reservations-out-of-pool" TOKEN_HOST_RESERVATION_IDENTIFIERS = 366, // "host-reservation-identifiers" TOKEN_CLIENT_CLASSES = 367, // "client-classes" TOKEN_REQUIRE_CLIENT_CLASSES = 368, // "require-client-classes" @@ -803,13 +803,13 @@ namespace isc { namespace dhcp { S_INTERFACE = 101, // "interface" S_ID = 102, // "id" S_RESERVATION_MODE = 103, // "reservation-mode" - S_RESERVATIONS_OUT_OF_POOL = 104, // "reservations-out-of-pool" - S_RESERVATIONS_IN_SUBNET = 105, // "reservations-in-subnet" - S_RESERVATIONS_GLOBAL = 106, // "reservations-global" - S_DISABLED = 107, // "disabled" - S_OUT_OF_POOL = 108, // "out-of-pool" - S_GLOBAL = 109, // "global" - S_ALL = 110, // "all" + S_DISABLED = 104, // "disabled" + S_OUT_OF_POOL = 105, // "out-of-pool" + S_GLOBAL = 106, // "global" + S_ALL = 107, // "all" + S_RESERVATIONS_GLOBAL = 108, // "reservations-global" + S_RESERVATIONS_IN_SUBNET = 109, // "reservations-in-subnet" + S_RESERVATIONS_OUT_OF_POOL = 110, // "reservations-out-of-pool" S_HOST_RESERVATION_IDENTIFIERS = 111, // "host-reservation-identifiers" S_CLIENT_CLASSES = 112, // "client-classes" S_REQUIRE_CLIENT_CLASSES = 113, // "require-client-classes" @@ -1099,9 +1099,9 @@ namespace isc { namespace dhcp { S_397_62 = 397, // $@62 S_require_client_classes = 398, // require_client_classes S_399_63 = 399, // $@63 - S_reservations_out_of_pool = 400, // reservations_out_of_pool + S_reservations_global = 400, // reservations_global S_reservations_in_subnet = 401, // reservations_in_subnet - S_reservations_global = 402, // reservations_global + S_reservations_out_of_pool = 402, // reservations_out_of_pool S_reservation_mode = 403, // reservation_mode S_404_64 = 404, // $@64 S_hr_mode = 405, // hr_mode @@ -1597,13 +1597,13 @@ switch (yykind) symbol_type (int tok, location_type l) : super_type(token_type (tok), std::move (l)) { - YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER4_error || tok == token::TOKEN_PARSER4_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); + YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER4_error || tok == token::TOKEN_PARSER4_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); } #else symbol_type (int tok, const location_type& l) : super_type(token_type (tok), l) { - YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER4_error || tok == token::TOKEN_PARSER4_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); + YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER4_error || tok == token::TOKEN_PARSER4_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP4 || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_DHCP_SOCKET_TYPE || tok == token::TOKEN_RAW || tok == token::TOKEN_UDP || tok == token::TOKEN_OUTBOUND_INTERFACE || tok == token::TOKEN_SAME_AS_INBOUND || tok == token::TOKEN_USE_ROUTING || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_ECHO_CLIENT_ID || tok == token::TOKEN_MATCH_CLIENT_ID || tok == token::TOKEN_AUTHORITATIVE || tok == token::TOKEN_NEXT_SERVER || tok == token::TOKEN_SERVER_HOSTNAME || tok == token::TOKEN_BOOT_FILE_NAME || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET4 || tok == token::TOKEN_SUBNET_4O6_INTERFACE || tok == token::TOKEN_SUBNET_4O6_INTERFACE_ID || tok == token::TOKEN_SUBNET_4O6_SUBNET || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_ID || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_CIRCUIT_ID || tok == token::TOKEN_CLIENT_ID || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP4 || tok == token::TOKEN_SUB_DHCP4 || tok == token::TOKEN_SUB_INTERFACES4 || tok == token::TOKEN_SUB_SUBNET4 || tok == token::TOKEN_SUB_POOL4 || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); } #endif #if 201103L <= YY_CPLUSPLUS @@ -3266,51 +3266,6 @@ switch (yykind) return symbol_type (token::TOKEN_RESERVATION_MODE, l); } #endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_OUT_OF_POOL (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_OUT_OF_POOL (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, l); - } -#endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_IN_SUBNET (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_IN_SUBNET (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, l); - } -#endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_GLOBAL (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_GLOBAL (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, l); - } -#endif #if 201103L <= YY_CPLUSPLUS static symbol_type @@ -3371,6 +3326,51 @@ switch (yykind) return symbol_type (token::TOKEN_ALL, l); } #endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_GLOBAL (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_GLOBAL (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, l); + } +#endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_IN_SUBNET (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_IN_SUBNET (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, l); + } +#endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_OUT_OF_POOL (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_OUT_OF_POOL (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, l); + } +#endif #if 201103L <= YY_CPLUSPLUS static symbol_type diff --git a/src/bin/dhcp6/dhcp6_lexer.cc b/src/bin/dhcp6/dhcp6_lexer.cc index 81f2673333..5657deb092 100644 --- a/src/bin/dhcp6/dhcp6_lexer.cc +++ b/src/bin/dhcp6/dhcp6_lexer.cc @@ -511,13 +511,13 @@ static yyconst flex_int16_t yy_accept[1953] = 0, 0, 0, 0, 0, 0, 0, 211, 209, 0, 208, 207, 0, 0, 0, 0, 0, 166, 0, 28, - 0, 27, 0, 0, 124, 0, 0, 0, 0, 0, + 0, 27, 0, 0, 121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 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, 121, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 118, 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, @@ -555,7 +555,7 @@ static yyconst flex_int16_t yy_accept[1953] = 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, 123, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, 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, 0, 0, 0, 0, 0, @@ -581,7 +581,7 @@ static yyconst flex_int16_t yy_accept[1953] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 120, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 153, 0, 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -622,7 +622,7 @@ static yyconst flex_int16_t yy_accept[1953] = 0, 0, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 97, 122, 0, 0, 0, 0, 0, 0, + 0, 0, 97, 119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 17, 0, 15, 0, 187, 186, 0, 0, 0, 69, 0, 0, 0, 0, 0, 30, 0, @@ -661,7 +661,7 @@ static yyconst flex_int16_t yy_accept[1953] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, 0, 178, 0, 0, 0, 0, 147, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 116, 0, 0, 0, 0, 0, 0, 183, 0, 0, 0, 0, 0, 0, 0, 0, 85, 0, 0, 0, 0, @@ -676,17 +676,17 @@ static yyconst flex_int16_t yy_accept[1953] = 0, 0, 0, 0, 106, 0, 0, 176, 0, 0, 0, 0, 71, 0, 0, 0, 66, 0, 23, 0, - 118, 0, 0, 0, 94, 0, 0, 0, 0, 0, + 122, 0, 0, 0, 94, 0, 0, 0, 0, 0, 0, 0, 91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 90, 0, 0, 0, 182, 0, 0, 0, 0, 193, 75, 74, - 22, 0, 127, 144, 117, 0, 0, 0, 0, 86, + 22, 0, 127, 144, 123, 0, 0, 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, 174, 0, 0, - 179, 0, 88, 0, 81, 0, 0, 0, 0, 116, + 179, 0, 88, 0, 81, 0, 0, 0, 0, 124, 0, 0, 0, 173, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 92, 0, 128, 84, 0, 0, 0, 0, 83, @@ -1735,8 +1735,8 @@ static yyconst flex_int16_t yy_rule_linenum[213] = 982, 993, 1005, 1015, 1026, 1035, 1044, 1059, 1075, 1084, 1093, 1102, 1111, 1120, 1129, 1138, 1147, 1156, 1165, 1189, - 1213, 1222, 1232, 1242, 1251, 1261, 1272, 1283, 1294, 1305, - 1314, 1323, 1332, 1341, 1350, 1360, 1369, 1378, 1387, 1398, + 1213, 1222, 1232, 1242, 1251, 1261, 1272, 1281, 1290, 1299, + 1308, 1317, 1328, 1339, 1350, 1360, 1369, 1378, 1387, 1398, 1409, 1420, 1431, 1442, 1451, 1460, 1469, 1478, 1487, 1496, 1505, 1514, 1523, 1533, 1545, 1558, 1567, 1576, 1586, 1596, 1605, 1616, 1626, 1635, 1645, 1655, 1664, 1673, 1682, 1691, @@ -3704,9 +3704,9 @@ YY_RULE_SETUP case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::SUBNET6: case isc::dhcp::Parser6Context::SHARED_NETWORK: - return isc::dhcp::Dhcp6Parser::make_RESERVATIONS_OUT_OF_POOL(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_RESERVATION_MODE(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("reservations-out-of-pool", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("reservation-mode", driver.loc_); } } YY_BREAK @@ -3715,18 +3715,64 @@ YY_RULE_SETUP #line 1272 "dhcp6_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DHCP6: - case isc::dhcp::Parser6Context::SUBNET6: - case isc::dhcp::Parser6Context::SHARED_NETWORK: - return isc::dhcp::Dhcp6Parser::make_RESERVATIONS_IN_SUBNET(driver.loc_); + case isc::dhcp::Parser6Context::RESERVATION_MODE: + return isc::dhcp::Dhcp6Parser::make_DISABLED(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("reservations-in-subnet", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("disabled", driver.loc_); } } YY_BREAK case 118: YY_RULE_SETUP -#line 1283 "dhcp6_lexer.ll" +#line 1281 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::RESERVATION_MODE: + return isc::dhcp::Dhcp6Parser::make_DISABLED(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("off", driver.loc_); + } +} + YY_BREAK +case 119: +YY_RULE_SETUP +#line 1290 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::RESERVATION_MODE: + return isc::dhcp::Dhcp6Parser::make_OUT_OF_POOL(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("out-of-pool", driver.loc_); + } +} + YY_BREAK +case 120: +YY_RULE_SETUP +#line 1299 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::RESERVATION_MODE: + return isc::dhcp::Dhcp6Parser::make_GLOBAL(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("global", driver.loc_); + } +} + YY_BREAK +case 121: +YY_RULE_SETUP +#line 1308 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::RESERVATION_MODE: + return isc::dhcp::Dhcp6Parser::make_ALL(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("all", driver.loc_); + } +} + YY_BREAK +case 122: +YY_RULE_SETUP +#line 1317 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -3738,77 +3784,31 @@ YY_RULE_SETUP } } YY_BREAK -case 119: +case 123: YY_RULE_SETUP -#line 1294 "dhcp6_lexer.ll" +#line 1328 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: case isc::dhcp::Parser6Context::SUBNET6: case isc::dhcp::Parser6Context::SHARED_NETWORK: - return isc::dhcp::Dhcp6Parser::make_RESERVATION_MODE(driver.loc_); + return isc::dhcp::Dhcp6Parser::make_RESERVATIONS_IN_SUBNET(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("reservation-mode", driver.loc_); - } -} - YY_BREAK -case 120: -YY_RULE_SETUP -#line 1305 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::RESERVATION_MODE: - return isc::dhcp::Dhcp6Parser::make_DISABLED(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("disabled", driver.loc_); - } -} - YY_BREAK -case 121: -YY_RULE_SETUP -#line 1314 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::RESERVATION_MODE: - return isc::dhcp::Dhcp6Parser::make_DISABLED(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("off", driver.loc_); - } -} - YY_BREAK -case 122: -YY_RULE_SETUP -#line 1323 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::RESERVATION_MODE: - return isc::dhcp::Dhcp6Parser::make_OUT_OF_POOL(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("out-of-pool", driver.loc_); - } -} - YY_BREAK -case 123: -YY_RULE_SETUP -#line 1332 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::RESERVATION_MODE: - return isc::dhcp::Dhcp6Parser::make_GLOBAL(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("global", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("reservations-in-subnet", driver.loc_); } } YY_BREAK case 124: YY_RULE_SETUP -#line 1341 "dhcp6_lexer.ll" +#line 1339 "dhcp6_lexer.ll" { switch(driver.ctx_) { - case isc::dhcp::Parser6Context::RESERVATION_MODE: - return isc::dhcp::Dhcp6Parser::make_ALL(driver.loc_); + case isc::dhcp::Parser6Context::DHCP6: + case isc::dhcp::Parser6Context::SUBNET6: + case isc::dhcp::Parser6Context::SHARED_NETWORK: + return isc::dhcp::Dhcp6Parser::make_RESERVATIONS_OUT_OF_POOL(driver.loc_); default: - return isc::dhcp::Dhcp6Parser::make_STRING("all", driver.loc_); + return isc::dhcp::Dhcp6Parser::make_STRING("reservations-out-of-pool", driver.loc_); } } YY_BREAK diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc index cfe0032ee1..f2a0806517 100644 --- a/src/bin/dhcp6/dhcp6_parser.cc +++ b/src/bin/dhcp6/dhcp6_parser.cc @@ -2486,12 +2486,12 @@ namespace isc { namespace dhcp { #line 2487 "dhcp6_parser.cc" break; - case 390: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean" + case 390: // reservations_global: "reservations-global" ":" "boolean" #line 1468 "dhcp6_parser.yy" - { - ctx.unique("reservations-out-of-pool", ctx.loc2pos(yystack_[2].location)); + { + ctx.unique("reservations-global", ctx.loc2pos(yystack_[2].location)); ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reservations-out-of-pool", b); + ctx.stack_.back()->set("reservations-global", b); } #line 2497 "dhcp6_parser.cc" break; @@ -2506,12 +2506,12 @@ namespace isc { namespace dhcp { #line 2507 "dhcp6_parser.cc" break; - case 392: // reservations_global: "reservations-global" ":" "boolean" + case 392: // reservations_out_of_pool: "reservations-out-of-pool" ":" "boolean" #line 1480 "dhcp6_parser.yy" - { - ctx.unique("reservations-global", ctx.loc2pos(yystack_[2].location)); + { + ctx.unique("reservations-out-of-pool", ctx.loc2pos(yystack_[2].location)); ElementPtr b(new BoolElement(yystack_[0].value.as < bool > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reservations-global", b); + ctx.stack_.back()->set("reservations-out-of-pool", b); } #line 2517 "dhcp6_parser.cc" break; @@ -4631,134 +4631,134 @@ namespace isc { namespace dhcp { const short Dhcp6Parser::yypact_[] = { - 553, -964, -964, -964, -964, -964, -964, -964, -964, -964, + 510, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, 59, 33, 44, 54, 60, - 95, 105, 131, 139, 192, 212, 213, 226, 233, 235, + 95, 105, 131, 139, 146, 192, 208, 219, 226, 233, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, 33, -131, - 86, 116, 52, 278, 308, 296, 454, 39, 41, 119, - -61, 527, 322, -964, 256, 260, 153, 283, 301, -964, - 303, -964, -964, -964, -964, -964, -964, 347, 354, 355, - 362, 377, 391, 393, 394, 408, 424, 426, 428, 429, - 436, -964, 438, 440, 442, 444, 448, -964, -964, -964, - 449, 452, 460, -964, -964, -964, -964, -964, -964, -964, - 464, 465, 468, -964, -964, -964, -964, -964, -964, -964, - -964, -964, 469, -964, -964, -964, -964, -964, -964, 474, - -964, 479, -964, 75, -964, -964, -964, -964, -964, -964, + 86, 116, 52, 278, 276, 485, 286, 39, 41, 119, + -61, 588, 322, -964, 236, 259, 268, 255, 288, -964, + 343, -964, -964, -964, -964, -964, -964, 351, 358, 361, + 362, 382, 385, 394, 432, 434, 435, 436, 438, 440, + 442, -964, 444, 448, 449, 452, 454, -964, -964, -964, + 460, 464, 465, -964, -964, -964, -964, -964, -964, -964, + 468, 469, 479, -964, -964, -964, -964, -964, -964, -964, + -964, -964, 480, -964, -964, -964, -964, -964, -964, 481, + -964, 488, -964, 75, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, -964, -964, -964, 480, -964, 89, -964, - -964, -964, -964, -964, -964, -964, -964, -964, -964, 481, - 484, -964, -964, -964, -964, -964, -964, -964, -964, -964, + -964, -964, -964, -964, -964, -964, 494, -964, 89, -964, + -964, -964, -964, -964, -964, -964, -964, -964, -964, 496, + 500, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, 92, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, 96, -964, -964, -964, -964, -964, - 485, -964, 488, 496, -964, -964, -964, -964, -964, -964, + 501, -964, 503, 504, -964, -964, -964, -964, -964, -964, 134, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, -964, -964, -964, -964, -964, 305, 386, - -964, -964, -964, -964, -964, -964, -964, -964, 406, -964, - -964, 504, -964, -964, -964, 505, -964, -964, 417, 455, + -964, -964, -964, -964, -964, -964, -964, -964, 345, 393, + -964, -964, -964, -964, -964, -964, -964, -964, 391, -964, + -964, 506, -964, -964, -964, 512, -964, -964, 406, 430, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, 507, 508, -964, -964, -964, -964, 506, - 513, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, 144, -964, -964, -964, 517, -964, -964, - 520, -964, 524, 525, -964, -964, 535, 537, -964, -964, - -964, -964, -964, -964, -964, 150, -964, -964, -964, -964, + -964, -964, -964, 513, 517, -964, -964, -964, -964, 516, + 486, -964, -964, -964, -964, -964, -964, -964, -964, -964, + -964, -964, -964, 144, -964, -964, -964, 522, -964, -964, + 524, -964, 525, 532, -964, -964, 535, 537, -964, -964, + -964, -964, -964, -964, -964, 210, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, 539, 151, -964, -964, -964, -964, 33, - 33, -964, 315, 545, -964, 546, 547, 549, 555, 557, - 558, 328, 361, 363, 365, 366, 367, 374, 375, 376, - 353, 392, 405, 395, 409, 575, 411, 412, 390, 415, - 416, 576, 593, 609, 418, 422, 423, 612, 613, 620, - 622, 627, 630, 636, 437, 439, 443, 643, 645, 647, - 648, 650, 651, 653, 659, 660, 466, 662, 663, 664, - 666, 667, 668, 475, 669, -964, 116, -964, 675, 476, - 52, -964, 692, 694, 695, 696, 697, 499, 500, 702, - 703, 704, 278, -964, 705, 308, -964, 706, 509, 707, - 510, 514, 296, -964, 712, 714, 715, 716, 717, 718, - 719, -964, 454, -964, 720, 721, 523, 723, 724, 731, - 531, -964, 41, 733, 533, 534, -964, 119, 751, 752, - -73, -964, 552, 754, 755, 559, 756, 560, 561, 757, - 761, 562, 563, 762, 765, 766, 767, 527, -964, 768, - 570, 322, -964, -964, -964, 770, 769, 573, 771, 772, - 773, 774, 777, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, -964, -964, -964, -964, 581, -964, -964, - -964, -964, -964, 56, 582, 583, -964, -964, -964, 781, - 782, 783, 784, 785, 588, 334, -964, -964, -964, 786, + -964, -964, -964, 539, 231, -964, -964, -964, -964, 33, + 33, -964, 312, 541, -964, 542, 545, 546, 547, 549, + 550, 352, 359, 363, 365, 366, 367, 379, 380, 354, + 357, 360, 407, 396, 411, 561, 412, 413, 414, 415, + 416, 594, 613, 614, 418, 423, 424, 620, 622, 623, + 626, 629, 632, 635, 437, 441, 443, 636, 643, 645, + 646, 647, 649, 650, 652, 653, 458, 660, 661, 662, + 663, 664, 665, 466, 666, -964, 116, -964, 668, 476, + 52, -964, 669, 679, 680, 681, 682, 487, 483, 685, + 687, 688, 278, -964, 689, 276, -964, 690, 492, 692, + 509, 511, 485, -964, 709, 711, 714, 715, 716, 717, + 718, -964, 286, -964, 719, 720, 523, 721, 723, 724, + 530, -964, 41, 725, 531, 533, -964, 119, 733, 735, + -73, -964, 536, 736, 739, 554, 754, 557, 558, 755, + 758, 562, 563, 759, 762, 765, 766, 588, -964, 767, + 569, 322, -964, -964, -964, 769, 768, 572, 770, 771, + 772, 773, 776, -964, -964, -964, -964, -964, -964, -964, + -964, -964, -964, -964, -964, -964, -964, 574, -964, -964, + -964, -964, -964, 56, 580, 581, -964, -964, -964, 779, + 780, 781, 782, 784, 586, 395, -964, -964, -964, 787, 788, 789, 790, 791, 793, 794, 795, 796, -964, 797, - 798, 799, 800, 598, 599, -964, 803, -964, 804, -964, - -964, 805, 806, 610, 611, 614, -964, -964, 804, 615, - 807, -964, 616, -964, 617, -964, 618, -964, -964, -964, - 804, 804, 804, 619, 621, 623, 624, -964, 625, 626, - -964, 628, 629, 631, -964, -964, 632, -964, -964, -964, - 633, 785, -964, -964, 634, 635, -964, 637, -964, -964, - -121, 606, -964, -964, 56, 638, 639, 640, -964, 810, + 798, 799, 800, 587, 593, -964, 803, -964, 804, -964, + -964, 805, 806, 598, 599, 610, -964, -964, 804, 611, + 807, -964, 615, -964, 616, -964, 617, -964, -964, -964, + 804, 804, 804, 618, 619, 621, 624, -964, 625, 627, + -964, 628, 630, 631, -964, -964, 633, -964, -964, -964, + 634, 784, -964, -964, 637, 638, -964, 639, -964, -964, + -121, 644, -964, -964, 56, 640, 641, 642, -964, 811, -964, -964, 33, 116, -964, 322, 52, 247, 247, 815, -964, -964, -964, -964, -964, -964, -964, -964, -964, 817, - 822, 825, 831, -964, -964, -964, -964, -964, -964, -964, - -964, -78, 33, 385, 685, 836, 837, 838, 273, 64, - 154, 215, 48, 527, -964, -964, 839, -964, -964, 840, + 818, 821, 824, -964, -964, -964, -964, -964, -964, -964, + -964, -78, 33, 191, 727, 827, 831, 838, 174, 64, + 154, 67, 48, 588, -964, -964, 839, -964, -964, 840, 841, -964, -964, -964, -964, -964, -80, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, -964, -964, -964, 815, -964, 210, 218, - 231, -964, -964, -964, -964, 845, 846, 847, 848, 849, + -964, -964, -964, -964, -964, -964, 815, -964, 249, 250, + 262, -964, -964, -964, -964, 845, 846, 847, 848, 849, -964, 850, 851, -964, -964, -964, 852, 853, 854, 855, - -964, 249, -964, -964, -964, -964, -964, -964, -964, -964, + -964, 309, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, 250, -964, 856, 857, -964, -964, 858, + -964, -964, -964, 311, -964, 856, 857, -964, -964, 858, 860, -964, -964, 859, 863, -964, -964, 861, 865, -964, -964, 864, 866, -964, -964, -964, 57, -964, -964, -964, - 867, -964, -964, -964, 78, -964, -964, -964, -964, 262, + 867, -964, -964, -964, 78, -964, -964, -964, -964, 346, -964, -964, -964, 103, -964, -964, 868, 869, -964, -964, - 870, 872, -964, 873, 874, 875, 876, 877, 878, 300, + 870, 872, -964, 873, 874, 875, 876, 877, 878, 349, -964, -964, -964, -964, -964, -964, -964, -964, -964, 879, - 880, 881, -964, -964, -964, -964, 302, -964, -964, -964, - -964, -964, -964, 882, 883, 884, -964, 309, -964, -964, - -964, -964, -964, -964, -964, -964, -964, -964, -964, 311, - -964, -964, -964, 885, -964, 886, -964, -964, -964, 345, - -964, -964, -964, -964, -964, 346, -964, 206, -964, 689, - -964, 887, 889, -964, -964, 888, 892, -964, -964, -964, - 890, -964, 891, -964, -964, -964, 895, 896, 897, 898, - 658, 691, 700, 699, 708, 901, 709, 711, 902, 903, - 904, 722, 725, 710, 734, 247, -964, -964, 247, -964, - 815, 278, -964, 817, 41, -964, 822, 119, -964, 825, - 538, -964, 831, -78, -964, -964, 385, -964, 905, 685, - -964, 224, 836, -964, 454, -964, 837, -61, -964, 838, - 740, 741, 742, 753, 787, 801, 273, -964, 914, 923, - 809, 834, 835, 64, -964, 760, 843, 844, 154, -964, - 955, 967, 215, -964, 779, 989, 862, 992, 48, -964, - -964, 463, 839, -964, -964, 991, 997, 308, -964, 840, - 296, -964, 841, 1030, -964, -964, 472, 842, 871, 893, - -964, -964, -964, -964, -964, 894, -964, -964, 906, 907, - 908, -964, -964, -964, -964, -964, 349, -964, 352, -964, - 1035, -964, 1041, -964, -964, -964, -964, -964, -964, -964, + 880, 881, -964, -964, -964, -964, 356, -964, -964, -964, + -964, -964, -964, 882, 883, 884, -964, 376, -964, -964, + -964, -964, -964, -964, -964, -964, -964, -964, -964, 377, + -964, -964, -964, 885, -964, 886, -964, -964, -964, 384, + -964, -964, -964, -964, -964, 392, -964, 151, -964, 659, + -964, 887, 888, -964, -964, 889, 891, -964, -964, -964, + 890, -964, 893, -964, -964, -964, 892, 896, 897, 898, + 694, 698, 701, 700, 703, 903, 705, 706, 907, 908, + 910, 712, 722, 713, 734, 247, -964, -964, 247, -964, + 815, 278, -964, 817, 41, -964, 818, 119, -964, 821, + 540, -964, 824, -78, -964, -964, 191, -964, 923, 727, + -964, 224, 827, -964, 286, -964, 831, -61, -964, 838, + 740, 741, 742, 753, 756, 801, 174, -964, 924, 961, + 809, 834, 835, 64, -964, 785, 843, 844, 154, -964, + 967, 980, 67, -964, 792, 989, 862, 992, 48, -964, + -964, 329, 839, -964, -964, 994, 1031, 276, -964, 840, + 485, -964, 841, 1039, -964, -964, 556, 842, 871, 894, + -964, -964, -964, -964, -964, 895, -964, -964, 901, 902, + 904, -964, -964, -964, -964, -964, 408, -964, 409, -964, + 1041, -964, 1042, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - 359, -964, -964, -964, -964, -964, -964, -964, -964, 909, - -964, -964, 1046, -964, -964, -964, -964, -964, 1044, 1050, - -964, -964, -964, -964, -964, 1047, -964, 388, -964, -964, - -964, -964, -964, -964, -964, -964, 53, 910, -964, -964, - -964, -964, -964, -964, -964, -964, 911, 912, -964, -964, - 913, -964, 33, -964, -964, 1052, -964, -964, -964, -964, - -964, 410, -964, -964, -964, -964, -964, -964, 915, 413, - -964, 419, -964, 916, -964, -964, -964, -964, -964, -964, + 410, -964, -964, -964, -964, -964, -964, -964, -964, 905, + -964, -964, 1048, -964, -964, -964, -964, -964, 1045, 1051, + -964, -964, -964, -964, -964, 1047, -964, 419, -964, -964, + -964, -964, -964, -964, -964, -964, 53, 906, -964, -964, + -964, -964, -964, -964, -964, -964, 909, 911, -964, -964, + 912, -964, 33, -964, -964, 1052, -964, -964, -964, -964, + -964, 420, -964, -964, -964, -964, -964, -964, 913, 421, + -964, 422, -964, 914, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - 538, -964, -964, 1053, 899, -964, 224, -964, -964, -964, - -964, -964, -964, -964, -964, -964, -964, -964, 1054, 900, - 1055, 463, -964, -964, -964, -964, -964, -964, 917, -964, - -964, 1049, -964, 918, -964, -964, 1057, -964, -964, 266, - -964, -36, 1057, -964, -964, 1058, 1062, 1063, -964, 421, - -964, -964, -964, -964, -964, -964, -964, 1064, 919, 920, - 922, 1065, -36, -964, 924, -964, -964, -964, 925, -964, + 540, -964, -964, 1053, 915, -964, 224, -964, -964, -964, + -964, -964, -964, -964, -964, -964, -964, -964, 1054, 916, + 1055, 329, -964, -964, -964, -964, -964, -964, 919, -964, + -964, 1056, -964, 920, -964, -964, 1057, -964, -964, 206, + -964, -36, 1057, -964, -964, 1058, 1062, 1063, -964, 429, + -964, -964, -964, -964, -964, -964, -964, 1064, 918, 921, + 922, 1065, -36, -964, 925, -964, -964, -964, 926, -964, -964, -964 }; @@ -4901,47 +4901,47 @@ namespace isc { namespace dhcp { { -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -10, -964, -564, -964, - 200, -964, -964, -964, -964, 339, -964, -595, -964, -964, + 200, -964, -964, -964, -964, 170, -964, -595, -964, -964, -964, -71, -964, -964, -964, -964, -964, -964, 378, 584, -964, -964, -59, -43, -42, -40, -39, -28, -27, -26, -23, -21, -15, -9, -3, -964, -1, 17, 18, 20, - -964, 396, 25, -964, 28, -964, 30, 32, 35, -964, + -964, 388, 25, -964, 28, -964, 30, 32, 35, -964, 38, -964, 40, -964, -964, -964, -964, -964, -964, -964, - -964, -964, 379, 586, -964, -964, -964, -964, -964, -964, - -964, -964, -964, 298, -964, 97, -964, -676, 104, -964, + -964, -964, 381, 585, -964, -964, -964, -964, -964, -964, + -964, -964, -964, 298, -964, 98, -964, -676, 101, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -67, -964, -714, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, -964, 73, -964, -964, -964, -964, -964, 85, -698, - -964, -964, -964, -964, 87, -964, -964, -964, -964, -964, + -964, -964, 80, -964, -964, -964, -964, -964, 87, -698, + -964, -964, -964, -964, 85, -964, -964, -964, -964, -964, -964, -964, 58, -964, -964, -964, -964, -964, -964, -964, - 72, -964, -964, -964, 77, 542, -964, -964, -964, -964, + 73, -964, -964, -964, 76, 544, -964, -964, -964, -964, -964, -964, -964, 69, -964, -964, -964, -964, -964, -964, - -963, -964, -964, -964, 106, -964, -964, -964, 107, 585, + -963, -964, -964, -964, 104, -964, -964, -964, 107, 589, -964, -964, -962, -964, -961, -964, 51, -964, 55, -964, 42, 45, 46, 50, -964, -964, -964, -955, -964, -964, - -964, -964, 98, -964, -964, -119, 1015, -964, -964, -964, - -964, -964, 108, -964, -964, -964, 109, -964, 565, -964, + -964, -964, 97, -964, -964, -120, 1015, -964, -964, -964, + -964, -964, 108, -964, -964, -964, 109, -964, 567, -964, -66, -964, -964, -964, -964, -964, -47, -964, -964, -964, - -964, -964, 13, -964, -964, -964, 110, -964, -964, -964, - 113, -964, 569, -964, -964, -964, -964, -964, -964, -964, - -964, -964, -964, -964, 67, -964, -964, -964, 74, 602, + -964, -964, 13, -964, -964, -964, 106, -964, -964, -964, + 113, -964, 573, -964, -964, -964, -964, -964, -964, -964, + -964, -964, -964, -964, 63, -964, -964, -964, 62, 612, -964, -964, -55, -964, 1, -964, -964, -964, -964, -964, - 70, -964, -964, -964, 79, 641, -964, -964, -964, -964, - -964, -964, -964, -57, -964, -964, -964, 122, -964, -964, - -964, 126, -964, 644, 387, -964, -964, -964, -964, -964, + 66, -964, -964, -964, 79, 651, -964, -964, -964, -964, + -964, -964, -964, -57, -964, -964, -964, 120, -964, -964, + -964, 126, -964, 609, 386, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -954, -964, - -964, -964, -964, -964, -964, -964, 129, -964, -964, -964, - -84, -964, -964, -964, -964, -964, -964, -964, 111, -964, + -964, -964, -964, -964, -964, -964, 132, -964, -964, -964, + -83, -964, -964, -964, -964, -964, -964, -964, 112, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, 112, -964, -964, -964, -964, -964, -964, -964, 99, + -964, 110, -964, -964, -964, -964, -964, -964, -964, 99, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - 402, 579, -964, -964, -964, -964, -964, -964, -964, -964, + 403, 583, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, -964, - -964, 445, 577, -964, -964, -964, -964, -964, -964, 100, - -964, -964, -90, -964, -964, -964, -964, -964, -964, -106, - -964, -964, -125, -964, -964, -964, -964, -964, -964, -964 + -964, 446, 577, -964, -964, -964, -964, -964, -964, 102, + -964, -964, -85, -964, -964, -964, -964, -964, -964, -105, + -964, -964, -124, -964, -964, -964, -964, -964, -964, -964 }; const short @@ -5010,108 +5010,108 @@ namespace isc { namespace dhcp { 333, 334, 335, 269, 845, 281, 295, 91, 92, 282, 296, 93, 127, 128, 94, 95, 96, 512, 52, 127, 128, 151, 513, 127, 128, 1254, 54, 540, 1255, 1256, - 1257, 1258, 541, 557, 561, 127, 128, 420, 558, 562, + 1257, 1258, 541, 56, 1042, 127, 128, 1043, 127, 128, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 1219, - 1220, 1221, 330, 352, 331, 332, 353, 354, 126, 56, - 923, 924, 925, 888, 889, 890, 891, 127, 128, 1042, - 127, 128, 1043, 486, 129, 130, 131, 132, 953, 58, - 60, 561, 133, 134, 135, 136, 954, 137, 701, 702, - 703, 704, 138, 62, 490, 34, 35, 36, 37, 955, - 64, 139, 66, 151, 140, 127, 128, 1110, 1111, 1112, - 926, 141, 975, 975, 151, 1119, 1125, 976, 977, 142, - 143, 705, 418, 419, 144, 999, 151, 145, 781, 1252, - 1000, 146, 1253, 782, 783, 784, 785, 786, 787, 788, + 1220, 1221, 330, 352, 331, 332, 353, 354, 126, 58, + 923, 924, 925, 888, 889, 890, 891, 127, 128, 1252, + 127, 128, 1253, 557, 129, 60, 914, 915, 558, 130, + 131, 132, 133, 134, 135, 136, 62, 137, 701, 702, + 703, 704, 138, 64, 561, 34, 35, 36, 37, 562, + 66, 139, 418, 151, 140, 127, 128, 1110, 1111, 1112, + 926, 141, 486, 561, 151, 1119, 1125, 953, 954, 142, + 143, 705, 419, 421, 144, 490, 151, 145, 781, 151, + 955, 146, 420, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, - 799, 421, 147, 148, 149, 150, 125, 330, 853, 903, - 904, 905, 1076, 1016, 422, 1023, 127, 128, 1017, 893, - 1024, 424, 1028, 521, 1032, 127, 128, 1029, 151, 1033, + 799, 422, 147, 148, 149, 150, 125, 330, 853, 903, + 904, 905, 1076, 873, 874, 875, 876, 877, 878, 893, + 844, 851, 975, 852, 975, 127, 128, 976, 151, 977, 330, 151, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 412, 413, 1131, 1132, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 1038, 557, - 125, 431, 975, 1039, 1040, 502, 151, 1206, 432, 433, - 1207, 224, 1210, 225, 914, 915, 434, 1211, 125, 127, - 128, 226, 227, 228, 229, 230, 129, 130, 131, 132, - 125, 435, 289, 290, 291, 292, 293, 127, 128, 522, - 231, 540, 279, 232, 138, 436, 1218, 437, 438, 127, - 128, 233, 873, 874, 875, 876, 877, 878, 231, 563, - 564, 232, 439, 1231, 523, 152, 505, 151, 1232, 217, - 231, 1234, 512, 232, 1272, 531, 151, 1235, 440, 1273, - 441, 234, 442, 443, 280, 222, 716, 717, 718, 719, - 444, 294, 446, 235, 447, 277, 448, 274, 449, 151, - 287, 314, 450, 454, 147, 148, 455, 298, 532, 236, - 237, 336, 238, 239, 456, 337, 355, 316, 464, 465, - 356, 357, 466, 476, 240, 241, 242, 350, 483, 243, - 151, 244, 368, 485, 489, 497, 392, 245, 498, 508, - 358, 223, 510, 246, 1194, 1195, 1196, 1197, 151, 247, - 511, 248, 393, 275, 844, 851, 288, 852, 526, 530, - 151, 534, 535, 299, 536, 272, 537, 565, 283, 249, - 250, 542, 251, 317, 545, 297, 125, 252, 547, 548, - 253, 573, 254, 351, 255, 315, 330, 256, 369, 551, - 257, 552, 258, 560, 266, 127, 128, 267, 268, 566, - 567, 568, 269, 569, 127, 128, 281, 582, 394, 570, - 282, 571, 572, 295, 574, 307, 575, 296, 576, 577, - 578, 308, 309, 310, 311, 312, 313, 579, 580, 587, - 593, 581, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 590, 583, 594, 585, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 584, - 125, 330, 586, 595, 588, 589, 599, 600, 127, 128, - 591, 592, 152, 596, 601, 217, 602, 597, 598, 127, - 128, 603, 227, 228, 604, 230, 129, 130, 131, 132, - 605, 222, 606, 1174, 607, 1175, 1176, 609, 608, 610, - 231, 611, 612, 232, 613, 614, 151, 615, 892, 906, - 916, 233, 392, 616, 617, 151, 619, 620, 621, 618, - 622, 623, 624, 626, 894, 912, 917, 927, 393, 628, - 625, 629, 777, 377, 378, 379, 380, 381, 382, 383, - 384, 385, 386, 387, 388, 389, 631, 223, 632, 633, - 634, 635, 636, 390, 391, 637, 638, 639, 640, 642, - 644, 646, 645, 647, 147, 148, 650, 648, 651, 652, - 653, 654, 655, 656, 658, 659, 660, 661, 662, 151, - 895, 913, 918, 928, 394, 663, 664, 666, 667, 668, - 151, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 670, 671, 673, 674, 675, - 677, 680, 676, 678, 679, 681, 684, 682, 683, 685, - 686, 687, 689, 690, 692, 694, 693, 771, 695, 696, - 697, 698, 699, 700, 707, 708, 709, 710, 711, 712, - 715, 721, 32, 722, 723, 858, 725, 724, 726, 727, - 734, 735, 728, 729, 730, 731, 732, 733, 736, 737, - 739, 740, 741, 742, 746, 776, 743, 745, 747, 748, - 749, 753, 824, 754, 828, 755, 756, 757, 758, 832, - 759, 760, 836, 761, 762, 763, 765, 766, 840, 767, - 773, 774, 775, 862, 865, 869, 936, 940, 944, 960, + 115, 116, 117, 118, 119, 120, 121, 122, 125, 999, + 125, 424, 1016, 521, 1000, 431, 151, 1017, 125, 1023, + 279, 224, 432, 225, 1024, 433, 434, 127, 128, 127, + 128, 226, 227, 228, 229, 230, 129, 127, 128, 1028, + 1032, 130, 131, 132, 1029, 1033, 435, 1038, 231, 436, + 231, 232, 1039, 232, 138, 557, 522, 307, 437, 523, + 1040, 233, 330, 308, 309, 310, 311, 312, 313, 563, + 564, 975, 502, 1210, 531, 152, 1206, 1207, 1211, 217, + 127, 128, 540, 1231, 505, 512, 151, 1218, 1232, 1234, + 1235, 234, 1272, 532, 280, 222, 438, 1273, 439, 440, + 441, 294, 442, 235, 443, 277, 444, 274, 446, 151, + 287, 314, 447, 448, 147, 148, 449, 298, 450, 236, + 237, 336, 238, 239, 454, 337, 355, 316, 455, 456, + 356, 357, 464, 465, 240, 241, 242, 350, 151, 243, + 151, 244, 368, 466, 476, 483, 392, 245, 151, 537, + 358, 223, 485, 246, 716, 717, 718, 719, 489, 247, + 497, 248, 393, 275, 498, 508, 288, 510, 511, 1174, + 526, 1175, 1176, 299, 565, 272, 530, 534, 283, 249, + 250, 535, 251, 317, 536, 297, 542, 252, 545, 547, + 253, 151, 254, 351, 255, 315, 548, 256, 369, 551, + 257, 552, 258, 560, 266, 566, 567, 267, 268, 568, + 569, 570, 269, 571, 572, 573, 281, 125, 394, 581, + 282, 582, 574, 295, 583, 587, 575, 296, 576, 577, + 578, 289, 290, 291, 292, 293, 127, 128, 1194, 1195, + 1196, 1197, 579, 580, 97, 98, 99, 100, 101, 102, + 103, 104, 105, 106, 107, 108, 109, 231, 593, 585, + 232, 114, 115, 116, 117, 118, 119, 120, 121, 122, + 123, 584, 125, 330, 586, 588, 589, 594, 595, 590, + 591, 592, 152, 596, 599, 217, 600, 601, 597, 598, + 602, 127, 128, 603, 227, 228, 604, 230, 129, 605, + 609, 222, 606, 130, 131, 132, 607, 610, 608, 611, + 612, 613, 231, 614, 615, 232, 616, 617, 892, 906, + 916, 618, 392, 233, 619, 620, 621, 622, 623, 624, + 626, 625, 628, 631, 894, 912, 917, 927, 393, 127, + 128, 629, 777, 632, 633, 634, 635, 151, 637, 638, + 636, 639, 640, 642, 644, 645, 646, 223, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 647, 650, 648, 651, 147, 148, 652, 653, + 654, 655, 656, 658, 659, 661, 660, 662, 663, 666, + 895, 913, 918, 928, 394, 664, 667, 670, 668, 671, + 674, 673, 151, 675, 377, 378, 379, 380, 381, 382, + 383, 384, 385, 386, 387, 388, 389, 676, 677, 680, + 678, 679, 681, 684, 390, 391, 685, 682, 683, 686, + 687, 689, 690, 692, 694, 693, 700, 695, 696, 697, + 698, 699, 707, 708, 709, 710, 711, 712, 715, 734, + 151, 32, 721, 722, 723, 735, 725, 724, 726, 727, + 741, 742, 728, 729, 730, 731, 732, 733, 736, 737, + 739, 740, 743, 745, 746, 771, 776, 747, 748, 749, + 753, 754, 824, 755, 828, 832, 756, 757, 836, 758, + 759, 840, 760, 761, 862, 762, 763, 858, 865, 765, + 766, 767, 773, 774, 775, 869, 936, 940, 944, 960, 961, 962, 963, 964, 966, 967, 971, 972, 973, 974, - 980, 1060, 979, 983, 982, 985, 986, 988, 989, 992, + 980, 1044, 979, 983, 982, 985, 986, 988, 989, 992, 991, 764, 1006, 995, 1005, 1009, 1008, 1010, 1011, 1012, 1013, 1014, 1015, 1020, 1021, 1022, 1025, 1026, 1027, 1034, - 1036, 1044, 1049, 1048, 1051, 1052, 1061, 1055, 1054, 1056, - 1057, 1058, 1059, 1062, 1063, 1065, 1068, 1069, 1070, 1129, - 234, 1064, 1066, 336, 1067, 1073, 355, 337, 1156, 1084, - 356, 357, 235, 1109, 277, 1071, 274, 1157, 1072, 350, + 1036, 1049, 850, 1048, 1052, 1051, 1056, 1060, 1054, 1055, + 1057, 1058, 1059, 1061, 1062, 1063, 1064, 1065, 1066, 1067, + 234, 1068, 1069, 336, 1070, 1071, 355, 337, 1073, 1084, + 356, 357, 235, 1109, 277, 1072, 274, 1129, 1156, 350, 1133, 1085, 368, 314, 1134, 1123, 372, 1074, 236, 237, 358, 238, 239, 1149, 1150, 1151, 1136, 1086, 1087, 316, - 1088, 1089, 892, 240, 241, 242, 1152, 906, 243, 1166, - 244, 916, 1090, 1091, 1092, 1162, 245, 1093, 894, 1094, - 1177, 1167, 246, 912, 1178, 1095, 280, 917, 247, 294, - 248, 1096, 275, 927, 1169, 351, 1179, 1097, 369, 1098, - 1153, 1124, 287, 1170, 272, 298, 1172, 1187, 249, 250, - 1188, 251, 1137, 1122, 1154, 317, 252, 1099, 1100, 253, + 1088, 1089, 892, 240, 241, 242, 1152, 906, 243, 1153, + 244, 916, 1090, 1091, 1092, 1157, 245, 1093, 894, 1094, + 1177, 1166, 246, 912, 1178, 1095, 280, 917, 247, 294, + 248, 1096, 275, 927, 1167, 351, 1179, 1097, 369, 1098, + 1162, 1124, 287, 1170, 272, 298, 1172, 1169, 249, 250, + 1187, 251, 1137, 1122, 1154, 317, 252, 1099, 1100, 253, 1101, 254, 1158, 255, 1135, 1102, 256, 315, 1103, 257, 1104, 258, 1105, 266, 895, 1106, 267, 268, 1107, 913, - 1108, 269, 1115, 918, 1193, 1116, 1117, 1159, 1160, 928, - 1118, 1113, 1180, 1208, 1199, 1114, 1163, 1164, 288, 1209, - 1214, 299, 1215, 1216, 1246, 1217, 1229, 1238, 1241, 1243, - 283, 850, 1268, 297, 1248, 1171, 1269, 1270, 1274, 1278, - 627, 778, 1130, 1200, 952, 780, 630, 1077, 1127, 1075, - 772, 1148, 672, 1128, 1147, 1155, 1165, 641, 1078, 1079, - 1126, 1237, 328, 1080, 1081, 1201, 1202, 665, 281, 1083, - 1082, 295, 282, 1242, 1239, 296, 669, 643, 1203, 1204, - 1205, 1212, 1223, 1224, 1225, 1226, 1190, 1233, 1236, 1245, - 1247, 1189, 1192, 1276, 1275, 1277, 1280, 1281, 1146, 1191, - 1145, 1144, 1240, 949, 1161, 935, 688, 1173, 691, 1084, - 779, 1244, 1186, 1109, 1168, 1133, 1266, 1279, 0, 1134, - 0, 1085, 0, 649, 0, 1123, 0, 0, 0, 0, - 1177, 1136, 1227, 0, 1178, 0, 657, 1086, 1087, 0, + 1108, 269, 1115, 918, 1188, 1116, 1117, 1159, 1160, 928, + 1118, 1113, 1180, 1193, 1199, 1114, 1163, 1164, 288, 1208, + 1209, 299, 1214, 1215, 1216, 1217, 1229, 1238, 1241, 1243, + 283, 1246, 1268, 297, 1248, 1171, 1269, 1270, 1274, 1278, + 627, 778, 772, 1200, 952, 630, 1075, 780, 1077, 1130, + 1127, 1128, 1148, 1147, 672, 1155, 1165, 1079, 1078, 1126, + 1237, 641, 328, 1080, 1081, 1083, 1201, 1202, 281, 665, + 1082, 295, 282, 1203, 1204, 296, 1205, 1212, 1223, 1189, + 669, 1224, 1190, 1225, 1226, 1233, 1236, 643, 1192, 1242, + 1239, 1245, 1247, 1275, 1276, 1277, 1146, 1280, 1281, 1191, + 1145, 657, 949, 1240, 1144, 1161, 935, 1173, 691, 1084, + 688, 779, 1168, 1109, 1186, 1133, 1244, 1266, 1279, 1134, + 0, 1085, 0, 0, 0, 1123, 0, 0, 0, 0, + 1177, 1136, 1227, 649, 1178, 0, 0, 1086, 1087, 0, 1088, 1089, 0, 0, 0, 0, 1179, 0, 0, 0, 0, 0, 1090, 1091, 1092, 0, 0, 1093, 0, 1094, 0, 0, 0, 0, 0, 1095, 0, 0, 0, 0, @@ -5142,108 +5142,108 @@ namespace isc { namespace dhcp { 79, 80, 81, 73, 202, 74, 75, 11, 12, 74, 75, 15, 91, 92, 18, 19, 20, 3, 7, 91, 92, 202, 8, 91, 92, 181, 7, 3, 184, 185, - 186, 187, 8, 3, 3, 91, 92, 4, 8, 8, + 186, 187, 8, 7, 3, 91, 92, 6, 91, 92, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 136, 137, 138, 73, 74, 75, 76, 77, 78, 82, 7, 152, 153, 154, 139, 140, 141, 142, 91, 92, 3, - 91, 92, 6, 3, 98, 99, 100, 101, 8, 7, - 7, 3, 106, 107, 108, 109, 8, 111, 172, 173, + 91, 92, 6, 3, 98, 7, 149, 150, 8, 103, + 104, 105, 106, 107, 108, 109, 7, 111, 172, 173, 174, 175, 116, 7, 3, 202, 203, 204, 205, 8, - 7, 125, 7, 202, 128, 91, 92, 1210, 1210, 1210, + 7, 125, 6, 202, 128, 91, 92, 1210, 1210, 1210, 202, 135, 3, 3, 202, 1210, 1210, 8, 8, 143, - 144, 205, 6, 3, 148, 3, 202, 151, 21, 3, - 8, 155, 6, 26, 27, 28, 29, 30, 31, 32, + 144, 205, 3, 8, 148, 3, 202, 151, 21, 202, + 8, 155, 4, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 8, 176, 177, 178, 179, 72, 73, 996, 145, - 146, 147, 978, 3, 3, 3, 91, 92, 8, 1023, - 8, 8, 3, 8, 3, 91, 92, 8, 202, 8, + 43, 3, 176, 177, 178, 179, 72, 73, 996, 145, + 146, 147, 978, 129, 130, 131, 132, 133, 134, 1023, + 119, 120, 3, 122, 3, 91, 92, 8, 202, 8, 73, 202, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 13, 14, 113, 114, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 3, 3, - 72, 4, 3, 8, 8, 3, 202, 8, 4, 4, - 8, 83, 3, 85, 149, 150, 4, 8, 72, 91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 72, 4, 86, 87, 88, 89, 90, 91, 92, 3, - 112, 3, 84, 115, 116, 4, 8, 4, 4, 91, - 92, 123, 129, 130, 131, 132, 133, 134, 112, 419, - 420, 115, 4, 3, 8, 486, 3, 202, 8, 490, - 112, 8, 3, 115, 3, 8, 202, 8, 4, 8, - 4, 502, 4, 4, 505, 490, 102, 103, 104, 105, + 62, 63, 64, 65, 66, 67, 68, 69, 72, 3, + 72, 8, 3, 8, 8, 4, 202, 8, 72, 3, + 84, 83, 4, 85, 8, 4, 4, 91, 92, 91, + 92, 93, 94, 95, 96, 97, 98, 91, 92, 3, + 3, 103, 104, 105, 8, 8, 4, 3, 112, 4, + 112, 115, 8, 115, 116, 3, 3, 111, 4, 8, + 8, 123, 73, 117, 118, 119, 120, 121, 122, 419, + 420, 3, 3, 3, 8, 486, 8, 8, 8, 490, + 91, 92, 3, 3, 3, 3, 202, 8, 8, 8, + 8, 502, 3, 3, 505, 490, 4, 8, 4, 4, 4, 512, 4, 502, 4, 502, 4, 502, 4, 202, - 505, 522, 4, 4, 176, 177, 4, 512, 3, 502, + 505, 522, 4, 4, 176, 177, 4, 512, 4, 502, 502, 532, 502, 502, 4, 532, 537, 522, 4, 4, - 537, 537, 4, 4, 502, 502, 502, 532, 4, 502, - 202, 502, 537, 4, 4, 4, 557, 502, 4, 4, - 537, 490, 4, 502, 22, 23, 24, 25, 202, 502, - 4, 502, 557, 502, 119, 120, 505, 122, 4, 4, - 202, 4, 4, 512, 8, 502, 3, 202, 505, 502, - 502, 4, 502, 522, 4, 512, 72, 502, 4, 4, - 502, 203, 502, 532, 502, 522, 73, 502, 537, 4, - 502, 4, 502, 4, 502, 91, 92, 502, 502, 4, - 4, 4, 502, 4, 91, 92, 505, 204, 557, 4, - 505, 4, 4, 512, 203, 111, 203, 512, 203, 203, - 203, 117, 118, 119, 120, 121, 122, 203, 203, 4, - 4, 205, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 205, 204, 4, 203, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 204, - 72, 73, 203, 4, 203, 203, 4, 4, 91, 92, - 205, 205, 693, 205, 4, 696, 4, 205, 205, 91, - 92, 4, 94, 95, 4, 97, 98, 99, 100, 101, - 4, 696, 205, 180, 205, 182, 183, 4, 205, 4, - 112, 4, 4, 115, 4, 4, 202, 4, 729, 730, - 731, 123, 733, 4, 4, 202, 4, 4, 4, 203, - 4, 4, 4, 4, 729, 730, 731, 732, 733, 4, - 205, 205, 692, 156, 157, 158, 159, 160, 161, 162, - 163, 164, 165, 166, 167, 168, 4, 696, 4, 4, - 4, 4, 203, 176, 177, 205, 4, 4, 4, 4, - 4, 4, 203, 203, 176, 177, 4, 203, 4, 4, - 4, 4, 4, 4, 4, 4, 203, 4, 4, 202, - 729, 730, 731, 732, 733, 4, 205, 4, 205, 205, - 202, 188, 189, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 4, 4, 205, 4, 4, - 4, 4, 203, 203, 203, 4, 4, 205, 205, 4, - 4, 4, 4, 203, 4, 202, 7, 171, 7, 7, - 7, 7, 5, 202, 202, 202, 5, 5, 5, 5, - 202, 5, 7, 5, 5, 110, 5, 7, 5, 5, + 537, 537, 4, 4, 502, 502, 502, 532, 202, 502, + 202, 502, 537, 4, 4, 4, 557, 502, 202, 3, + 537, 490, 4, 502, 99, 100, 101, 102, 4, 502, + 4, 502, 557, 502, 4, 4, 505, 4, 4, 180, + 4, 182, 183, 512, 202, 502, 4, 4, 505, 502, + 502, 4, 502, 522, 8, 512, 4, 502, 4, 4, + 502, 202, 502, 532, 502, 522, 4, 502, 537, 4, + 502, 4, 502, 4, 502, 4, 4, 502, 502, 4, + 4, 4, 502, 4, 4, 203, 505, 72, 557, 205, + 505, 204, 203, 512, 204, 4, 203, 512, 203, 203, + 203, 86, 87, 88, 89, 90, 91, 92, 22, 23, + 24, 25, 203, 203, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 112, 4, 203, + 115, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 204, 72, 73, 203, 203, 203, 4, 4, 205, + 205, 205, 693, 205, 4, 696, 4, 4, 205, 205, + 4, 91, 92, 4, 94, 95, 4, 97, 98, 4, + 4, 696, 205, 103, 104, 105, 205, 4, 205, 4, + 4, 4, 112, 4, 4, 115, 4, 4, 729, 730, + 731, 203, 733, 123, 4, 4, 4, 4, 4, 4, + 4, 205, 4, 4, 729, 730, 731, 732, 733, 91, + 92, 205, 692, 4, 4, 4, 4, 202, 205, 4, + 203, 4, 4, 4, 4, 203, 4, 696, 188, 189, + 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, + 200, 201, 203, 4, 203, 4, 176, 177, 4, 4, + 4, 4, 4, 4, 4, 4, 203, 4, 4, 4, + 729, 730, 731, 732, 733, 205, 205, 4, 205, 4, + 4, 205, 202, 4, 156, 157, 158, 159, 160, 161, + 162, 163, 164, 165, 166, 167, 168, 203, 4, 4, + 203, 203, 4, 4, 176, 177, 4, 205, 205, 4, + 4, 4, 203, 4, 202, 7, 202, 7, 7, 7, + 7, 5, 202, 202, 5, 5, 5, 5, 202, 202, + 202, 7, 5, 5, 5, 202, 5, 7, 5, 5, 202, 202, 7, 7, 7, 7, 7, 7, 5, 5, - 5, 5, 202, 202, 7, 5, 202, 202, 202, 202, - 202, 202, 7, 202, 7, 202, 202, 202, 202, 7, - 202, 202, 7, 202, 202, 202, 202, 202, 7, 202, - 202, 202, 202, 7, 7, 7, 7, 7, 7, 4, + 5, 5, 202, 202, 7, 171, 5, 202, 202, 202, + 202, 202, 7, 202, 7, 7, 202, 202, 7, 202, + 202, 7, 202, 202, 7, 202, 202, 110, 7, 202, + 202, 202, 202, 202, 202, 7, 7, 7, 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 3, 203, 6, 3, 6, 6, 3, 6, 3, 3, + 3, 202, 6, 3, 6, 6, 3, 6, 3, 3, 6, 671, 3, 6, 6, 3, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 202, 3, 6, 6, 3, 205, 6, 8, 4, - 4, 4, 4, 203, 205, 4, 4, 4, 4, 4, - 981, 203, 203, 984, 203, 205, 987, 984, 4, 990, - 987, 987, 981, 990, 981, 203, 981, 4, 203, 984, + 4, 3, 722, 6, 3, 6, 4, 203, 8, 6, + 4, 4, 4, 205, 203, 205, 203, 4, 203, 203, + 981, 4, 4, 984, 4, 203, 987, 984, 205, 990, + 987, 987, 981, 990, 981, 203, 981, 4, 4, 984, 1001, 990, 987, 1004, 1001, 990, 1007, 203, 981, 981, 987, 981, 981, 203, 203, 203, 1001, 990, 990, 1004, - 990, 990, 1023, 981, 981, 981, 203, 1028, 981, 4, - 981, 1032, 990, 990, 990, 205, 981, 990, 1023, 990, + 990, 990, 1023, 981, 981, 981, 203, 1028, 981, 203, + 981, 1032, 990, 990, 990, 4, 981, 990, 1023, 990, 1041, 4, 981, 1028, 1041, 990, 1047, 1032, 981, 1050, - 981, 990, 981, 1038, 205, 984, 1041, 990, 987, 990, - 203, 990, 1047, 4, 981, 1050, 4, 6, 981, 981, - 3, 981, 1001, 990, 203, 1004, 981, 990, 990, 981, + 981, 990, 981, 1038, 4, 984, 1041, 990, 987, 990, + 205, 990, 1047, 4, 981, 1050, 4, 205, 981, 981, + 6, 981, 1001, 990, 203, 1004, 981, 990, 990, 981, 990, 981, 203, 981, 1001, 990, 981, 1004, 990, 981, 990, 981, 990, 981, 1023, 990, 981, 981, 990, 1028, - 990, 981, 990, 1032, 4, 990, 990, 203, 203, 1038, - 990, 990, 1041, 8, 202, 990, 203, 203, 1047, 8, - 4, 1050, 8, 3, 5, 8, 4, 4, 4, 4, - 1047, 722, 4, 1050, 7, 203, 4, 4, 4, 4, - 486, 693, 999, 202, 776, 696, 490, 980, 993, 975, - 684, 1009, 540, 996, 1007, 1016, 1028, 502, 981, 983, - 992, 1210, 77, 984, 986, 202, 202, 532, 1047, 989, - 987, 1050, 1047, 203, 205, 1050, 537, 505, 202, 202, - 202, 202, 202, 202, 202, 202, 1049, 202, 202, 202, - 202, 1047, 1052, 203, 205, 203, 202, 202, 1006, 1050, - 1004, 1002, 1216, 746, 1023, 733, 557, 1038, 561, 1210, - 695, 1231, 1042, 1210, 1032, 1216, 1252, 1272, -1, 1216, - -1, 1210, -1, 512, -1, 1210, -1, -1, -1, -1, - 1231, 1216, 1172, -1, 1231, -1, 522, 1210, 1210, -1, + 990, 981, 990, 1032, 3, 990, 990, 203, 203, 1038, + 990, 990, 1041, 4, 202, 990, 203, 203, 1047, 8, + 8, 1050, 4, 8, 3, 8, 4, 4, 4, 4, + 1047, 5, 4, 1050, 7, 203, 4, 4, 4, 4, + 486, 693, 684, 202, 776, 490, 975, 696, 980, 999, + 993, 996, 1009, 1007, 540, 1016, 1028, 983, 981, 992, + 1210, 502, 77, 984, 986, 989, 202, 202, 1047, 532, + 987, 1050, 1047, 202, 202, 1050, 202, 202, 202, 1047, + 537, 202, 1049, 202, 202, 202, 202, 505, 1052, 203, + 205, 202, 202, 205, 203, 203, 1006, 202, 202, 1050, + 1004, 522, 746, 1216, 1002, 1023, 733, 1038, 561, 1210, + 557, 695, 1032, 1210, 1042, 1216, 1231, 1252, 1272, 1216, + -1, 1210, -1, -1, -1, 1210, -1, -1, -1, -1, + 1231, 1216, 1172, 512, 1231, -1, -1, 1210, 1210, -1, 1210, 1210, -1, -1, -1, -1, 1231, -1, -1, -1, -1, -1, 1210, 1210, 1210, -1, -1, 1210, -1, 1210, -1, -1, -1, -1, -1, 1210, -1, -1, -1, -1, @@ -5272,7 +5272,7 @@ namespace isc { namespace dhcp { 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 82, 91, 92, 98, - 99, 100, 101, 106, 107, 108, 109, 111, 116, 125, + 103, 104, 105, 106, 107, 108, 109, 111, 116, 125, 128, 135, 143, 144, 148, 151, 155, 176, 177, 178, 179, 202, 237, 244, 245, 246, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, @@ -5330,7 +5330,7 @@ namespace isc { namespace dhcp { 4, 4, 205, 205, 4, 4, 4, 4, 577, 4, 203, 608, 4, 7, 202, 7, 7, 7, 7, 5, 202, 172, 173, 174, 175, 205, 267, 202, 202, 5, - 5, 5, 5, 224, 226, 202, 102, 103, 104, 105, + 5, 5, 5, 224, 226, 202, 99, 100, 101, 102, 411, 5, 5, 5, 7, 5, 5, 5, 7, 7, 7, 7, 7, 7, 202, 202, 5, 5, 233, 5, 5, 202, 202, 202, 233, 202, 7, 202, 202, 202, @@ -5597,72 +5597,72 @@ namespace isc { namespace dhcp { "\"excluded-prefix\"", "\"excluded-prefix-len\"", "\"delegated-len\"", "\"user-context\"", "\"comment\"", "\"subnet\"", "\"interface\"", "\"interface-id\"", "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", - "\"reservations-out-of-pool\"", "\"reservations-in-subnet\"", - "\"reservations-global\"", "\"disabled\"", "\"out-of-pool\"", - "\"global\"", "\"all\"", "\"mac-sources\"", "\"relay-supplied-options\"", - "\"host-reservation-identifiers\"", "\"sanity-checks\"", - "\"lease-checks\"", "\"client-classes\"", "\"require-client-classes\"", - "\"test\"", "\"only-if-required\"", "\"client-class\"", - "\"reservations\"", "\"ip-addresses\"", "\"prefixes\"", "\"duid\"", - "\"hw-address\"", "\"hostname\"", "\"flex-id\"", "\"relay\"", - "\"ip-address\"", "\"hooks-libraries\"", "\"library\"", "\"parameters\"", - "\"expired-leases-processing\"", "\"reclaim-timer-wait-time\"", - "\"flush-reclaimed-timer-wait-time\"", "\"hold-reclaimed-time\"", - "\"max-reclaim-leases\"", "\"max-reclaim-time\"", - "\"unwarned-reclaim-cycles\"", "\"server-id\"", "\"LLT\"", "\"EN\"", - "\"LL\"", "\"identifier\"", "\"htype\"", "\"time\"", "\"enterprise-id\"", - "\"dhcp4o6-port\"", "\"multi-threading\"", "\"enable-multi-threading\"", - "\"thread-pool-size\"", "\"packet-queue-size\"", "\"control-socket\"", - "\"socket-type\"", "\"socket-name\"", "\"dhcp-queue-control\"", - "\"enable-queue\"", "\"queue-type\"", "\"capacity\"", "\"dhcp-ddns\"", - "\"enable-updates\"", "\"qualifying-suffix\"", "\"server-ip\"", - "\"server-port\"", "\"sender-ip\"", "\"sender-port\"", - "\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"", - "\"override-no-update\"", "\"override-client-update\"", - "\"replace-client-name\"", "\"generated-prefix\"", "\"UDP\"", "\"TCP\"", - "\"JSON\"", "\"when-present\"", "\"never\"", "\"always\"", - "\"when-not-present\"", "\"hostname-char-set\"", - "\"hostname-char-replacement\"", "\"ip-reservations-unique\"", - "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", - "\"severity\"", "\"flush\"", "\"maxsize\"", "\"maxver\"", "\"pattern\"", - "TOPLEVEL_JSON", "TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", - "SUB_SUBNET6", "SUB_POOL6", "SUB_PD_POOL", "SUB_RESERVATION", - "SUB_OPTION_DEFS", "SUB_OPTION_DEF", "SUB_OPTION_DATA", - "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS", "SUB_CONFIG_CONTROL", - "\"constant string\"", "\"integer\"", "\"floating point\"", - "\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "$@4", "$@5", - "$@6", "$@7", "$@8", "$@9", "$@10", "$@11", "$@12", "$@13", "$@14", - "value", "sub_json", "map2", "$@15", "map_value", "map_content", - "not_empty_map", "list_generic", "$@16", "list_content", - "not_empty_list", "list_strings", "$@17", "list_strings_content", - "not_empty_list_strings", "unknown_map_entry", "syntax_map", "$@18", - "global_object", "$@19", "sub_dhcp6", "$@20", "global_params", - "global_param", "data_directory", "$@21", "preferred_lifetime", - "min_preferred_lifetime", "max_preferred_lifetime", "valid_lifetime", - "min_valid_lifetime", "max_valid_lifetime", "renew_timer", - "rebind_timer", "calculate_tee_times", "t1_percent", "t2_percent", - "cache_threshold", "cache_max_age", "decline_probation_period", - "ddns_send_updates", "ddns_override_no_update", - "ddns_override_client_update", "ddns_replace_client_name", "$@22", - "ddns_replace_client_name_value", "ddns_generated_prefix", "$@23", - "ddns_qualifying_suffix", "$@24", "ddns_update_on_renew", - "ddns_use_conflict_resolution", "hostname_char_set", "$@25", - "hostname_char_replacement", "$@26", "store_extended_info", - "statistic_default_sample_count", "statistic_default_sample_age", - "server_tag", "$@27", "ip_reservations_unique", "interfaces_config", - "$@28", "sub_interfaces6", "$@29", "interfaces_config_params", - "interfaces_config_param", "interfaces_list", "$@30", "re_detect", - "lease_database", "$@31", "hosts_database", "$@32", "hosts_databases", - "$@33", "database_list", "not_empty_database_list", "database", "$@34", - "database_map_params", "database_map_param", "database_type", "$@35", - "db_type", "user", "$@36", "password", "$@37", "host", "$@38", "port", - "name", "$@39", "persist", "lfc_interval", "readonly", "connect_timeout", - "reconnect_wait_time", "max_row_errors", "request_timeout", - "tcp_keepalive", "tcp_nodelay", "contact_points", "$@40", - "max_reconnect_tries", "keyspace", "$@41", "consistency", "$@42", - "serial_consistency", "$@43", "sanity_checks", "$@44", - "sanity_checks_params", "sanity_checks_param", "lease_checks", "$@45", - "mac_sources", "$@46", "mac_sources_list", "mac_sources_value", + "\"disabled\"", "\"out-of-pool\"", "\"global\"", "\"all\"", + "\"reservations-global\"", "\"reservations-in-subnet\"", + "\"reservations-out-of-pool\"", "\"mac-sources\"", + "\"relay-supplied-options\"", "\"host-reservation-identifiers\"", + "\"sanity-checks\"", "\"lease-checks\"", "\"client-classes\"", + "\"require-client-classes\"", "\"test\"", "\"only-if-required\"", + "\"client-class\"", "\"reservations\"", "\"ip-addresses\"", + "\"prefixes\"", "\"duid\"", "\"hw-address\"", "\"hostname\"", + "\"flex-id\"", "\"relay\"", "\"ip-address\"", "\"hooks-libraries\"", + "\"library\"", "\"parameters\"", "\"expired-leases-processing\"", + "\"reclaim-timer-wait-time\"", "\"flush-reclaimed-timer-wait-time\"", + "\"hold-reclaimed-time\"", "\"max-reclaim-leases\"", + "\"max-reclaim-time\"", "\"unwarned-reclaim-cycles\"", "\"server-id\"", + "\"LLT\"", "\"EN\"", "\"LL\"", "\"identifier\"", "\"htype\"", "\"time\"", + "\"enterprise-id\"", "\"dhcp4o6-port\"", "\"multi-threading\"", + "\"enable-multi-threading\"", "\"thread-pool-size\"", + "\"packet-queue-size\"", "\"control-socket\"", "\"socket-type\"", + "\"socket-name\"", "\"dhcp-queue-control\"", "\"enable-queue\"", + "\"queue-type\"", "\"capacity\"", "\"dhcp-ddns\"", "\"enable-updates\"", + "\"qualifying-suffix\"", "\"server-ip\"", "\"server-port\"", + "\"sender-ip\"", "\"sender-port\"", "\"max-queue-size\"", + "\"ncr-protocol\"", "\"ncr-format\"", "\"override-no-update\"", + "\"override-client-update\"", "\"replace-client-name\"", + "\"generated-prefix\"", "\"UDP\"", "\"TCP\"", "\"JSON\"", + "\"when-present\"", "\"never\"", "\"always\"", "\"when-not-present\"", + "\"hostname-char-set\"", "\"hostname-char-replacement\"", + "\"ip-reservations-unique\"", "\"loggers\"", "\"output_options\"", + "\"output\"", "\"debuglevel\"", "\"severity\"", "\"flush\"", + "\"maxsize\"", "\"maxver\"", "\"pattern\"", "TOPLEVEL_JSON", + "TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6", + "SUB_POOL6", "SUB_PD_POOL", "SUB_RESERVATION", "SUB_OPTION_DEFS", + "SUB_OPTION_DEF", "SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY", + "SUB_DHCP_DDNS", "SUB_CONFIG_CONTROL", "\"constant string\"", + "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", + "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", + "$@11", "$@12", "$@13", "$@14", "value", "sub_json", "map2", "$@15", + "map_value", "map_content", "not_empty_map", "list_generic", "$@16", + "list_content", "not_empty_list", "list_strings", "$@17", + "list_strings_content", "not_empty_list_strings", "unknown_map_entry", + "syntax_map", "$@18", "global_object", "$@19", "sub_dhcp6", "$@20", + "global_params", "global_param", "data_directory", "$@21", + "preferred_lifetime", "min_preferred_lifetime", "max_preferred_lifetime", + "valid_lifetime", "min_valid_lifetime", "max_valid_lifetime", + "renew_timer", "rebind_timer", "calculate_tee_times", "t1_percent", + "t2_percent", "cache_threshold", "cache_max_age", + "decline_probation_period", "ddns_send_updates", + "ddns_override_no_update", "ddns_override_client_update", + "ddns_replace_client_name", "$@22", "ddns_replace_client_name_value", + "ddns_generated_prefix", "$@23", "ddns_qualifying_suffix", "$@24", + "ddns_update_on_renew", "ddns_use_conflict_resolution", + "hostname_char_set", "$@25", "hostname_char_replacement", "$@26", + "store_extended_info", "statistic_default_sample_count", + "statistic_default_sample_age", "server_tag", "$@27", + "ip_reservations_unique", "interfaces_config", "$@28", "sub_interfaces6", + "$@29", "interfaces_config_params", "interfaces_config_param", + "interfaces_list", "$@30", "re_detect", "lease_database", "$@31", + "hosts_database", "$@32", "hosts_databases", "$@33", "database_list", + "not_empty_database_list", "database", "$@34", "database_map_params", + "database_map_param", "database_type", "$@35", "db_type", "user", "$@36", + "password", "$@37", "host", "$@38", "port", "name", "$@39", "persist", + "lfc_interval", "readonly", "connect_timeout", "reconnect_wait_time", + "max_row_errors", "request_timeout", "tcp_keepalive", "tcp_nodelay", + "contact_points", "$@40", "max_reconnect_tries", "keyspace", "$@41", + "consistency", "$@42", "serial_consistency", "$@43", "sanity_checks", + "$@44", "sanity_checks_params", "sanity_checks_param", "lease_checks", + "$@45", "mac_sources", "$@46", "mac_sources_list", "mac_sources_value", "duid_id", "string_id", "host_reservation_identifiers", "$@47", "host_reservation_identifiers_list", "host_reservation_identifier", "hw_address_id", "flex_id", "relay_supplied_options", "$@48", @@ -5679,8 +5679,8 @@ namespace isc { namespace dhcp { "subnet6_list_content", "not_empty_subnet6_list", "subnet6", "$@57", "sub_subnet6", "$@58", "subnet6_params", "subnet6_param", "subnet", "$@59", "interface", "$@60", "interface_id", "$@61", "client_class", - "$@62", "require_client_classes", "$@63", "reservations_out_of_pool", - "reservations_in_subnet", "reservations_global", "reservation_mode", + "$@62", "require_client_classes", "$@63", "reservations_global", + "reservations_in_subnet", "reservations_out_of_pool", "reservation_mode", "$@64", "hr_mode", "id", "rapid_commit", "shared_networks", "$@65", "shared_networks_content", "shared_networks_list", "shared_network", "$@66", "shared_network_params", "shared_network_param", diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h index c916d40dd7..b11490cb3a 100644 --- a/src/bin/dhcp6/dhcp6_parser.h +++ b/src/bin/dhcp6/dhcp6_parser.h @@ -581,13 +581,13 @@ namespace isc { namespace dhcp { TOKEN_ID = 351, // "id" TOKEN_RAPID_COMMIT = 352, // "rapid-commit" TOKEN_RESERVATION_MODE = 353, // "reservation-mode" - TOKEN_RESERVATIONS_OUT_OF_POOL = 354, // "reservations-out-of-pool" - TOKEN_RESERVATIONS_IN_SUBNET = 355, // "reservations-in-subnet" - TOKEN_RESERVATIONS_GLOBAL = 356, // "reservations-global" - TOKEN_DISABLED = 357, // "disabled" - TOKEN_OUT_OF_POOL = 358, // "out-of-pool" - TOKEN_GLOBAL = 359, // "global" - TOKEN_ALL = 360, // "all" + TOKEN_DISABLED = 354, // "disabled" + TOKEN_OUT_OF_POOL = 355, // "out-of-pool" + TOKEN_GLOBAL = 356, // "global" + TOKEN_ALL = 357, // "all" + TOKEN_RESERVATIONS_GLOBAL = 358, // "reservations-global" + TOKEN_RESERVATIONS_IN_SUBNET = 359, // "reservations-in-subnet" + TOKEN_RESERVATIONS_OUT_OF_POOL = 360, // "reservations-out-of-pool" TOKEN_MAC_SOURCES = 361, // "mac-sources" TOKEN_RELAY_SUPPLIED_OPTIONS = 362, // "relay-supplied-options" TOKEN_HOST_RESERVATION_IDENTIFIERS = 363, // "host-reservation-identifiers" @@ -805,13 +805,13 @@ namespace isc { namespace dhcp { S_ID = 96, // "id" S_RAPID_COMMIT = 97, // "rapid-commit" S_RESERVATION_MODE = 98, // "reservation-mode" - S_RESERVATIONS_OUT_OF_POOL = 99, // "reservations-out-of-pool" - S_RESERVATIONS_IN_SUBNET = 100, // "reservations-in-subnet" - S_RESERVATIONS_GLOBAL = 101, // "reservations-global" - S_DISABLED = 102, // "disabled" - S_OUT_OF_POOL = 103, // "out-of-pool" - S_GLOBAL = 104, // "global" - S_ALL = 105, // "all" + S_DISABLED = 99, // "disabled" + S_OUT_OF_POOL = 100, // "out-of-pool" + S_GLOBAL = 101, // "global" + S_ALL = 102, // "all" + S_RESERVATIONS_GLOBAL = 103, // "reservations-global" + S_RESERVATIONS_IN_SUBNET = 104, // "reservations-in-subnet" + S_RESERVATIONS_OUT_OF_POOL = 105, // "reservations-out-of-pool" S_MAC_SOURCES = 106, // "mac-sources" S_RELAY_SUPPLIED_OPTIONS = 107, // "relay-supplied-options" S_HOST_RESERVATION_IDENTIFIERS = 108, // "host-reservation-identifiers" @@ -1112,9 +1112,9 @@ namespace isc { namespace dhcp { S_403_62 = 403, // $@62 S_require_client_classes = 404, // require_client_classes S_405_63 = 405, // $@63 - S_reservations_out_of_pool = 406, // reservations_out_of_pool + S_reservations_global = 406, // reservations_global S_reservations_in_subnet = 407, // reservations_in_subnet - S_reservations_global = 408, // reservations_global + S_reservations_out_of_pool = 408, // reservations_out_of_pool S_reservation_mode = 409, // reservation_mode S_410_64 = 410, // $@64 S_hr_mode = 411, // hr_mode @@ -1630,13 +1630,13 @@ switch (yykind) symbol_type (int tok, location_type l) : super_type(token_type (tok), std::move (l)) { - YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER6_error || tok == token::TOKEN_PARSER6_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); + YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER6_error || tok == token::TOKEN_PARSER6_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); } #else symbol_type (int tok, const location_type& l) : super_type(token_type (tok), l) { - YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER6_error || tok == token::TOKEN_PARSER6_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); + YY_ASSERT (tok == token::TOKEN_END || tok == token::TOKEN_PARSER6_error || tok == token::TOKEN_PARSER6_UNDEF || tok == token::TOKEN_COMMA || tok == token::TOKEN_COLON || tok == token::TOKEN_LSQUARE_BRACKET || tok == token::TOKEN_RSQUARE_BRACKET || tok == token::TOKEN_LCURLY_BRACKET || tok == token::TOKEN_RCURLY_BRACKET || tok == token::TOKEN_NULL_TYPE || tok == token::TOKEN_DHCP6 || tok == token::TOKEN_DATA_DIRECTORY || tok == token::TOKEN_CONFIG_CONTROL || tok == token::TOKEN_CONFIG_DATABASES || tok == token::TOKEN_CONFIG_FETCH_WAIT_TIME || tok == token::TOKEN_INTERFACES_CONFIG || tok == token::TOKEN_INTERFACES || tok == token::TOKEN_RE_DETECT || tok == token::TOKEN_LEASE_DATABASE || tok == token::TOKEN_HOSTS_DATABASE || tok == token::TOKEN_HOSTS_DATABASES || tok == token::TOKEN_TYPE || tok == token::TOKEN_MEMFILE || tok == token::TOKEN_MYSQL || tok == token::TOKEN_POSTGRESQL || tok == token::TOKEN_CQL || tok == token::TOKEN_USER || tok == token::TOKEN_PASSWORD || tok == token::TOKEN_HOST || tok == token::TOKEN_PORT || tok == token::TOKEN_PERSIST || tok == token::TOKEN_LFC_INTERVAL || tok == token::TOKEN_READONLY || tok == token::TOKEN_CONNECT_TIMEOUT || tok == token::TOKEN_CONTACT_POINTS || tok == token::TOKEN_MAX_RECONNECT_TRIES || tok == token::TOKEN_RECONNECT_WAIT_TIME || tok == token::TOKEN_KEYSPACE || tok == token::TOKEN_CONSISTENCY || tok == token::TOKEN_SERIAL_CONSISTENCY || tok == token::TOKEN_REQUEST_TIMEOUT || tok == token::TOKEN_TCP_KEEPALIVE || tok == token::TOKEN_TCP_NODELAY || tok == token::TOKEN_MAX_ROW_ERRORS || tok == token::TOKEN_PREFERRED_LIFETIME || tok == token::TOKEN_MIN_PREFERRED_LIFETIME || tok == token::TOKEN_MAX_PREFERRED_LIFETIME || tok == token::TOKEN_VALID_LIFETIME || tok == token::TOKEN_MIN_VALID_LIFETIME || tok == token::TOKEN_MAX_VALID_LIFETIME || tok == token::TOKEN_RENEW_TIMER || tok == token::TOKEN_REBIND_TIMER || tok == token::TOKEN_CALCULATE_TEE_TIMES || tok == token::TOKEN_T1_PERCENT || tok == token::TOKEN_T2_PERCENT || tok == token::TOKEN_CACHE_THRESHOLD || tok == token::TOKEN_CACHE_MAX_AGE || tok == token::TOKEN_DECLINE_PROBATION_PERIOD || tok == token::TOKEN_SERVER_TAG || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_COUNT || tok == token::TOKEN_STATISTIC_DEFAULT_SAMPLE_AGE || tok == token::TOKEN_DDNS_SEND_UPDATES || tok == token::TOKEN_DDNS_OVERRIDE_NO_UPDATE || tok == token::TOKEN_DDNS_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_DDNS_REPLACE_CLIENT_NAME || tok == token::TOKEN_DDNS_GENERATED_PREFIX || tok == token::TOKEN_DDNS_QUALIFYING_SUFFIX || tok == token::TOKEN_DDNS_UPDATE_ON_RENEW || tok == token::TOKEN_DDNS_USE_CONFLICT_RESOLUTION || tok == token::TOKEN_STORE_EXTENDED_INFO || tok == token::TOKEN_SUBNET6 || tok == token::TOKEN_OPTION_DEF || tok == token::TOKEN_OPTION_DATA || tok == token::TOKEN_NAME || tok == token::TOKEN_DATA || tok == token::TOKEN_CODE || tok == token::TOKEN_SPACE || tok == token::TOKEN_CSV_FORMAT || tok == token::TOKEN_ALWAYS_SEND || tok == token::TOKEN_RECORD_TYPES || tok == token::TOKEN_ENCAPSULATE || tok == token::TOKEN_ARRAY || tok == token::TOKEN_SHARED_NETWORKS || tok == token::TOKEN_POOLS || tok == token::TOKEN_POOL || tok == token::TOKEN_PD_POOLS || tok == token::TOKEN_PREFIX || tok == token::TOKEN_PREFIX_LEN || tok == token::TOKEN_EXCLUDED_PREFIX || tok == token::TOKEN_EXCLUDED_PREFIX_LEN || tok == token::TOKEN_DELEGATED_LEN || tok == token::TOKEN_USER_CONTEXT || tok == token::TOKEN_COMMENT || tok == token::TOKEN_SUBNET || tok == token::TOKEN_INTERFACE || tok == token::TOKEN_INTERFACE_ID || tok == token::TOKEN_ID || tok == token::TOKEN_RAPID_COMMIT || tok == token::TOKEN_RESERVATION_MODE || tok == token::TOKEN_DISABLED || tok == token::TOKEN_OUT_OF_POOL || tok == token::TOKEN_GLOBAL || tok == token::TOKEN_ALL || tok == token::TOKEN_RESERVATIONS_GLOBAL || tok == token::TOKEN_RESERVATIONS_IN_SUBNET || tok == token::TOKEN_RESERVATIONS_OUT_OF_POOL || tok == token::TOKEN_MAC_SOURCES || tok == token::TOKEN_RELAY_SUPPLIED_OPTIONS || tok == token::TOKEN_HOST_RESERVATION_IDENTIFIERS || tok == token::TOKEN_SANITY_CHECKS || tok == token::TOKEN_LEASE_CHECKS || tok == token::TOKEN_CLIENT_CLASSES || tok == token::TOKEN_REQUIRE_CLIENT_CLASSES || tok == token::TOKEN_TEST || tok == token::TOKEN_ONLY_IF_REQUIRED || tok == token::TOKEN_CLIENT_CLASS || tok == token::TOKEN_RESERVATIONS || tok == token::TOKEN_IP_ADDRESSES || tok == token::TOKEN_PREFIXES || tok == token::TOKEN_DUID || tok == token::TOKEN_HW_ADDRESS || tok == token::TOKEN_HOSTNAME || tok == token::TOKEN_FLEX_ID || tok == token::TOKEN_RELAY || tok == token::TOKEN_IP_ADDRESS || tok == token::TOKEN_HOOKS_LIBRARIES || tok == token::TOKEN_LIBRARY || tok == token::TOKEN_PARAMETERS || tok == token::TOKEN_EXPIRED_LEASES_PROCESSING || tok == token::TOKEN_RECLAIM_TIMER_WAIT_TIME || tok == token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME || tok == token::TOKEN_HOLD_RECLAIMED_TIME || tok == token::TOKEN_MAX_RECLAIM_LEASES || tok == token::TOKEN_MAX_RECLAIM_TIME || tok == token::TOKEN_UNWARNED_RECLAIM_CYCLES || tok == token::TOKEN_SERVER_ID || tok == token::TOKEN_LLT || tok == token::TOKEN_EN || tok == token::TOKEN_LL || tok == token::TOKEN_IDENTIFIER || tok == token::TOKEN_HTYPE || tok == token::TOKEN_TIME || tok == token::TOKEN_ENTERPRISE_ID || tok == token::TOKEN_DHCP4O6_PORT || tok == token::TOKEN_DHCP_MULTI_THREADING || tok == token::TOKEN_ENABLE_MULTI_THREADING || tok == token::TOKEN_THREAD_POOL_SIZE || tok == token::TOKEN_PACKET_QUEUE_SIZE || tok == token::TOKEN_CONTROL_SOCKET || tok == token::TOKEN_SOCKET_TYPE || tok == token::TOKEN_SOCKET_NAME || tok == token::TOKEN_DHCP_QUEUE_CONTROL || tok == token::TOKEN_ENABLE_QUEUE || tok == token::TOKEN_QUEUE_TYPE || tok == token::TOKEN_CAPACITY || tok == token::TOKEN_DHCP_DDNS || tok == token::TOKEN_ENABLE_UPDATES || tok == token::TOKEN_QUALIFYING_SUFFIX || tok == token::TOKEN_SERVER_IP || tok == token::TOKEN_SERVER_PORT || tok == token::TOKEN_SENDER_IP || tok == token::TOKEN_SENDER_PORT || tok == token::TOKEN_MAX_QUEUE_SIZE || tok == token::TOKEN_NCR_PROTOCOL || tok == token::TOKEN_NCR_FORMAT || tok == token::TOKEN_OVERRIDE_NO_UPDATE || tok == token::TOKEN_OVERRIDE_CLIENT_UPDATE || tok == token::TOKEN_REPLACE_CLIENT_NAME || tok == token::TOKEN_GENERATED_PREFIX || tok == token::TOKEN_UDP || tok == token::TOKEN_TCP || tok == token::TOKEN_JSON || tok == token::TOKEN_WHEN_PRESENT || tok == token::TOKEN_NEVER || tok == token::TOKEN_ALWAYS || tok == token::TOKEN_WHEN_NOT_PRESENT || tok == token::TOKEN_HOSTNAME_CHAR_SET || tok == token::TOKEN_HOSTNAME_CHAR_REPLACEMENT || tok == token::TOKEN_IP_RESERVATIONS_UNIQUE || tok == token::TOKEN_LOGGERS || tok == token::TOKEN_OUTPUT_OPTIONS || tok == token::TOKEN_OUTPUT || tok == token::TOKEN_DEBUGLEVEL || tok == token::TOKEN_SEVERITY || tok == token::TOKEN_FLUSH || tok == token::TOKEN_MAXSIZE || tok == token::TOKEN_MAXVER || tok == token::TOKEN_PATTERN || tok == token::TOKEN_TOPLEVEL_JSON || tok == token::TOKEN_TOPLEVEL_DHCP6 || tok == token::TOKEN_SUB_DHCP6 || tok == token::TOKEN_SUB_INTERFACES6 || tok == token::TOKEN_SUB_SUBNET6 || tok == token::TOKEN_SUB_POOL6 || tok == token::TOKEN_SUB_PD_POOL || tok == token::TOKEN_SUB_RESERVATION || tok == token::TOKEN_SUB_OPTION_DEFS || tok == token::TOKEN_SUB_OPTION_DEF || tok == token::TOKEN_SUB_OPTION_DATA || tok == token::TOKEN_SUB_HOOKS_LIBRARY || tok == token::TOKEN_SUB_DHCP_DDNS || tok == token::TOKEN_SUB_CONFIG_CONTROL); } #endif #if 201103L <= YY_CPLUSPLUS @@ -3224,51 +3224,6 @@ switch (yykind) return symbol_type (token::TOKEN_RESERVATION_MODE, l); } #endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_OUT_OF_POOL (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_OUT_OF_POOL (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, l); - } -#endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_IN_SUBNET (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_IN_SUBNET (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, l); - } -#endif -#if 201103L <= YY_CPLUSPLUS - static - symbol_type - make_RESERVATIONS_GLOBAL (location_type l) - { - return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, std::move (l)); - } -#else - static - symbol_type - make_RESERVATIONS_GLOBAL (const location_type& l) - { - return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, l); - } -#endif #if 201103L <= YY_CPLUSPLUS static symbol_type @@ -3329,6 +3284,51 @@ switch (yykind) return symbol_type (token::TOKEN_ALL, l); } #endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_GLOBAL (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_GLOBAL (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_GLOBAL, l); + } +#endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_IN_SUBNET (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_IN_SUBNET (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_IN_SUBNET, l); + } +#endif +#if 201103L <= YY_CPLUSPLUS + static + symbol_type + make_RESERVATIONS_OUT_OF_POOL (location_type l) + { + return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, std::move (l)); + } +#else + static + symbol_type + make_RESERVATIONS_OUT_OF_POOL (const location_type& l) + { + return symbol_type (token::TOKEN_RESERVATIONS_OUT_OF_POOL, l); + } +#endif #if 201103L <= YY_CPLUSPLUS static symbol_type