diff --git a/doc/Makefile.am b/doc/Makefile.am index dff8c492ed..312996b2fd 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -20,6 +20,7 @@ nobase_dist_doc_DATA += examples/kea4/pgsql-reservations.json nobase_dist_doc_DATA += examples/kea4/reservations.json nobase_dist_doc_DATA += examples/kea4/several-subnets.json nobase_dist_doc_DATA += examples/kea4/single-subnet.json +nobase_dist_doc_DATA += examples/kea4/with-ddns.json nobase_dist_doc_DATA += examples/kea6/advanced.json nobase_dist_doc_DATA += examples/kea6/backends.json nobase_dist_doc_DATA += examples/kea6/classify.json @@ -35,6 +36,7 @@ nobase_dist_doc_DATA += examples/kea6/several-subnets.json nobase_dist_doc_DATA += examples/kea6/simple.json nobase_dist_doc_DATA += examples/kea6/softwire46.json nobase_dist_doc_DATA += examples/kea6/stateless.json +nobase_dist_doc_DATA += examples/kea6/with-ddns.json devel: mkdir -p html diff --git a/doc/examples/kea4/with-ddns.json b/doc/examples/kea4/with-ddns.json new file mode 100644 index 0000000000..ab6fc8c736 --- /dev/null +++ b/doc/examples/kea4/with-ddns.json @@ -0,0 +1,77 @@ +# This is an example configuration file for the DHCPv4 server in Kea. +# It is a basic scenario with one IPv4 subnet configured but with DDNS +# enabled. + +{ "Dhcp4": + +{ +# Kea is told to listen on ethX interface only. + "interfaces-config": { + "interfaces": [ "ethX" ] + }, + +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. + "lease-database": { + "type": "memfile", + "lfc-interval": 3600 + }, + +# Addresses will be assigned with a lifetime of 4000 seconds. + "valid-lifetime": 4000, + +# Renew and rebind timers are commented out. This implies that options +# 58 and 59 will not be sent to the client. In this case it is up to +# the client to pick the timer values according to RFC2131. Uncomment the +# timers to send these options to the client. +# "renew-timer": 1000, +# "rebind-timer": 2000, + +# The following list defines subnets. We have only one subnet +# here. We tell Kea that it is directly available over local interface. + "subnet4": [ + { + "pools": [ { "pool": "192.0.2.1 - 192.0.2.200" } ], + "subnet": "192.0.2.0/24", + "interface": "ethX" + } + ], + +# Enable dynamic DNS updates + "dhcp-ddns" : { + "enable-updates" : true, + "server-ip" : "192.0.2.0", + "server-port" : 3432, + "sender-ip" : "192.0.2.1", + "sender-port" : 3433, + "max-queue-size" : 2048, + "ncr-protocol" : "UDP", + "ncr-format" : "JSON", + "always-include-fqdn" : true, + "override-no-update" : true, + "override-client-update" : true, + "replace-client-name" : "when-present", + "generated-prefix" : "test.prefix", + "qualifying-suffix" : "test.suffix." + } +}, + +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error and fatal) should be logged to stdout. +"Logging": { + "loggers": [ + { + "name": "kea-dhcp4", + "output_options": [ + { + "output": "stdout" + } + ], + "severity": "INFO" + } + ] +} + +} diff --git a/doc/examples/kea6/with-ddns.json b/doc/examples/kea6/with-ddns.json new file mode 100644 index 0000000000..1c98f1bb93 --- /dev/null +++ b/doc/examples/kea6/with-ddns.json @@ -0,0 +1,82 @@ +# This is an example configuration file for DHCPv6 server in Kea. +# It's a basic scenario with one IPv6 subnet configured. It is +# assumed that one subnet (2001:db8:1::/64 is available directly +# over ethX interface. + +{ "Dhcp6": + +{ +# Kea is told to listen on ethX interface only. + "interfaces-config": { + "interfaces": [ "ethX" ] + }, + +# We need to specify the the database used to store leases. As of +# September 2016, four database backends are supported: MySQL, +# PostgreSQL, Cassandra, and the in-memory database, Memfile. +# We'll use memfile because it doesn't require any prior set up. + "lease-database": { + "type": "memfile", + "lfc-interval": 3600 + }, + +# Addresses will be assigned with preferred and valid lifetimes +# being 3000 and 4000, respectively. Client is told to start +# renewing after 1000 seconds. If the server does not respond +# after 2000 seconds since the lease was granted, client is supposed +# to start REBIND procedure (emergency renewal that allows switching +# to a different server). + "preferred-lifetime": 3000, + "valid-lifetime": 4000, + "renew-timer": 1000, + "rebind-timer": 2000, + +# The following list defines subnets. Each subnet consists of at +# least subnet and pool entries. + "subnet6": [ + { + "pools": [ { "pool": "2001:db8:1::/80" } ], + "subnet": "2001:db8:1::/64", + "interface": "ethX" + } + ], + +# Enable dynamic DNS updates + "dhcp-ddns" : { + "enable-updates" : true, + "server-ip" : "3001::1", + "server-port" : 3432, + "sender-ip" : "3001::2", + "sender-port" : 3433, + "max-queue-size" : 2048, + "ncr-protocol" : "UDP", + "ncr-format" : "JSON", + "always-include-fqdn" : true, + "override-no-update" : true, + "override-client-update" : true, + "replace-client-name" : "when-present", + "generated-prefix" : "test.prefix", + "qualifying-suffix" : "test.suffix." + } + +}, + +# The following configures logging. It assumes that messages with at least +# informational level (info, warn, error and fatal) should be logged to stdout. +"Logging": { + "loggers": [ + { + "name": "kea-dhcp6", + "output_options": [ + { + "output": "stdout" + } + ], + "debuglevel": 0, + "severity": "INFO" + } + ] +} + +} + diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 6c74a2fada..9c98739422 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -2174,9 +2174,10 @@ It is merely echoed by the server Note that formerly, this parameter was a boolean and permitted only values of true and false. Boolean values - will still be accepted but may eventually be deprecated. A value of - true equates to when-present, - false equates to never. + have been deprecated and are no longer accepted. If you are currently using + booleans, you must replace them with the desired mode name. A value of + true maps to "when-present", while + false maps to "never". For example, To instruct kea-dhcp4 to always generate the FQDN for a diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 166c932e66..99602aeb56 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -2372,9 +2372,10 @@ should include options from the isc option space: Note that formerly, this parameter was a boolean and permitted only values of true and false. Boolean values - will still be accepted but may eventually be deprecated. A value of - true equates to when-present, - false equates to never. + have been deprecated and are no longer accepted. If you are currently using + booleans, you must replace them with the desired mode name. A value of + true maps to "when-present", while + false maps to "never". For example, To instruct kea-dhcp6 to always generate the FQDN for a diff --git a/src/bin/dhcp4/dhcp4_lexer.cc b/src/bin/dhcp4/dhcp4_lexer.cc index 23145b4bc4..5a22eb1046 100644 --- a/src/bin/dhcp4/dhcp4_lexer.cc +++ b/src/bin/dhcp4/dhcp4_lexer.cc @@ -467,8 +467,8 @@ static void yynoreturn yy_fatal_error (yyconst char* msg ); (yy_c_buf_p) = yy_cp; /* %% [4.0] data tables for the DFA and the user's section 1 definitions go here */ -#define YY_NUM_RULES 116 -#define YY_END_OF_BUFFER 117 +#define YY_NUM_RULES 132 +#define YY_END_OF_BUFFER 133 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -476,107 +476,121 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[901] = +static yyconst flex_int16_t yy_accept[1028] = { 0, - 109, 109, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 115, 10, 11, 115, 1, 109, 106, 109, 109, - 115, 108, 107, 115, 115, 115, 115, 115, 102, 103, - 115, 115, 115, 104, 105, 5, 5, 5, 115, 115, - 115, 10, 11, 0, 0, 98, 0, 0, 0, 0, + 125, 125, 0, 0, 0, 0, 0, 0, 0, 0, + 133, 131, 10, 11, 131, 1, 125, 122, 125, 125, + 131, 124, 123, 131, 131, 131, 131, 131, 118, 119, + 131, 131, 131, 120, 121, 5, 5, 5, 131, 131, + 131, 10, 11, 0, 0, 114, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 125, 125, 0, + 124, 125, 3, 2, 6, 0, 125, 0, 0, 0, + 0, 0, 0, 4, 0, 0, 9, 0, 115, 0, + + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 117, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2, 0, 0, 0, 0, 0, 0, 0, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 116, 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, 39, + 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, + 130, 128, 0, 127, 126, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 96, 0, 95, 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, 1, 109, - 109, 0, 108, 109, 3, 2, 6, 0, 109, 0, - 0, 0, 0, 0, 0, 4, 0, 0, 9, 0, - 99, 0, 0, 0, 0, 0, 101, 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, 129, 126, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 97, 0, 0, 99, 0, 0, 0, + 0, 0, 0, 0, 0, 42, 0, 0, 33, 0, + 0, 0, 0, 54, 0, 0, 0, 0, 0, 0, + 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 32, 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, 2, 0, 0, 0, 0, 0, 0, - 0, 8, 0, 0, 0, 0, 0, 100, 0, 0, + 0, 0, 0, 52, 72, 19, 20, 0, 0, 0, + 0, 0, 0, 12, 104, 0, 101, 0, 100, 0, + 0, 0, 0, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 41, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 34, 0, 0, 0, 0, 0, + 64, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 0, 7, 0, 0, 102, 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, - 114, 112, 0, 111, 110, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 47, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 36, 0, 0, 0, 0, 0, 44, 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, 15, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 113, 110, 0, 0, 0, 0, 0, 0, 0, + 0, 68, 45, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 44, 0, 0, 35, - 0, 0, 0, 0, 56, 0, 0, 0, 0, 0, - 0, 0, 24, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 34, 0, 0, - 0, 0, 0, 0, 37, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, - 74, 21, 0, 22, 0, 0, 0, 0, 0, 12, - 88, 0, 0, 65, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, + 29, 0, 0, 0, 105, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 58, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 21, 0, 0, 18, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 56, 0, 0, 0, 0, 79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 36, 0, 0, 0, 0, 0, 66, 0, 0, - 0, 0, 0, 61, 0, 0, 0, 7, 0, 0, + 0, 0, 0, 37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 84, 0, 0, + 69, 82, 0, 0, 0, 0, 0, 108, 0, 0, + 0, 0, 0, 57, 0, 0, 60, 48, 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, 49, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, - 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, + 55, 70, 0, 15, 0, 65, 0, 0, 0, 0, + 88, 0, 0, 0, 30, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 47, 0, 0, 0, 0, - 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, - 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 60, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 23, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 51, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 58, 0, 0, 0, + 0, 0, 0, 0, 0, 62, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 111, + 31, 0, 0, 0, 0, 0, 0, 0, 26, 0, + 0, 0, 85, 0, 83, 78, 77, 0, 0, 0, + 98, 0, 0, 0, 51, 0, 0, 0, 0, 75, + 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, + 0, 24, 0, 0, 87, 0, 0, 0, 0, 40, + 27, 61, 0, 0, 53, 0, 0, 106, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 71, 0, 0, 0, 0, - 0, 92, 0, 59, 0, 0, 62, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 57, 72, 0, 17, 0, 67, 0, 0, 0, 0, - 0, 0, 32, 0, 69, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 0, 0, 0, 95, 33, - 0, 0, 0, 0, 0, 28, 0, 0, 0, 86, - 85, 0, 0, 0, 0, 53, 0, 0, 0, 0, - 83, 0, 0, 0, 0, 0, 0, 0, 0, 40, - 0, 0, 26, 0, 0, 0, 0, 42, 29, 0, - 63, 0, 55, 0, 0, 0, 90, 0, 0, 0, - 0, 0, 0, 0, 75, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 97, 52, 84, 0, 0, 93, 0, - 0, 0, 0, 0, 19, 0, 18, 0, 0, 0, - - 48, 0, 0, 0, 0, 27, 0, 0, 0, 0, - 0, 0, 68, 0, 0, 94, 0, 0, 0, 0, - 96, 0, 91, 0, 14, 0, 0, 0, 0, 0, - 0, 81, 0, 43, 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 0, 0, 0, 0, 0, 80, - 0, 0, 0, 0, 0, 79, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 82, 30, 0, 0, 0, 76, 0, 0, - 0, 0, 0, 0, 0, 45, 0, 0, 78, 0 + 0, 113, 50, 76, 0, 0, 109, 80, 0, 0, + 0, 0, 17, 0, 16, 0, 86, 46, 0, 0, + 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, + 0, 0, 0, 66, 0, 0, 110, 0, 0, 0, + 0, 0, 112, 107, 103, 0, 0, 0, 14, 0, + 94, 0, 0, 0, 0, 0, 0, 41, 0, 0, + 0, 0, 0, 13, 0, 0, 81, 0, 0, 0, + 0, 0, 0, 0, 91, 0, 90, 89, 0, 0, + 0, 0, 93, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 92, 0, 0, 0, 28, 0, + 0, 74, 0, 0, 0, 43, 0 } ; static yyconst YY_CHAR yy_ec[256] = @@ -587,14 +601,14 @@ static yyconst YY_CHAR yy_ec[256] = 1, 4, 5, 6, 7, 5, 5, 5, 5, 5, 5, 8, 9, 10, 11, 12, 13, 14, 14, 14, 14, 15, 14, 16, 14, 14, 14, 17, 5, 18, - 5, 19, 20, 5, 21, 22, 22, 23, 24, 25, - 5, 5, 5, 5, 5, 26, 5, 27, 5, 5, - 5, 28, 29, 30, 31, 5, 5, 5, 5, 5, - 32, 33, 34, 5, 35, 5, 36, 37, 38, 39, + 5, 19, 20, 5, 21, 22, 23, 24, 25, 26, + 5, 27, 5, 28, 5, 29, 5, 30, 31, 32, + 5, 33, 34, 35, 36, 37, 38, 5, 39, 5, + 40, 41, 42, 5, 43, 5, 44, 45, 46, 47, - 40, 41, 42, 43, 44, 5, 45, 46, 47, 48, - 49, 50, 5, 51, 52, 53, 54, 55, 56, 57, - 58, 5, 59, 5, 60, 5, 5, 5, 5, 5, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, + 68, 69, 70, 5, 71, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -611,510 +625,580 @@ static yyconst YY_CHAR yy_ec[256] = 5, 5, 5, 5, 5 } ; -static yyconst YY_CHAR yy_meta[61] = +static yyconst YY_CHAR yy_meta[72] = { 0, 1, 1, 2, 3, 3, 4, 3, 3, 3, 3, - 3, 3, 5, 6, 6, 6, 3, 3, 3, 3, - 6, 6, 6, 6, 6, 3, 3, 3, 3, 3, - 3, 3, 5, 3, 3, 6, 7, 6, 6, 6, - 7, 3, 3, 3, 3, 3, 3, 5, 3, 3, - 5, 3, 5, 5, 3, 3, 3, 3, 3, 3 + 3, 3, 3, 5, 5, 5, 3, 3, 3, 3, + 5, 5, 5, 5, 5, 5, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 5, 5, 5, 5, 5, 5, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3 } ; -static yyconst flex_uint16_t yy_base[913] = +static yyconst flex_uint16_t yy_base[1040] = { 0, - 0, 0, 59, 62, 65, 0, 63, 67, 64, 66, - 1204, 1205, 83, 1200, 125, 0, 174, 1205, 179, 185, - 80, 192, 1205, 1182, 87, 79, 37, 66, 1205, 1205, - 83, 156, 164, 1205, 1205, 1205, 110, 1188, 1152, 0, - 1180, 118, 1195, 190, 218, 1205, 1148, 1153, 1146, 247, - 1143, 1144, 178, 177, 164, 1146, 186, 190, 234, 1155, - 207, 195, 241, 210, 242, 245, 254, 1154, 0, 293, - 298, 309, 315, 320, 1205, 0, 1205, 326, 331, 202, - 253, 180, 302, 306, 232, 1205, 1151, 1182, 1205, 288, - 1205, 1133, 1170, 1147, 1142, 1177, 0, 347, 1131, 1132, + 0, 70, 19, 29, 41, 49, 52, 58, 87, 95, + 1388, 1389, 32, 1384, 141, 0, 201, 1389, 206, 88, + 11, 213, 1389, 1366, 114, 25, 2, 6, 1389, 1389, + 73, 11, 17, 1389, 1389, 1389, 104, 1372, 1327, 0, + 1364, 107, 1379, 217, 247, 1389, 1323, 185, 1329, 93, + 58, 1321, 91, 209, 200, 14, 273, 190, 1320, 181, + 186, 189, 1329, 68, 206, 232, 1332, 294, 256, 216, + 1311, 200, 268, 300, 277, 1330, 0, 329, 335, 348, + 355, 359, 1389, 0, 1389, 273, 371, 212, 223, 289, + 300, 327, 329, 1389, 1327, 1366, 1389, 325, 1389, 375, - 1129, 1135, 310, 1123, 1124, 199, 1138, 1131, 1131, 266, - 1123, 1118, 304, 1113, 1159, 212, 1116, 1157, 1131, 1128, - 1128, 1122, 258, 1116, 1105, 1108, 1107, 313, 1108, 1109, - 287, 343, 322, 1119, 1120, 1118, 1102, 1106, 1102, 1101, - 1094, 1109, 1102, 0, 322, 350, 335, 338, 352, 342, - 1101, 1205, 0, 1135, 1095, 1102, 1137, 1205, 385, 1106, - 1088, 1102, 1099, 1098, 1084, 1125, 1099, 1080, 1087, 1082, - 1092, 1081, 1093, 1088, 1083, 1074, 1086, 1079, 1070, 1072, - 1085, 1205, 1072, 1079, 1082, 1065, 1105, 1064, 1072, 1075, - 1101, 1071, 1057, 1065, 1058, 1071, 1054, 1053, 1058, 1059, + 1355, 334, 1324, 347, 347, 1319, 352, 347, 354, 360, + 310, 1362, 0, 426, 356, 1306, 1308, 1304, 1312, 75, + 1298, 1299, 350, 1315, 1308, 1308, 364, 1299, 1300, 339, + 1288, 1344, 385, 1291, 1342, 1308, 1305, 1305, 1299, 346, + 1292, 1286, 361, 1283, 1282, 1296, 353, 1282, 1284, 1297, + 1281, 399, 364, 1293, 1294, 1292, 1274, 1279, 1275, 1285, + 1277, 0, 397, 375, 387, 400, 408, 398, 1276, 1389, + 0, 1319, 432, 1270, 421, 427, 1278, 439, 1321, 440, + 1320, 436, 1319, 1389, 480, 1266, 446, 1279, 1259, 1275, + 1272, 1271, 1255, 1306, 1272, 1251, 1259, 1254, 1265, 1253, - 1096, 1062, 1056, 308, 1063, 1058, 1057, 1041, 1055, 1049, - 1055, 1044, 1038, 1050, 1049, 1082, 1051, 1035, 1041, 373, - 1205, 1205, 378, 1205, 1205, 1030, 0, 153, 388, 1039, - 413, 1024, 1070, 1026, 1031, 1072, 1026, 1035, 1069, 1032, - 1029, 401, 1066, 1060, 1020, 1018, 1017, 1024, 1055, 1013, - 408, 1024, 1024, 1009, 1010, 1021, 1019, 1014, 1021, 1016, - 1012, 1003, 1047, 1041, 1002, 996, 1002, 992, 1003, 245, - 1007, 1205, 996, 996, 1007, 991, 983, 984, 988, 998, - 986, 996, 995, 994, 1027, 1026, 1025, 1205, 979, 1023, - 989, 1205, 1205, 988, 0, 978, 971, 1018, 1017, 983, + 1265, 1265, 1260, 1255, 1258, 1251, 1241, 1244, 1258, 1389, + 1244, 1252, 1255, 1236, 1286, 1235, 1245, 1248, 1282, 1244, + 1280, 1227, 1237, 1229, 1226, 1242, 1223, 1222, 1228, 1227, + 1229, 1233, 1227, 1220, 1233, 1228, 1220, 1226, 1226, 1207, + 1223, 1216, 1223, 1211, 1204, 1218, 1217, 1203, 1211, 443, + 1389, 1389, 444, 1389, 1389, 1198, 0, 207, 421, 462, + 460, 1255, 1208, 446, 1389, 1253, 1389, 1247, 516, 1191, + 441, 1188, 1244, 1190, 1196, 1246, 1190, 1201, 1243, 1198, + 1195, 499, 1240, 1234, 1189, 1184, 1181, 1180, 1179, 1177, + 509, 1190, 1190, 1173, 1174, 1187, 1185, 1180, 1187, 1182, - 973, 447, 1014, 978, 974, 964, 1205, 967, 966, 1205, - 968, 965, 353, 963, 1205, 973, 958, 959, 968, 996, - 955, 994, 1205, 953, 967, 991, 995, 961, 955, 957, - 958, 985, 947, 943, 942, 981, 951, 1205, 938, 941, - 935, 947, 937, 933, 1205, 978, 972, 934, 942, 936, - 940, 972, 966, 921, 924, 930, 920, 966, 918, 1205, - 1205, 1205, 922, 1205, 958, 928, 0, 914, 929, 1205, - 1205, 917, 922, 1205, 919, 909, 950, 914, 908, 918, - 917, 917, 906, 938, 907, 898, 900, 911, 898, 908, - 901, 906, 898, 905, 1205, 892, 901, 905, 889, 900, + 1178, 1168, 1221, 462, 1215, 1167, 1160, 1162, 1166, 1155, + 1168, 62, 1167, 1171, 1159, 1159, 1154, 1146, 1147, 1168, + 1150, 1162, 1161, 1147, 1159, 1158, 1157, 1198, 1197, 1196, + 1195, 1153, 1389, 1389, 1152, 0, 1141, 1133, 482, 1190, + 1189, 1147, 1187, 1389, 1135, 1185, 1389, 513, 559, 1179, + 484, 1183, 1139, 1135, 1123, 1389, 1127, 1126, 1389, 1128, + 1125, 210, 1123, 1389, 1134, 1131, 1116, 1118, 1128, 1131, + 1163, 1389, 1112, 1128, 1160, 1164, 1122, 1116, 1118, 1119, + 1154, 1107, 1102, 1101, 1150, 1096, 1389, 1101, 1097, 1095, + 1099, 1092, 1102, 1105, 1094, 1089, 1389, 1144, 1100, 1137, - 885, 879, 884, 897, 896, 893, 921, 270, 878, 879, - 876, 1205, 890, 881, 915, 878, 913, 1205, 870, 886, - 910, 867, 908, 1205, 424, 878, 871, 1205, 876, 867, - 862, 907, 866, 900, 402, 899, 862, 853, 896, 858, - 867, 893, 859, 856, 857, 889, 859, 860, 853, 844, - 855, 858, 853, 848, 853, 850, 853, 848, 881, 880, - 839, 838, 832, 843, 1205, 832, 840, 840, 872, 828, - 818, 822, 863, 820, 828, 818, 350, 812, 68, 1205, - 863, 829, 823, 815, 825, 858, 1205, 823, 818, 815, - 821, 807, 822, 817, 806, 803, 809, 803, 812, 815, + 1090, 1099, 1098, 1138, 1132, 1096, 1076, 1079, 1078, 1086, + 1074, 1130, 1072, 1389, 1389, 1389, 1389, 1123, 1085, 0, + 1069, 1086, 1124, 1389, 1389, 1072, 1389, 1078, 1389, 491, + 486, 1081, 506, 1389, 1074, 1062, 1113, 1068, 1061, 1073, + 1072, 1072, 1060, 1101, 1061, 1104, 1050, 1052, 1065, 1048, + 1055, 1061, 1052, 1060, 1389, 1045, 1056, 1060, 1042, 1055, + 1038, 1032, 1037, 1052, 1049, 1035, 1037, 1046, 1082, 491, + 1045, 1028, 1029, 1026, 1389, 1020, 1041, 1031, 1074, 1073, + 1389, 1020, 1034, 1037, 1069, 1068, 1015, 1066, 1389, 14, + 1021, 1389, 1027, 1017, 1389, 1011, 1066, 488, 488, 1016, - 798, 803, 810, 801, 809, 805, 838, 790, 790, 801, - 800, 787, 785, 786, 1205, 1205, 792, 799, 779, 405, - 783, 781, 825, 1205, 783, 823, 784, 774, 768, 778, - 780, 774, 783, 815, 784, 761, 1205, 807, 776, 775, - 762, 1205, 803, 774, 776, 805, 761, 756, 762, 756, - 800, 765, 755, 755, 749, 761, 760, 753, 762, 746, - 745, 1205, 759, 742, 742, 437, 740, 755, 735, 749, - 744, 747, 733, 744, 731, 731, 1205, 735, 1205, 734, - 736, 729, 738, 728, 724, 769, 1205, 727, 723, 721, - 731, 734, 763, 720, 761, 714, 1205, 727, 758, 757, + 1018, 1014, 1057, 502, 1056, 1010, 1000, 1053, 1006, 1016, + 1050, 1008, 995, 1003, 1005, 1045, 1007, 1002, 991, 1004, + 1007, 1002, 997, 1002, 999, 1002, 997, 1038, 1037, 987, + 977, 984, 976, 977, 990, 1389, 978, 987, 986, 986, + 1026, 979, 972, 961, 965, 964, 974, 1014, 961, 498, + 517, 955, 495, 1389, 1016, 969, 959, 971, 1012, 1389, + 1006, 525, 964, 958, 966, 961, 957, 964, 948, 965, + 960, 948, 944, 951, 945, 955, 943, 957, 938, 944, + 951, 952, 948, 989, 931, 931, 944, 943, 928, 926, + 927, 1389, 1389, 935, 938, 941, 926, 918, 542, 923, - 713, 1205, 708, 709, 706, 718, 746, 720, 719, 710, - 717, 697, 714, 744, 743, 1205, 704, 409, 741, 709, - 709, 696, 696, 691, 705, 734, 695, 732, 693, 696, - 688, 694, 682, 684, 678, 1205, 690, 689, 688, 674, - 688, 1205, 689, 1205, 672, 678, 1205, 1205, 685, 710, - 667, 708, 712, 673, 664, 671, 667, 662, 676, 675, - 1205, 1205, 657, 1205, 650, 1205, 633, 621, 607, 112, - 220, 281, 1205, 267, 1205, 273, 366, 391, 380, 427, - 444, 394, 438, 441, 419, 414, 419, 417, 459, 426, - 431, 420, 468, 431, 1205, 437, 437, 431, 439, 436, + 970, 919, 973, 1389, 921, 921, 970, 923, 906, 917, + 926, 919, 911, 911, 910, 508, 909, 960, 921, 896, + 1389, 914, 913, 898, 1389, 556, 508, 912, 913, 947, + 910, 912, 949, 896, 890, 897, 890, 944, 901, 890, + 890, 899, 882, 896, 895, 931, 880, 879, 1389, 895, + 876, 876, 583, 874, 891, 869, 885, 921, 868, 884, + 881, 865, 878, 863, 271, 863, 1389, 874, 867, 1389, + 866, 862, 872, 864, 860, 911, 855, 853, 908, 907, + 851, 1389, 855, 851, 861, 864, 901, 558, 563, 849, + 850, 847, 897, 840, 1389, 855, 894, 893, 840, 1389, - 428, 430, 484, 442, 440, 487, 483, 449, 1205, 1205, - 449, 492, 494, 450, 497, 1205, 457, 499, 470, 1205, - 1205, 461, 461, 503, 470, 1205, 459, 459, 460, 457, - 1205, 477, 511, 466, 479, 481, 481, 478, 483, 1205, - 476, 485, 1205, 482, 487, 484, 477, 1205, 1205, 519, - 1205, 482, 1205, 485, 497, 494, 1205, 491, 530, 531, - 532, 495, 490, 535, 1205, 531, 504, 533, 493, 497, - 541, 507, 543, 511, 515, 505, 547, 498, 516, 516, - 513, 552, 520, 1205, 1205, 1205, 511, 521, 1205, 512, - 552, 511, 559, 518, 1205, 523, 1205, 562, 517, 530, + 834, 835, 832, 850, 845, 881, 847, 831, 15, 56, + 90, 132, 260, 1389, 289, 586, 393, 436, 438, 441, + 437, 494, 477, 492, 533, 572, 527, 540, 538, 592, + 588, 548, 553, 554, 548, 558, 554, 1389, 549, 550, + 1389, 1389, 551, 568, 569, 555, 575, 1389, 598, 587, + 561, 561, 582, 1389, 565, 574, 1389, 1389, 584, 619, + 568, 621, 570, 628, 583, 574, 576, 577, 595, 596, + 1389, 1389, 594, 1389, 596, 1389, 599, 589, 584, 596, + 1389, 594, 645, 646, 1389, 595, 602, 644, 1389, 594, + 594, 597, 597, 654, 613, 651, 657, 607, 659, 660, - 1205, 535, 532, 567, 527, 1205, 569, 528, 571, 527, - 526, 536, 1205, 570, 540, 1205, 543, 578, 541, 580, - 1205, 576, 1205, 577, 1205, 540, 546, 544, 548, 587, - 542, 1205, 542, 1205, 558, 547, 560, 552, 560, 562, - 1205, 596, 592, 546, 565, 566, 567, 602, 569, 1205, - 557, 573, 561, 561, 563, 1205, 567, 572, 571, 574, - 567, 609, 568, 575, 583, 575, 581, 570, 583, 588, - 577, 591, 583, 596, 592, 628, 629, 630, 595, 594, - 595, 1205, 1205, 1205, 634, 588, 602, 1205, 632, 593, - 592, 594, 603, 642, 602, 1205, 610, 645, 1205, 1205, + 661, 616, 621, 636, 665, 661, 626, 618, 669, 628, + 633, 615, 673, 628, 633, 1389, 635, 635, 636, 633, + 623, 625, 682, 631, 628, 685, 681, 624, 688, 1389, + 1389, 638, 648, 633, 635, 694, 695, 696, 1389, 646, + 648, 699, 1389, 662, 1389, 1389, 1389, 651, 703, 683, + 1389, 646, 663, 664, 1389, 653, 653, 655, 651, 1389, + 673, 659, 716, 661, 675, 677, 674, 679, 1389, 671, + 681, 1389, 678, 684, 1389, 671, 677, 676, 687, 1389, + 1389, 1389, 674, 680, 1389, 683, 692, 1389, 689, 712, + 684, 733, 739, 740, 741, 696, 690, 744, 745, 1389, - 651, 658, 665, 672, 679, 686, 690, 695, 697, 699, - 701, 703 + 741, 701, 692, 697, 750, 708, 752, 712, 754, 755, + 699, 716, 715, 754, 719, 719, 762, 723, 736, 725, + 724, 1389, 1389, 1389, 716, 727, 1389, 1389, 717, 710, + 772, 722, 1389, 728, 1389, 775, 1389, 1389, 771, 739, + 732, 728, 738, 781, 1389, 782, 783, 746, 731, 735, + 787, 733, 789, 1389, 785, 747, 1389, 734, 737, 734, + 758, 797, 1389, 1389, 1389, 741, 758, 795, 1389, 749, + 1389, 756, 803, 751, 763, 806, 757, 1389, 766, 758, + 757, 771, 771, 1389, 772, 814, 1389, 773, 816, 817, + 776, 777, 778, 783, 1389, 822, 1389, 1389, 768, 768, + + 774, 769, 1389, 781, 772, 772, 788, 779, 786, 787, + 834, 794, 785, 794, 1389, 838, 795, 794, 1389, 841, + 800, 1389, 788, 788, 845, 1389, 1389, 851, 856, 861, + 866, 871, 876, 881, 884, 858, 863, 865, 878 } ; -static yyconst flex_int16_t yy_def[913] = +static yyconst flex_int16_t yy_def[1040] = { 0, - 900, 1, 901, 901, 1, 5, 5, 5, 5, 5, - 900, 900, 900, 900, 900, 902, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 903, - 900, 900, 900, 904, 15, 900, 45, 45, 45, 905, + 1028, 1028, 1029, 1029, 1028, 1028, 1028, 1028, 1028, 1028, + 1027, 1027, 1027, 1027, 1027, 1030, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1031, + 1027, 1027, 1027, 1032, 15, 1027, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1033, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1030, 1027, 1027, 1027, + 1027, 1027, 1027, 1034, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1031, 1027, 1032, 1027, 1027, + + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1035, 45, 1033, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1034, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1036, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1035, 1027, 1033, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1027, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1037, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 1027, 45, 1033, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 902, 900, - 900, 900, 900, 900, 900, 906, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 903, 900, 904, - 900, 907, 45, 45, 45, 908, 45, 905, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 1027, 1027, 1027, 1038, 45, 45, 45, 45, + 45, 45, 45, 1027, 45, 45, 1027, 45, 1033, 45, + 45, 45, 45, 45, 45, 1027, 45, 45, 1027, 45, + 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, + 45, 1027, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1027, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1027, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 906, 900, 900, 900, 900, 900, 900, - 900, 900, 909, 45, 45, 45, 908, 900, 905, 45, + 45, 45, 45, 1027, 1027, 1027, 1027, 45, 1027, 1039, + 45, 45, 45, 1027, 1027, 45, 1027, 45, 1027, 45, + 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 45, 45, 45, 45, + 1027, 45, 45, 45, 45, 45, 45, 45, 1027, 45, + 45, 1027, 45, 45, 1027, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1027, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1027, 45, 45, 45, 45, 45, 1027, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1027, 1027, 45, 45, 45, 45, 45, 45, 45, + + 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1027, 45, 45, 45, 1027, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 1027, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 1027, 45, 45, 1027, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1027, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 45, 45, 45, 1027, + + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 1027, 45, 45, + 1027, 1027, 45, 45, 45, 45, 45, 1027, 45, 45, + 45, 45, 45, 1027, 45, 45, 1027, 1027, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 1027, 1027, 45, 1027, 45, 1027, 45, 45, 45, 45, + 1027, 45, 45, 45, 1027, 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 900, - 900, 900, 900, 900, 900, 900, 910, 45, 45, 45, - 905, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 900, 45, 45, - 45, 900, 900, 900, 911, 45, 45, 45, 45, 45, - - 45, 905, 45, 45, 45, 45, 900, 45, 45, 900, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, - 45, 45, 900, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 900, 45, 45, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 900, - 900, 900, 45, 900, 45, 900, 912, 45, 45, 900, - 900, 45, 45, 900, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 1027, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1027, + 1027, 45, 45, 45, 45, 45, 45, 45, 1027, 45, + 45, 45, 1027, 45, 1027, 1027, 1027, 45, 45, 45, + 1027, 45, 45, 45, 1027, 45, 45, 45, 45, 1027, + 45, 45, 45, 45, 45, 45, 45, 45, 1027, 45, + 45, 1027, 45, 45, 1027, 45, 45, 45, 45, 1027, + 1027, 1027, 45, 45, 1027, 45, 45, 1027, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 1027, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 900, 45, 45, 45, 45, 45, 900, 45, 45, - 45, 45, 45, 900, 45, 45, 45, 900, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 900, - 45, 45, 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 1027, 1027, 1027, 45, 45, 1027, 1027, 45, 45, + 45, 45, 1027, 45, 1027, 45, 1027, 1027, 45, 45, + 45, 45, 45, 45, 1027, 45, 45, 45, 45, 45, + 45, 45, 45, 1027, 45, 45, 1027, 45, 45, 45, + 45, 45, 1027, 1027, 1027, 45, 45, 45, 1027, 45, + 1027, 45, 45, 45, 45, 45, 45, 1027, 45, 45, + 45, 45, 45, 1027, 45, 45, 1027, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 1027, 1027, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 900, 900, 45, 45, 45, 45, - 45, 45, 45, 900, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 900, 45, 45, 45, - 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 900, 45, 900, 45, - 45, 45, 45, 45, 45, 45, 900, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 900, 45, 45, 45, - - 45, 900, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 900, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 900, 45, 45, 45, 45, - 45, 900, 45, 900, 45, 45, 900, 900, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 900, 900, 45, 900, 45, 900, 45, 45, 45, 45, - 45, 45, 900, 45, 900, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, - - 45, 45, 45, 45, 45, 45, 45, 45, 900, 900, - 45, 45, 45, 45, 45, 900, 45, 45, 45, 900, - 900, 45, 45, 45, 45, 900, 45, 45, 45, 45, - 900, 45, 45, 45, 45, 45, 45, 45, 45, 900, - 45, 45, 900, 45, 45, 45, 45, 900, 900, 45, - 900, 45, 900, 45, 45, 45, 900, 45, 45, 45, - 45, 45, 45, 45, 900, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 900, 900, 900, 45, 45, 900, 45, - 45, 45, 45, 45, 900, 45, 900, 45, 45, 45, - - 900, 45, 45, 45, 45, 900, 45, 45, 45, 45, - 45, 45, 900, 45, 45, 900, 45, 45, 45, 45, - 900, 45, 900, 45, 900, 45, 45, 45, 45, 45, - 45, 900, 45, 900, 45, 45, 45, 45, 45, 45, - 900, 45, 45, 45, 45, 45, 45, 45, 45, 900, - 45, 45, 45, 45, 45, 900, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 45, 900, 900, 900, 45, 45, 45, 900, 45, 45, - 45, 45, 45, 45, 45, 900, 45, 45, 900, 0, - - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900 + 45, 45, 1027, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 1027, 45, 45, 45, 1027, 45, + 45, 1027, 45, 45, 45, 1027, 0, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027 } ; -static yyconst flex_uint16_t yy_nxt[1266] = +static yyconst flex_uint16_t yy_nxt[1461] = { 0, - 12, 13, 14, 13, 12, 15, 16, 12, 17, 18, - 19, 20, 21, 22, 22, 22, 23, 24, 12, 12, - 12, 12, 12, 25, 26, 12, 27, 12, 12, 28, - 12, 29, 12, 30, 12, 12, 12, 12, 12, 25, - 31, 12, 12, 12, 12, 12, 12, 32, 12, 12, - 12, 12, 33, 12, 12, 12, 12, 12, 34, 35, - 37, 14, 37, 37, 14, 37, 38, 81, 40, 38, - 12, 12, 40, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 41, 42, 41, 42, 75, 12, 12, - 81, 12, 76, 82, 12, 78, 12, 78, 12, 80, + 1027, 13, 14, 13, 1027, 15, 16, 1027, 17, 18, + 19, 20, 21, 22, 22, 22, 23, 24, 83, 554, + 37, 14, 37, 84, 25, 26, 38, 1027, 555, 27, + 37, 14, 37, 42, 28, 42, 38, 89, 90, 29, + 111, 30, 13, 14, 13, 88, 89, 25, 31, 90, + 13, 14, 13, 13, 14, 13, 32, 40, 768, 13, + 14, 13, 33, 40, 111, 89, 90, 397, 88, 34, + 35, 13, 14, 13, 92, 15, 16, 93, 17, 18, + 19, 20, 21, 22, 22, 22, 23, 24, 13, 14, + 13, 105, 39, 88, 25, 26, 13, 14, 13, 27, - 79, 79, 79, 80, 12, 12, 12, 12, 39, 12, - 12, 42, 12, 42, 80, 535, 82, 12, 83, 42, - 536, 42, 708, 12, 12, 44, 44, 44, 45, 45, - 46, 45, 45, 45, 45, 45, 45, 45, 45, 47, - 45, 45, 45, 45, 45, 45, 45, 48, 45, 45, - 49, 45, 45, 45, 45, 45, 45, 50, 45, 45, - 51, 52, 53, 54, 55, 56, 45, 57, 58, 45, - 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 45, 45, 45, 45, 45, 70, 81, 71, 71, 71, - 70, 82, 73, 73, 73, 91, 296, 72, 74, 74, + 39, 82, 82, 82, 28, 42, 41, 42, 42, 29, + 42, 30, 80, 104, 41, 107, 91, 25, 31, 105, + 769, 192, 86, 398, 86, 130, 32, 87, 87, 87, + 131, 193, 33, 132, 770, 80, 104, 771, 107, 34, + 35, 44, 44, 44, 45, 45, 46, 45, 45, 45, + 45, 45, 45, 45, 45, 47, 45, 45, 45, 45, + 45, 48, 45, 45, 49, 45, 50, 45, 51, 52, + 53, 45, 45, 45, 45, 54, 55, 45, 56, 45, + 45, 57, 45, 45, 58, 59, 60, 61, 62, 50, + 63, 64, 65, 51, 45, 66, 67, 68, 69, 70, - 74, 109, 72, 70, 297, 73, 73, 73, 72, 84, - 147, 110, 105, 72, 85, 72, 106, 182, 72, 107, - 111, 101, 92, 102, 72, 709, 103, 145, 116, 104, - 108, 72, 45, 147, 113, 168, 169, 117, 114, 118, - 45, 115, 124, 45, 126, 131, 125, 145, 127, 132, - 345, 183, 97, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 147, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 119, 120, 465, 128, 121, 146, 45, - 129, 133, 122, 45, 137, 150, 710, 45, 138, 130, - 134, 135, 140, 91, 45, 136, 346, 45, 146, 45, + 71, 72, 73, 74, 75, 76, 56, 45, 45, 45, + 45, 45, 78, 102, 79, 79, 79, 78, 102, 81, + 81, 81, 99, 110, 78, 80, 81, 81, 81, 122, + 80, 108, 118, 123, 126, 119, 124, 80, 120, 102, + 163, 109, 121, 151, 115, 127, 110, 152, 80, 125, + 116, 164, 133, 80, 108, 128, 442, 100, 337, 147, + 80, 45, 134, 148, 135, 772, 163, 45, 338, 109, + 45, 443, 45, 149, 45, 45, 45, 164, 113, 136, + 137, 45, 45, 138, 45, 45, 87, 87, 87, 139, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, - 98, 141, 139, 173, 466, 142, 74, 74, 74, 70, - 190, 71, 71, 71, 191, 711, 72, 78, 174, 78, - 92, 72, 79, 79, 79, 712, 70, 145, 73, 73, - 73, 146, 72, 74, 74, 74, 200, 72, 72, 79, - 79, 79, 201, 72, 79, 79, 79, 148, 164, 177, - 220, 149, 178, 275, 72, 179, 276, 165, 222, 72, - 159, 159, 159, 196, 197, 222, 220, 159, 159, 159, - 159, 159, 208, 220, 222, 221, 209, 221, 202, 203, - 204, 225, 159, 159, 159, 159, 159, 159, 205, 223, - 206, 382, 532, 533, 207, 221, 292, 224, 231, 231, + 110, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 144, 153, 728, 45, 107, 145, + 146, 45, 108, 110, 165, 154, 155, 729, 163, 45, + 99, 156, 109, 45, 182, 45, 114, 141, 160, 142, + 773, 143, 82, 82, 82, 108, 78, 157, 79, 79, + 79, 158, 165, 80, 166, 164, 86, 182, 86, 80, + 109, 87, 87, 87, 165, 100, 78, 159, 81, 81, + 81, 173, 82, 82, 82, 175, 80, 176, 179, 80, + 98, 167, 80, 80, 87, 87, 87, 98, 178, 180, + 210, 181, 168, 173, 196, 197, 206, 178, 776, 173, - 231, 292, 298, 299, 383, 231, 231, 231, 231, 231, - 300, 313, 292, 323, 664, 314, 713, 293, 324, 665, - 231, 231, 231, 231, 231, 231, 302, 302, 302, 480, - 714, 715, 716, 302, 302, 302, 302, 302, 481, 490, - 573, 719, 616, 720, 574, 491, 721, 617, 302, 302, - 302, 302, 302, 302, 717, 325, 722, 723, 724, 326, - 45, 45, 45, 725, 726, 728, 729, 45, 45, 45, - 45, 45, 730, 731, 732, 733, 734, 735, 736, 737, - 738, 739, 45, 45, 45, 45, 45, 45, 618, 740, - 741, 742, 743, 744, 745, 718, 747, 748, 727, 749, + 207, 175, 80, 251, 176, 179, 80, 201, 218, 202, + 186, 252, 219, 226, 227, 98, 178, 180, 181, 98, + 239, 187, 252, 98, 240, 178, 203, 222, 241, 251, + 250, 98, 211, 250, 252, 98, 251, 98, 171, 185, + 185, 185, 232, 233, 234, 255, 185, 185, 185, 185, + 185, 185, 259, 235, 261, 236, 262, 237, 250, 339, + 238, 253, 254, 264, 266, 268, 259, 333, 333, 185, + 185, 185, 185, 185, 185, 259, 340, 341, 346, 339, + 777, 778, 261, 262, 343, 342, 264, 266, 339, 271, + 333, 334, 268, 269, 269, 269, 536, 779, 780, 781, - 750, 746, 751, 752, 753, 754, 755, 756, 757, 759, - 760, 761, 762, 758, 763, 764, 765, 766, 767, 768, - 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, - 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, - 789, 790, 791, 792, 793, 794, 795, 796, 797, 798, - 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, - 809, 810, 811, 812, 813, 814, 815, 816, 817, 818, - 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, - 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, - 839, 840, 841, 842, 843, 844, 845, 846, 847, 848, + 269, 269, 269, 269, 269, 269, 346, 343, 351, 362, + 388, 495, 562, 363, 372, 423, 501, 423, 499, 373, + 389, 498, 561, 269, 269, 269, 269, 269, 269, 349, + 349, 349, 689, 537, 782, 562, 349, 349, 349, 349, + 349, 349, 430, 423, 431, 433, 499, 567, 498, 613, + 561, 619, 783, 568, 679, 689, 614, 620, 627, 349, + 349, 349, 349, 349, 349, 374, 680, 615, 616, 430, + 375, 431, 45, 45, 45, 617, 784, 785, 786, 45, + 45, 45, 45, 45, 45, 662, 627, 688, 714, 663, + 749, 774, 750, 715, 787, 788, 775, 789, 790, 791, - 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, - 859, 860, 861, 862, 863, 864, 865, 866, 867, 868, - 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, - 879, 880, 881, 882, 883, 884, 885, 886, 887, 888, + 792, 793, 45, 45, 45, 45, 45, 45, 794, 795, + 796, 797, 798, 799, 688, 800, 801, 802, 749, 750, + 803, 805, 804, 806, 807, 808, 809, 810, 811, 812, + 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, + 823, 824, 825, 826, 716, 804, 827, 828, 829, 805, + 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, + 840, 841, 843, 844, 845, 846, 847, 848, 849, 850, + 851, 852, 853, 854, 855, 857, 858, 859, 860, 861, + 862, 863, 864, 865, 866, 867, 868, 869, 870, 871, + 872, 873, 874, 875, 876, 877, 878, 850, 879, 880, + + 881, 882, 883, 884, 885, 886, 887, 890, 888, 891, + 892, 893, 842, 889, 894, 895, 856, 896, 897, 898, + 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, + 890, 909, 910, 911, 912, 913, 914, 915, 916, 917, + 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, + 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, + 938, 939, 940, 941, 942, 943, 944, 945, 919, 946, + 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, + 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, + 967, 968, 969, 970, 971, 972, 973, 974, 947, 975, + + 976, 977, 978, 979, 980, 981, 982, 983, 984, 985, + 986, 987, 988, 989, 990, 991, 992, 993, 994, 995, + 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, + 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, + 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, + 1026, 12, 12, 12, 12, 12, 36, 36, 36, 36, + 36, 77, 257, 77, 77, 77, 96, 336, 96, 420, + 96, 98, 98, 98, 98, 98, 112, 112, 112, 112, + 112, 162, 98, 162, 162, 162, 183, 183, 183, 767, + 766, 765, 764, 763, 762, 761, 760, 759, 758, 757, + + 756, 755, 754, 753, 752, 751, 748, 747, 746, 745, + 744, 743, 742, 741, 740, 739, 738, 737, 736, 735, + 734, 733, 732, 731, 730, 727, 726, 725, 724, 723, + 722, 721, 720, 719, 718, 717, 713, 712, 711, 710, + 709, 708, 707, 706, 705, 704, 703, 702, 701, 700, + 699, 698, 697, 696, 695, 694, 693, 692, 691, 690, + 687, 686, 685, 684, 683, 682, 681, 678, 677, 676, + 675, 674, 673, 672, 671, 670, 669, 668, 667, 666, + 665, 664, 661, 660, 659, 658, 657, 656, 655, 654, + 653, 652, 651, 650, 649, 648, 647, 646, 645, 644, + + 643, 642, 641, 640, 639, 638, 637, 636, 635, 634, + 633, 632, 631, 630, 629, 628, 626, 625, 624, 623, + 622, 621, 618, 612, 611, 610, 609, 608, 607, 606, + 605, 604, 603, 602, 601, 600, 599, 598, 597, 596, + 595, 594, 593, 592, 591, 590, 589, 588, 587, 586, + 585, 584, 583, 582, 581, 580, 579, 578, 577, 576, + 575, 574, 573, 572, 571, 570, 569, 566, 565, 564, + 563, 560, 559, 558, 557, 556, 553, 552, 551, 550, + 549, 548, 547, 546, 545, 544, 543, 542, 541, 540, + 539, 538, 535, 534, 533, 532, 531, 530, 529, 528, + + 527, 526, 525, 524, 523, 522, 521, 520, 519, 518, + 517, 516, 515, 514, 513, 512, 511, 510, 509, 508, + 507, 506, 505, 504, 503, 502, 500, 497, 496, 495, + 494, 493, 492, 491, 490, 489, 488, 487, 486, 485, + 484, 483, 482, 481, 480, 479, 478, 477, 476, 475, + 474, 473, 472, 471, 470, 469, 468, 467, 466, 465, + 464, 463, 462, 461, 460, 459, 458, 457, 456, 455, + 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, + 444, 441, 440, 439, 438, 437, 436, 435, 434, 432, + 429, 428, 427, 426, 425, 424, 422, 421, 419, 418, + + 417, 416, 415, 414, 413, 412, 411, 410, 409, 408, + 407, 406, 405, 404, 403, 402, 401, 400, 399, 396, + 395, 394, 393, 392, 391, 390, 387, 386, 385, 384, + 383, 382, 381, 380, 379, 378, 377, 376, 371, 370, + 369, 368, 367, 366, 365, 364, 361, 360, 359, 358, + 357, 356, 355, 354, 353, 352, 350, 348, 347, 345, + 344, 335, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 323, 322, 321, 320, 319, 318, 317, 316, 315, + 314, 313, 312, 311, 310, 309, 308, 307, 306, 305, + 304, 303, 302, 301, 300, 299, 298, 297, 296, 295, + + 294, 293, 292, 291, 290, 289, 288, 287, 286, 285, + 284, 283, 282, 281, 280, 279, 278, 277, 276, 275, + 274, 273, 272, 270, 184, 267, 265, 263, 260, 258, + 256, 249, 248, 247, 246, 245, 244, 243, 242, 231, + 230, 229, 228, 225, 224, 223, 221, 220, 217, 216, + 215, 214, 213, 212, 209, 208, 205, 204, 200, 199, + 198, 195, 194, 191, 190, 189, 188, 184, 177, 174, + 172, 170, 169, 161, 150, 140, 129, 117, 106, 103, + 101, 43, 97, 95, 94, 85, 43, 1027, 11, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027 + } ; + +static yyconst flex_int16_t yy_chk[1461] = + { 0, + 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 21, 490, + 3, 3, 3, 21, 1, 1, 3, 0, 490, 1, + 4, 4, 4, 13, 1, 13, 4, 27, 28, 1, + 56, 1, 5, 5, 5, 26, 32, 1, 1, 33, + 6, 6, 6, 7, 7, 7, 1, 7, 709, 8, + 8, 8, 1, 8, 56, 27, 28, 312, 26, 1, + 1, 2, 2, 2, 32, 2, 2, 33, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 9, 9, + 9, 51, 5, 31, 2, 2, 10, 10, 10, 2, + + 6, 20, 20, 20, 2, 37, 9, 37, 42, 2, + 42, 2, 20, 50, 10, 53, 31, 2, 2, 51, + 710, 120, 25, 312, 25, 64, 2, 25, 25, 25, + 64, 120, 2, 64, 711, 20, 50, 712, 53, 2, + 2, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + + 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, + 15, 15, 17, 48, 17, 17, 17, 19, 58, 19, + 19, 19, 44, 55, 22, 17, 22, 22, 22, 61, + 19, 54, 60, 61, 62, 60, 61, 22, 60, 48, + 88, 54, 60, 72, 58, 62, 55, 72, 17, 61, + 58, 89, 65, 19, 54, 62, 362, 44, 258, 70, + 22, 45, 65, 70, 65, 713, 88, 45, 258, 54, + 45, 362, 45, 70, 45, 45, 45, 89, 57, 66, + 66, 45, 45, 66, 45, 57, 86, 86, 86, 66, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + + 75, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 57, 69, 73, 665, 57, 68, 69, + 69, 57, 74, 75, 90, 73, 73, 665, 91, 57, + 98, 73, 74, 57, 111, 57, 57, 68, 75, 68, + 715, 68, 78, 78, 78, 74, 79, 74, 79, 79, + 79, 74, 90, 78, 91, 92, 80, 111, 80, 79, + 74, 80, 80, 80, 93, 98, 81, 74, 81, 81, + 81, 102, 82, 82, 82, 104, 78, 105, 108, 81, + 100, 92, 79, 82, 87, 87, 87, 100, 107, 109, + 133, 110, 93, 115, 123, 123, 130, 143, 717, 102, + + 130, 104, 81, 164, 105, 108, 82, 127, 140, 127, + 115, 165, 140, 147, 147, 100, 107, 109, 110, 100, + 153, 115, 168, 100, 153, 143, 127, 143, 153, 164, + 163, 100, 133, 166, 165, 100, 167, 100, 100, 114, + 114, 114, 152, 152, 152, 168, 114, 114, 114, 114, + 114, 114, 173, 152, 175, 152, 176, 152, 163, 259, + 152, 166, 167, 178, 180, 182, 187, 250, 253, 114, + 114, 114, 114, 114, 114, 173, 260, 260, 264, 271, + 718, 719, 175, 176, 261, 260, 178, 180, 259, 187, + 250, 253, 182, 185, 185, 185, 470, 720, 721, 722, + + 185, 185, 185, 185, 185, 185, 264, 261, 271, 282, + 304, 433, 499, 282, 291, 339, 433, 351, 431, 291, + 304, 430, 498, 185, 185, 185, 185, 185, 185, 269, + 269, 269, 627, 470, 723, 499, 269, 269, 269, 269, + 269, 269, 348, 339, 348, 351, 431, 504, 430, 550, + 498, 553, 724, 504, 616, 627, 550, 553, 562, 269, + 269, 269, 269, 269, 269, 291, 616, 551, 551, 348, + 291, 348, 349, 349, 349, 551, 725, 726, 727, 349, + 349, 349, 349, 349, 349, 599, 562, 626, 653, 599, + 688, 716, 689, 653, 728, 729, 716, 730, 731, 732, + + 733, 734, 349, 349, 349, 349, 349, 349, 735, 736, + 737, 739, 740, 743, 626, 744, 745, 746, 688, 689, + 747, 750, 749, 751, 752, 753, 755, 756, 759, 760, + 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, + 773, 775, 777, 778, 653, 749, 779, 780, 782, 750, + 783, 784, 786, 787, 788, 790, 791, 792, 793, 794, + 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, + 805, 806, 807, 808, 809, 810, 811, 812, 813, 814, + 815, 817, 818, 819, 820, 821, 822, 823, 824, 825, + 826, 827, 828, 829, 832, 833, 834, 804, 835, 836, + + 837, 838, 840, 841, 842, 844, 848, 850, 849, 852, + 853, 854, 796, 849, 856, 857, 809, 858, 859, 861, + 862, 863, 864, 865, 866, 867, 868, 870, 871, 873, + 850, 874, 876, 877, 878, 879, 883, 884, 886, 887, 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, - 899, 36, 36, 36, 36, 36, 36, 36, 69, 707, - 69, 69, 69, 69, 69, 88, 706, 88, 705, 88, - 88, 88, 90, 90, 90, 90, 90, 90, 90, 96, - 96, 96, 96, 96, 96, 96, 144, 704, 144, 144, - 144, 144, 144, 90, 90, 703, 90, 157, 157, 157, + 899, 901, 902, 903, 904, 905, 906, 907, 908, 909, + 910, 911, 912, 913, 914, 915, 916, 917, 890, 918, + 919, 920, 921, 925, 926, 929, 930, 931, 932, 934, + 936, 939, 940, 941, 942, 943, 944, 946, 947, 948, + 949, 950, 951, 952, 953, 955, 956, 958, 919, 959, - 157, 157, 227, 227, 295, 295, 367, 367, 90, 90, - 702, 701, 700, 699, 698, 697, 696, 695, 694, 693, - 692, 691, 690, 689, 688, 687, 686, 685, 684, 683, - 682, 681, 680, 679, 678, 677, 676, 675, 674, 673, - 672, 671, 670, 669, 668, 667, 666, 663, 662, 661, - 660, 659, 658, 657, 656, 655, 654, 653, 652, 651, - 650, 649, 648, 647, 646, 645, 644, 643, 642, 641, - 640, 639, 638, 637, 636, 635, 634, 633, 632, 631, - 630, 629, 628, 627, 626, 625, 624, 623, 622, 621, - 620, 619, 615, 614, 613, 612, 611, 610, 609, 608, + 960, 961, 962, 966, 967, 968, 970, 972, 973, 974, + 975, 976, 977, 979, 980, 981, 982, 983, 985, 986, + 988, 989, 990, 991, 992, 993, 994, 996, 999, 1000, + 1001, 1002, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, + 1012, 1013, 1014, 1016, 1017, 1018, 1020, 1021, 1023, 1024, + 1025, 1028, 1028, 1028, 1028, 1028, 1029, 1029, 1029, 1029, + 1029, 1030, 1036, 1030, 1030, 1030, 1031, 1037, 1031, 1038, + 1031, 1032, 1032, 1032, 1032, 1032, 1033, 1033, 1033, 1033, + 1033, 1034, 1039, 1034, 1034, 1034, 1035, 1035, 1035, 708, + 707, 706, 705, 704, 703, 702, 701, 699, 698, 697, - 607, 606, 605, 604, 603, 602, 601, 600, 599, 598, - 597, 596, 595, 594, 593, 592, 591, 590, 589, 588, - 587, 586, 585, 584, 583, 582, 581, 580, 579, 578, - 577, 576, 575, 572, 571, 570, 569, 568, 567, 566, - 565, 564, 563, 562, 561, 560, 559, 558, 557, 556, - 555, 554, 553, 552, 551, 550, 549, 548, 547, 546, - 545, 544, 543, 542, 541, 540, 539, 538, 537, 534, + 696, 694, 693, 692, 691, 690, 687, 686, 685, 684, + 683, 681, 680, 679, 678, 677, 676, 675, 674, 673, + 672, 671, 669, 668, 666, 664, 663, 662, 661, 660, + 659, 658, 657, 656, 655, 654, 652, 651, 650, 648, + 647, 646, 645, 644, 643, 642, 641, 640, 639, 638, + 637, 636, 635, 634, 633, 632, 631, 630, 629, 628, + 624, 623, 622, 620, 619, 618, 617, 615, 614, 613, + 612, 611, 610, 609, 608, 607, 606, 605, 603, 602, + 601, 600, 598, 597, 596, 595, 594, 591, 590, 589, + 588, 587, 586, 585, 584, 583, 582, 581, 580, 579, + + 578, 577, 576, 575, 574, 573, 572, 571, 570, 569, + 568, 567, 566, 565, 564, 563, 561, 559, 558, 557, + 556, 555, 552, 549, 548, 547, 546, 545, 544, 543, + 542, 541, 540, 539, 538, 537, 535, 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, 515, 514, 513, 512, - 511, 510, 509, 508, 507, 506, 505, 504, 503, 502, + 511, 510, 509, 508, 507, 506, 505, 503, 502, 501, + 500, 497, 496, 494, 493, 491, 488, 487, 486, 485, + 484, 483, 482, 480, 479, 478, 477, 476, 474, 473, + 472, 471, 469, 468, 467, 466, 465, 464, 463, 462, - 501, 500, 499, 498, 497, 496, 495, 494, 493, 492, - 489, 488, 487, 486, 485, 484, 483, 482, 479, 478, - 477, 476, 475, 474, 473, 472, 471, 470, 469, 468, - 467, 464, 463, 462, 461, 460, 459, 458, 457, 456, - 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, - 445, 444, 443, 442, 441, 440, 439, 438, 437, 436, - 435, 434, 433, 432, 431, 430, 429, 428, 427, 426, - 425, 424, 423, 422, 421, 420, 419, 418, 417, 416, - 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, - 405, 404, 403, 402, 401, 400, 399, 398, 397, 396, + 461, 460, 459, 458, 457, 456, 454, 453, 452, 451, + 450, 449, 448, 447, 446, 445, 444, 443, 442, 441, + 440, 439, 438, 437, 436, 435, 432, 428, 426, 423, + 422, 421, 419, 418, 413, 412, 411, 410, 409, 408, + 407, 406, 405, 404, 403, 402, 401, 400, 399, 398, + 396, 395, 394, 393, 392, 391, 390, 389, 388, 386, + 385, 384, 383, 382, 381, 380, 379, 378, 377, 376, + 375, 374, 373, 371, 370, 369, 368, 367, 366, 365, + 363, 361, 360, 358, 357, 355, 354, 353, 352, 350, + 346, 345, 343, 342, 341, 340, 338, 337, 335, 332, - 395, 394, 393, 392, 391, 390, 389, 388, 387, 386, - 385, 384, 381, 380, 379, 378, 377, 376, 375, 374, - 373, 372, 371, 370, 369, 368, 366, 365, 364, 363, - 362, 361, 360, 359, 358, 357, 356, 355, 354, 353, - 352, 351, 350, 349, 348, 347, 344, 343, 342, 341, - 340, 339, 338, 337, 336, 335, 334, 333, 332, 331, - 330, 329, 328, 327, 322, 321, 320, 319, 318, 317, - 316, 315, 312, 311, 310, 309, 308, 307, 306, 305, - 304, 303, 301, 294, 291, 290, 289, 288, 287, 286, - 285, 284, 283, 282, 281, 280, 279, 278, 277, 274, + 331, 330, 329, 328, 327, 326, 325, 324, 323, 322, + 321, 320, 319, 318, 317, 316, 315, 314, 313, 311, + 310, 309, 308, 307, 306, 305, 303, 302, 301, 300, + 299, 298, 297, 296, 295, 294, 293, 292, 290, 289, + 288, 287, 286, 285, 284, 283, 281, 280, 279, 278, + 277, 276, 275, 274, 273, 272, 270, 268, 266, 263, + 262, 256, 249, 248, 247, 246, 245, 244, 243, 242, + 241, 240, 239, 238, 237, 236, 235, 234, 233, 232, + 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, + 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, - 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, - 263, 262, 261, 260, 259, 258, 257, 256, 255, 254, - 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, - 243, 242, 241, 240, 239, 238, 237, 236, 235, 234, - 233, 232, 158, 230, 229, 228, 226, 219, 218, 217, - 216, 215, 214, 213, 212, 211, 210, 199, 198, 195, - 194, 193, 192, 189, 188, 187, 186, 185, 184, 181, - 180, 176, 175, 172, 171, 170, 167, 166, 163, 162, - 161, 160, 158, 156, 155, 154, 153, 152, 151, 143, - 123, 112, 100, 99, 95, 94, 93, 43, 89, 87, + 211, 209, 208, 207, 206, 205, 204, 203, 202, 201, + 200, 199, 198, 197, 196, 195, 194, 193, 192, 191, + 190, 189, 188, 186, 183, 181, 179, 177, 174, 172, + 169, 161, 160, 159, 158, 157, 156, 155, 154, 151, + 150, 149, 148, 146, 145, 144, 142, 141, 139, 138, + 137, 136, 135, 134, 132, 131, 129, 128, 126, 125, + 124, 122, 121, 119, 118, 117, 116, 112, 106, 103, + 101, 96, 95, 76, 71, 67, 63, 59, 52, 49, + 47, 43, 41, 39, 38, 24, 14, 11, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, - 86, 77, 43, 900, 11, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900 - } ; - -static yyconst flex_int16_t yy_chk[1266] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 3, 3, 4, 4, 4, 3, 27, 7, 4, - 5, 5, 8, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 9, 13, 10, 13, 21, 5, 5, - 27, 5, 21, 28, 5, 25, 5, 25, 5, 26, - - 25, 25, 25, 31, 5, 5, 7, 9, 5, 10, - 8, 37, 5, 37, 26, 479, 28, 5, 31, 42, - 479, 42, 670, 5, 5, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 15, 15, 15, 17, 32, 17, 17, 17, - 19, 33, 19, 19, 19, 44, 228, 17, 20, 20, - - 20, 55, 19, 22, 228, 22, 22, 22, 20, 32, - 82, 55, 54, 17, 33, 22, 54, 116, 19, 54, - 55, 53, 44, 53, 20, 671, 53, 80, 58, 53, - 54, 22, 45, 82, 57, 106, 106, 58, 57, 58, - 45, 57, 61, 45, 62, 64, 61, 80, 62, 64, - 270, 116, 50, 45, 45, 45, 45, 45, 45, 50, - 45, 45, 85, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 59, 59, 408, 63, 59, 81, 50, - 63, 65, 59, 50, 66, 85, 672, 50, 66, 63, - 65, 65, 67, 90, 50, 65, 270, 50, 81, 50, - - 50, 67, 66, 110, 408, 67, 70, 70, 70, 71, - 123, 71, 71, 71, 123, 674, 70, 72, 110, 72, - 90, 71, 72, 72, 72, 676, 73, 83, 73, 73, - 73, 84, 70, 74, 74, 74, 131, 71, 73, 78, - 78, 78, 131, 74, 79, 79, 79, 83, 103, 113, - 145, 84, 113, 204, 73, 113, 204, 103, 147, 74, - 98, 98, 98, 128, 128, 150, 148, 98, 98, 98, - 98, 98, 133, 145, 147, 146, 133, 149, 132, 132, - 132, 150, 98, 98, 98, 98, 98, 98, 132, 148, - 132, 313, 477, 477, 132, 146, 220, 149, 159, 159, - - 159, 223, 229, 229, 313, 159, 159, 159, 159, 159, - 229, 242, 220, 251, 618, 242, 677, 223, 251, 618, - 159, 159, 159, 159, 159, 159, 231, 231, 231, 425, - 678, 679, 680, 231, 231, 231, 231, 231, 425, 435, - 520, 682, 566, 683, 520, 435, 684, 566, 231, 231, - 231, 231, 231, 231, 681, 251, 685, 686, 687, 251, - 302, 302, 302, 688, 689, 690, 691, 302, 302, 302, - 302, 302, 692, 693, 694, 696, 697, 698, 699, 700, - 701, 702, 302, 302, 302, 302, 302, 302, 566, 703, - 704, 705, 706, 707, 708, 681, 711, 712, 689, 713, - - 714, 708, 715, 717, 718, 719, 722, 723, 724, 725, - 727, 728, 729, 724, 730, 732, 733, 734, 735, 736, - 737, 738, 739, 741, 742, 744, 745, 746, 747, 750, - 752, 754, 755, 756, 758, 759, 760, 761, 762, 763, - 764, 766, 767, 768, 769, 770, 771, 772, 773, 774, - 775, 776, 777, 778, 779, 780, 781, 782, 783, 787, - 788, 790, 791, 792, 793, 794, 796, 798, 799, 800, - 802, 803, 804, 805, 807, 808, 809, 810, 811, 812, - 814, 815, 817, 818, 819, 820, 822, 824, 826, 827, - 828, 829, 830, 831, 833, 835, 836, 837, 838, 839, - - 840, 842, 843, 844, 845, 846, 847, 848, 849, 851, - 852, 853, 854, 855, 857, 858, 859, 860, 861, 862, - 863, 864, 865, 866, 867, 868, 869, 870, 871, 872, - 873, 874, 875, 876, 877, 878, 879, 880, 881, 885, - 886, 887, 889, 890, 891, 892, 893, 894, 895, 897, - 898, 901, 901, 901, 901, 901, 901, 901, 902, 669, - 902, 902, 902, 902, 902, 903, 668, 903, 667, 903, - 903, 903, 904, 904, 904, 904, 904, 904, 904, 905, - 905, 905, 905, 905, 905, 905, 906, 665, 906, 906, - 906, 906, 906, 907, 907, 663, 907, 908, 908, 908, - - 908, 908, 909, 909, 910, 910, 911, 911, 912, 912, - 660, 659, 658, 657, 656, 655, 654, 653, 652, 651, - 650, 649, 646, 645, 643, 641, 640, 639, 638, 637, - 635, 634, 633, 632, 631, 630, 629, 628, 627, 626, - 625, 624, 623, 622, 621, 620, 619, 617, 615, 614, - 613, 612, 611, 610, 609, 608, 607, 606, 605, 604, - 603, 601, 600, 599, 598, 596, 595, 594, 593, 592, - 591, 590, 589, 588, 586, 585, 584, 583, 582, 581, - 580, 578, 576, 575, 574, 573, 572, 571, 570, 569, - 568, 567, 565, 564, 563, 561, 560, 559, 558, 557, - - 556, 555, 554, 553, 552, 551, 550, 549, 548, 547, - 546, 545, 544, 543, 541, 540, 539, 538, 536, 535, - 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, - 523, 522, 521, 519, 518, 517, 514, 513, 512, 511, - 510, 509, 508, 507, 506, 505, 504, 503, 502, 501, - 500, 499, 498, 497, 496, 495, 494, 493, 492, 491, - 490, 489, 488, 486, 485, 484, 483, 482, 481, 478, - 476, 475, 474, 473, 472, 471, 470, 469, 468, 467, - 466, 464, 463, 462, 461, 460, 459, 458, 457, 456, - 455, 454, 453, 452, 451, 450, 449, 448, 447, 446, - - 445, 444, 443, 442, 441, 440, 439, 438, 437, 436, - 434, 433, 432, 431, 430, 429, 427, 426, 423, 422, - 421, 420, 419, 417, 416, 415, 414, 413, 411, 410, - 409, 407, 406, 405, 404, 403, 402, 401, 400, 399, - 398, 397, 396, 394, 393, 392, 391, 390, 389, 388, - 387, 386, 385, 384, 383, 382, 381, 380, 379, 378, - 377, 376, 375, 373, 372, 369, 368, 366, 365, 363, - 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, - 349, 348, 347, 346, 344, 343, 342, 341, 340, 339, - 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, - - 327, 326, 325, 324, 322, 321, 320, 319, 318, 317, - 316, 314, 312, 311, 309, 308, 306, 305, 304, 303, - 301, 300, 299, 298, 297, 296, 294, 291, 290, 289, - 287, 286, 285, 284, 283, 282, 281, 280, 279, 278, - 277, 276, 275, 274, 273, 271, 269, 268, 267, 266, - 265, 264, 263, 262, 261, 260, 259, 258, 257, 256, - 255, 254, 253, 252, 250, 249, 248, 247, 246, 245, - 244, 243, 241, 240, 239, 238, 237, 236, 235, 234, - 233, 232, 230, 226, 219, 218, 217, 216, 215, 214, - 213, 212, 211, 210, 209, 208, 207, 206, 205, 203, - - 202, 201, 200, 199, 198, 197, 196, 195, 194, 193, - 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, - 181, 180, 179, 178, 177, 176, 175, 174, 173, 172, - 171, 170, 169, 168, 167, 166, 165, 164, 163, 162, - 161, 160, 157, 156, 155, 154, 151, 143, 142, 141, - 140, 139, 138, 137, 136, 135, 134, 130, 129, 127, - 126, 125, 124, 122, 121, 120, 119, 118, 117, 115, - 114, 112, 111, 109, 108, 107, 105, 104, 102, 101, - 100, 99, 96, 95, 94, 93, 92, 88, 87, 68, - 60, 56, 52, 51, 49, 48, 47, 43, 41, 39, - - 38, 24, 14, 11, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900, 900, 900, 900, 900, 900, - 900, 900, 900, 900, 900 + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, + 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027, 1027 } ; static yy_state_type yy_last_accepting_state; @@ -1123,21 +1207,23 @@ static char *yy_last_accepting_cpos; extern int parser4__flex_debug; int parser4__flex_debug = 1; -static yyconst flex_int16_t yy_rule_linenum[116] = +static yyconst flex_int16_t yy_rule_linenum[132] = { 0, - 128, 130, 132, 137, 138, 143, 144, 145, 157, 160, - 165, 172, 181, 190, 199, 208, 217, 226, 235, 244, - 253, 265, 275, 285, 295, 306, 316, 326, 336, 346, - 355, 364, 373, 387, 402, 411, 420, 429, 438, 447, - 456, 465, 474, 483, 493, 502, 511, 520, 529, 538, - 547, 556, 566, 576, 586, 595, 605, 615, 625, 635, - 644, 654, 663, 672, 681, 690, 699, 709, 719, 728, - 737, 746, 755, 764, 773, 782, 791, 800, 809, 818, - 827, 836, 845, 854, 863, 872, 881, 890, 899, 908, - 917, 926, 935, 945, 955, 967, 978, 991, 1089, 1094, + 130, 132, 134, 139, 140, 145, 146, 147, 159, 162, + 167, 174, 183, 192, 201, 210, 219, 228, 237, 249, + 259, 269, 279, 290, 300, 310, 320, 330, 339, 348, + 357, 371, 386, 395, 404, 413, 422, 431, 440, 449, + 458, 467, 477, 486, 495, 504, 513, 522, 531, 540, + 550, 560, 570, 579, 589, 599, 609, 619, 628, 638, + 647, 656, 665, 674, 683, 693, 703, 712, 721, 730, + 739, 748, 757, 766, 775, 784, 793, 802, 811, 820, + 829, 838, 847, 856, 865, 874, 883, 892, 901, 910, + 919, 928, 937, 946, 955, 965, 975, 985, 995, 1005, - 1099, 1104, 1105, 1106, 1107, 1108, 1109, 1111, 1129, 1142, - 1147, 1151, 1153, 1155, 1157 + 1015, 1025, 1035, 1045, 1054, 1063, 1072, 1081, 1090, 1100, + 1110, 1122, 1133, 1146, 1244, 1249, 1254, 1259, 1260, 1261, + 1262, 1263, 1264, 1266, 1284, 1297, 1302, 1306, 1308, 1310, + 1312 } ; /* The intent behind this definition is that it'll catch @@ -1208,7 +1294,7 @@ unsigned int comment_start_line = 0; // by moving it ahead by parser4_leng bytes. parser4_leng specifies the length of the // currently matched token. #define YY_USER_ACTION driver.loc_.columns(parser4_leng); -#line 1212 "dhcp4_lexer.cc" +#line 1298 "dhcp4_lexer.cc" #define INITIAL 0 #define COMMENT 1 @@ -1528,11 +1614,13 @@ YY_DECL return isc::dhcp::Dhcp4Parser::make_SUB_OPTION_DATA(driver.loc_); case Parser4Context::PARSER_HOOKS_LIBRARY: return isc::dhcp::Dhcp4Parser::make_SUB_HOOKS_LIBRARY(driver.loc_); + case Parser4Context::PARSER_DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SUB_DHCP_DDNS(driver.loc_); } } -#line 1536 "dhcp4_lexer.cc" +#line 1624 "dhcp4_lexer.cc" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1561,13 +1649,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 901 ) + if ( yy_current_state >= 1028 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_current_state != 900 ); + while ( yy_current_state != 1027 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1586,13 +1674,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 116 ) + else if ( yy_act < 132 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], parser4_text ); - else if ( yy_act == 116 ) + else if ( yy_act == 132 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", parser4_text ); - else if ( yy_act == 117 ) + else if ( yy_act == 133 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1610,17 +1698,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 128 "dhcp4_lexer.ll" +#line 130 "dhcp4_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 130 "dhcp4_lexer.ll" +#line 132 "dhcp4_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 132 "dhcp4_lexer.ll" +#line 134 "dhcp4_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1628,33 +1716,33 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 137 "dhcp4_lexer.ll" +#line 139 "dhcp4_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 138 "dhcp4_lexer.ll" +#line 140 "dhcp4_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 139 "dhcp4_lexer.ll" +#line 141 "dhcp4_lexer.ll" { isc_throw(Dhcp4ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 143 "dhcp4_lexer.ll" +#line 145 "dhcp4_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 144 "dhcp4_lexer.ll" +#line 146 "dhcp4_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 145 "dhcp4_lexer.ll" +#line 147 "dhcp4_lexer.ll" { // Include directive. @@ -1668,19 +1756,19 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 154 "dhcp4_lexer.ll" +#line 156 "dhcp4_lexer.ll" { isc_throw(Dhcp4ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 157 "dhcp4_lexer.ll" +#line 159 "dhcp4_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 160 "dhcp4_lexer.ll" +#line 162 "dhcp4_lexer.ll" { // Ok, we found a with space. Let's ignore it and update loc variable. driver.loc_.step(); @@ -1689,7 +1777,7 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 165 "dhcp4_lexer.ll" +#line 167 "dhcp4_lexer.ll" { // Newline found. Let's update the location and continue. driver.loc_.lines(parser4_leng); @@ -1698,7 +1786,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 172 "dhcp4_lexer.ll" +#line 174 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -1710,7 +1798,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 181 "dhcp4_lexer.ll" +#line 183 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1722,7 +1810,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 190 "dhcp4_lexer.ll" +#line 192 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::INTERFACES_CONFIG: @@ -1734,31 +1822,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 199 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE: - return isc::dhcp::Dhcp4Parser::make_RAW(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("raw", driver.loc_); - } -} - YY_BREAK -case 16: -YY_RULE_SETUP -#line 208 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE: - return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("udp", driver.loc_); - } -} - YY_BREAK -case 17: -YY_RULE_SETUP -#line 217 "dhcp4_lexer.ll" +#line 201 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::INTERFACES_CONFIG: @@ -1768,9 +1832,9 @@ YY_RULE_SETUP } } YY_BREAK -case 18: +case 16: YY_RULE_SETUP -#line 226 "dhcp4_lexer.ll" +#line 210 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1780,9 +1844,9 @@ YY_RULE_SETUP } } YY_BREAK -case 19: +case 17: YY_RULE_SETUP -#line 235 "dhcp4_lexer.ll" +#line 219 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1792,9 +1856,9 @@ YY_RULE_SETUP } } YY_BREAK -case 20: +case 18: YY_RULE_SETUP -#line 244 "dhcp4_lexer.ll" +#line 228 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOSTS_DATABASE: @@ -1804,9 +1868,9 @@ YY_RULE_SETUP } } YY_BREAK -case 21: +case 19: YY_RULE_SETUP -#line 253 "dhcp4_lexer.ll" +#line 237 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1819,9 +1883,9 @@ YY_RULE_SETUP } } YY_BREAK -case 22: +case 20: YY_RULE_SETUP -#line 265 "dhcp4_lexer.ll" +#line 249 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1832,9 +1896,9 @@ YY_RULE_SETUP } } YY_BREAK -case 23: +case 21: YY_RULE_SETUP -#line 275 "dhcp4_lexer.ll" +#line 259 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1845,9 +1909,9 @@ YY_RULE_SETUP } } YY_BREAK -case 24: +case 22: YY_RULE_SETUP -#line 285 "dhcp4_lexer.ll" +#line 269 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1858,9 +1922,9 @@ YY_RULE_SETUP } } YY_BREAK -case 25: +case 23: YY_RULE_SETUP -#line 295 "dhcp4_lexer.ll" +#line 279 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1872,9 +1936,9 @@ YY_RULE_SETUP } } YY_BREAK -case 26: +case 24: YY_RULE_SETUP -#line 306 "dhcp4_lexer.ll" +#line 290 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1885,9 +1949,9 @@ YY_RULE_SETUP } } YY_BREAK -case 27: +case 25: YY_RULE_SETUP -#line 316 "dhcp4_lexer.ll" +#line 300 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1898,9 +1962,9 @@ YY_RULE_SETUP } } YY_BREAK -case 28: +case 26: YY_RULE_SETUP -#line 326 "dhcp4_lexer.ll" +#line 310 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1911,9 +1975,9 @@ YY_RULE_SETUP } } YY_BREAK -case 29: +case 27: YY_RULE_SETUP -#line 336 "dhcp4_lexer.ll" +#line 320 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1924,9 +1988,9 @@ YY_RULE_SETUP } } YY_BREAK -case 30: +case 28: YY_RULE_SETUP -#line 346 "dhcp4_lexer.ll" +#line 330 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1936,9 +2000,9 @@ YY_RULE_SETUP } } YY_BREAK -case 31: +case 29: YY_RULE_SETUP -#line 355 "dhcp4_lexer.ll" +#line 339 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1948,9 +2012,9 @@ YY_RULE_SETUP } } YY_BREAK -case 32: +case 30: YY_RULE_SETUP -#line 364 "dhcp4_lexer.ll" +#line 348 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1960,9 +2024,9 @@ YY_RULE_SETUP } } YY_BREAK -case 33: +case 31: YY_RULE_SETUP -#line 373 "dhcp4_lexer.ll" +#line 357 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -1977,9 +2041,9 @@ YY_RULE_SETUP } } YY_BREAK -case 34: +case 32: YY_RULE_SETUP -#line 387 "dhcp4_lexer.ll" +#line 371 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LEASE_DATABASE: @@ -1995,9 +2059,9 @@ YY_RULE_SETUP } } YY_BREAK -case 35: +case 33: YY_RULE_SETUP -#line 402 "dhcp4_lexer.ll" +#line 386 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2007,9 +2071,9 @@ YY_RULE_SETUP } } YY_BREAK -case 36: +case 34: YY_RULE_SETUP -#line 411 "dhcp4_lexer.ll" +#line 395 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2019,9 +2083,9 @@ YY_RULE_SETUP } } YY_BREAK -case 37: +case 35: YY_RULE_SETUP -#line 420 "dhcp4_lexer.ll" +#line 404 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::POOLS: @@ -2031,9 +2095,9 @@ YY_RULE_SETUP } } YY_BREAK -case 38: +case 36: YY_RULE_SETUP -#line 429 "dhcp4_lexer.ll" +#line 413 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2043,9 +2107,9 @@ YY_RULE_SETUP } } YY_BREAK -case 39: +case 37: YY_RULE_SETUP -#line 438 "dhcp4_lexer.ll" +#line 422 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2055,9 +2119,9 @@ YY_RULE_SETUP } } YY_BREAK -case 40: +case 38: YY_RULE_SETUP -#line 447 "dhcp4_lexer.ll" +#line 431 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2067,9 +2131,9 @@ YY_RULE_SETUP } } YY_BREAK -case 41: +case 39: YY_RULE_SETUP -#line 456 "dhcp4_lexer.ll" +#line 440 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2079,9 +2143,9 @@ YY_RULE_SETUP } } YY_BREAK -case 42: +case 40: YY_RULE_SETUP -#line 465 "dhcp4_lexer.ll" +#line 449 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2091,9 +2155,9 @@ YY_RULE_SETUP } } YY_BREAK -case 43: +case 41: YY_RULE_SETUP -#line 474 "dhcp4_lexer.ll" +#line 458 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2103,9 +2167,9 @@ YY_RULE_SETUP } } YY_BREAK -case 44: +case 42: YY_RULE_SETUP -#line 483 "dhcp4_lexer.ll" +#line 467 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2116,9 +2180,9 @@ YY_RULE_SETUP } } YY_BREAK -case 45: +case 43: YY_RULE_SETUP -#line 493 "dhcp4_lexer.ll" +#line 477 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2128,9 +2192,9 @@ YY_RULE_SETUP } } YY_BREAK -case 46: +case 44: YY_RULE_SETUP -#line 502 "dhcp4_lexer.ll" +#line 486 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -2140,9 +2204,9 @@ YY_RULE_SETUP } } YY_BREAK -case 47: +case 45: YY_RULE_SETUP -#line 511 "dhcp4_lexer.ll" +#line 495 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGING: @@ -2152,9 +2216,9 @@ YY_RULE_SETUP } } YY_BREAK -case 48: +case 46: YY_RULE_SETUP -#line 520 "dhcp4_lexer.ll" +#line 504 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2164,9 +2228,9 @@ YY_RULE_SETUP } } YY_BREAK -case 49: +case 47: YY_RULE_SETUP -#line 529 "dhcp4_lexer.ll" +#line 513 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OUTPUT_OPTIONS: @@ -2176,9 +2240,9 @@ YY_RULE_SETUP } } YY_BREAK -case 50: +case 48: YY_RULE_SETUP -#line 538 "dhcp4_lexer.ll" +#line 522 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2188,9 +2252,9 @@ YY_RULE_SETUP } } YY_BREAK -case 51: +case 49: YY_RULE_SETUP -#line 547 "dhcp4_lexer.ll" +#line 531 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::LOGGERS: @@ -2200,9 +2264,9 @@ YY_RULE_SETUP } } YY_BREAK -case 52: +case 50: YY_RULE_SETUP -#line 556 "dhcp4_lexer.ll" +#line 540 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2213,9 +2277,9 @@ YY_RULE_SETUP } } YY_BREAK -case 53: +case 51: YY_RULE_SETUP -#line 566 "dhcp4_lexer.ll" +#line 550 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2226,9 +2290,9 @@ YY_RULE_SETUP } } YY_BREAK -case 54: +case 52: YY_RULE_SETUP -#line 576 "dhcp4_lexer.ll" +#line 560 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CLIENT_CLASSES: @@ -2239,9 +2303,9 @@ YY_RULE_SETUP } } YY_BREAK -case 55: +case 53: YY_RULE_SETUP -#line 586 "dhcp4_lexer.ll" +#line 570 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2251,9 +2315,9 @@ YY_RULE_SETUP } } YY_BREAK -case 56: +case 54: YY_RULE_SETUP -#line 595 "dhcp4_lexer.ll" +#line 579 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2264,9 +2328,9 @@ YY_RULE_SETUP } } YY_BREAK -case 57: +case 55: YY_RULE_SETUP -#line 605 "dhcp4_lexer.ll" +#line 589 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2277,9 +2341,9 @@ YY_RULE_SETUP } } YY_BREAK -case 58: +case 56: YY_RULE_SETUP -#line 615 "dhcp4_lexer.ll" +#line 599 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2290,9 +2354,9 @@ YY_RULE_SETUP } } YY_BREAK -case 59: +case 57: YY_RULE_SETUP -#line 625 "dhcp4_lexer.ll" +#line 609 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOST_RESERVATION_IDENTIFIERS: @@ -2303,9 +2367,9 @@ YY_RULE_SETUP } } YY_BREAK -case 60: +case 58: YY_RULE_SETUP -#line 635 "dhcp4_lexer.ll" +#line 619 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RESERVATIONS: @@ -2315,9 +2379,9 @@ YY_RULE_SETUP } } YY_BREAK -case 61: +case 59: YY_RULE_SETUP -#line 644 "dhcp4_lexer.ll" +#line 628 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2328,9 +2392,9 @@ YY_RULE_SETUP } } YY_BREAK -case 62: +case 60: YY_RULE_SETUP -#line 654 "dhcp4_lexer.ll" +#line 638 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DATA: @@ -2340,9 +2404,9 @@ YY_RULE_SETUP } } YY_BREAK -case 63: +case 61: YY_RULE_SETUP -#line 663 "dhcp4_lexer.ll" +#line 647 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2352,9 +2416,9 @@ YY_RULE_SETUP } } YY_BREAK -case 64: +case 62: YY_RULE_SETUP -#line 672 "dhcp4_lexer.ll" +#line 656 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2364,9 +2428,9 @@ YY_RULE_SETUP } } YY_BREAK -case 65: +case 63: YY_RULE_SETUP -#line 681 "dhcp4_lexer.ll" +#line 665 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::OPTION_DEF: @@ -2376,9 +2440,9 @@ YY_RULE_SETUP } } YY_BREAK -case 66: +case 64: YY_RULE_SETUP -#line 690 "dhcp4_lexer.ll" +#line 674 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2388,9 +2452,9 @@ YY_RULE_SETUP } } YY_BREAK -case 67: +case 65: YY_RULE_SETUP -#line 699 "dhcp4_lexer.ll" +#line 683 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::RELAY: @@ -2401,9 +2465,9 @@ YY_RULE_SETUP } } YY_BREAK -case 68: +case 66: YY_RULE_SETUP -#line 709 "dhcp4_lexer.ll" +#line 693 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2413,9 +2477,9 @@ YY_RULE_SETUP } } YY_BREAK -case 69: +case 67: YY_RULE_SETUP -#line 719 "dhcp4_lexer.ll" +#line 703 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2425,9 +2489,9 @@ YY_RULE_SETUP } } YY_BREAK -case 70: +case 68: YY_RULE_SETUP -#line 728 "dhcp4_lexer.ll" +#line 712 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::HOOKS_LIBRARIES: @@ -2437,9 +2501,9 @@ YY_RULE_SETUP } } YY_BREAK -case 71: +case 69: YY_RULE_SETUP -#line 737 "dhcp4_lexer.ll" +#line 721 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2449,9 +2513,9 @@ YY_RULE_SETUP } } YY_BREAK -case 72: +case 70: YY_RULE_SETUP -#line 746 "dhcp4_lexer.ll" +#line 730 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SERVER_ID: @@ -2461,9 +2525,9 @@ YY_RULE_SETUP } } YY_BREAK -case 73: +case 71: YY_RULE_SETUP -#line 755 "dhcp4_lexer.ll" +#line 739 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SERVER_ID: @@ -2473,9 +2537,9 @@ YY_RULE_SETUP } } YY_BREAK -case 74: +case 72: YY_RULE_SETUP -#line 764 "dhcp4_lexer.ll" +#line 748 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SERVER_ID: @@ -2485,9 +2549,9 @@ YY_RULE_SETUP } } YY_BREAK -case 75: +case 73: YY_RULE_SETUP -#line 773 "dhcp4_lexer.ll" +#line 757 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SERVER_ID: @@ -2497,9 +2561,9 @@ YY_RULE_SETUP } } YY_BREAK -case 76: +case 74: YY_RULE_SETUP -#line 782 "dhcp4_lexer.ll" +#line 766 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2509,81 +2573,9 @@ YY_RULE_SETUP } } YY_BREAK -case 77: +case 75: YY_RULE_SETUP -#line 791 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_RECLAIM_TIMER_WAIT_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("reclaim-timer-wait-time", driver.loc_); - } -} - YY_BREAK -case 78: -YY_RULE_SETUP -#line 800 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("flush-reclaimed-timer-wait-time", driver.loc_); - } -} - YY_BREAK -case 79: -YY_RULE_SETUP -#line 809 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_HOLD_RECLAIMED_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("hold-reclaimed-time", driver.loc_); - } -} - YY_BREAK -case 80: -YY_RULE_SETUP -#line 818 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_MAX_RECLAIM_LEASES(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("max-reclaim-leases", driver.loc_); - } -} - YY_BREAK -case 81: -YY_RULE_SETUP -#line 827 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_MAX_RECLAIM_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("max-reclaim-time", driver.loc_); - } -} - YY_BREAK -case 82: -YY_RULE_SETUP -#line 836 "dhcp4_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser4Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp4Parser::make_UNWARNED_RECLAIM_CYCLES(driver.loc_); - default: - return isc::dhcp::Dhcp4Parser::make_STRING("unwarned-reclaim-cycles", driver.loc_); - } -} - YY_BREAK -case 83: -YY_RULE_SETUP -#line 845 "dhcp4_lexer.ll" +#line 775 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2593,9 +2585,9 @@ YY_RULE_SETUP } } YY_BREAK -case 84: +case 76: YY_RULE_SETUP -#line 854 "dhcp4_lexer.ll" +#line 784 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2605,9 +2597,9 @@ YY_RULE_SETUP } } YY_BREAK -case 85: +case 77: YY_RULE_SETUP -#line 863 "dhcp4_lexer.ll" +#line 793 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2617,9 +2609,9 @@ YY_RULE_SETUP } } YY_BREAK -case 86: +case 78: YY_RULE_SETUP -#line 872 "dhcp4_lexer.ll" +#line 802 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONTROL_SOCKET: @@ -2629,9 +2621,9 @@ YY_RULE_SETUP } } YY_BREAK -case 87: +case 79: YY_RULE_SETUP -#line 881 "dhcp4_lexer.ll" +#line 811 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2641,9 +2633,306 @@ YY_RULE_SETUP } } YY_BREAK +case 80: +YY_RULE_SETUP +#line 820 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ENABLE_UPDATES(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("enable-updates", driver.loc_); + } +} + YY_BREAK +case 81: +YY_RULE_SETUP +#line 829 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_QUALIFYING_SUFFIX(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("qualifying-suffix", driver.loc_); + } +} + YY_BREAK +case 82: +YY_RULE_SETUP +#line 838 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SERVER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("server-ip", driver.loc_); + } +} + YY_BREAK +case 83: +YY_RULE_SETUP +#line 847 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SERVER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("server-port", driver.loc_); + } +} + YY_BREAK +case 84: +YY_RULE_SETUP +#line 856 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SENDER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("sender-ip", driver.loc_); + } +} + YY_BREAK +case 85: +YY_RULE_SETUP +#line 865 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SENDER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("sender-port", driver.loc_); + } +} + YY_BREAK +case 86: +YY_RULE_SETUP +#line 874 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_MAX_QUEUE_SIZE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("max-queue-size", driver.loc_); + } +} + YY_BREAK +case 87: +YY_RULE_SETUP +#line 883 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_NCR_PROTOCOL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("ncr-protocol", driver.loc_); + } +} + YY_BREAK case 88: YY_RULE_SETUP -#line 890 "dhcp4_lexer.ll" +#line 892 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_NCR_FORMAT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("ncr-format", driver.loc_); + } +} + YY_BREAK +case 89: +YY_RULE_SETUP +#line 901 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("always-include-fqdn", driver.loc_); + } +} + YY_BREAK +case 90: +YY_RULE_SETUP +#line 910 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("allow-client-update", driver.loc_); + } +} + YY_BREAK +case 91: +YY_RULE_SETUP +#line 919 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_OVERRIDE_NO_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("override-no-update", driver.loc_); + } +} + YY_BREAK +case 92: +YY_RULE_SETUP +#line 928 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_OVERRIDE_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("override-client-update", driver.loc_); + } +} + YY_BREAK +case 93: +YY_RULE_SETUP +#line 937 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_REPLACE_CLIENT_NAME(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("replace-client-name", driver.loc_); + } +} + YY_BREAK +case 94: +YY_RULE_SETUP +#line 946 "dhcp4_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_GENERATED_PREFIX(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("generated-prefix", driver.loc_); + } +} + YY_BREAK +case 95: +YY_RULE_SETUP +#line 955 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 96: +YY_RULE_SETUP +#line 965 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp4Parser::make_TCP(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 97: +YY_RULE_SETUP +#line 975 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { + return isc::dhcp::Dhcp4Parser::make_JSON(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 98: +YY_RULE_SETUP +#line 985 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 99: +YY_RULE_SETUP +#line 995 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 100: +YY_RULE_SETUP +#line 1005 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 101: +YY_RULE_SETUP +#line 1015 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 102: +YY_RULE_SETUP +#line 1025 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_ALWAYS(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 103: +YY_RULE_SETUP +#line 1035 "dhcp4_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_NOT_PRESENT(driver.loc_); + } + std::string tmp(parser4_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 104: +YY_RULE_SETUP +#line 1045 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -2653,9 +2942,9 @@ YY_RULE_SETUP } } YY_BREAK -case 89: +case 105: YY_RULE_SETUP -#line 899 "dhcp4_lexer.ll" +#line 1054 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: @@ -2665,9 +2954,9 @@ YY_RULE_SETUP } } YY_BREAK -case 90: +case 106: YY_RULE_SETUP -#line 908 "dhcp4_lexer.ll" +#line 1063 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2677,9 +2966,9 @@ YY_RULE_SETUP } } YY_BREAK -case 91: +case 107: YY_RULE_SETUP -#line 917 "dhcp4_lexer.ll" +#line 1072 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2689,9 +2978,9 @@ YY_RULE_SETUP } } YY_BREAK -case 92: +case 108: YY_RULE_SETUP -#line 926 "dhcp4_lexer.ll" +#line 1081 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2701,9 +2990,9 @@ YY_RULE_SETUP } } YY_BREAK -case 93: +case 109: YY_RULE_SETUP -#line 935 "dhcp4_lexer.ll" +#line 1090 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2714,9 +3003,9 @@ YY_RULE_SETUP } } YY_BREAK -case 94: +case 110: YY_RULE_SETUP -#line 945 "dhcp4_lexer.ll" +#line 1100 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2727,9 +3016,9 @@ YY_RULE_SETUP } } YY_BREAK -case 95: +case 111: YY_RULE_SETUP -#line 955 "dhcp4_lexer.ll" +#line 1110 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::DHCP4: @@ -2742,9 +3031,9 @@ YY_RULE_SETUP } } YY_BREAK -case 96: +case 112: YY_RULE_SETUP -#line 967 "dhcp4_lexer.ll" +#line 1122 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2756,9 +3045,9 @@ YY_RULE_SETUP } } YY_BREAK -case 97: +case 113: YY_RULE_SETUP -#line 978 "dhcp4_lexer.ll" +#line 1133 "dhcp4_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::SUBNET4: @@ -2770,9 +3059,9 @@ YY_RULE_SETUP } } YY_BREAK -case 98: +case 114: YY_RULE_SETUP -#line 991 "dhcp4_lexer.ll" +#line 1146 "dhcp4_lexer.ll" { // A string has been matched. It contains the actual string and single quotes. // We need to get those quotes out of the way and just use its content, e.g. @@ -2871,65 +3160,65 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 99: -/* rule 99 can match eol */ +case 115: +/* rule 115 can match eol */ YY_RULE_SETUP -#line 1089 "dhcp4_lexer.ll" +#line 1244 "dhcp4_lexer.ll" { // Bad string with a forbidden control character inside driver.error(driver.loc_, "Invalid control in " + std::string(parser4_text)); } YY_BREAK -case 100: -/* rule 100 can match eol */ +case 116: +/* rule 116 can match eol */ YY_RULE_SETUP -#line 1094 "dhcp4_lexer.ll" +#line 1249 "dhcp4_lexer.ll" { // Bad string with a bad escape inside driver.error(driver.loc_, "Bad escape in " + std::string(parser4_text)); } YY_BREAK -case 101: +case 117: YY_RULE_SETUP -#line 1099 "dhcp4_lexer.ll" +#line 1254 "dhcp4_lexer.ll" { // Bad string with an open escape at the end driver.error(driver.loc_, "Overflow escape in " + std::string(parser4_text)); } YY_BREAK -case 102: +case 118: YY_RULE_SETUP -#line 1104 "dhcp4_lexer.ll" +#line 1259 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 103: +case 119: YY_RULE_SETUP -#line 1105 "dhcp4_lexer.ll" +#line 1260 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 104: +case 120: YY_RULE_SETUP -#line 1106 "dhcp4_lexer.ll" +#line 1261 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK -case 105: +case 121: YY_RULE_SETUP -#line 1107 "dhcp4_lexer.ll" +#line 1262 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK -case 106: +case 122: YY_RULE_SETUP -#line 1108 "dhcp4_lexer.ll" +#line 1263 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); } YY_BREAK -case 107: +case 123: YY_RULE_SETUP -#line 1109 "dhcp4_lexer.ll" +#line 1264 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); } YY_BREAK -case 108: +case 124: YY_RULE_SETUP -#line 1111 "dhcp4_lexer.ll" +#line 1266 "dhcp4_lexer.ll" { // An integer was found. std::string tmp(parser4_text); @@ -2948,9 +3237,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 109: +case 125: YY_RULE_SETUP -#line 1129 "dhcp4_lexer.ll" +#line 1284 "dhcp4_lexer.ll" { // A floating point was found. std::string tmp(parser4_text); @@ -2964,43 +3253,43 @@ YY_RULE_SETUP return isc::dhcp::Dhcp4Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 110: +case 126: YY_RULE_SETUP -#line 1142 "dhcp4_lexer.ll" +#line 1297 "dhcp4_lexer.ll" { string tmp(parser4_text); return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 111: +case 127: YY_RULE_SETUP -#line 1147 "dhcp4_lexer.ll" +#line 1302 "dhcp4_lexer.ll" { return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 112: +case 128: YY_RULE_SETUP -#line 1151 "dhcp4_lexer.ll" +#line 1306 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK -case 113: +case 129: YY_RULE_SETUP -#line 1153 "dhcp4_lexer.ll" +#line 1308 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK -case 114: +case 130: YY_RULE_SETUP -#line 1155 "dhcp4_lexer.ll" +#line 1310 "dhcp4_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK -case 115: +case 131: YY_RULE_SETUP -#line 1157 "dhcp4_lexer.ll" +#line 1312 "dhcp4_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(parser4_text)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1159 "dhcp4_lexer.ll" +#line 1314 "dhcp4_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp4Parser::make_END(driver.loc_); @@ -3024,12 +3313,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 116: +case 132: YY_RULE_SETUP -#line 1182 "dhcp4_lexer.ll" +#line 1337 "dhcp4_lexer.ll" ECHO; YY_BREAK -#line 3033 "dhcp4_lexer.cc" +#line 3322 "dhcp4_lexer.cc" case YY_END_OF_BUFFER: { @@ -3346,7 +3635,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 901 ) + if ( yy_current_state >= 1028 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -3379,11 +3668,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 901 ) + if ( yy_current_state >= 1028 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 900); + yy_is_jam = (yy_current_state == 1027); return yy_is_jam ? 0 : yy_current_state; } @@ -4132,7 +4421,7 @@ void parser4_free (void * ptr ) /* %ok-for-header */ -#line 1182 "dhcp4_lexer.ll" +#line 1337 "dhcp4_lexer.ll" diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll index 29de204512..9d4ef42b25 100644 --- a/src/bin/dhcp4/dhcp4_lexer.ll +++ b/src/bin/dhcp4/dhcp4_lexer.ll @@ -121,6 +121,8 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} return isc::dhcp::Dhcp4Parser::make_SUB_OPTION_DATA(driver.loc_); case Parser4Context::PARSER_HOOKS_LIBRARY: return isc::dhcp::Dhcp4Parser::make_SUB_HOOKS_LIBRARY(driver.loc_); + case Parser4Context::PARSER_DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SUB_DHCP_DDNS(driver.loc_); } } %} @@ -887,6 +889,231 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } } +\"enable-updates\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ENABLE_UPDATES(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("enable-updates", driver.loc_); + } +} + +\"qualifying-suffix\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_QUALIFYING_SUFFIX(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("qualifying-suffix", driver.loc_); + } +} + +\"server-ip\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SERVER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("server-ip", driver.loc_); + } +} + +\"server-port\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SERVER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("server-port", driver.loc_); + } +} + +\"sender-ip\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SENDER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("sender-ip", driver.loc_); + } +} + +\"sender-port\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_SENDER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("sender-port", driver.loc_); + } +} + +\"max-queue-size\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_MAX_QUEUE_SIZE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("max-queue-size", driver.loc_); + } +} + +\"ncr-protocol\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_NCR_PROTOCOL(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("ncr-protocol", driver.loc_); + } +} + +\"ncr-format\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_NCR_FORMAT(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("ncr-format", driver.loc_); + } +} + +\"always-include-fqdn\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("always-include-fqdn", driver.loc_); + } +} + +\"allow-client-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("allow-client-update", driver.loc_); + } +} + +\"override-no-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_OVERRIDE_NO_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("override-no-update", driver.loc_); + } +} + +\"override-client-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_OVERRIDE_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("override-client-update", driver.loc_); + } +} + +\"replace-client-name\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_REPLACE_CLIENT_NAME(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("replace-client-name", driver.loc_); + } +} + +\"generated-prefix\" { + switch(driver.ctx_) { + case isc::dhcp::Parser4Context::DHCP_DDNS: + return isc::dhcp::Dhcp4Parser::make_GENERATED_PREFIX(driver.loc_); + default: + return isc::dhcp::Dhcp4Parser::make_STRING("generated-prefix", driver.loc_); + } +} + +(?i:\"UDP\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"TCP\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp4Parser::make_TCP(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"JSON\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_FORMAT) { + return isc::dhcp::Dhcp4Parser::make_JSON(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"when-present\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"true\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"never\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"false\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_NEVER(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"always\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_ALWAYS(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"when-not-present\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser4Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp4Parser::make_WHEN_NOT_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp4Parser::make_STRING(tmp, driver.loc_); +} + \"Dhcp6\" { switch(driver.ctx_) { case isc::dhcp::Parser4Context::CONFIG: diff --git a/src/bin/dhcp4/dhcp4_parser.cc b/src/bin/dhcp4/dhcp4_parser.cc index c8d7c9041e..464b3b8f15 100644 --- a/src/bin/dhcp4/dhcp4_parser.cc +++ b/src/bin/dhcp4/dhcp4_parser.cc @@ -253,24 +253,25 @@ namespace isc { namespace dhcp { { switch (that.type_get ()) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.move< ElementPtr > (that.value); break; - case 109: // "boolean" + case 124: // "boolean" value.move< bool > (that.value); break; - case 108: // "floating point" + case 123: // "floating point" value.move< double > (that.value); break; - case 107: // "integer" + case 122: // "integer" value.move< int64_t > (that.value); break; - case 106: // "constant string" + case 121: // "constant string" value.move< std::string > (that.value); break; @@ -289,24 +290,25 @@ namespace isc { namespace dhcp { state = that.state; switch (that.type_get ()) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.copy< ElementPtr > (that.value); break; - case 109: // "boolean" + case 124: // "boolean" value.copy< bool > (that.value); break; - case 108: // "floating point" + case 123: // "floating point" value.copy< double > (that.value); break; - case 107: // "integer" + case 122: // "integer" value.copy< int64_t > (that.value); break; - case 106: // "constant string" + case 121: // "constant string" value.copy< std::string > (that.value); break; @@ -346,46 +348,53 @@ namespace isc { namespace dhcp { << yysym.location << ": "; switch (yytype) { - case 106: // "constant string" + case 121: // "constant string" -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } -#line 354 "dhcp4_parser.cc" // lalr1.cc:636 +#line 356 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 107: // "integer" + case 122: // "integer" -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int64_t > (); } -#line 361 "dhcp4_parser.cc" // lalr1.cc:636 +#line 363 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 108: // "floating point" + case 123: // "floating point" -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< double > (); } -#line 368 "dhcp4_parser.cc" // lalr1.cc:636 +#line 370 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 109: // "boolean" + case 124: // "boolean" -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< bool > (); } -#line 375 "dhcp4_parser.cc" // lalr1.cc:636 +#line 377 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 122: // value + case 138: // value -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } -#line 382 "dhcp4_parser.cc" // lalr1.cc:636 +#line 384 "dhcp4_parser.cc" // lalr1.cc:636 break; - case 161: // socket_type + case 383: // ncr_protocol_value -#line 198 "dhcp4_parser.yy" // lalr1.cc:636 +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } -#line 389 "dhcp4_parser.cc" // lalr1.cc:636 +#line 391 "dhcp4_parser.cc" // lalr1.cc:636 + break; + + case 392: // replace_client_name_value + +#line 194 "dhcp4_parser.yy" // lalr1.cc:636 + { yyoutput << yysym.value.template as< ElementPtr > (); } +#line 398 "dhcp4_parser.cc" // lalr1.cc:636 break; @@ -585,24 +594,25 @@ namespace isc { namespace dhcp { when using variants. */ switch (yyr1_[yyn]) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value yylhs.value.build< ElementPtr > (); break; - case 109: // "boolean" + case 124: // "boolean" yylhs.value.build< bool > (); break; - case 108: // "floating point" + case 123: // "floating point" yylhs.value.build< double > (); break; - case 107: // "integer" + case 122: // "integer" yylhs.value.build< int64_t > (); break; - case 106: // "constant string" + case 121: // "constant string" yylhs.value.build< std::string > (); break; @@ -624,242 +634,248 @@ namespace isc { namespace dhcp { switch (yyn) { case 2: -#line 207 "dhcp4_parser.yy" // lalr1.cc:859 +#line 203 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.NO_KEYWORD; } -#line 630 "dhcp4_parser.cc" // lalr1.cc:859 +#line 640 "dhcp4_parser.cc" // lalr1.cc:859 break; case 4: -#line 208 "dhcp4_parser.yy" // lalr1.cc:859 +#line 204 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG; } -#line 636 "dhcp4_parser.cc" // lalr1.cc:859 +#line 646 "dhcp4_parser.cc" // lalr1.cc:859 break; case 6: -#line 209 "dhcp4_parser.yy" // lalr1.cc:859 +#line 205 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP4; } -#line 642 "dhcp4_parser.cc" // lalr1.cc:859 +#line 652 "dhcp4_parser.cc" // lalr1.cc:859 break; case 8: -#line 210 "dhcp4_parser.yy" // lalr1.cc:859 +#line 206 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.INTERFACES_CONFIG; } -#line 648 "dhcp4_parser.cc" // lalr1.cc:859 +#line 658 "dhcp4_parser.cc" // lalr1.cc:859 break; case 10: -#line 211 "dhcp4_parser.yy" // lalr1.cc:859 +#line 207 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.SUBNET4; } -#line 654 "dhcp4_parser.cc" // lalr1.cc:859 +#line 664 "dhcp4_parser.cc" // lalr1.cc:859 break; case 12: -#line 212 "dhcp4_parser.yy" // lalr1.cc:859 +#line 208 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.POOLS; } -#line 660 "dhcp4_parser.cc" // lalr1.cc:859 +#line 670 "dhcp4_parser.cc" // lalr1.cc:859 break; case 14: -#line 213 "dhcp4_parser.yy" // lalr1.cc:859 +#line 209 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.RESERVATIONS; } -#line 666 "dhcp4_parser.cc" // lalr1.cc:859 +#line 676 "dhcp4_parser.cc" // lalr1.cc:859 break; case 16: -#line 214 "dhcp4_parser.yy" // lalr1.cc:859 +#line 210 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DEF; } -#line 672 "dhcp4_parser.cc" // lalr1.cc:859 +#line 682 "dhcp4_parser.cc" // lalr1.cc:859 break; case 18: -#line 215 "dhcp4_parser.yy" // lalr1.cc:859 +#line 211 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DATA; } -#line 678 "dhcp4_parser.cc" // lalr1.cc:859 +#line 688 "dhcp4_parser.cc" // lalr1.cc:859 break; case 20: -#line 216 "dhcp4_parser.yy" // lalr1.cc:859 +#line 212 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } -#line 684 "dhcp4_parser.cc" // lalr1.cc:859 +#line 694 "dhcp4_parser.cc" // lalr1.cc:859 break; case 22: -#line 224 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } -#line 690 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 23: -#line 225 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } -#line 696 "dhcp4_parser.cc" // lalr1.cc:859 +#line 213 "dhcp4_parser.yy" // lalr1.cc:859 + { ctx.ctx_ = ctx.DHCP_DDNS; } +#line 700 "dhcp4_parser.cc" // lalr1.cc:859 break; case 24: -#line 226 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } -#line 702 "dhcp4_parser.cc" // lalr1.cc:859 +#line 221 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } +#line 706 "dhcp4_parser.cc" // lalr1.cc:859 break; case 25: -#line 227 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } -#line 708 "dhcp4_parser.cc" // lalr1.cc:859 +#line 222 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } +#line 712 "dhcp4_parser.cc" // lalr1.cc:859 break; case 26: -#line 228 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } -#line 714 "dhcp4_parser.cc" // lalr1.cc:859 +#line 223 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } +#line 718 "dhcp4_parser.cc" // lalr1.cc:859 break; case 27: -#line 229 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } -#line 720 "dhcp4_parser.cc" // lalr1.cc:859 +#line 224 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } +#line 724 "dhcp4_parser.cc" // lalr1.cc:859 break; case 28: -#line 230 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } -#line 726 "dhcp4_parser.cc" // lalr1.cc:859 +#line 225 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } +#line 730 "dhcp4_parser.cc" // lalr1.cc:859 break; case 29: -#line 233 "dhcp4_parser.yy" // lalr1.cc:859 +#line 226 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } +#line 736 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 30: +#line 227 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } +#line 742 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 31: +#line 230 "dhcp4_parser.yy" // lalr1.cc:859 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); } -#line 735 "dhcp4_parser.cc" // lalr1.cc:859 +#line 751 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 30: -#line 238 "dhcp4_parser.yy" // lalr1.cc:859 + case 32: +#line 235 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 746 "dhcp4_parser.cc" // lalr1.cc:859 +#line 762 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 31: -#line 243 "dhcp4_parser.yy" // lalr1.cc:859 + case 33: +#line 240 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place // for it. } -#line 756 "dhcp4_parser.cc" // lalr1.cc:859 +#line 772 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 34: -#line 254 "dhcp4_parser.yy" // lalr1.cc:859 + case 36: +#line 251 "dhcp4_parser.yy" // lalr1.cc:859 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); } -#line 765 "dhcp4_parser.cc" // lalr1.cc:859 +#line 781 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 35: -#line 258 "dhcp4_parser.yy" // lalr1.cc:859 + case 37: +#line 255 "dhcp4_parser.yy" // lalr1.cc:859 { // map consisting of a shorter map followed by // comma and string:value ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); } -#line 775 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 36: -#line 265 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.push_back(l); -} -#line 784 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 37: -#line 268 "dhcp4_parser.yy" // lalr1.cc:859 - { - // list parsing complete. Put any sanity checking here -} -#line 792 "dhcp4_parser.cc" // lalr1.cc:859 +#line 791 "dhcp4_parser.cc" // lalr1.cc:859 break; case 38: -#line 273 "dhcp4_parser.yy" // lalr1.cc:859 +#line 262 "dhcp4_parser.yy" // lalr1.cc:859 { - // List parsing about to start + ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.push_back(l); } #line 800 "dhcp4_parser.cc" // lalr1.cc:859 break; case 39: -#line 275 "dhcp4_parser.yy" // lalr1.cc:859 +#line 265 "dhcp4_parser.yy" // lalr1.cc:859 + { + // list parsing complete. Put any sanity checking here +} +#line 808 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 40: +#line 270 "dhcp4_parser.yy" // lalr1.cc:859 + { + // List parsing about to start +} +#line 816 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 41: +#line 272 "dhcp4_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here //ctx.stack_.pop_back(); } -#line 809 "dhcp4_parser.cc" // lalr1.cc:859 +#line 825 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 42: -#line 284 "dhcp4_parser.yy" // lalr1.cc:859 + case 44: +#line 281 "dhcp4_parser.yy" // lalr1.cc:859 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); } -#line 818 "dhcp4_parser.cc" // lalr1.cc:859 +#line 834 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 43: -#line 288 "dhcp4_parser.yy" // lalr1.cc:859 + case 45: +#line 285 "dhcp4_parser.yy" // lalr1.cc:859 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); } -#line 827 "dhcp4_parser.cc" // lalr1.cc:859 +#line 843 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 44: -#line 299 "dhcp4_parser.yy" // lalr1.cc:859 + case 46: +#line 296 "dhcp4_parser.yy" // lalr1.cc:859 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); error(yystack_[1].location, "got unexpected keyword \"" + keyword + "\" in " + where + " map."); } -#line 838 "dhcp4_parser.cc" // lalr1.cc:859 +#line 854 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 45: -#line 309 "dhcp4_parser.yy" // lalr1.cc:859 + case 47: +#line 306 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 849 "dhcp4_parser.cc" // lalr1.cc:859 +#line 865 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 46: -#line 314 "dhcp4_parser.yy" // lalr1.cc:859 + case 48: +#line 311 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place // for it. } -#line 859 "dhcp4_parser.cc" // lalr1.cc:859 +#line 875 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 54: -#line 333 "dhcp4_parser.yy" // lalr1.cc:859 + case 56: +#line 330 "dhcp4_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -868,11 +884,11 @@ namespace isc { namespace dhcp { ctx.stack_.push_back(m); ctx.enter(ctx.DHCP4); } -#line 872 "dhcp4_parser.cc" // lalr1.cc:859 +#line 888 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 55: -#line 340 "dhcp4_parser.yy" // lalr1.cc:859 + case 57: +#line 337 "dhcp4_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -880,578 +896,522 @@ namespace isc { namespace dhcp { ctx.stack_.pop_back(); ctx.leave(); } -#line 884 "dhcp4_parser.cc" // lalr1.cc:859 +#line 900 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 56: -#line 350 "dhcp4_parser.yy" // lalr1.cc:859 + case 58: +#line 347 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the Dhcp4 map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 894 "dhcp4_parser.cc" // lalr1.cc:859 +#line 910 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 57: -#line 354 "dhcp4_parser.yy" // lalr1.cc:859 + case 59: +#line 351 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 902 "dhcp4_parser.cc" // lalr1.cc:859 +#line 918 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 82: -#line 388 "dhcp4_parser.yy" // lalr1.cc:859 + case 84: +#line 385 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("valid-lifetime", prf); } -#line 911 "dhcp4_parser.cc" // lalr1.cc:859 +#line 927 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 83: -#line 393 "dhcp4_parser.yy" // lalr1.cc:859 + case 85: +#line 390 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("renew-timer", prf); } -#line 920 "dhcp4_parser.cc" // lalr1.cc:859 +#line 936 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 84: -#line 398 "dhcp4_parser.yy" // lalr1.cc:859 + case 86: +#line 395 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rebind-timer", prf); } -#line 929 "dhcp4_parser.cc" // lalr1.cc:859 +#line 945 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 85: -#line 403 "dhcp4_parser.yy" // lalr1.cc:859 + case 87: +#line 400 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("decline-probation-period", dpp); } -#line 938 "dhcp4_parser.cc" // lalr1.cc:859 +#line 954 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 86: -#line 408 "dhcp4_parser.yy" // lalr1.cc:859 + case 88: +#line 405 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr echo(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("echo-client-id", echo); } -#line 947 "dhcp4_parser.cc" // lalr1.cc:859 +#line 963 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 87: -#line 413 "dhcp4_parser.yy" // lalr1.cc:859 + case 89: +#line 410 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr match(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("match-client-id", match); } -#line 956 "dhcp4_parser.cc" // lalr1.cc:859 +#line 972 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 88: -#line 419 "dhcp4_parser.yy" // lalr1.cc:859 + case 90: +#line 416 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces-config", i); ctx.stack_.push_back(i); ctx.enter(ctx.INTERFACES_CONFIG); } -#line 967 "dhcp4_parser.cc" // lalr1.cc:859 +#line 983 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 89: -#line 424 "dhcp4_parser.yy" // lalr1.cc:859 + case 91: +#line 421 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 976 "dhcp4_parser.cc" // lalr1.cc:859 +#line 992 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 94: -#line 437 "dhcp4_parser.yy" // lalr1.cc:859 + case 96: +#line 434 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the interfaces-config map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 986 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1002 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 95: -#line 441 "dhcp4_parser.yy" // lalr1.cc:859 + case 97: +#line 438 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 994 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1010 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 96: -#line 445 "dhcp4_parser.yy" // lalr1.cc:859 + case 98: +#line 442 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 1005 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1021 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 97: -#line 450 "dhcp4_parser.yy" // lalr1.cc:859 + case 99: +#line 447 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1014 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 98: -#line 455 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.DHCP_SOCKET_TYPE); -} -#line 1022 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 99: -#line 457 "dhcp4_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("dhcp-socket-type", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 1031 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1030 "dhcp4_parser.cc" // lalr1.cc:859 break; case 100: -#line 462 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("raw", ctx.loc2pos(yystack_[0].location))); } -#line 1037 "dhcp4_parser.cc" // lalr1.cc:859 +#line 452 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 1038 "dhcp4_parser.cc" // lalr1.cc:859 break; case 101: -#line 463 "dhcp4_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("udp", ctx.loc2pos(yystack_[0].location))); } -#line 1043 "dhcp4_parser.cc" // lalr1.cc:859 +#line 454 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr type(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("dhcp-socket-type", type); + ctx.leave(); +} +#line 1048 "dhcp4_parser.cc" // lalr1.cc:859 break; case 102: -#line 466 "dhcp4_parser.yy" // lalr1.cc:859 +#line 460 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lease-database", i); ctx.stack_.push_back(i); ctx.enter(ctx.LEASE_DATABASE); } -#line 1054 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1059 "dhcp4_parser.cc" // lalr1.cc:859 break; case 103: -#line 471 "dhcp4_parser.yy" // lalr1.cc:859 +#line 465 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1063 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1068 "dhcp4_parser.cc" // lalr1.cc:859 break; case 104: -#line 476 "dhcp4_parser.yy" // lalr1.cc:859 +#line 470 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-database", i); ctx.stack_.push_back(i); ctx.enter(ctx.HOSTS_DATABASE); } -#line 1074 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1079 "dhcp4_parser.cc" // lalr1.cc:859 break; case 105: -#line 481 "dhcp4_parser.yy" // lalr1.cc:859 +#line 475 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1083 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1088 "dhcp4_parser.cc" // lalr1.cc:859 break; case 117: -#line 501 "dhcp4_parser.yy" // lalr1.cc:859 +#line 495 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1091 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1096 "dhcp4_parser.cc" // lalr1.cc:859 break; case 118: -#line 503 "dhcp4_parser.yy" // lalr1.cc:859 +#line 497 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("type", prf); ctx.leave(); } -#line 1101 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1106 "dhcp4_parser.cc" // lalr1.cc:859 break; case 119: -#line 509 "dhcp4_parser.yy" // lalr1.cc:859 +#line 503 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1109 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1114 "dhcp4_parser.cc" // lalr1.cc:859 break; case 120: -#line 511 "dhcp4_parser.yy" // lalr1.cc:859 +#line 505 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("user", user); ctx.leave(); } -#line 1119 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1124 "dhcp4_parser.cc" // lalr1.cc:859 break; case 121: -#line 517 "dhcp4_parser.yy" // lalr1.cc:859 +#line 511 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1127 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1132 "dhcp4_parser.cc" // lalr1.cc:859 break; case 122: -#line 519 "dhcp4_parser.yy" // lalr1.cc:859 +#line 513 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("password", pwd); ctx.leave(); } -#line 1137 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1142 "dhcp4_parser.cc" // lalr1.cc:859 break; case 123: -#line 525 "dhcp4_parser.yy" // lalr1.cc:859 +#line 519 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1145 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1150 "dhcp4_parser.cc" // lalr1.cc:859 break; case 124: -#line 527 "dhcp4_parser.yy" // lalr1.cc:859 +#line 521 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host", h); ctx.leave(); } -#line 1155 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1160 "dhcp4_parser.cc" // lalr1.cc:859 break; case 125: -#line 533 "dhcp4_parser.yy" // lalr1.cc:859 +#line 527 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1163 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1168 "dhcp4_parser.cc" // lalr1.cc:859 break; case 126: -#line 535 "dhcp4_parser.yy" // lalr1.cc:859 +#line 529 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("name", name); ctx.leave(); } -#line 1173 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1178 "dhcp4_parser.cc" // lalr1.cc:859 break; case 127: -#line 541 "dhcp4_parser.yy" // lalr1.cc:859 +#line 535 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("persist", n); } -#line 1182 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1187 "dhcp4_parser.cc" // lalr1.cc:859 break; case 128: -#line 546 "dhcp4_parser.yy" // lalr1.cc:859 +#line 540 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lfc-interval", n); } -#line 1191 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1196 "dhcp4_parser.cc" // lalr1.cc:859 break; case 129: -#line 551 "dhcp4_parser.yy" // lalr1.cc:859 +#line 545 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("readonly", n); } -#line 1200 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1205 "dhcp4_parser.cc" // lalr1.cc:859 break; case 130: -#line 556 "dhcp4_parser.yy" // lalr1.cc:859 +#line 550 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); } -#line 1209 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1214 "dhcp4_parser.cc" // lalr1.cc:859 break; case 131: -#line 561 "dhcp4_parser.yy" // lalr1.cc:859 +#line 555 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host-reservation-identifiers", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS); } -#line 1220 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1225 "dhcp4_parser.cc" // lalr1.cc:859 break; case 132: -#line 566 "dhcp4_parser.yy" // lalr1.cc:859 +#line 560 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1229 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1234 "dhcp4_parser.cc" // lalr1.cc:859 break; case 139: -#line 581 "dhcp4_parser.yy" // lalr1.cc:859 +#line 575 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(hwaddr); } -#line 1238 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1243 "dhcp4_parser.cc" // lalr1.cc:859 break; case 140: -#line 586 "dhcp4_parser.yy" // lalr1.cc:859 +#line 580 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr circuit(new StringElement("circuit-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(circuit); } -#line 1247 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1252 "dhcp4_parser.cc" // lalr1.cc:859 break; case 141: -#line 591 "dhcp4_parser.yy" // lalr1.cc:859 +#line 585 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr client(new StringElement("client-id", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(client); } -#line 1256 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1261 "dhcp4_parser.cc" // lalr1.cc:859 break; case 142: -#line 596 "dhcp4_parser.yy" // lalr1.cc:859 +#line 590 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOOKS_LIBRARIES); } -#line 1267 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1272 "dhcp4_parser.cc" // lalr1.cc:859 break; case 143: -#line 601 "dhcp4_parser.yy" // lalr1.cc:859 +#line 595 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1276 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1281 "dhcp4_parser.cc" // lalr1.cc:859 break; case 148: -#line 614 "dhcp4_parser.yy" // lalr1.cc:859 +#line 608 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1286 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1291 "dhcp4_parser.cc" // lalr1.cc:859 break; case 149: -#line 618 "dhcp4_parser.yy" // lalr1.cc:859 +#line 612 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1294 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1299 "dhcp4_parser.cc" // lalr1.cc:859 break; case 150: -#line 622 "dhcp4_parser.yy" // lalr1.cc:859 +#line 616 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the hooks-libraries list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1304 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1309 "dhcp4_parser.cc" // lalr1.cc:859 break; case 151: -#line 626 "dhcp4_parser.yy" // lalr1.cc:859 +#line 620 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1312 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1317 "dhcp4_parser.cc" // lalr1.cc:859 break; case 157: -#line 639 "dhcp4_parser.yy" // lalr1.cc:859 +#line 633 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1320 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1325 "dhcp4_parser.cc" // lalr1.cc:859 break; case 158: -#line 641 "dhcp4_parser.yy" // lalr1.cc:859 +#line 635 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); ctx.leave(); } -#line 1330 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1335 "dhcp4_parser.cc" // lalr1.cc:859 break; case 159: -#line 647 "dhcp4_parser.yy" // lalr1.cc:859 +#line 641 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1338 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1343 "dhcp4_parser.cc" // lalr1.cc:859 break; case 160: -#line 649 "dhcp4_parser.yy" // lalr1.cc:859 +#line 643 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 1347 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1352 "dhcp4_parser.cc" // lalr1.cc:859 break; case 161: -#line 655 "dhcp4_parser.yy" // lalr1.cc:859 +#line 649 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("expired-leases-processing", m); ctx.stack_.push_back(m); - ctx.enter(ctx.EXPIRED_LEASES_PROCESSING); + ctx.enter(ctx.NO_KEYWORD); } -#line 1358 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1363 "dhcp4_parser.cc" // lalr1.cc:859 break; case 162: -#line 660 "dhcp4_parser.yy" // lalr1.cc:859 +#line 654 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1367 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1372 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 171: -#line 677 "dhcp4_parser.yy" // lalr1.cc:859 + case 165: +#line 666 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reclaim-timer-wait-time", value); + ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), value); } -#line 1376 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1381 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 172: -#line 682 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value); -} -#line 1385 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 173: -#line 687 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("hold-reclaimed-time", value); -} -#line 1394 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 174: -#line 692 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-reclaim-leases", value); -} -#line 1403 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 175: -#line 697 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-reclaim-time", value); -} -#line 1412 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 176: -#line 702 "dhcp4_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("unwarned-reclaim-cycles", value); -} -#line 1421 "dhcp4_parser.cc" // lalr1.cc:859 - break; - - case 177: -#line 710 "dhcp4_parser.yy" // lalr1.cc:859 + case 166: +#line 674 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet4", l); ctx.stack_.push_back(l); ctx.enter(ctx.SUBNET4); } -#line 1432 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1392 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 178: -#line 715 "dhcp4_parser.yy" // lalr1.cc:859 + case 167: +#line 679 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1441 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1401 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 183: -#line 735 "dhcp4_parser.yy" // lalr1.cc:859 + case 172: +#line 699 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1451 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1411 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 184: -#line 739 "dhcp4_parser.yy" // lalr1.cc:859 + case 173: +#line 703 "dhcp4_parser.yy" // lalr1.cc:859 { // Once we reached this place, the subnet parsing is now complete. // If we want to, we can implement default values here. @@ -1470,1133 +1430,1400 @@ namespace isc { namespace dhcp { // } ctx.stack_.pop_back(); } -#line 1474 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1434 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 185: -#line 758 "dhcp4_parser.yy" // lalr1.cc:859 + case 174: +#line 722 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the subnet4 list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1484 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1444 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 186: -#line 762 "dhcp4_parser.yy" // lalr1.cc:859 + case 175: +#line 726 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1492 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1452 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 209: -#line 794 "dhcp4_parser.yy" // lalr1.cc:859 + case 198: +#line 758 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1500 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1460 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 210: -#line 796 "dhcp4_parser.yy" // lalr1.cc:859 + case 199: +#line 760 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet", subnet); ctx.leave(); } -#line 1510 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1470 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 211: -#line 802 "dhcp4_parser.yy" // lalr1.cc:859 + case 200: +#line 766 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1518 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1478 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 212: -#line 804 "dhcp4_parser.yy" // lalr1.cc:859 + case 201: +#line 768 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface", iface); ctx.leave(); } -#line 1528 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1488 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 213: -#line 810 "dhcp4_parser.yy" // lalr1.cc:859 + case 202: +#line 774 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1536 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1496 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 214: -#line 812 "dhcp4_parser.yy" // lalr1.cc:859 + case 203: +#line 776 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-interface-id", iface); ctx.leave(); } -#line 1546 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1506 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 215: -#line 818 "dhcp4_parser.yy" // lalr1.cc:859 + case 204: +#line 782 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1554 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1514 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 216: -#line 820 "dhcp4_parser.yy" // lalr1.cc:859 + case 205: +#line 784 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("4o6-subnet", iface); ctx.leave(); } -#line 1564 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1524 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 217: -#line 826 "dhcp4_parser.yy" // lalr1.cc:859 + case 206: +#line 790 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1572 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1532 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 218: -#line 828 "dhcp4_parser.yy" // lalr1.cc:859 + case 207: +#line 792 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface", iface); ctx.leave(); } -#line 1582 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1542 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 219: -#line 834 "dhcp4_parser.yy" // lalr1.cc:859 + case 208: +#line 798 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1590 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1550 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 220: -#line 836 "dhcp4_parser.yy" // lalr1.cc:859 + case 209: +#line 800 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface-id", iface); ctx.leave(); } -#line 1600 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1560 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 221: -#line 842 "dhcp4_parser.yy" // lalr1.cc:859 + case 210: +#line 806 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.CLIENT_CLASS); } -#line 1608 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1568 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 222: -#line 844 "dhcp4_parser.yy" // lalr1.cc:859 + case 211: +#line 808 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-class", cls); ctx.leave(); } -#line 1618 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1578 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 223: -#line 850 "dhcp4_parser.yy" // lalr1.cc:859 + case 212: +#line 814 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1626 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1586 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 224: -#line 852 "dhcp4_parser.yy" // lalr1.cc:859 + case 213: +#line 816 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rm(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservation-mode", rm); ctx.leave(); } -#line 1636 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1596 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 225: -#line 858 "dhcp4_parser.yy" // lalr1.cc:859 + case 214: +#line 822 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("id", id); } -#line 1645 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1605 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 226: -#line 863 "dhcp4_parser.yy" // lalr1.cc:859 + case 215: +#line 827 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rapid-commit", rc); } -#line 1654 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1614 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 227: -#line 872 "dhcp4_parser.yy" // lalr1.cc:859 + case 216: +#line 836 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-def", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DEF); } -#line 1665 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1625 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 228: -#line 877 "dhcp4_parser.yy" // lalr1.cc:859 + case 217: +#line 841 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1674 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1634 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 233: -#line 894 "dhcp4_parser.yy" // lalr1.cc:859 + case 222: +#line 858 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1684 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1644 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 234: -#line 898 "dhcp4_parser.yy" // lalr1.cc:859 + case 223: +#line 862 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1692 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1652 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 235: -#line 905 "dhcp4_parser.yy" // lalr1.cc:859 + case 224: +#line 869 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-def list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1702 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1662 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 236: -#line 909 "dhcp4_parser.yy" // lalr1.cc:859 + case 225: +#line 873 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1710 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1670 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 250: -#line 935 "dhcp4_parser.yy" // lalr1.cc:859 + case 239: +#line 899 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("code", code); } -#line 1719 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1679 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 253: -#line 944 "dhcp4_parser.yy" // lalr1.cc:859 + case 242: +#line 908 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1727 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1687 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 254: -#line 946 "dhcp4_parser.yy" // lalr1.cc:859 + case 243: +#line 910 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("record-types", rtypes); ctx.leave(); } -#line 1737 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1697 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 255: -#line 952 "dhcp4_parser.yy" // lalr1.cc:859 + case 244: +#line 916 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1745 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1705 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 256: -#line 954 "dhcp4_parser.yy" // lalr1.cc:859 + case 245: +#line 918 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("space", space); ctx.leave(); } -#line 1755 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1715 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 258: -#line 962 "dhcp4_parser.yy" // lalr1.cc:859 + case 247: +#line 926 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1763 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1723 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 259: -#line 964 "dhcp4_parser.yy" // lalr1.cc:859 + case 248: +#line 928 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("encapsulate", encap); ctx.leave(); } -#line 1773 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1733 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 260: -#line 970 "dhcp4_parser.yy" // lalr1.cc:859 + case 249: +#line 934 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("array", array); } -#line 1782 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1742 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 261: -#line 979 "dhcp4_parser.yy" // lalr1.cc:859 + case 250: +#line 943 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-data", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DATA); } -#line 1793 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1753 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 262: -#line 984 "dhcp4_parser.yy" // lalr1.cc:859 + case 251: +#line 948 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1802 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1762 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 267: -#line 1003 "dhcp4_parser.yy" // lalr1.cc:859 + case 256: +#line 967 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1812 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1772 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 268: -#line 1007 "dhcp4_parser.yy" // lalr1.cc:859 + case 257: +#line 971 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1820 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1780 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 269: -#line 1014 "dhcp4_parser.yy" // lalr1.cc:859 + case 258: +#line 978 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the option-data list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1830 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1790 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 270: -#line 1018 "dhcp4_parser.yy" // lalr1.cc:859 + case 259: +#line 982 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1838 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1798 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 282: -#line 1047 "dhcp4_parser.yy" // lalr1.cc:859 + case 271: +#line 1011 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1846 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1806 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 283: -#line 1049 "dhcp4_parser.yy" // lalr1.cc:859 + case 272: +#line 1013 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("data", data); ctx.leave(); } -#line 1856 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1816 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 286: -#line 1059 "dhcp4_parser.yy" // lalr1.cc:859 + case 275: +#line 1023 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("csv-format", space); } -#line 1865 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1825 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 287: -#line 1067 "dhcp4_parser.yy" // lalr1.cc:859 + case 276: +#line 1031 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.POOLS); } -#line 1876 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1836 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 288: -#line 1072 "dhcp4_parser.yy" // lalr1.cc:859 + case 277: +#line 1036 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1885 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1845 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 293: -#line 1087 "dhcp4_parser.yy" // lalr1.cc:859 + case 282: +#line 1051 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1895 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1855 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 294: -#line 1091 "dhcp4_parser.yy" // lalr1.cc:859 + case 283: +#line 1055 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1903 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1863 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 295: -#line 1095 "dhcp4_parser.yy" // lalr1.cc:859 + case 284: +#line 1059 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1913 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1873 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 296: -#line 1099 "dhcp4_parser.yy" // lalr1.cc:859 + case 285: +#line 1063 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1921 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1881 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 302: -#line 1112 "dhcp4_parser.yy" // lalr1.cc:859 + case 291: +#line 1076 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1929 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1889 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 303: -#line 1114 "dhcp4_parser.yy" // lalr1.cc:859 + case 292: +#line 1078 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pool", pool); ctx.leave(); } -#line 1939 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1899 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 304: -#line 1123 "dhcp4_parser.yy" // lalr1.cc:859 + case 293: +#line 1087 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservations", l); ctx.stack_.push_back(l); ctx.enter(ctx.RESERVATIONS); } -#line 1950 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1910 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 305: -#line 1128 "dhcp4_parser.yy" // lalr1.cc:859 + case 294: +#line 1092 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1959 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1919 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 310: -#line 1141 "dhcp4_parser.yy" // lalr1.cc:859 + case 299: +#line 1105 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1969 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1929 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 311: -#line 1145 "dhcp4_parser.yy" // lalr1.cc:859 + case 300: +#line 1109 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1977 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1937 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 312: -#line 1149 "dhcp4_parser.yy" // lalr1.cc:859 + case 301: +#line 1113 "dhcp4_parser.yy" // lalr1.cc:859 { // Parse the reservations list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1987 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1947 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 313: -#line 1153 "dhcp4_parser.yy" // lalr1.cc:859 + case 302: +#line 1117 "dhcp4_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1995 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1955 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 330: -#line 1180 "dhcp4_parser.yy" // lalr1.cc:859 + case 319: +#line 1144 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2003 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1963 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 331: -#line 1182 "dhcp4_parser.yy" // lalr1.cc:859 + case 320: +#line 1146 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr next_server(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("next-server", next_server); ctx.leave(); } -#line 2013 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1973 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 332: -#line 1188 "dhcp4_parser.yy" // lalr1.cc:859 + case 321: +#line 1152 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2021 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1981 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 333: -#line 1190 "dhcp4_parser.yy" // lalr1.cc:859 + case 322: +#line 1154 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr srv(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-hostname", srv); ctx.leave(); } -#line 2031 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1991 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 334: -#line 1196 "dhcp4_parser.yy" // lalr1.cc:859 + case 323: +#line 1160 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2039 "dhcp4_parser.cc" // lalr1.cc:859 +#line 1999 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 335: -#line 1198 "dhcp4_parser.yy" // lalr1.cc:859 + case 324: +#line 1162 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr bootfile(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("boot-file-name", bootfile); ctx.leave(); } -#line 2049 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2009 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 336: -#line 1204 "dhcp4_parser.yy" // lalr1.cc:859 + case 325: +#line 1168 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2057 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2017 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 337: -#line 1206 "dhcp4_parser.yy" // lalr1.cc:859 + case 326: +#line 1170 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr addr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", addr); ctx.leave(); } -#line 2067 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2027 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 338: -#line 1212 "dhcp4_parser.yy" // lalr1.cc:859 + case 327: +#line 1176 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2075 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2035 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 339: -#line 1214 "dhcp4_parser.yy" // lalr1.cc:859 + case 328: +#line 1178 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("duid", d); ctx.leave(); } -#line 2085 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2045 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 340: -#line 1220 "dhcp4_parser.yy" // lalr1.cc:859 + case 329: +#line 1184 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2093 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2053 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 341: -#line 1222 "dhcp4_parser.yy" // lalr1.cc:859 + case 330: +#line 1186 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hw-address", hw); ctx.leave(); } -#line 2103 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2063 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 342: -#line 1228 "dhcp4_parser.yy" // lalr1.cc:859 + case 331: +#line 1192 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2111 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2071 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 343: -#line 1230 "dhcp4_parser.yy" // lalr1.cc:859 + case 332: +#line 1194 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-id", hw); ctx.leave(); } -#line 2121 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2081 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 344: -#line 1236 "dhcp4_parser.yy" // lalr1.cc:859 + case 333: +#line 1200 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2129 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2089 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 345: -#line 1238 "dhcp4_parser.yy" // lalr1.cc:859 + case 334: +#line 1202 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("circuit-id", hw); ctx.leave(); } -#line 2139 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2099 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 346: -#line 1245 "dhcp4_parser.yy" // lalr1.cc:859 + case 335: +#line 1209 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2147 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2107 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 347: -#line 1247 "dhcp4_parser.yy" // lalr1.cc:859 + case 336: +#line 1211 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname", host); ctx.leave(); } -#line 2157 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2117 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 348: -#line 1253 "dhcp4_parser.yy" // lalr1.cc:859 + case 337: +#line 1217 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", c); ctx.stack_.push_back(c); ctx.enter(ctx.NO_KEYWORD); } -#line 2168 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2128 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 349: -#line 1258 "dhcp4_parser.yy" // lalr1.cc:859 + case 338: +#line 1222 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2177 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2137 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 350: -#line 1266 "dhcp4_parser.yy" // lalr1.cc:859 + case 339: +#line 1230 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay", m); ctx.stack_.push_back(m); ctx.enter(ctx.RELAY); } -#line 2188 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2148 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 351: -#line 1271 "dhcp4_parser.yy" // lalr1.cc:859 + case 340: +#line 1235 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2197 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2157 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 352: -#line 1276 "dhcp4_parser.yy" // lalr1.cc:859 + case 341: +#line 1240 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2205 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2165 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 353: -#line 1278 "dhcp4_parser.yy" // lalr1.cc:859 + case 342: +#line 1242 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", ip); ctx.leave(); } -#line 2215 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2175 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 354: -#line 1287 "dhcp4_parser.yy" // lalr1.cc:859 + case 343: +#line 1251 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", l); ctx.stack_.push_back(l); ctx.enter(ctx.CLIENT_CLASSES); } -#line 2226 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2186 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 355: -#line 1292 "dhcp4_parser.yy" // lalr1.cc:859 + case 344: +#line 1256 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2235 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2195 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 358: -#line 1301 "dhcp4_parser.yy" // lalr1.cc:859 + case 347: +#line 1265 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2245 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2205 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 359: -#line 1305 "dhcp4_parser.yy" // lalr1.cc:859 + case 348: +#line 1269 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2253 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2213 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 372: -#line 1328 "dhcp4_parser.yy" // lalr1.cc:859 + case 361: +#line 1292 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2261 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2221 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 373: -#line 1330 "dhcp4_parser.yy" // lalr1.cc:859 + case 362: +#line 1294 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("test", test); ctx.leave(); } -#line 2271 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2231 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 374: -#line 1339 "dhcp4_parser.yy" // lalr1.cc:859 + case 363: +#line 1303 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-id", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER_ID); } -#line 2282 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2242 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 375: -#line 1344 "dhcp4_parser.yy" // lalr1.cc:859 + case 364: +#line 1308 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2291 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2251 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 385: -#line 1362 "dhcp4_parser.yy" // lalr1.cc:859 + case 374: +#line 1326 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("htype", htype); } -#line 2300 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2260 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 386: -#line 1367 "dhcp4_parser.yy" // lalr1.cc:859 + case 375: +#line 1331 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2308 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2268 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 387: -#line 1369 "dhcp4_parser.yy" // lalr1.cc:859 + case 376: +#line 1333 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("identifier", id); ctx.leave(); } -#line 2318 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2278 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 388: -#line 1375 "dhcp4_parser.yy" // lalr1.cc:859 + case 377: +#line 1339 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("time", time); } -#line 2327 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2287 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 389: -#line 1380 "dhcp4_parser.yy" // lalr1.cc:859 + case 378: +#line 1344 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("enterprise-id", time); } -#line 2336 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2296 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 390: -#line 1387 "dhcp4_parser.yy" // lalr1.cc:859 + case 379: +#line 1351 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4o6-port", time); } -#line 2345 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2305 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 391: -#line 1394 "dhcp4_parser.yy" // lalr1.cc:859 + case 380: +#line 1358 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); ctx.stack_.push_back(m); ctx.enter(ctx.CONTROL_SOCKET); } -#line 2356 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2316 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 392: -#line 1399 "dhcp4_parser.yy" // lalr1.cc:859 + case 381: +#line 1363 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2365 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2325 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 397: -#line 1412 "dhcp4_parser.yy" // lalr1.cc:859 + case 386: +#line 1376 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2373 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2333 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 398: -#line 1414 "dhcp4_parser.yy" // lalr1.cc:859 + case 387: +#line 1378 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-type", stype); ctx.leave(); } -#line 2383 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2343 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 399: -#line 1420 "dhcp4_parser.yy" // lalr1.cc:859 + case 388: +#line 1384 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2391 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2351 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 400: -#line 1422 "dhcp4_parser.yy" // lalr1.cc:859 + case 389: +#line 1386 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-name", name); ctx.leave(); } -#line 2401 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2361 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 401: -#line 1430 "dhcp4_parser.yy" // lalr1.cc:859 + case 390: +#line 1394 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); - ctx.enter(ctx.NO_KEYWORD); + ctx.enter(ctx.DHCP_DDNS); } -#line 2412 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2372 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 402: -#line 1435 "dhcp4_parser.yy" // lalr1.cc:859 + case 391: +#line 1399 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2421 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2381 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 403: -#line 1442 "dhcp4_parser.yy" // lalr1.cc:859 + case 392: +#line 1404 "dhcp4_parser.yy" // lalr1.cc:859 + { + // Parse the dhcp-ddns map + ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.push_back(m); +} +#line 2391 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 393: +#line 1408 "dhcp4_parser.yy" // lalr1.cc:859 + { + // parsing completed +} +#line 2399 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 412: +#line 1434 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("enable-updates", b); +} +#line 2408 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 413: +#line 1439 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2429 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2416 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 404: -#line 1444 "dhcp4_parser.yy" // lalr1.cc:859 + case 414: +#line 1441 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("qualifying-suffix", s); + ctx.leave(); +} +#line 2426 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 415: +#line 1447 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2434 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 416: +#line 1449 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-ip", s); + ctx.leave(); +} +#line 2444 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 417: +#line 1455 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-port", i); +} +#line 2453 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 418: +#line 1460 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2461 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 419: +#line 1462 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("sender-ip", s); + ctx.leave(); +} +#line 2471 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 420: +#line 1468 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("sender-port", i); +} +#line 2480 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 421: +#line 1473 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("max-queue-size", i); +} +#line 2489 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 422: +#line 1478 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_PROTOCOL); +} +#line 2497 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 423: +#line 1480 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2506 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 424: +#line 1486 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } +#line 2512 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 425: +#line 1487 "dhcp4_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } +#line 2518 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 426: +#line 1490 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_FORMAT); +} +#line 2526 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 427: +#line 1492 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("ncr-format", json); + ctx.leave(); +} +#line 2536 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 428: +#line 1498 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("always-include-fqdn", b); +} +#line 2545 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 429: +#line 1503 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("allow-client-update", b); +} +#line 2554 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 430: +#line 1508 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-no-update", b); +} +#line 2563 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 431: +#line 1513 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-client-update", b); +} +#line 2572 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 432: +#line 1518 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.REPLACE_CLIENT_NAME); +} +#line 2580 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 433: +#line 1520 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2589 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 434: +#line 1526 "dhcp4_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); + } +#line 2597 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 435: +#line 1529 "dhcp4_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); + } +#line 2605 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 436: +#line 1532 "dhcp4_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + } +#line 2613 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 437: +#line 1535 "dhcp4_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); + } +#line 2621 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 438: +#line 1538 "dhcp4_parser.yy" // lalr1.cc:859 + { + error(yystack_[0].location, "boolean values for the replace-client-name are " + "no longer supported"); + } +#line 2630 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 439: +#line 1544 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2638 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 440: +#line 1546 "dhcp4_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("generated-prefix", s); + ctx.leave(); +} +#line 2648 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 441: +#line 1554 "dhcp4_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2656 "dhcp4_parser.cc" // lalr1.cc:859 + break; + + case 442: +#line 1556 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("Dhcp6", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 2438 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2665 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 405: -#line 1449 "dhcp4_parser.yy" // lalr1.cc:859 + case 443: +#line 1561 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2446 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2673 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 406: -#line 1451 "dhcp4_parser.yy" // lalr1.cc:859 + case 444: +#line 1563 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 2455 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2682 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 407: -#line 1461 "dhcp4_parser.yy" // lalr1.cc:859 + case 445: +#line 1573 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("Logging", m); ctx.stack_.push_back(m); ctx.enter(ctx.LOGGING); } -#line 2466 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2693 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 408: -#line 1466 "dhcp4_parser.yy" // lalr1.cc:859 + case 446: +#line 1578 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2475 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2702 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 412: -#line 1483 "dhcp4_parser.yy" // lalr1.cc:859 + case 450: +#line 1595 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("loggers", l); ctx.stack_.push_back(l); ctx.enter(ctx.LOGGERS); } -#line 2486 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2713 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 413: -#line 1488 "dhcp4_parser.yy" // lalr1.cc:859 + case 451: +#line 1600 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2495 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2722 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 416: -#line 1500 "dhcp4_parser.yy" // lalr1.cc:859 + case 454: +#line 1612 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(l); ctx.stack_.push_back(l); } -#line 2505 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2732 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 417: -#line 1504 "dhcp4_parser.yy" // lalr1.cc:859 + case 455: +#line 1616 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2513 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2740 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 425: -#line 1519 "dhcp4_parser.yy" // lalr1.cc:859 + case 463: +#line 1631 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("debuglevel", dl); } -#line 2522 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2749 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 426: -#line 1523 "dhcp4_parser.yy" // lalr1.cc:859 + case 464: +#line 1635 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2530 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2757 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 427: -#line 1525 "dhcp4_parser.yy" // lalr1.cc:859 + case 465: +#line 1637 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 2540 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2767 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 428: -#line 1531 "dhcp4_parser.yy" // lalr1.cc:859 + case 466: +#line 1643 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output_options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } -#line 2551 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2778 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 429: -#line 1536 "dhcp4_parser.yy" // lalr1.cc:859 + case 467: +#line 1648 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2560 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2787 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 432: -#line 1545 "dhcp4_parser.yy" // lalr1.cc:859 + case 470: +#line 1657 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2570 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2797 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 433: -#line 1549 "dhcp4_parser.yy" // lalr1.cc:859 + case 471: +#line 1661 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2578 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2805 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 436: -#line 1557 "dhcp4_parser.yy" // lalr1.cc:859 + case 474: +#line 1669 "dhcp4_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2586 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2813 "dhcp4_parser.cc" // lalr1.cc:859 break; - case 437: -#line 1559 "dhcp4_parser.yy" // lalr1.cc:859 + case 475: +#line 1671 "dhcp4_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 2596 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2823 "dhcp4_parser.cc" // lalr1.cc:859 break; -#line 2600 "dhcp4_parser.cc" // lalr1.cc:859 +#line 2827 "dhcp4_parser.cc" // lalr1.cc:859 default: break; } @@ -2851,497 +3078,535 @@ namespace isc { namespace dhcp { } - const short int Dhcp4Parser::yypact_ninf_ = -411; + const short int Dhcp4Parser::yypact_ninf_ = -476; const signed char Dhcp4Parser::yytable_ninf_ = -1; const short int Dhcp4Parser::yypact_[] = { - 179, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, 39, 22, 34, 54, 61, 94, 113, 155, 173, - 209, 218, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, 22, -29, 18, 65, 106, 19, -6, 96, - 17, 67, -17, -411, 170, 175, 192, 199, 224, -411, - -411, -411, -411, 226, -411, 72, -411, -411, -411, -411, - -411, -411, 227, 228, -411, -411, -411, 230, 231, 232, - 235, -411, -411, -411, -411, -411, -411, -411, -411, 237, - -411, -411, -411, 131, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, 134, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - 238, 240, -411, -411, -411, -411, -411, -411, -411, -411, - -411, 142, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, 143, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, 241, 245, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - 248, -411, -411, -411, 249, -411, -411, -411, 257, 266, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, 267, -411, -411, -411, -411, 264, 270, -411, -411, - -411, -411, -411, -411, -411, -411, -411, 167, -411, -411, - -411, -411, 22, 22, -411, 180, 281, 283, 284, 285, - -411, 18, -411, 286, 182, 183, 289, 290, 291, 193, - 194, 195, 196, 292, 293, 294, 295, 300, 301, 302, - 303, 204, 304, 305, 65, -411, 306, 308, 106, -411, - 26, 309, 310, 311, 312, 313, 314, 315, 213, 215, - 317, 318, 319, 321, 19, -411, 322, -6, -411, 323, - 324, 325, 326, 327, 328, 329, 330, 333, -411, 96, - 334, 335, 233, 337, 338, 339, 236, -411, 17, 340, - 239, -411, 67, 342, 343, -22, -411, -411, -411, 345, - 344, 346, 22, 22, -411, 347, -411, -411, 244, 348, - 349, -411, -411, -411, -411, 352, 353, 354, 357, 358, - 359, 360, 361, -411, 362, 363, -411, 366, 112, -411, - -411, -411, -411, -411, -411, -411, -411, 364, 370, -411, - -411, -411, 246, 269, 271, 371, 272, 274, 275, -411, - -411, 276, 277, 380, 379, -411, 282, -411, 287, 288, - 366, 296, 297, 298, 299, 316, 320, -411, 331, 332, - -411, 336, 341, 350, -411, -411, 351, -411, -411, 355, - 22, -411, 22, 65, 307, -411, -411, 106, -411, 161, - 161, 382, 383, 385, 197, 35, 390, 92, 11, 70, - -29, -411, -411, -411, -411, -411, 394, -411, 26, -411, - -411, -411, 392, -411, -411, -411, -411, -411, 393, 356, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, 169, - -411, 171, -411, -411, 190, -411, -411, -411, 397, 402, - 403, -411, 191, -411, -411, -411, -411, -411, -411, -411, - -411, -411, 200, -411, 381, 405, -411, -411, 404, 406, - -411, -411, 408, 409, -411, -411, -411, -411, -411, -411, - 29, -411, -411, -411, -411, -411, 99, -411, 410, 414, - -411, 407, 415, 416, 417, 420, 421, 201, -411, -411, - -411, -411, -411, -411, -411, -411, 423, 424, 425, -411, - -411, -411, 202, -411, -411, -411, -411, -411, -411, -411, - 203, -411, -411, -411, 210, 22, 365, -411, -411, 412, - 427, -411, -411, 426, 428, -411, -411, 431, -411, 429, - 307, -411, -411, 430, 432, 436, 367, 368, 369, 161, - -411, -411, 19, -411, 382, 17, -411, 383, 67, -411, - 385, 197, -411, 35, -411, -17, -411, 390, 372, 373, - 374, 375, 376, 377, 92, -411, 437, 378, 384, 386, - 11, -411, 439, 440, 70, -411, -411, 442, -411, -6, - -411, 392, 96, -411, 393, 441, -411, 444, -411, 388, - 389, 391, -411, -411, -411, -411, 211, -411, 438, -411, - 443, -411, -411, -411, 212, -411, -411, -411, -411, -411, - -411, -411, -411, 395, -411, -411, -411, -411, 396, 398, - -411, -411, 214, -411, 445, -411, 399, 447, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, 141, -411, 48, 447, -411, -411, 446, -411, - -411, -411, 220, -411, -411, -411, -411, -411, 448, 400, - 451, 48, -411, 453, -411, 411, -411, 452, -411, -411, - 189, -411, 401, 452, -411, -411, 221, -411, -411, 456, - 401, -411, 413, -411, -411 + 107, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, 58, 23, 69, 108, 128, 149, 153, 155, + 166, 223, 246, 247, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, 23, 21, 19, 82, + 39, 20, 28, 44, 42, 50, -21, 158, -476, 180, + 233, 257, 254, 260, -476, -476, -476, -476, 261, -476, + 30, -476, -476, -476, -476, -476, -476, 262, 264, -476, + -476, -476, 265, 266, 269, 271, -476, -476, -476, -476, + -476, -476, -476, -476, 272, -476, -476, -476, 56, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, 71, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, 274, 276, -476, -476, -476, + -476, -476, -476, -476, -476, -476, 121, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, 122, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + 256, 279, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, 282, -476, -476, -476, 283, + -476, -476, -476, 275, 285, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, 291, -476, -476, -476, + -476, 293, 296, -476, -476, -476, -476, -476, -476, -476, + -476, -476, 123, -476, -476, -476, 299, -476, -476, 300, + -476, 301, 302, -476, -476, 303, 305, 307, 308, -476, + -476, -476, 135, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + 23, 23, -476, 194, 309, 310, 312, 313, -476, 19, + -476, 314, 195, 196, 317, 319, 320, 203, 204, 206, + 207, 323, 326, 327, 328, 329, 330, 331, 332, 215, + 334, 335, 82, -476, 336, 337, 39, -476, 116, 338, + 339, 340, 341, 342, 343, 344, 227, 228, 346, 347, + 349, 350, 20, -476, 351, 28, -476, 352, 353, 354, + 355, 356, 357, 358, 359, 360, -476, 44, 361, 362, + 245, 364, 365, 366, 248, -476, 42, 367, 249, -476, + 50, 370, 371, 27, -476, 252, 373, 374, 258, 375, + 259, 263, 378, 379, 267, 268, 270, 273, 380, 382, + 158, -476, -476, -476, 383, 381, 386, 23, 23, -476, + 388, -476, -476, 277, 389, 392, -476, -476, -476, -476, + 384, 385, 397, 398, 399, 400, 401, 402, -476, 403, + 404, -476, 407, 286, -476, -476, -476, -476, -476, -476, + -476, -476, 405, 411, -476, -476, -476, 294, 295, 297, + 412, 298, 304, 315, -476, -476, 316, 318, 415, 414, + -476, 321, -476, 324, 325, 407, 333, 345, 348, 363, + 368, 369, -476, 372, 376, -476, 377, 387, 390, -476, + -476, 391, -476, -476, 393, 23, -476, -476, 394, 395, + -476, 396, -476, -476, 103, 406, -476, -476, -476, -476, + 80, 408, -476, 23, 82, 410, -476, -476, 39, -476, + 18, 18, 416, 417, 419, 197, 60, 422, 409, 95, + 45, 158, -476, -476, -476, 418, -476, 116, -476, -476, + -476, 423, -476, -476, -476, -476, -476, 424, 420, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, 147, -476, 156, -476, -476, 167, -476, -476, + -476, 430, 431, 434, -476, 179, -476, -476, -476, -476, + -476, -476, -476, -476, -476, 181, -476, 441, 437, -476, + -476, 442, 447, -476, -476, 445, 449, -476, -476, -476, + -476, -476, -476, 31, -476, -476, -476, -476, -476, 208, + -476, 451, 450, -476, 454, 182, -476, -476, 455, 457, + 458, -476, -476, -476, 185, -476, -476, -476, -476, -476, + -476, -476, 189, -476, -476, -476, 192, 23, 413, -476, + -476, 459, 452, -476, -476, 461, 460, -476, -476, 456, + -476, 464, 410, -476, -476, 466, 467, 468, 421, 284, + 425, 18, -476, -476, 20, -476, 416, 42, -476, 417, + 50, -476, 419, 197, -476, 60, -476, -21, -476, 422, + 426, 409, -476, 469, 428, 429, 432, 95, -476, 470, + 471, 45, -476, -476, 473, -476, 28, -476, 423, 44, + -476, 424, 472, -476, 475, -476, 435, 436, 438, -476, + -476, -476, -476, 193, -476, 474, -476, 478, -476, -476, + -476, 202, -476, -476, -476, 439, -476, -476, -476, -476, + 440, 443, -476, -476, 205, -476, 479, -476, 444, 476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, 209, -476, 70, 476, -476, -476, + 477, -476, -476, -476, 225, -476, -476, -476, -476, -476, + 484, 433, 487, 70, -476, 489, -476, 446, -476, 485, + -476, -476, 229, -476, 427, 485, -476, -476, 226, -476, + -476, 491, 427, -476, 448, -476, -476 }; const unsigned short int Dhcp4Parser::yydefact_[] = { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, - 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 36, 30, 26, 25, 22, 23, 24, - 29, 3, 27, 28, 45, 5, 56, 7, 94, 9, - 185, 11, 295, 13, 312, 15, 235, 17, 269, 19, - 150, 21, 40, 32, 0, 0, 0, 0, 0, 314, - 237, 271, 0, 42, 0, 41, 0, 0, 33, 54, - 407, 403, 405, 0, 53, 0, 47, 49, 51, 52, - 50, 88, 0, 0, 330, 102, 104, 0, 0, 0, - 0, 177, 227, 261, 131, 354, 142, 161, 374, 0, - 391, 401, 81, 0, 58, 60, 61, 62, 63, 78, - 79, 65, 66, 67, 68, 72, 73, 64, 70, 71, - 80, 69, 74, 75, 76, 77, 96, 98, 0, 90, - 92, 93, 358, 211, 213, 215, 287, 209, 217, 219, - 0, 0, 223, 221, 304, 350, 208, 189, 190, 191, - 203, 0, 187, 194, 205, 206, 207, 195, 196, 199, - 201, 197, 198, 192, 193, 200, 204, 202, 302, 301, - 300, 0, 297, 299, 332, 334, 348, 338, 340, 344, - 342, 346, 336, 329, 325, 0, 315, 316, 326, 327, - 328, 322, 318, 323, 320, 321, 324, 319, 117, 125, - 0, 255, 253, 258, 0, 248, 252, 249, 0, 238, - 239, 241, 251, 242, 243, 244, 257, 245, 246, 247, - 282, 0, 280, 281, 284, 285, 0, 272, 273, 275, - 276, 277, 278, 279, 157, 159, 154, 0, 152, 155, - 156, 37, 0, 0, 31, 0, 0, 0, 0, 0, - 44, 0, 46, 0, 0, 0, 0, 0, 0, 0, + 20, 22, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 38, 32, 28, 27, 24, + 25, 26, 31, 3, 29, 30, 47, 5, 58, 7, + 96, 9, 174, 11, 284, 13, 301, 15, 224, 17, + 258, 19, 150, 21, 392, 23, 42, 34, 0, 0, + 0, 0, 0, 303, 226, 260, 0, 0, 44, 0, + 43, 0, 0, 35, 56, 445, 441, 443, 0, 55, + 0, 49, 51, 53, 54, 52, 90, 0, 0, 319, + 102, 104, 0, 0, 0, 0, 166, 216, 250, 131, + 343, 142, 161, 363, 0, 380, 390, 83, 0, 60, + 62, 63, 64, 65, 80, 81, 67, 68, 69, 70, + 74, 75, 66, 72, 73, 82, 71, 76, 77, 78, + 79, 98, 100, 0, 92, 94, 95, 347, 200, 202, + 204, 276, 198, 206, 208, 0, 0, 212, 210, 293, + 339, 197, 178, 179, 180, 192, 0, 176, 183, 194, + 195, 196, 184, 185, 188, 190, 186, 187, 181, 182, + 189, 193, 191, 291, 290, 289, 0, 286, 288, 321, + 323, 337, 327, 329, 333, 331, 335, 325, 318, 314, + 0, 304, 305, 315, 316, 317, 311, 307, 312, 309, + 310, 313, 308, 117, 125, 0, 244, 242, 247, 0, + 237, 241, 238, 0, 227, 228, 230, 240, 231, 232, + 233, 246, 234, 235, 236, 271, 0, 269, 270, 273, + 274, 0, 261, 262, 264, 265, 266, 267, 268, 157, + 159, 154, 0, 152, 155, 156, 0, 413, 415, 0, + 418, 0, 0, 422, 426, 0, 0, 0, 0, 432, + 439, 411, 0, 394, 396, 397, 398, 399, 400, 401, + 402, 403, 404, 405, 406, 407, 408, 409, 410, 39, + 0, 0, 33, 0, 0, 0, 0, 0, 46, 0, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 57, 0, 0, 0, 95, - 360, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 186, 0, 0, 296, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 313, 0, - 0, 0, 0, 0, 0, 0, 0, 236, 0, 0, - 0, 270, 0, 0, 0, 0, 151, 43, 34, 0, - 0, 0, 0, 0, 48, 0, 86, 87, 0, 0, - 0, 82, 83, 84, 85, 0, 0, 0, 0, 0, - 0, 0, 0, 390, 0, 0, 59, 0, 0, 91, - 372, 370, 371, 366, 367, 368, 369, 0, 361, 362, - 364, 365, 0, 0, 0, 0, 0, 0, 0, 225, - 226, 0, 0, 0, 0, 188, 0, 298, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 317, 0, 0, - 250, 0, 0, 0, 260, 240, 0, 286, 274, 0, - 0, 153, 0, 0, 0, 404, 406, 0, 331, 0, - 0, 179, 229, 263, 0, 0, 144, 0, 0, 0, - 0, 38, 97, 100, 101, 99, 0, 359, 0, 212, - 214, 216, 289, 210, 218, 220, 224, 222, 306, 0, - 303, 333, 335, 349, 339, 341, 345, 343, 347, 337, - 118, 126, 256, 254, 259, 283, 158, 160, 35, 0, - 412, 0, 409, 411, 0, 119, 121, 123, 0, 0, - 0, 116, 0, 106, 108, 109, 110, 111, 112, 113, - 114, 115, 0, 183, 0, 180, 181, 233, 0, 230, - 231, 267, 0, 264, 265, 130, 139, 140, 141, 135, - 0, 133, 136, 137, 138, 356, 0, 148, 0, 145, - 146, 0, 0, 0, 0, 0, 0, 0, 163, 165, - 166, 167, 168, 169, 170, 386, 0, 0, 0, 384, - 378, 383, 0, 376, 381, 379, 380, 382, 397, 399, - 0, 393, 395, 396, 0, 40, 0, 363, 293, 0, - 290, 291, 310, 0, 307, 308, 352, 0, 55, 0, - 0, 408, 89, 0, 0, 0, 0, 0, 0, 0, - 103, 105, 0, 178, 0, 237, 228, 0, 271, 262, - 0, 0, 132, 0, 355, 0, 143, 0, 0, 0, - 0, 0, 0, 0, 0, 162, 0, 0, 0, 0, - 0, 375, 0, 0, 0, 392, 402, 0, 373, 0, - 288, 0, 314, 305, 0, 0, 351, 0, 410, 0, - 0, 0, 127, 128, 129, 107, 0, 182, 0, 232, - 0, 266, 134, 357, 0, 147, 171, 172, 173, 174, - 175, 176, 164, 0, 385, 388, 389, 377, 0, 0, - 394, 39, 0, 292, 0, 309, 0, 0, 120, 122, - 124, 184, 234, 268, 149, 387, 398, 400, 294, 311, - 353, 416, 0, 414, 0, 0, 413, 428, 0, 426, - 424, 420, 0, 418, 422, 423, 421, 415, 0, 0, - 0, 0, 417, 0, 425, 0, 419, 0, 427, 432, - 0, 430, 0, 0, 429, 436, 0, 434, 431, 0, - 0, 433, 0, 435, 437 + 0, 0, 0, 59, 0, 0, 0, 97, 349, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 175, 0, 0, 285, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 302, 0, 0, 0, + 0, 0, 0, 0, 0, 225, 0, 0, 0, 259, + 0, 0, 0, 0, 151, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 393, 45, 36, 0, 0, 0, 0, 0, 50, + 0, 88, 89, 0, 0, 0, 84, 85, 86, 87, + 0, 0, 0, 0, 0, 0, 0, 0, 379, 0, + 0, 61, 0, 0, 93, 361, 359, 360, 355, 356, + 357, 358, 0, 350, 351, 353, 354, 0, 0, 0, + 0, 0, 0, 0, 214, 215, 0, 0, 0, 0, + 177, 0, 287, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 306, 0, 0, 239, 0, 0, 0, 249, + 229, 0, 275, 263, 0, 0, 153, 412, 0, 0, + 417, 0, 420, 421, 0, 0, 428, 429, 430, 431, + 0, 0, 395, 0, 0, 0, 442, 444, 0, 320, + 0, 0, 168, 218, 252, 0, 0, 144, 0, 0, + 0, 0, 40, 99, 101, 0, 348, 0, 201, 203, + 205, 278, 199, 207, 209, 213, 211, 295, 0, 292, + 322, 324, 338, 328, 330, 334, 332, 336, 326, 118, + 126, 245, 243, 248, 272, 158, 160, 414, 416, 419, + 424, 425, 423, 427, 434, 435, 436, 437, 438, 433, + 440, 37, 0, 450, 0, 447, 449, 0, 119, 121, + 123, 0, 0, 0, 116, 0, 106, 108, 109, 110, + 111, 112, 113, 114, 115, 0, 172, 0, 169, 170, + 222, 0, 219, 220, 256, 0, 253, 254, 130, 139, + 140, 141, 135, 0, 133, 136, 137, 138, 345, 0, + 148, 0, 145, 146, 0, 0, 163, 375, 0, 0, + 0, 373, 367, 372, 0, 365, 370, 368, 369, 371, + 386, 388, 0, 382, 384, 385, 0, 42, 0, 352, + 282, 0, 279, 280, 299, 0, 296, 297, 341, 0, + 57, 0, 0, 446, 91, 0, 0, 0, 0, 0, + 0, 0, 103, 105, 0, 167, 0, 226, 217, 0, + 260, 251, 0, 0, 132, 0, 344, 0, 143, 0, + 0, 0, 162, 0, 0, 0, 0, 0, 364, 0, + 0, 0, 381, 391, 0, 362, 0, 277, 0, 303, + 294, 0, 0, 340, 0, 448, 0, 0, 0, 127, + 128, 129, 107, 0, 171, 0, 221, 0, 255, 134, + 346, 0, 147, 165, 164, 0, 374, 377, 378, 366, + 0, 0, 383, 41, 0, 281, 0, 298, 0, 0, + 120, 122, 124, 173, 223, 257, 149, 376, 387, 389, + 283, 300, 342, 454, 0, 452, 0, 0, 451, 466, + 0, 464, 462, 458, 0, 456, 460, 461, 459, 453, + 0, 0, 0, 0, 455, 0, 463, 0, 457, 0, + 465, 470, 0, 468, 0, 0, 467, 474, 0, 472, + 469, 0, 0, 471, 0, 473, 475 }; const short int Dhcp4Parser::yypgoto_[] = { - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, 3, -411, -411, -411, -411, 5, -411, -411, - 73, -411, -93, -411, -54, -411, -411, -411, 216, -411, - -411, -411, -411, 51, 198, -56, -40, -38, -411, -411, - -37, -411, -411, 49, 187, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, 50, -111, -398, -411, - -411, -411, -411, -411, -411, -411, -59, -411, -410, -411, - -411, -411, -411, -411, -411, -122, -411, -411, -411, -411, - -411, -411, -411, -124, -411, -411, -411, -121, 152, -411, - -411, -411, -411, -411, -411, -411, -118, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -97, -411, -411, - -411, -94, 205, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -402, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -98, -411, -411, -411, -95, - -411, 178, -411, -52, -411, -411, -411, -411, -48, -411, - -411, -411, -411, -411, -47, -411, -411, -411, -92, -411, - -411, -411, -88, -411, 181, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -115, -411, -411, -411, -110, - 217, -411, -411, -411, -411, -411, -411, -116, -411, -411, - -411, -112, -411, 206, -43, -411, -256, -411, -255, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, 74, -411, -411, -411, -411, -411, - -411, -99, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -101, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -49, -411, -411, -411, -169, - -411, -411, -183, -411, -411, -411, -411, -411, -411, -191, - -411, -411, -197, -411 + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, 13, -476, -476, -476, -476, -476, -476, + -476, 32, -476, -128, -476, -58, -476, -476, -476, 211, + -476, -476, -476, -476, 17, 190, -60, -42, -41, -476, + -476, -40, -476, -476, 16, 191, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, 14, -145, -468, -476, + -476, -476, -476, -476, -476, -476, -63, -476, -475, -476, + -476, -476, -476, -476, -476, -154, -476, -476, -476, -476, + -476, -476, -476, -159, -476, -476, -476, -149, 157, -476, + -476, -476, -476, -476, -476, -476, -152, -476, -476, -476, + -476, -135, -476, -476, -476, -132, 199, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -471, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -136, + -476, -476, -476, -133, -476, 169, -476, -52, -476, -476, + -476, -476, -50, -476, -476, -476, -476, -476, -51, -476, + -476, -476, -134, -476, -476, -476, -127, -476, 175, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -162, + -476, -476, -476, -150, 212, -476, -476, -476, -476, -476, + -476, -164, -476, -476, -476, -151, -476, 216, -47, -476, + -301, -476, -300, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, 33, -476, + -476, -476, -476, -476, -476, -140, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -142, -476, -476, -476, -476, + -476, -476, -476, -476, 40, 162, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -476, -476, -476, + -476, -476, -476, -476, -476, -476, -476, -99, -476, -476, + -476, -203, -476, -476, -217, -476, -476, -476, -476, -476, + -476, -223, -476, -476, -229, -476 }; const short int Dhcp4Parser::yydefgoto_[] = { - -1, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 63, 31, 32, 53, 67, 68, 33, 52, - 432, 555, 64, 65, 102, 35, 54, 75, 76, 77, - 246, 37, 55, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 253, 128, 129, 39, 56, 130, 276, 131, - 277, 435, 112, 257, 113, 258, 482, 483, 206, 310, - 485, 573, 486, 574, 487, 575, 207, 311, 489, 490, - 491, 509, 114, 266, 510, 511, 512, 513, 514, 115, - 268, 518, 519, 520, 595, 51, 62, 237, 238, 239, - 323, 240, 324, 116, 269, 527, 528, 529, 530, 531, - 532, 533, 534, 117, 263, 494, 495, 496, 582, 41, - 57, 151, 152, 153, 285, 154, 281, 155, 282, 156, - 283, 157, 286, 158, 287, 159, 291, 160, 290, 161, - 162, 118, 264, 498, 499, 500, 585, 47, 60, 208, - 209, 210, 211, 212, 213, 214, 215, 314, 216, 313, - 217, 218, 315, 219, 119, 265, 502, 503, 504, 588, - 49, 61, 226, 227, 228, 229, 230, 319, 231, 232, - 233, 164, 284, 559, 560, 561, 619, 43, 58, 171, - 172, 173, 296, 165, 292, 563, 564, 565, 622, 45, - 59, 185, 186, 187, 120, 256, 189, 299, 190, 300, - 191, 307, 192, 302, 193, 303, 194, 305, 195, 304, - 196, 306, 197, 301, 167, 293, 567, 625, 121, 267, - 516, 280, 367, 368, 369, 370, 371, 436, 122, 270, - 542, 543, 544, 545, 606, 546, 547, 123, 124, 272, - 550, 551, 552, 612, 553, 613, 125, 273, 78, 248, - 79, 249, 80, 247, 471, 472, 473, 569, 682, 683, - 684, 692, 693, 694, 695, 700, 696, 698, 710, 711, - 712, 716, 717, 719 + -1, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 68, 33, 34, 57, 72, 73, 35, + 56, 503, 627, 69, 70, 107, 37, 58, 80, 81, + 82, 284, 39, 59, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 291, 133, 134, 41, 60, 135, 314, + 136, 315, 117, 295, 118, 296, 565, 566, 211, 348, + 568, 645, 569, 646, 570, 647, 212, 349, 572, 573, + 574, 592, 119, 304, 593, 594, 595, 596, 597, 120, + 306, 601, 602, 603, 667, 53, 66, 242, 243, 244, + 361, 245, 362, 121, 307, 605, 606, 122, 301, 577, + 578, 579, 654, 43, 61, 156, 157, 158, 323, 159, + 319, 160, 320, 161, 321, 162, 324, 163, 325, 164, + 329, 165, 328, 166, 167, 123, 302, 581, 582, 583, + 657, 49, 64, 213, 214, 215, 216, 217, 218, 219, + 220, 352, 221, 351, 222, 223, 353, 224, 124, 303, + 585, 586, 587, 660, 51, 65, 231, 232, 233, 234, + 235, 357, 236, 237, 238, 169, 322, 631, 632, 633, + 686, 45, 62, 176, 177, 178, 334, 170, 330, 635, + 636, 637, 689, 47, 63, 190, 191, 192, 125, 294, + 194, 337, 195, 338, 196, 345, 197, 340, 198, 341, + 199, 343, 200, 342, 201, 344, 202, 339, 172, 331, + 639, 692, 126, 305, 599, 318, 422, 423, 424, 425, + 426, 505, 127, 308, 614, 615, 616, 617, 673, 618, + 619, 128, 129, 310, 622, 623, 624, 679, 625, 680, + 130, 311, 55, 67, 262, 263, 264, 265, 366, 266, + 367, 267, 268, 369, 269, 270, 271, 372, 542, 272, + 373, 273, 274, 275, 276, 277, 378, 549, 278, 379, + 83, 286, 84, 287, 85, 285, 554, 555, 556, 641, + 744, 745, 746, 754, 755, 756, 757, 762, 758, 760, + 772, 773, 774, 778, 779, 781 }; const unsigned short int Dhcp4Parser::yytable_[] = { - 74, 147, 223, 146, 169, 183, 205, 222, 236, 224, - 163, 170, 184, 225, 166, 30, 188, 148, 541, 149, - 150, 484, 484, 515, 365, 366, 132, 23, 69, 24, - 540, 25, 591, 93, 198, 592, 83, 84, 478, 22, - 198, 34, 132, 168, 84, 174, 175, 234, 235, 87, - 88, 89, 234, 235, 133, 134, 135, 199, 93, 200, - 201, 36, 202, 203, 204, 93, 199, 136, 38, 137, - 138, 139, 140, 141, 142, 251, 81, 66, 143, 144, - 252, 82, 83, 84, 360, 145, 85, 86, 199, 73, - 535, 536, 537, 538, 143, 87, 88, 89, 90, 91, - 73, 40, 593, 92, 93, 594, 70, 199, 220, 200, - 201, 221, 71, 72, 84, 174, 175, 73, 126, 127, - 42, 94, 95, 73, 73, 73, 433, 434, 26, 27, - 28, 29, 73, 96, 274, 93, 97, 278, 687, 275, - 688, 689, 279, 98, 685, 294, 297, 686, 99, 100, - 295, 298, 101, 176, 73, 548, 549, 177, 178, 179, - 180, 181, 44, 182, 521, 522, 523, 524, 525, 526, - 325, 73, 274, 73, 570, 326, 241, 568, 242, 571, - 46, 484, 365, 366, 198, 475, 476, 477, 478, 479, - 480, 643, 713, 278, 579, 714, 243, 74, 572, 580, - 541, 199, 73, 579, 604, 610, 614, 244, 581, 605, - 611, 615, 540, 245, 294, 325, 48, 297, 616, 671, - 674, 362, 678, 701, 720, 50, 361, 245, 702, 721, - 250, 254, 255, 363, 259, 260, 261, 364, 147, 262, - 146, 271, 288, 169, 289, 327, 328, 163, 309, 308, - 170, 166, 312, 316, 148, 183, 149, 150, 505, 506, - 507, 508, 184, 223, 205, 317, 188, 73, 222, 318, - 224, 320, 321, 322, 225, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 330, 329, 331, 332, 333, - 335, 336, 337, 338, 339, 340, 345, 346, 347, 348, - 341, 342, 343, 344, 349, 350, 351, 352, 354, 355, - 357, 353, 358, 372, 373, 374, 375, 376, 377, 378, - 379, 381, 382, 383, 380, 384, 386, 388, 389, 390, - 391, 392, 393, 394, 395, 415, 416, 396, 398, 399, - 400, 401, 402, 403, 406, 404, 409, 410, 407, 412, - 418, 413, 439, 414, 417, 419, 420, 421, 422, 423, - 488, 488, 424, 425, 426, 481, 481, 427, 428, 429, - 430, 431, 437, 438, 539, 440, 442, 441, 443, 362, - 444, 445, 446, 447, 361, 448, 449, 583, 450, 493, - 497, 363, 501, 451, 452, 364, 470, 517, 556, 558, - 562, 576, 454, 455, 456, 457, 577, 578, 584, 587, - 586, 598, 590, 467, 589, 468, 596, 597, 620, 599, - 600, 601, 458, 566, 602, 603, 459, 607, 608, 609, - 621, 624, 623, 627, 629, 554, 630, 460, 461, 626, - 631, 653, 462, 658, 659, 666, 672, 463, 661, 667, - 699, 673, 703, 679, 681, 705, 464, 465, 707, 709, - 722, 466, 617, 453, 469, 359, 474, 334, 635, 642, - 492, 618, 356, 645, 644, 633, 632, 411, 634, 646, - 647, 648, 649, 650, 651, 654, 652, 637, 636, 639, - 638, 655, 715, 656, 668, 669, 405, 670, 641, 385, - 640, 675, 676, 408, 677, 680, 663, 704, 665, 662, - 664, 657, 557, 660, 387, 397, 697, 708, 706, 724, - 488, 628, 718, 723, 0, 481, 147, 0, 146, 223, - 0, 205, 0, 0, 222, 163, 224, 0, 0, 166, - 225, 236, 148, 0, 149, 150, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 539, 0, 0, 0, - 0, 0, 0, 0, 0, 169, 0, 0, 183, 0, - 0, 0, 170, 0, 0, 184, 0, 0, 0, 188, + 79, 152, 228, 151, 174, 188, 210, 227, 241, 261, + 168, 175, 189, 229, 171, 230, 193, 420, 421, 153, + 154, 155, 567, 567, 613, 598, 32, 137, 25, 74, + 26, 612, 27, 289, 663, 88, 89, 664, 290, 203, + 558, 559, 560, 561, 562, 563, 239, 240, 92, 93, + 94, 131, 132, 138, 139, 140, 204, 98, 24, 312, + 89, 179, 180, 203, 313, 98, 141, 137, 142, 143, + 144, 145, 146, 147, 316, 173, 36, 148, 149, 317, + 204, 98, 205, 206, 150, 207, 208, 209, 204, 225, + 205, 206, 226, 86, 239, 240, 87, 88, 89, 181, + 78, 90, 91, 182, 183, 184, 185, 186, 204, 187, + 92, 93, 94, 95, 96, 38, 203, 148, 97, 98, + 561, 75, 620, 621, 332, 335, 363, 76, 77, 333, + 336, 364, 89, 179, 180, 40, 99, 100, 380, 78, + 78, 78, 71, 381, 28, 29, 30, 31, 101, 78, + 312, 102, 103, 98, 204, 640, 42, 104, 105, 642, + 44, 106, 46, 78, 643, 78, 607, 608, 609, 610, + 316, 78, 415, 48, 749, 644, 750, 751, 544, 545, + 546, 547, 651, 567, 651, 671, 279, 652, 677, 653, + 672, 78, 681, 678, 710, 380, 332, 682, 540, 541, + 683, 733, 613, 78, 548, 363, 420, 421, 335, 612, + 736, 665, 747, 740, 666, 748, 78, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 763, 782, + 50, 79, 775, 764, 783, 776, 280, 78, 246, 247, + 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 52, 54, 417, 588, 589, 590, 591, + 416, 281, 282, 283, 346, 288, 292, 418, 293, 297, + 298, 419, 152, 299, 151, 300, 309, 174, 326, 78, + 327, 168, 347, 355, 175, 171, 350, 354, 356, 188, + 153, 154, 155, 382, 383, 358, 189, 228, 210, 360, + 193, 359, 227, 365, 368, 370, 371, 374, 229, 375, + 230, 376, 377, 385, 386, 384, 387, 388, 390, 391, + 392, 393, 261, 394, 395, 396, 397, 400, 398, 399, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, + 412, 413, 427, 428, 429, 430, 431, 432, 433, 434, + 436, 437, 435, 438, 439, 441, 443, 444, 445, 446, + 447, 448, 449, 450, 451, 453, 454, 455, 456, 457, + 458, 461, 459, 462, 464, 465, 467, 468, 469, 471, + 470, 472, 474, 475, 480, 473, 481, 483, 484, 492, + 493, 476, 477, 485, 478, 488, 490, 479, 489, 491, + 486, 487, 494, 495, 496, 497, 700, 504, 498, 499, + 500, 501, 502, 506, 507, 508, 509, 511, 510, 512, + 517, 518, 628, 576, 580, 513, 584, 571, 571, 600, + 630, 634, 564, 564, 648, 649, 514, 515, 650, 516, + 656, 611, 519, 261, 417, 520, 521, 655, 658, 416, + 659, 661, 662, 669, 523, 688, 418, 668, 670, 674, + 419, 675, 676, 691, 693, 687, 524, 690, 694, 525, + 696, 697, 698, 715, 720, 721, 728, 522, 536, 723, + 729, 761, 734, 743, 526, 638, 735, 741, 765, 527, + 528, 767, 771, 529, 769, 784, 551, 530, 531, 684, + 389, 552, 411, 543, 557, 575, 702, 414, 532, 709, + 712, 533, 534, 553, 535, 537, 538, 539, 711, 714, + 466, 704, 703, 706, 705, 460, 725, 727, 708, 550, + 604, 440, 777, 707, 685, 463, 724, 719, 726, 722, + 629, 626, 482, 695, 759, 699, 768, 442, 713, 701, + 716, 717, 780, 785, 718, 766, 730, 731, 0, 732, + 737, 738, 0, 452, 739, 742, 0, 770, 0, 786, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 571, 0, + 0, 0, 0, 564, 152, 0, 151, 228, 0, 210, + 0, 0, 227, 168, 0, 0, 0, 171, 229, 241, + 230, 0, 153, 154, 155, 0, 0, 0, 0, 611, + 0, 0, 0, 0, 0, 0, 0, 0, 174, 0, + 0, 188, 0, 0, 0, 175, 0, 0, 189, 0, + 0, 0, 193, 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, 753, 0, 0, 0, 0, 752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 691, 0, 0, 0, 0, - 690, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 691, 0, 0, 0, 0, 690 + 753, 0, 0, 0, 0, 752 }; const short int Dhcp4Parser::yycheck_[] = { - 54, 57, 61, 57, 58, 59, 60, 61, 62, 61, - 57, 58, 59, 61, 57, 12, 59, 57, 428, 57, - 57, 419, 420, 425, 280, 280, 7, 5, 10, 7, - 428, 9, 3, 39, 23, 6, 17, 18, 27, 0, - 23, 7, 7, 49, 18, 19, 20, 69, 70, 30, - 31, 32, 69, 70, 35, 36, 37, 40, 39, 42, - 43, 7, 45, 46, 47, 39, 40, 48, 7, 50, - 51, 52, 53, 54, 55, 3, 11, 106, 59, 60, - 8, 16, 17, 18, 58, 66, 21, 22, 40, 106, - 79, 80, 81, 82, 59, 30, 31, 32, 33, 34, - 106, 7, 3, 38, 39, 6, 88, 40, 41, 42, - 43, 44, 94, 95, 18, 19, 20, 106, 12, 13, - 7, 56, 57, 106, 106, 106, 14, 15, 106, 107, - 108, 109, 106, 68, 3, 39, 71, 3, 90, 8, - 92, 93, 8, 78, 3, 3, 3, 6, 83, 84, - 8, 8, 87, 57, 106, 85, 86, 61, 62, 63, - 64, 65, 7, 67, 72, 73, 74, 75, 76, 77, - 3, 106, 3, 106, 3, 8, 6, 8, 3, 8, - 7, 579, 438, 438, 23, 24, 25, 26, 27, 28, - 29, 593, 3, 3, 3, 6, 4, 251, 8, 8, - 610, 40, 106, 3, 3, 3, 3, 8, 8, 8, - 8, 8, 610, 3, 3, 3, 7, 3, 8, 8, - 8, 280, 8, 3, 3, 7, 280, 3, 8, 8, - 4, 4, 4, 280, 4, 4, 4, 280, 294, 4, - 294, 4, 4, 297, 4, 242, 243, 294, 3, 8, - 297, 294, 4, 4, 294, 309, 294, 294, 61, 62, - 63, 64, 309, 322, 318, 8, 309, 106, 322, 3, - 322, 4, 8, 3, 322, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 4, 106, 4, 4, 4, - 4, 109, 109, 4, 4, 4, 4, 4, 4, 4, - 107, 107, 107, 107, 4, 4, 4, 4, 4, 4, - 4, 107, 4, 4, 4, 4, 4, 4, 4, 4, - 107, 4, 4, 4, 109, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 332, 333, 4, 4, 4, - 107, 4, 4, 4, 4, 109, 4, 4, 109, 4, - 106, 7, 106, 7, 7, 7, 7, 5, 5, 5, - 419, 420, 5, 5, 5, 419, 420, 7, 7, 7, - 7, 5, 8, 3, 428, 106, 5, 106, 106, 438, - 106, 106, 106, 106, 438, 5, 7, 6, 106, 7, - 7, 438, 7, 106, 106, 438, 89, 7, 4, 7, - 7, 4, 106, 106, 106, 106, 4, 4, 3, 3, - 6, 4, 3, 410, 6, 412, 6, 3, 6, 4, - 4, 4, 106, 67, 4, 4, 106, 4, 4, 4, - 3, 3, 6, 4, 4, 430, 4, 106, 106, 8, - 4, 4, 106, 4, 4, 4, 8, 106, 6, 5, - 4, 8, 4, 8, 7, 4, 106, 106, 5, 7, - 4, 106, 555, 390, 413, 278, 417, 251, 579, 591, - 420, 106, 274, 597, 595, 107, 109, 325, 109, 107, - 107, 107, 107, 107, 107, 107, 604, 584, 582, 587, - 585, 107, 91, 107, 106, 106, 318, 106, 590, 294, - 588, 106, 106, 322, 106, 106, 621, 107, 624, 619, - 622, 610, 438, 614, 297, 309, 685, 106, 701, 106, - 579, 570, 713, 720, -1, 579, 582, -1, 582, 588, - -1, 585, -1, -1, 588, 582, 588, -1, -1, 582, - 588, 595, 582, -1, 582, 582, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 610, -1, -1, -1, - -1, -1, -1, -1, -1, 619, -1, -1, 622, -1, - -1, -1, 619, -1, -1, 622, -1, -1, -1, 622, + 58, 61, 65, 61, 62, 63, 64, 65, 66, 67, + 61, 62, 63, 65, 61, 65, 63, 318, 318, 61, + 61, 61, 490, 491, 499, 496, 13, 7, 5, 10, + 7, 499, 9, 3, 3, 15, 16, 6, 8, 21, + 22, 23, 24, 25, 26, 27, 67, 68, 28, 29, + 30, 12, 13, 33, 34, 35, 38, 37, 0, 3, + 16, 17, 18, 21, 8, 37, 46, 7, 48, 49, + 50, 51, 52, 53, 3, 47, 7, 57, 58, 8, + 38, 37, 40, 41, 64, 43, 44, 45, 38, 39, + 40, 41, 42, 11, 67, 68, 14, 15, 16, 55, + 121, 19, 20, 59, 60, 61, 62, 63, 38, 65, + 28, 29, 30, 31, 32, 7, 21, 57, 36, 37, + 25, 102, 77, 78, 3, 3, 3, 108, 109, 8, + 8, 8, 16, 17, 18, 7, 54, 55, 3, 121, + 121, 121, 121, 8, 121, 122, 123, 124, 66, 121, + 3, 69, 70, 37, 38, 8, 7, 75, 76, 3, + 7, 79, 7, 121, 8, 121, 71, 72, 73, 74, + 3, 121, 56, 7, 104, 8, 106, 107, 98, 99, + 100, 101, 3, 651, 3, 3, 6, 8, 3, 8, + 8, 121, 3, 8, 665, 3, 3, 8, 95, 96, + 8, 8, 677, 121, 124, 3, 507, 507, 3, 677, + 8, 3, 3, 8, 6, 6, 121, 110, 111, 112, + 113, 114, 115, 116, 117, 118, 119, 120, 3, 3, + 7, 289, 3, 8, 8, 6, 3, 121, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 7, 7, 318, 59, 60, 61, 62, + 318, 4, 8, 3, 8, 4, 4, 318, 4, 4, + 4, 318, 332, 4, 332, 4, 4, 335, 4, 121, + 4, 332, 3, 8, 335, 332, 4, 4, 3, 347, + 332, 332, 332, 280, 281, 4, 347, 360, 356, 3, + 347, 8, 360, 4, 4, 4, 4, 4, 360, 4, + 360, 4, 4, 4, 4, 121, 4, 4, 4, 124, + 124, 4, 380, 4, 4, 122, 122, 4, 122, 122, + 4, 4, 4, 4, 4, 4, 4, 122, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 122, + 4, 4, 124, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 122, 4, 4, + 4, 4, 124, 124, 4, 4, 124, 4, 4, 4, + 122, 122, 4, 4, 4, 122, 4, 4, 7, 5, + 5, 124, 124, 7, 124, 7, 7, 124, 121, 7, + 387, 388, 5, 5, 5, 5, 122, 121, 7, 7, + 7, 7, 5, 8, 3, 121, 121, 5, 121, 121, + 5, 7, 4, 7, 7, 121, 7, 490, 491, 7, + 7, 7, 490, 491, 4, 4, 121, 121, 4, 121, + 3, 499, 121, 501, 507, 121, 121, 6, 6, 507, + 3, 6, 3, 3, 121, 3, 507, 6, 4, 4, + 507, 4, 4, 3, 8, 6, 121, 6, 4, 121, + 4, 4, 4, 4, 4, 4, 4, 445, 465, 6, + 5, 4, 8, 7, 121, 65, 8, 8, 4, 121, + 121, 4, 7, 121, 5, 4, 483, 121, 121, 627, + 289, 484, 312, 97, 488, 491, 651, 316, 121, 663, + 669, 121, 121, 103, 121, 121, 121, 121, 667, 671, + 363, 656, 654, 659, 657, 356, 688, 691, 662, 121, + 121, 332, 105, 660, 121, 360, 686, 677, 689, 681, + 507, 501, 380, 642, 747, 124, 763, 335, 122, 124, + 122, 122, 775, 782, 122, 122, 121, 121, -1, 121, + 121, 121, -1, 347, 121, 121, -1, 121, -1, 121, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 651, -1, + -1, -1, -1, 651, 654, -1, 654, 660, -1, 657, + -1, -1, 660, 654, -1, -1, -1, 654, 660, 667, + 660, -1, 654, 654, 654, -1, -1, -1, -1, 677, + -1, -1, -1, -1, -1, -1, -1, -1, 686, -1, + -1, 689, -1, -1, -1, 686, -1, -1, 689, -1, + -1, -1, 689, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 746, -1, -1, -1, -1, 746, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 684, -1, -1, -1, -1, - 684, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 701, -1, -1, -1, -1, 701 + 763, -1, -1, -1, -1, 763 }; const unsigned short int Dhcp4Parser::yystos_[] = { - 0, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 0, 5, 7, 9, 106, 107, 108, 109, - 122, 123, 124, 128, 7, 135, 7, 141, 7, 155, - 7, 219, 7, 287, 7, 299, 7, 247, 7, 270, - 7, 195, 129, 125, 136, 142, 156, 220, 288, 300, - 248, 271, 196, 122, 132, 133, 106, 126, 127, 10, - 88, 94, 95, 106, 134, 137, 138, 139, 358, 360, - 362, 11, 16, 17, 18, 21, 22, 30, 31, 32, - 33, 34, 38, 39, 56, 57, 68, 71, 78, 83, - 84, 87, 134, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 162, 164, 182, 189, 203, 213, 241, 264, - 304, 328, 338, 347, 348, 356, 12, 13, 153, 154, - 157, 159, 7, 35, 36, 37, 48, 50, 51, 52, - 53, 54, 55, 59, 60, 66, 134, 145, 146, 147, - 150, 221, 222, 223, 225, 227, 229, 231, 233, 235, - 237, 239, 240, 264, 281, 293, 304, 324, 49, 134, - 264, 289, 290, 291, 19, 20, 57, 61, 62, 63, - 64, 65, 67, 134, 264, 301, 302, 303, 304, 306, - 308, 310, 312, 314, 316, 318, 320, 322, 23, 40, - 42, 43, 45, 46, 47, 134, 168, 176, 249, 250, - 251, 252, 253, 254, 255, 256, 258, 260, 261, 263, - 41, 44, 134, 176, 253, 258, 272, 273, 274, 275, - 276, 278, 279, 280, 69, 70, 134, 197, 198, 199, - 201, 6, 3, 4, 8, 3, 140, 363, 359, 361, - 4, 3, 8, 152, 4, 4, 305, 163, 165, 4, - 4, 4, 4, 214, 242, 265, 183, 329, 190, 204, - 339, 4, 349, 357, 3, 8, 158, 160, 3, 8, - 331, 226, 228, 230, 282, 224, 232, 234, 4, 4, - 238, 236, 294, 325, 3, 8, 292, 3, 8, 307, - 309, 323, 313, 315, 319, 317, 321, 311, 8, 3, - 169, 177, 4, 259, 257, 262, 4, 8, 3, 277, - 4, 8, 3, 200, 202, 3, 8, 122, 122, 106, - 4, 4, 4, 4, 138, 4, 109, 109, 4, 4, - 4, 107, 107, 107, 107, 4, 4, 4, 4, 4, - 4, 4, 4, 107, 4, 4, 144, 4, 4, 154, - 58, 134, 176, 264, 304, 306, 308, 332, 333, 334, - 335, 336, 4, 4, 4, 4, 4, 4, 4, 107, - 109, 4, 4, 4, 4, 222, 4, 290, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 303, 4, 4, - 107, 4, 4, 4, 109, 251, 4, 109, 274, 4, - 4, 198, 4, 7, 7, 122, 122, 7, 106, 7, - 7, 5, 5, 5, 5, 5, 5, 7, 7, 7, - 7, 5, 130, 14, 15, 161, 337, 8, 3, 106, - 106, 106, 5, 106, 106, 106, 106, 106, 5, 7, - 106, 106, 106, 130, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 122, 122, 143, - 89, 364, 365, 366, 153, 24, 25, 26, 27, 28, - 29, 134, 166, 167, 168, 170, 172, 174, 176, 178, - 179, 180, 166, 7, 215, 216, 217, 7, 243, 244, - 245, 7, 266, 267, 268, 61, 62, 63, 64, 181, - 184, 185, 186, 187, 188, 235, 330, 7, 191, 192, - 193, 72, 73, 74, 75, 76, 77, 205, 206, 207, - 208, 209, 210, 211, 212, 79, 80, 81, 82, 134, - 168, 178, 340, 341, 342, 343, 345, 346, 85, 86, - 350, 351, 352, 354, 127, 131, 4, 334, 7, 283, - 284, 285, 7, 295, 296, 297, 67, 326, 8, 367, - 3, 8, 8, 171, 173, 175, 4, 4, 4, 3, - 8, 8, 218, 6, 3, 246, 6, 3, 269, 6, - 3, 3, 6, 3, 6, 194, 6, 3, 4, 4, - 4, 4, 4, 4, 3, 8, 344, 4, 4, 4, - 3, 8, 353, 355, 3, 8, 8, 132, 106, 286, - 6, 3, 298, 6, 3, 327, 8, 4, 365, 4, - 4, 4, 109, 107, 109, 167, 221, 217, 249, 245, - 272, 268, 185, 235, 197, 193, 107, 107, 107, 107, - 107, 107, 206, 4, 107, 107, 107, 341, 4, 4, - 351, 6, 289, 285, 301, 297, 4, 5, 106, 106, - 106, 8, 8, 8, 8, 106, 106, 106, 8, 8, - 106, 7, 368, 369, 370, 3, 6, 90, 92, 93, - 134, 176, 371, 372, 373, 374, 376, 369, 377, 4, - 375, 3, 8, 4, 107, 4, 372, 5, 106, 7, - 378, 379, 380, 3, 6, 91, 381, 382, 379, 383, - 3, 8, 4, 382, 106 + 0, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 0, 5, 7, 9, 121, 122, + 123, 124, 138, 139, 140, 144, 7, 151, 7, 157, + 7, 171, 7, 228, 7, 296, 7, 308, 7, 256, + 7, 279, 7, 210, 7, 367, 145, 141, 152, 158, + 172, 229, 297, 309, 257, 280, 211, 368, 138, 148, + 149, 121, 142, 143, 10, 102, 108, 109, 121, 150, + 153, 154, 155, 395, 397, 399, 11, 14, 15, 16, + 19, 20, 28, 29, 30, 31, 32, 36, 37, 54, + 55, 66, 69, 70, 75, 76, 79, 150, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 177, 179, 197, + 204, 218, 222, 250, 273, 313, 337, 347, 356, 357, + 365, 12, 13, 169, 170, 173, 175, 7, 33, 34, + 35, 46, 48, 49, 50, 51, 52, 53, 57, 58, + 64, 150, 161, 162, 163, 166, 230, 231, 232, 234, + 236, 238, 240, 242, 244, 246, 248, 249, 273, 290, + 302, 313, 333, 47, 150, 273, 298, 299, 300, 17, + 18, 55, 59, 60, 61, 62, 63, 65, 150, 273, + 310, 311, 312, 313, 315, 317, 319, 321, 323, 325, + 327, 329, 331, 21, 38, 40, 41, 43, 44, 45, + 150, 183, 191, 258, 259, 260, 261, 262, 263, 264, + 265, 267, 269, 270, 272, 39, 42, 150, 191, 262, + 267, 281, 282, 283, 284, 285, 287, 288, 289, 67, + 68, 150, 212, 213, 214, 216, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 150, 369, 370, 371, 372, 374, 376, 377, 379, + 380, 381, 384, 386, 387, 388, 389, 390, 393, 6, + 3, 4, 8, 3, 156, 400, 396, 398, 4, 3, + 8, 168, 4, 4, 314, 178, 180, 4, 4, 4, + 4, 223, 251, 274, 198, 338, 205, 219, 348, 4, + 358, 366, 3, 8, 174, 176, 3, 8, 340, 235, + 237, 239, 291, 233, 241, 243, 4, 4, 247, 245, + 303, 334, 3, 8, 301, 3, 8, 316, 318, 332, + 322, 324, 328, 326, 330, 320, 8, 3, 184, 192, + 4, 268, 266, 271, 4, 8, 3, 286, 4, 8, + 3, 215, 217, 3, 8, 4, 373, 375, 4, 378, + 4, 4, 382, 385, 4, 4, 4, 4, 391, 394, + 3, 8, 138, 138, 121, 4, 4, 4, 4, 154, + 4, 124, 124, 4, 4, 4, 122, 122, 122, 122, + 4, 4, 4, 4, 4, 4, 4, 4, 122, 4, + 4, 160, 4, 4, 170, 56, 150, 191, 273, 313, + 315, 317, 341, 342, 343, 344, 345, 4, 4, 4, + 4, 4, 4, 4, 122, 124, 4, 4, 4, 4, + 231, 4, 299, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 312, 4, 4, 122, 4, 4, 4, 124, + 260, 4, 124, 283, 4, 4, 213, 124, 4, 4, + 122, 4, 122, 122, 4, 4, 124, 124, 124, 124, + 4, 4, 370, 4, 7, 7, 138, 138, 7, 121, + 7, 7, 5, 5, 5, 5, 5, 5, 7, 7, + 7, 7, 5, 146, 121, 346, 8, 3, 121, 121, + 121, 5, 121, 121, 121, 121, 121, 5, 7, 121, + 121, 121, 146, 121, 121, 121, 121, 121, 121, 121, + 121, 121, 121, 121, 121, 121, 138, 121, 121, 121, + 95, 96, 383, 97, 98, 99, 100, 101, 124, 392, + 121, 138, 159, 103, 401, 402, 403, 169, 22, 23, + 24, 25, 26, 27, 150, 181, 182, 183, 185, 187, + 189, 191, 193, 194, 195, 181, 7, 224, 225, 226, + 7, 252, 253, 254, 7, 275, 276, 277, 59, 60, + 61, 62, 196, 199, 200, 201, 202, 203, 244, 339, + 7, 206, 207, 208, 121, 220, 221, 71, 72, 73, + 74, 150, 183, 193, 349, 350, 351, 352, 354, 355, + 77, 78, 359, 360, 361, 363, 369, 147, 4, 343, + 7, 292, 293, 294, 7, 304, 305, 306, 65, 335, + 8, 404, 3, 8, 8, 186, 188, 190, 4, 4, + 4, 3, 8, 8, 227, 6, 3, 255, 6, 3, + 278, 6, 3, 3, 6, 3, 6, 209, 6, 3, + 4, 3, 8, 353, 4, 4, 4, 3, 8, 362, + 364, 3, 8, 8, 148, 121, 295, 6, 3, 307, + 6, 3, 336, 8, 4, 402, 4, 4, 4, 124, + 122, 124, 182, 230, 226, 258, 254, 281, 277, 200, + 244, 212, 208, 122, 221, 4, 122, 122, 122, 350, + 4, 4, 360, 6, 298, 294, 310, 306, 4, 5, + 121, 121, 121, 8, 8, 8, 8, 121, 121, 121, + 8, 8, 121, 7, 405, 406, 407, 3, 6, 104, + 106, 107, 150, 191, 408, 409, 410, 411, 413, 406, + 414, 4, 412, 3, 8, 4, 122, 4, 409, 5, + 121, 7, 415, 416, 417, 3, 6, 105, 418, 419, + 416, 420, 3, 8, 4, 419, 121 }; const unsigned short int Dhcp4Parser::yyr1_[] = { - 0, 110, 112, 111, 113, 111, 114, 111, 115, 111, - 116, 111, 117, 111, 118, 111, 119, 111, 120, 111, - 121, 111, 122, 122, 122, 122, 122, 122, 122, 123, - 125, 124, 126, 126, 127, 127, 129, 128, 131, 130, - 132, 132, 133, 133, 134, 136, 135, 137, 137, 138, - 138, 138, 138, 138, 140, 139, 142, 141, 143, 143, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, - 144, 144, 145, 146, 147, 148, 149, 150, 152, 151, - 153, 153, 154, 154, 156, 155, 158, 157, 160, 159, - 161, 161, 163, 162, 165, 164, 166, 166, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 169, 168, 171, - 170, 173, 172, 175, 174, 177, 176, 178, 179, 180, - 181, 183, 182, 184, 184, 185, 185, 185, 185, 186, - 187, 188, 190, 189, 191, 191, 192, 192, 194, 193, - 196, 195, 197, 197, 197, 198, 198, 200, 199, 202, - 201, 204, 203, 205, 205, 206, 206, 206, 206, 206, - 206, 207, 208, 209, 210, 211, 212, 214, 213, 215, - 215, 216, 216, 218, 217, 220, 219, 221, 221, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 222, 222, 222, 222, 222, 222, 222, 224, - 223, 226, 225, 228, 227, 230, 229, 232, 231, 234, - 233, 236, 235, 238, 237, 239, 240, 242, 241, 243, - 243, 244, 244, 246, 245, 248, 247, 249, 249, 250, - 250, 251, 251, 251, 251, 251, 251, 251, 251, 252, - 253, 254, 255, 257, 256, 259, 258, 260, 262, 261, - 263, 265, 264, 266, 266, 267, 267, 269, 268, 271, - 270, 272, 272, 273, 273, 274, 274, 274, 274, 274, - 274, 275, 277, 276, 278, 279, 280, 282, 281, 283, - 283, 284, 284, 286, 285, 288, 287, 289, 289, 290, - 290, 290, 292, 291, 294, 293, 295, 295, 296, 296, - 298, 297, 300, 299, 301, 301, 302, 302, 303, 303, - 303, 303, 303, 303, 303, 303, 303, 303, 303, 303, - 305, 304, 307, 306, 309, 308, 311, 310, 313, 312, - 315, 314, 317, 316, 319, 318, 321, 320, 323, 322, - 325, 324, 327, 326, 329, 328, 330, 330, 331, 235, - 332, 332, 333, 333, 334, 334, 334, 334, 334, 334, - 334, 335, 337, 336, 339, 338, 340, 340, 341, 341, - 341, 341, 341, 341, 341, 342, 344, 343, 345, 346, - 347, 349, 348, 350, 350, 351, 351, 353, 352, 355, - 354, 357, 356, 359, 358, 361, 360, 363, 362, 364, - 364, 365, 367, 366, 368, 368, 370, 369, 371, 371, - 372, 372, 372, 372, 372, 373, 375, 374, 377, 376, - 378, 378, 380, 379, 381, 381, 383, 382 + 0, 125, 127, 126, 128, 126, 129, 126, 130, 126, + 131, 126, 132, 126, 133, 126, 134, 126, 135, 126, + 136, 126, 137, 126, 138, 138, 138, 138, 138, 138, + 138, 139, 141, 140, 142, 142, 143, 143, 145, 144, + 147, 146, 148, 148, 149, 149, 150, 152, 151, 153, + 153, 154, 154, 154, 154, 154, 156, 155, 158, 157, + 159, 159, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 160, 160, 160, 161, 162, 163, 164, 165, 166, + 168, 167, 169, 169, 170, 170, 172, 171, 174, 173, + 176, 175, 178, 177, 180, 179, 181, 181, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 184, 183, 186, + 185, 188, 187, 190, 189, 192, 191, 193, 194, 195, + 196, 198, 197, 199, 199, 200, 200, 200, 200, 201, + 202, 203, 205, 204, 206, 206, 207, 207, 209, 208, + 211, 210, 212, 212, 212, 213, 213, 215, 214, 217, + 216, 219, 218, 220, 220, 221, 223, 222, 224, 224, + 225, 225, 227, 226, 229, 228, 230, 230, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, + 231, 231, 231, 231, 231, 231, 231, 231, 233, 232, + 235, 234, 237, 236, 239, 238, 241, 240, 243, 242, + 245, 244, 247, 246, 248, 249, 251, 250, 252, 252, + 253, 253, 255, 254, 257, 256, 258, 258, 259, 259, + 260, 260, 260, 260, 260, 260, 260, 260, 261, 262, + 263, 264, 266, 265, 268, 267, 269, 271, 270, 272, + 274, 273, 275, 275, 276, 276, 278, 277, 280, 279, + 281, 281, 282, 282, 283, 283, 283, 283, 283, 283, + 284, 286, 285, 287, 288, 289, 291, 290, 292, 292, + 293, 293, 295, 294, 297, 296, 298, 298, 299, 299, + 299, 301, 300, 303, 302, 304, 304, 305, 305, 307, + 306, 309, 308, 310, 310, 311, 311, 312, 312, 312, + 312, 312, 312, 312, 312, 312, 312, 312, 312, 314, + 313, 316, 315, 318, 317, 320, 319, 322, 321, 324, + 323, 326, 325, 328, 327, 330, 329, 332, 331, 334, + 333, 336, 335, 338, 337, 339, 339, 340, 244, 341, + 341, 342, 342, 343, 343, 343, 343, 343, 343, 343, + 344, 346, 345, 348, 347, 349, 349, 350, 350, 350, + 350, 350, 350, 350, 351, 353, 352, 354, 355, 356, + 358, 357, 359, 359, 360, 360, 362, 361, 364, 363, + 366, 365, 368, 367, 369, 369, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 371, 373, 372, 375, 374, 376, 378, 377, + 379, 380, 382, 381, 383, 383, 385, 384, 386, 387, + 388, 389, 391, 390, 392, 392, 392, 392, 392, 394, + 393, 396, 395, 398, 397, 400, 399, 401, 401, 402, + 404, 403, 405, 405, 407, 406, 408, 408, 409, 409, + 409, 409, 409, 410, 412, 411, 414, 413, 415, 415, + 417, 416, 418, 418, 420, 419 }; const unsigned char @@ -3349,48 +3614,52 @@ namespace isc { namespace dhcp { { 0, 2, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, - 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 0, 1, 3, 5, 0, 4, 0, 4, - 0, 1, 1, 3, 2, 0, 4, 1, 3, 1, - 1, 1, 1, 1, 0, 6, 0, 4, 1, 3, + 0, 3, 0, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 4, 0, 1, 3, 5, 0, 4, + 0, 4, 0, 1, 1, 3, 2, 0, 4, 1, + 3, 1, 1, 1, 1, 1, 0, 6, 0, 4, + 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 3, 3, 3, 3, 3, 0, 6, - 1, 3, 1, 1, 0, 4, 0, 4, 0, 4, - 1, 1, 0, 6, 0, 6, 1, 3, 1, 1, + 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, + 0, 6, 1, 3, 1, 1, 0, 4, 0, 4, + 0, 4, 0, 6, 0, 6, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 3, 3, 3, 1, 0, 6, 1, 3, 1, 1, 1, 1, 1, 1, 1, 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, 1, 0, 4, 0, - 4, 0, 6, 1, 3, 1, 1, 1, 1, 1, - 1, 3, 3, 3, 3, 3, 3, 0, 6, 0, - 1, 1, 3, 0, 4, 0, 4, 1, 3, 1, + 4, 0, 6, 1, 3, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, + 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, + 0, 4, 0, 4, 3, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 1, 1, 0, 4, 0, 4, 1, 0, 4, 3, + 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, + 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 1, 1, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, + 1, 0, 4, 0, 6, 0, 1, 1, 3, 0, + 4, 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, - 4, 0, 4, 0, 4, 3, 3, 0, 6, 0, - 1, 1, 3, 0, 4, 0, 4, 0, 1, 1, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 1, 1, 0, 4, 0, 4, 1, 0, 4, - 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, - 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, - 1, 1, 0, 4, 1, 1, 3, 0, 6, 0, - 1, 1, 3, 0, 4, 0, 4, 1, 3, 1, - 1, 1, 0, 4, 0, 6, 0, 1, 1, 3, - 0, 4, 0, 4, 0, 1, 1, 3, 1, 1, + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 6, 0, 4, 0, 6, 1, 3, 0, 4, 0, + 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 0, 4, 0, 6, 1, 3, 1, 1, 1, + 1, 1, 1, 1, 3, 0, 4, 3, 3, 3, + 0, 6, 1, 3, 1, 1, 0, 4, 0, 4, + 0, 6, 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 0, 6, 0, 4, 0, 6, 1, 3, 0, 4, - 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 4, 0, 6, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 3, 0, 4, 3, 3, - 3, 0, 6, 1, 3, 1, 1, 0, 4, 0, - 4, 0, 6, 0, 4, 0, 4, 0, 6, 1, - 3, 1, 0, 6, 1, 3, 0, 4, 1, 3, - 1, 1, 1, 1, 1, 3, 0, 4, 0, 6, - 1, 3, 0, 4, 1, 3, 0, 4 + 1, 1, 3, 0, 4, 0, 4, 3, 0, 4, + 3, 3, 0, 4, 1, 1, 0, 4, 3, 3, + 3, 3, 0, 4, 1, 1, 1, 1, 1, 0, + 4, 0, 4, 0, 4, 0, 6, 1, 3, 1, + 0, 6, 1, 3, 0, 4, 1, 3, 1, 1, + 1, 1, 1, 3, 0, 4, 0, 6, 1, 3, + 0, 4, 1, 3, 0, 4 }; @@ -3403,148 +3672,160 @@ namespace isc { namespace dhcp { "\"end of file\"", "error", "$undefined", "\",\"", "\":\"", "\"[\"", "\"]\"", "\"{\"", "\"}\"", "\"null\"", "\"Dhcp4\"", "\"interfaces-config\"", "\"interfaces\"", "\"dhcp-socket-type\"", - "\"raw\"", "\"udp\"", "\"echo-client-id\"", "\"match-client-id\"", - "\"next-server\"", "\"server-hostname\"", "\"boot-file-name\"", - "\"lease-database\"", "\"hosts-database\"", "\"type\"", "\"user\"", - "\"password\"", "\"host\"", "\"persist\"", "\"lfc-interval\"", - "\"readonly\"", "\"valid-lifetime\"", "\"renew-timer\"", - "\"rebind-timer\"", "\"decline-probation-period\"", "\"subnet4\"", - "\"4o6-interface\"", "\"4o6-interface-id\"", "\"4o6-subnet\"", - "\"option-def\"", "\"option-data\"", "\"name\"", "\"data\"", "\"code\"", - "\"space\"", "\"csv-format\"", "\"record-types\"", "\"encapsulate\"", - "\"array\"", "\"pools\"", "\"pool\"", "\"subnet\"", "\"interface\"", - "\"interface-id\"", "\"id\"", "\"rapid-commit\"", "\"reservation-mode\"", + "\"echo-client-id\"", "\"match-client-id\"", "\"next-server\"", + "\"server-hostname\"", "\"boot-file-name\"", "\"lease-database\"", + "\"hosts-database\"", "\"type\"", "\"user\"", "\"password\"", "\"host\"", + "\"persist\"", "\"lfc-interval\"", "\"readonly\"", "\"valid-lifetime\"", + "\"renew-timer\"", "\"rebind-timer\"", "\"decline-probation-period\"", + "\"subnet4\"", "\"4o6-interface\"", "\"4o6-interface-id\"", + "\"4o6-subnet\"", "\"option-def\"", "\"option-data\"", "\"name\"", + "\"data\"", "\"code\"", "\"space\"", "\"csv-format\"", + "\"record-types\"", "\"encapsulate\"", "\"array\"", "\"pools\"", + "\"pool\"", "\"subnet\"", "\"interface\"", "\"interface-id\"", "\"id\"", + "\"rapid-commit\"", "\"reservation-mode\"", "\"host-reservation-identifiers\"", "\"client-classes\"", "\"test\"", "\"client-class\"", "\"reservations\"", "\"duid\"", "\"hw-address\"", "\"circuit-id\"", "\"client-id\"", "\"hostname\"", "\"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\"", "\"identifier\"", + "\"expired-leases-processing\"", "\"server-id\"", "\"identifier\"", "\"htype\"", "\"time\"", "\"enterprise-id\"", "\"dhcp4o6-port\"", "\"control-socket\"", "\"socket-type\"", "\"socket-name\"", - "\"dhcp-ddns\"", "\"Logging\"", "\"loggers\"", "\"output_options\"", - "\"output\"", "\"debuglevel\"", "\"severity\"", "\"Dhcp6\"", - "\"DhcpDdns\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCP4", "SUB_DHCP4", - "SUB_INTERFACES4", "SUB_SUBNET4", "SUB_POOL4", "SUB_RESERVATION", - "SUB_OPTION_DEF", "SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY", - "\"constant string\"", "\"integer\"", "\"floating point\"", - "\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "$@4", "$@5", - "$@6", "$@7", "$@8", "$@9", "$@10", "value", "sub_json", "map2", "$@11", - "map_content", "not_empty_map", "list_generic", "$@12", "list2", "$@13", - "list_content", "not_empty_list", "unknown_map_entry", "syntax_map", - "$@14", "global_objects", "global_object", "dhcp4_object", "$@15", - "sub_dhcp4", "$@16", "global_params", "global_param", "valid_lifetime", - "renew_timer", "rebind_timer", "decline_probation_period", - "echo_client_id", "match_client_id", "interfaces_config", "$@17", + "\"dhcp-ddns\"", "\"enable-updates\"", "\"qualifying-suffix\"", + "\"server-ip\"", "\"server-port\"", "\"sender-ip\"", "\"sender-port\"", + "\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"", + "\"always-include-fqdn\"", "\"allow-client-update\"", + "\"override-no-update\"", "\"override-client-update\"", + "\"replace-client-name\"", "\"generated-prefix\"", "\"UDP\"", "\"TCP\"", + "\"JSON\"", "\"when-present\"", "\"never\"", "\"always\"", + "\"when-not-present\"", "\"Logging\"", "\"loggers\"", + "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", + "\"Dhcp6\"", "\"DhcpDdns\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCP4", + "SUB_DHCP4", "SUB_INTERFACES4", "SUB_SUBNET4", "SUB_POOL4", + "SUB_RESERVATION", "SUB_OPTION_DEF", "SUB_OPTION_DATA", + "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS", "\"constant string\"", + "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", + "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", + "$@11", "value", "sub_json", "map2", "$@12", "map_content", + "not_empty_map", "list_generic", "$@13", "list2", "$@14", "list_content", + "not_empty_list", "unknown_map_entry", "syntax_map", "$@15", + "global_objects", "global_object", "dhcp4_object", "$@16", "sub_dhcp4", + "$@17", "global_params", "global_param", "valid_lifetime", "renew_timer", + "rebind_timer", "decline_probation_period", "echo_client_id", + "match_client_id", "interfaces_config", "$@18", "interfaces_config_params", "interfaces_config_param", "sub_interfaces4", - "$@18", "interfaces_list", "$@19", "dhcp_socket_type", "$@20", - "socket_type", "lease_database", "$@21", "hosts_database", "$@22", - "database_map_params", "database_map_param", "type", "$@23", "user", - "$@24", "password", "$@25", "host", "$@26", "name", "$@27", "persist", + "$@19", "interfaces_list", "$@20", "dhcp_socket_type", "$@21", + "lease_database", "$@22", "hosts_database", "$@23", + "database_map_params", "database_map_param", "type", "$@24", "user", + "$@25", "password", "$@26", "host", "$@27", "name", "$@28", "persist", "lfc_interval", "readonly", "duid_id", "host_reservation_identifiers", - "$@28", "host_reservation_identifiers_list", + "$@29", "host_reservation_identifiers_list", "host_reservation_identifier", "hw_address_id", "circuit_id", - "client_id", "hooks_libraries", "$@29", "hooks_libraries_list", - "not_empty_hooks_libraries_list", "hooks_library", "$@30", - "sub_hooks_library", "$@31", "hooks_params", "hooks_param", "library", - "$@32", "parameters", "$@33", "expired_leases_processing", "$@34", - "expired_leases_params", "expired_leases_param", - "reclaim_timer_wait_time", "flush_reclaimed_timer_wait_time", - "hold_reclaimed_time", "max_reclaim_leases", "max_reclaim_time", - "unwarned_reclaim_cycles", "subnet4_list", "$@35", - "subnet4_list_content", "not_empty_subnet4_list", "subnet4", "$@36", - "sub_subnet4", "$@37", "subnet4_params", "subnet4_param", "subnet", - "$@38", "subnet_4o6_interface", "$@39", "subnet_4o6_interface_id", - "$@40", "subnet_4o6_subnet", "$@41", "interface", "$@42", "interface_id", - "$@43", "client_class", "$@44", "reservation_mode", "$@45", "id", - "rapid_commit", "option_def_list", "$@46", "option_def_list_content", - "not_empty_option_def_list", "option_def_entry", "$@47", - "sub_option_def", "$@48", "option_def_params", + "client_id", "hooks_libraries", "$@30", "hooks_libraries_list", + "not_empty_hooks_libraries_list", "hooks_library", "$@31", + "sub_hooks_library", "$@32", "hooks_params", "hooks_param", "library", + "$@33", "parameters", "$@34", "expired_leases_processing", "$@35", + "expired_leases_params", "expired_leases_param", "subnet4_list", "$@36", + "subnet4_list_content", "not_empty_subnet4_list", "subnet4", "$@37", + "sub_subnet4", "$@38", "subnet4_params", "subnet4_param", "subnet", + "$@39", "subnet_4o6_interface", "$@40", "subnet_4o6_interface_id", + "$@41", "subnet_4o6_subnet", "$@42", "interface", "$@43", "interface_id", + "$@44", "client_class", "$@45", "reservation_mode", "$@46", "id", + "rapid_commit", "option_def_list", "$@47", "option_def_list_content", + "not_empty_option_def_list", "option_def_entry", "$@48", + "sub_option_def", "$@49", "option_def_params", "not_empty_option_def_params", "option_def_param", "option_def_name", "code", "option_def_code", "option_def_type", "option_def_record_types", - "$@49", "space", "$@50", "option_def_space", "option_def_encapsulate", - "$@51", "option_def_array", "option_data_list", "$@52", + "$@50", "space", "$@51", "option_def_space", "option_def_encapsulate", + "$@52", "option_def_array", "option_data_list", "$@53", "option_data_list_content", "not_empty_option_data_list", - "option_data_entry", "$@53", "sub_option_data", "$@54", + "option_data_entry", "$@54", "sub_option_data", "$@55", "option_data_params", "not_empty_option_data_params", - "option_data_param", "option_data_name", "option_data_data", "$@55", + "option_data_param", "option_data_name", "option_data_data", "$@56", "option_data_code", "option_data_space", "option_data_csv_format", - "pools_list", "$@56", "pools_list_content", "not_empty_pools_list", - "pool_list_entry", "$@57", "sub_pool4", "$@58", "pool_params", - "pool_param", "pool_entry", "$@59", "reservations", "$@60", + "pools_list", "$@57", "pools_list_content", "not_empty_pools_list", + "pool_list_entry", "$@58", "sub_pool4", "$@59", "pool_params", + "pool_param", "pool_entry", "$@60", "reservations", "$@61", "reservations_list", "not_empty_reservations_list", "reservation", - "$@61", "sub_reservation", "$@62", "reservation_params", + "$@62", "sub_reservation", "$@63", "reservation_params", "not_empty_reservation_params", "reservation_param", "next_server", - "$@63", "server_hostname", "$@64", "boot_file_name", "$@65", - "ip_address", "$@66", "duid", "$@67", "hw_address", "$@68", - "client_id_value", "$@69", "circuit_id_value", "$@70", "hostname", - "$@71", "reservation_client_classes", "$@72", "relay", "$@73", - "relay_map", "$@74", "client_classes", "$@75", "client_classes_list", - "$@76", "client_class_params", "not_empty_client_class_params", - "client_class_param", "client_class_name", "client_class_test", "$@77", - "server_id", "$@78", "server_id_params", "server_id_param", "htype", - "identifier", "$@79", "time", "enterprise_id", "dhcp4o6_port", - "control_socket", "$@80", "control_socket_params", - "control_socket_param", "control_socket_type", "$@81", - "control_socket_name", "$@82", "dhcp_ddns", "$@83", "dhcp6_json_object", - "$@84", "dhcpddns_json_object", "$@85", "logging_object", "$@86", - "logging_params", "logging_param", "loggers", "$@87", "loggers_entries", - "logger_entry", "$@88", "logger_params", "logger_param", "debuglevel", - "severity", "$@89", "output_options_list", "$@90", - "output_options_list_content", "output_entry", "$@91", "output_params", - "output_param", "$@92", YY_NULLPTR + "$@64", "server_hostname", "$@65", "boot_file_name", "$@66", + "ip_address", "$@67", "duid", "$@68", "hw_address", "$@69", + "client_id_value", "$@70", "circuit_id_value", "$@71", "hostname", + "$@72", "reservation_client_classes", "$@73", "relay", "$@74", + "relay_map", "$@75", "client_classes", "$@76", "client_classes_list", + "$@77", "client_class_params", "not_empty_client_class_params", + "client_class_param", "client_class_name", "client_class_test", "$@78", + "server_id", "$@79", "server_id_params", "server_id_param", "htype", + "identifier", "$@80", "time", "enterprise_id", "dhcp4o6_port", + "control_socket", "$@81", "control_socket_params", + "control_socket_param", "socket_type", "$@82", "socket_name", "$@83", + "dhcp_ddns", "$@84", "sub_dhcp_ddns", "$@85", "dhcp_ddns_params", + "dhcp_ddns_param", "enable_updates", "qualifying_suffix", "$@86", + "server_ip", "$@87", "server_port", "sender_ip", "$@88", "sender_port", + "max_queue_size", "ncr_protocol", "$@89", "ncr_protocol_value", + "ncr_format", "$@90", "always_include_fqdn", "allow_client_update", + "override_no_update", "override_client_update", "replace_client_name", + "$@91", "replace_client_name_value", "generated_prefix", "$@92", + "dhcp6_json_object", "$@93", "dhcpddns_json_object", "$@94", + "logging_object", "$@95", "logging_params", "logging_param", "loggers", + "$@96", "loggers_entries", "logger_entry", "$@97", "logger_params", + "logger_param", "debuglevel", "severity", "$@98", "output_options_list", + "$@99", "output_options_list_content", "output_entry", "$@100", + "output_params", "output_param", "$@101", YY_NULLPTR }; #if PARSER4_DEBUG const unsigned short int Dhcp4Parser::yyrline_[] = { - 0, 207, 207, 207, 208, 208, 209, 209, 210, 210, - 211, 211, 212, 212, 213, 213, 214, 214, 215, 215, - 216, 216, 224, 225, 226, 227, 228, 229, 230, 233, - 238, 238, 250, 251, 254, 258, 265, 265, 273, 273, - 280, 281, 284, 288, 299, 309, 309, 321, 322, 326, - 327, 328, 329, 330, 333, 333, 350, 350, 358, 359, - 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, - 384, 385, 388, 393, 398, 403, 408, 413, 419, 419, - 429, 430, 433, 434, 437, 437, 445, 445, 455, 455, - 462, 463, 466, 466, 476, 476, 486, 487, 490, 491, - 492, 493, 494, 495, 496, 497, 498, 501, 501, 509, - 509, 517, 517, 525, 525, 533, 533, 541, 546, 551, - 556, 561, 561, 571, 572, 575, 576, 577, 578, 581, - 586, 591, 596, 596, 606, 607, 610, 611, 614, 614, - 622, 622, 630, 631, 632, 635, 636, 639, 639, 647, - 647, 655, 655, 665, 666, 669, 670, 671, 672, 673, - 674, 677, 682, 687, 692, 697, 702, 710, 710, 723, - 724, 727, 728, 735, 735, 758, 758, 767, 768, 772, - 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, - 783, 784, 785, 786, 787, 788, 789, 790, 791, 794, - 794, 802, 802, 810, 810, 818, 818, 826, 826, 834, - 834, 842, 842, 850, 850, 858, 863, 872, 872, 884, - 885, 888, 889, 894, 894, 905, 905, 915, 916, 919, - 920, 923, 924, 925, 926, 927, 928, 929, 930, 933, - 935, 940, 942, 944, 944, 952, 952, 960, 962, 962, - 970, 979, 979, 991, 992, 997, 998, 1003, 1003, 1014, - 1014, 1025, 1026, 1031, 1032, 1037, 1038, 1039, 1040, 1041, - 1042, 1045, 1047, 1047, 1055, 1057, 1059, 1067, 1067, 1079, - 1080, 1083, 1084, 1087, 1087, 1095, 1095, 1103, 1104, 1107, - 1108, 1109, 1112, 1112, 1123, 1123, 1133, 1134, 1137, 1138, - 1141, 1141, 1149, 1149, 1157, 1158, 1161, 1162, 1166, 1167, - 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, - 1180, 1180, 1188, 1188, 1196, 1196, 1204, 1204, 1212, 1212, - 1220, 1220, 1228, 1228, 1236, 1236, 1245, 1245, 1253, 1253, - 1266, 1266, 1276, 1276, 1287, 1287, 1297, 1298, 1301, 1301, - 1309, 1310, 1313, 1314, 1317, 1318, 1319, 1320, 1321, 1322, - 1323, 1326, 1328, 1328, 1339, 1339, 1349, 1350, 1353, 1354, - 1355, 1356, 1357, 1358, 1359, 1362, 1367, 1367, 1375, 1380, - 1387, 1394, 1394, 1404, 1405, 1408, 1409, 1412, 1412, 1420, - 1420, 1430, 1430, 1442, 1442, 1449, 1449, 1461, 1461, 1474, - 1475, 1479, 1483, 1483, 1495, 1496, 1500, 1500, 1508, 1509, - 1512, 1513, 1514, 1515, 1516, 1519, 1523, 1523, 1531, 1531, - 1541, 1542, 1545, 1545, 1553, 1554, 1557, 1557 + 0, 203, 203, 203, 204, 204, 205, 205, 206, 206, + 207, 207, 208, 208, 209, 209, 210, 210, 211, 211, + 212, 212, 213, 213, 221, 222, 223, 224, 225, 226, + 227, 230, 235, 235, 247, 248, 251, 255, 262, 262, + 270, 270, 277, 278, 281, 285, 296, 306, 306, 318, + 319, 323, 324, 325, 326, 327, 330, 330, 347, 347, + 355, 356, 361, 362, 363, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, + 379, 380, 381, 382, 385, 390, 395, 400, 405, 410, + 416, 416, 426, 427, 430, 431, 434, 434, 442, 442, + 452, 452, 460, 460, 470, 470, 480, 481, 484, 485, + 486, 487, 488, 489, 490, 491, 492, 495, 495, 503, + 503, 511, 511, 519, 519, 527, 527, 535, 540, 545, + 550, 555, 555, 565, 566, 569, 570, 571, 572, 575, + 580, 585, 590, 590, 600, 601, 604, 605, 608, 608, + 616, 616, 624, 625, 626, 629, 630, 633, 633, 641, + 641, 649, 649, 659, 660, 666, 674, 674, 687, 688, + 691, 692, 699, 699, 722, 722, 731, 732, 736, 737, + 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, + 748, 749, 750, 751, 752, 753, 754, 755, 758, 758, + 766, 766, 774, 774, 782, 782, 790, 790, 798, 798, + 806, 806, 814, 814, 822, 827, 836, 836, 848, 849, + 852, 853, 858, 858, 869, 869, 879, 880, 883, 884, + 887, 888, 889, 890, 891, 892, 893, 894, 897, 899, + 904, 906, 908, 908, 916, 916, 924, 926, 926, 934, + 943, 943, 955, 956, 961, 962, 967, 967, 978, 978, + 989, 990, 995, 996, 1001, 1002, 1003, 1004, 1005, 1006, + 1009, 1011, 1011, 1019, 1021, 1023, 1031, 1031, 1043, 1044, + 1047, 1048, 1051, 1051, 1059, 1059, 1067, 1068, 1071, 1072, + 1073, 1076, 1076, 1087, 1087, 1097, 1098, 1101, 1102, 1105, + 1105, 1113, 1113, 1121, 1122, 1125, 1126, 1130, 1131, 1132, + 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1144, + 1144, 1152, 1152, 1160, 1160, 1168, 1168, 1176, 1176, 1184, + 1184, 1192, 1192, 1200, 1200, 1209, 1209, 1217, 1217, 1230, + 1230, 1240, 1240, 1251, 1251, 1261, 1262, 1265, 1265, 1273, + 1274, 1277, 1278, 1281, 1282, 1283, 1284, 1285, 1286, 1287, + 1290, 1292, 1292, 1303, 1303, 1313, 1314, 1317, 1318, 1319, + 1320, 1321, 1322, 1323, 1326, 1331, 1331, 1339, 1344, 1351, + 1358, 1358, 1368, 1369, 1372, 1373, 1376, 1376, 1384, 1384, + 1394, 1394, 1404, 1404, 1412, 1413, 1416, 1417, 1418, 1419, + 1420, 1421, 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, + 1430, 1431, 1434, 1439, 1439, 1447, 1447, 1455, 1460, 1460, + 1468, 1473, 1478, 1478, 1486, 1487, 1490, 1490, 1498, 1503, + 1508, 1513, 1518, 1518, 1526, 1529, 1532, 1535, 1538, 1544, + 1544, 1554, 1554, 1561, 1561, 1573, 1573, 1586, 1587, 1591, + 1595, 1595, 1607, 1608, 1612, 1612, 1620, 1621, 1624, 1625, + 1626, 1627, 1628, 1631, 1635, 1635, 1643, 1643, 1653, 1654, + 1657, 1657, 1665, 1666, 1669, 1669 }; // Print the state stack on the debug stream. @@ -3579,8 +3860,8 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:1167 } } // isc::dhcp -#line 3583 "dhcp4_parser.cc" // lalr1.cc:1167 -#line 1565 "dhcp4_parser.yy" // lalr1.cc:1168 +#line 3864 "dhcp4_parser.cc" // lalr1.cc:1167 +#line 1677 "dhcp4_parser.yy" // lalr1.cc:1168 void diff --git a/src/bin/dhcp4/dhcp4_parser.h b/src/bin/dhcp4/dhcp4_parser.h index fd3299cd94..3761c63b08 100644 --- a/src/bin/dhcp4/dhcp4_parser.h +++ b/src/bin/dhcp4/dhcp4_parser.h @@ -305,7 +305,8 @@ namespace isc { namespace dhcp { union union_type { // value - // socket_type + // ncr_protocol_value + // replace_client_name_value char dummy1[sizeof(ElementPtr)]; // "boolean" @@ -353,102 +354,117 @@ namespace isc { namespace dhcp { TOKEN_INTERFACES_CONFIG = 266, TOKEN_INTERFACES = 267, TOKEN_DHCP_SOCKET_TYPE = 268, - TOKEN_RAW = 269, - TOKEN_UDP = 270, - TOKEN_ECHO_CLIENT_ID = 271, - TOKEN_MATCH_CLIENT_ID = 272, - TOKEN_NEXT_SERVER = 273, - TOKEN_SERVER_HOSTNAME = 274, - TOKEN_BOOT_FILE_NAME = 275, - TOKEN_LEASE_DATABASE = 276, - TOKEN_HOSTS_DATABASE = 277, - TOKEN_TYPE = 278, - TOKEN_USER = 279, - TOKEN_PASSWORD = 280, - TOKEN_HOST = 281, - TOKEN_PERSIST = 282, - TOKEN_LFC_INTERVAL = 283, - TOKEN_READONLY = 284, - TOKEN_VALID_LIFETIME = 285, - TOKEN_RENEW_TIMER = 286, - TOKEN_REBIND_TIMER = 287, - TOKEN_DECLINE_PROBATION_PERIOD = 288, - TOKEN_SUBNET4 = 289, - TOKEN_SUBNET_4O6_INTERFACE = 290, - TOKEN_SUBNET_4O6_INTERFACE_ID = 291, - TOKEN_SUBNET_4O6_SUBNET = 292, - TOKEN_OPTION_DEF = 293, - TOKEN_OPTION_DATA = 294, - TOKEN_NAME = 295, - TOKEN_DATA = 296, - TOKEN_CODE = 297, - TOKEN_SPACE = 298, - TOKEN_CSV_FORMAT = 299, - TOKEN_RECORD_TYPES = 300, - TOKEN_ENCAPSULATE = 301, - TOKEN_ARRAY = 302, - TOKEN_POOLS = 303, - TOKEN_POOL = 304, - TOKEN_SUBNET = 305, - TOKEN_INTERFACE = 306, - TOKEN_INTERFACE_ID = 307, - TOKEN_ID = 308, - TOKEN_RAPID_COMMIT = 309, - TOKEN_RESERVATION_MODE = 310, - TOKEN_HOST_RESERVATION_IDENTIFIERS = 311, - TOKEN_CLIENT_CLASSES = 312, - TOKEN_TEST = 313, - TOKEN_CLIENT_CLASS = 314, - TOKEN_RESERVATIONS = 315, - TOKEN_DUID = 316, - TOKEN_HW_ADDRESS = 317, - TOKEN_CIRCUIT_ID = 318, - TOKEN_CLIENT_ID = 319, - TOKEN_HOSTNAME = 320, - TOKEN_RELAY = 321, - TOKEN_IP_ADDRESS = 322, - TOKEN_HOOKS_LIBRARIES = 323, - TOKEN_LIBRARY = 324, - TOKEN_PARAMETERS = 325, - TOKEN_EXPIRED_LEASES_PROCESSING = 326, - TOKEN_RECLAIM_TIMER_WAIT_TIME = 327, - TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 328, - TOKEN_HOLD_RECLAIMED_TIME = 329, - TOKEN_MAX_RECLAIM_LEASES = 330, - TOKEN_MAX_RECLAIM_TIME = 331, - TOKEN_UNWARNED_RECLAIM_CYCLES = 332, - TOKEN_SERVER_ID = 333, - TOKEN_IDENTIFIER = 334, - TOKEN_HTYPE = 335, - TOKEN_TIME = 336, - TOKEN_ENTERPRISE_ID = 337, - TOKEN_DHCP4O6_PORT = 338, - TOKEN_CONTROL_SOCKET = 339, - TOKEN_SOCKET_TYPE = 340, - TOKEN_SOCKET_NAME = 341, - TOKEN_DHCP_DDNS = 342, - TOKEN_LOGGING = 343, - TOKEN_LOGGERS = 344, - TOKEN_OUTPUT_OPTIONS = 345, - TOKEN_OUTPUT = 346, - TOKEN_DEBUGLEVEL = 347, - TOKEN_SEVERITY = 348, - TOKEN_DHCP6 = 349, - TOKEN_DHCPDDNS = 350, - TOKEN_TOPLEVEL_JSON = 351, - TOKEN_TOPLEVEL_DHCP4 = 352, - TOKEN_SUB_DHCP4 = 353, - TOKEN_SUB_INTERFACES4 = 354, - TOKEN_SUB_SUBNET4 = 355, - TOKEN_SUB_POOL4 = 356, - TOKEN_SUB_RESERVATION = 357, - TOKEN_SUB_OPTION_DEF = 358, - TOKEN_SUB_OPTION_DATA = 359, - TOKEN_SUB_HOOKS_LIBRARY = 360, - TOKEN_STRING = 361, - TOKEN_INTEGER = 362, - TOKEN_FLOAT = 363, - TOKEN_BOOLEAN = 364 + TOKEN_ECHO_CLIENT_ID = 269, + TOKEN_MATCH_CLIENT_ID = 270, + TOKEN_NEXT_SERVER = 271, + TOKEN_SERVER_HOSTNAME = 272, + TOKEN_BOOT_FILE_NAME = 273, + TOKEN_LEASE_DATABASE = 274, + TOKEN_HOSTS_DATABASE = 275, + TOKEN_TYPE = 276, + TOKEN_USER = 277, + TOKEN_PASSWORD = 278, + TOKEN_HOST = 279, + TOKEN_PERSIST = 280, + TOKEN_LFC_INTERVAL = 281, + TOKEN_READONLY = 282, + TOKEN_VALID_LIFETIME = 283, + TOKEN_RENEW_TIMER = 284, + TOKEN_REBIND_TIMER = 285, + TOKEN_DECLINE_PROBATION_PERIOD = 286, + TOKEN_SUBNET4 = 287, + TOKEN_SUBNET_4O6_INTERFACE = 288, + TOKEN_SUBNET_4O6_INTERFACE_ID = 289, + TOKEN_SUBNET_4O6_SUBNET = 290, + TOKEN_OPTION_DEF = 291, + TOKEN_OPTION_DATA = 292, + TOKEN_NAME = 293, + TOKEN_DATA = 294, + TOKEN_CODE = 295, + TOKEN_SPACE = 296, + TOKEN_CSV_FORMAT = 297, + TOKEN_RECORD_TYPES = 298, + TOKEN_ENCAPSULATE = 299, + TOKEN_ARRAY = 300, + TOKEN_POOLS = 301, + TOKEN_POOL = 302, + TOKEN_SUBNET = 303, + TOKEN_INTERFACE = 304, + TOKEN_INTERFACE_ID = 305, + TOKEN_ID = 306, + TOKEN_RAPID_COMMIT = 307, + TOKEN_RESERVATION_MODE = 308, + TOKEN_HOST_RESERVATION_IDENTIFIERS = 309, + TOKEN_CLIENT_CLASSES = 310, + TOKEN_TEST = 311, + TOKEN_CLIENT_CLASS = 312, + TOKEN_RESERVATIONS = 313, + TOKEN_DUID = 314, + TOKEN_HW_ADDRESS = 315, + TOKEN_CIRCUIT_ID = 316, + TOKEN_CLIENT_ID = 317, + TOKEN_HOSTNAME = 318, + TOKEN_RELAY = 319, + TOKEN_IP_ADDRESS = 320, + TOKEN_HOOKS_LIBRARIES = 321, + TOKEN_LIBRARY = 322, + TOKEN_PARAMETERS = 323, + TOKEN_EXPIRED_LEASES_PROCESSING = 324, + TOKEN_SERVER_ID = 325, + TOKEN_IDENTIFIER = 326, + TOKEN_HTYPE = 327, + TOKEN_TIME = 328, + TOKEN_ENTERPRISE_ID = 329, + TOKEN_DHCP4O6_PORT = 330, + TOKEN_CONTROL_SOCKET = 331, + TOKEN_SOCKET_TYPE = 332, + TOKEN_SOCKET_NAME = 333, + TOKEN_DHCP_DDNS = 334, + TOKEN_ENABLE_UPDATES = 335, + TOKEN_QUALIFYING_SUFFIX = 336, + TOKEN_SERVER_IP = 337, + TOKEN_SERVER_PORT = 338, + TOKEN_SENDER_IP = 339, + TOKEN_SENDER_PORT = 340, + TOKEN_MAX_QUEUE_SIZE = 341, + TOKEN_NCR_PROTOCOL = 342, + TOKEN_NCR_FORMAT = 343, + TOKEN_ALWAYS_INCLUDE_FQDN = 344, + TOKEN_ALLOW_CLIENT_UPDATE = 345, + TOKEN_OVERRIDE_NO_UPDATE = 346, + TOKEN_OVERRIDE_CLIENT_UPDATE = 347, + TOKEN_REPLACE_CLIENT_NAME = 348, + TOKEN_GENERATED_PREFIX = 349, + TOKEN_UDP = 350, + TOKEN_TCP = 351, + TOKEN_JSON = 352, + TOKEN_WHEN_PRESENT = 353, + TOKEN_NEVER = 354, + TOKEN_ALWAYS = 355, + TOKEN_WHEN_NOT_PRESENT = 356, + TOKEN_LOGGING = 357, + TOKEN_LOGGERS = 358, + TOKEN_OUTPUT_OPTIONS = 359, + TOKEN_OUTPUT = 360, + TOKEN_DEBUGLEVEL = 361, + TOKEN_SEVERITY = 362, + TOKEN_DHCP6 = 363, + TOKEN_DHCPDDNS = 364, + TOKEN_TOPLEVEL_JSON = 365, + TOKEN_TOPLEVEL_DHCP4 = 366, + TOKEN_SUB_DHCP4 = 367, + TOKEN_SUB_INTERFACES4 = 368, + TOKEN_SUB_SUBNET4 = 369, + TOKEN_SUB_POOL4 = 370, + TOKEN_SUB_RESERVATION = 371, + TOKEN_SUB_OPTION_DEF = 372, + TOKEN_SUB_OPTION_DATA = 373, + TOKEN_SUB_HOOKS_LIBRARY = 374, + TOKEN_SUB_DHCP_DDNS = 375, + TOKEN_STRING = 376, + TOKEN_INTEGER = 377, + TOKEN_FLOAT = 378, + TOKEN_BOOLEAN = 379 }; }; @@ -611,14 +627,6 @@ namespace isc { namespace dhcp { symbol_type make_DHCP_SOCKET_TYPE (const location_type& l); - static inline - symbol_type - make_RAW (const location_type& l); - - static inline - symbol_type - make_UDP (const location_type& l); - static inline symbol_type make_ECHO_CLIENT_ID (const location_type& l); @@ -843,30 +851,6 @@ namespace isc { namespace dhcp { symbol_type make_EXPIRED_LEASES_PROCESSING (const location_type& l); - static inline - symbol_type - make_RECLAIM_TIMER_WAIT_TIME (const location_type& l); - - static inline - symbol_type - make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l); - - static inline - symbol_type - make_HOLD_RECLAIMED_TIME (const location_type& l); - - static inline - symbol_type - make_MAX_RECLAIM_LEASES (const location_type& l); - - static inline - symbol_type - make_MAX_RECLAIM_TIME (const location_type& l); - - static inline - symbol_type - make_UNWARNED_RECLAIM_CYCLES (const location_type& l); - static inline symbol_type make_SERVER_ID (const location_type& l); @@ -907,6 +891,94 @@ namespace isc { namespace dhcp { symbol_type make_DHCP_DDNS (const location_type& l); + static inline + symbol_type + make_ENABLE_UPDATES (const location_type& l); + + static inline + symbol_type + make_QUALIFYING_SUFFIX (const location_type& l); + + static inline + symbol_type + make_SERVER_IP (const location_type& l); + + static inline + symbol_type + make_SERVER_PORT (const location_type& l); + + static inline + symbol_type + make_SENDER_IP (const location_type& l); + + static inline + symbol_type + make_SENDER_PORT (const location_type& l); + + static inline + symbol_type + make_MAX_QUEUE_SIZE (const location_type& l); + + static inline + symbol_type + make_NCR_PROTOCOL (const location_type& l); + + static inline + symbol_type + make_NCR_FORMAT (const location_type& l); + + static inline + symbol_type + make_ALWAYS_INCLUDE_FQDN (const location_type& l); + + static inline + symbol_type + make_ALLOW_CLIENT_UPDATE (const location_type& l); + + static inline + symbol_type + make_OVERRIDE_NO_UPDATE (const location_type& l); + + static inline + symbol_type + make_OVERRIDE_CLIENT_UPDATE (const location_type& l); + + static inline + symbol_type + make_REPLACE_CLIENT_NAME (const location_type& l); + + static inline + symbol_type + make_GENERATED_PREFIX (const location_type& l); + + static inline + symbol_type + make_UDP (const location_type& l); + + static inline + symbol_type + make_TCP (const location_type& l); + + static inline + symbol_type + make_JSON (const location_type& l); + + static inline + symbol_type + make_WHEN_PRESENT (const location_type& l); + + static inline + symbol_type + make_NEVER (const location_type& l); + + static inline + symbol_type + make_ALWAYS (const location_type& l); + + static inline + symbol_type + make_WHEN_NOT_PRESENT (const location_type& l); + static inline symbol_type make_LOGGING (const location_type& l); @@ -979,6 +1051,10 @@ namespace isc { namespace dhcp { symbol_type make_SUB_HOOKS_LIBRARY (const location_type& l); + static inline + symbol_type + make_SUB_DHCP_DDNS (const location_type& l); + static inline symbol_type make_STRING (const std::string& v, const location_type& l); @@ -1200,12 +1276,12 @@ namespace isc { namespace dhcp { enum { yyeof_ = 0, - yylast_ = 647, ///< Last index in yytable_. - yynnts_ = 274, ///< Number of nonterminal symbols. - yyfinal_ = 22, ///< Termination state number. + yylast_ = 705, ///< Last index in yytable_. + yynnts_ = 296, ///< Number of nonterminal symbols. + yyfinal_ = 24, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 110 ///< Number of tokens. + yyntokens_ = 125 ///< Number of tokens. }; @@ -1258,9 +1334,10 @@ namespace isc { namespace dhcp { 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109 + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124 }; - const unsigned int user_token_number_max_ = 364; + const unsigned int user_token_number_max_ = 379; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1293,24 +1370,25 @@ namespace isc { namespace dhcp { { switch (other.type_get ()) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.copy< ElementPtr > (other.value); break; - case 109: // "boolean" + case 124: // "boolean" value.copy< bool > (other.value); break; - case 108: // "floating point" + case 123: // "floating point" value.copy< double > (other.value); break; - case 107: // "integer" + case 122: // "integer" value.copy< int64_t > (other.value); break; - case 106: // "constant string" + case 121: // "constant string" value.copy< std::string > (other.value); break; @@ -1331,24 +1409,25 @@ namespace isc { namespace dhcp { (void) v; switch (this->type_get ()) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.copy< ElementPtr > (v); break; - case 109: // "boolean" + case 124: // "boolean" value.copy< bool > (v); break; - case 108: // "floating point" + case 123: // "floating point" value.copy< double > (v); break; - case 107: // "integer" + case 122: // "integer" value.copy< int64_t > (v); break; - case 106: // "constant string" + case 121: // "constant string" value.copy< std::string > (v); break; @@ -1428,24 +1507,25 @@ namespace isc { namespace dhcp { // Type destructor. switch (yytype) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.template destroy< ElementPtr > (); break; - case 109: // "boolean" + case 124: // "boolean" value.template destroy< bool > (); break; - case 108: // "floating point" + case 123: // "floating point" value.template destroy< double > (); break; - case 107: // "integer" + case 122: // "integer" value.template destroy< int64_t > (); break; - case 106: // "constant string" + case 121: // "constant string" value.template destroy< std::string > (); break; @@ -1472,24 +1552,25 @@ namespace isc { namespace dhcp { super_type::move(s); switch (this->type_get ()) { - case 122: // value - case 161: // socket_type + case 138: // value + case 383: // ncr_protocol_value + case 392: // replace_client_name_value value.move< ElementPtr > (s.value); break; - case 109: // "boolean" + case 124: // "boolean" value.move< bool > (s.value); break; - case 108: // "floating point" + case 123: // "floating point" value.move< double > (s.value); break; - case 107: // "integer" + case 122: // "integer" value.move< int64_t > (s.value); break; - case 106: // "constant string" + case 121: // "constant string" value.move< std::string > (s.value); break; @@ -1558,7 +1639,9 @@ namespace isc { namespace dhcp { 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, - 355, 356, 357, 358, 359, 360, 361, 362, 363, 364 + 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379 }; return static_cast (yytoken_number_[type]); } @@ -1635,18 +1718,6 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_DHCP_SOCKET_TYPE, l); } - Dhcp4Parser::symbol_type - Dhcp4Parser::make_RAW (const location_type& l) - { - return symbol_type (token::TOKEN_RAW, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_UDP (const location_type& l) - { - return symbol_type (token::TOKEN_UDP, l); - } - Dhcp4Parser::symbol_type Dhcp4Parser::make_ECHO_CLIENT_ID (const location_type& l) { @@ -1983,42 +2054,6 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, l); } - Dhcp4Parser::symbol_type - Dhcp4Parser::make_RECLAIM_TIMER_WAIT_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_HOLD_RECLAIMED_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_MAX_RECLAIM_LEASES (const location_type& l) - { - return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_MAX_RECLAIM_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, l); - } - - Dhcp4Parser::symbol_type - Dhcp4Parser::make_UNWARNED_RECLAIM_CYCLES (const location_type& l) - { - return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, l); - } - Dhcp4Parser::symbol_type Dhcp4Parser::make_SERVER_ID (const location_type& l) { @@ -2079,6 +2114,138 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_DHCP_DDNS, l); } + Dhcp4Parser::symbol_type + Dhcp4Parser::make_ENABLE_UPDATES (const location_type& l) + { + return symbol_type (token::TOKEN_ENABLE_UPDATES, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_QUALIFYING_SUFFIX (const location_type& l) + { + return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_SERVER_IP (const location_type& l) + { + return symbol_type (token::TOKEN_SERVER_IP, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_SERVER_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_SERVER_PORT, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_SENDER_IP (const location_type& l) + { + return symbol_type (token::TOKEN_SENDER_IP, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_SENDER_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_SENDER_PORT, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_MAX_QUEUE_SIZE (const location_type& l) + { + return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_NCR_PROTOCOL (const location_type& l) + { + return symbol_type (token::TOKEN_NCR_PROTOCOL, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_NCR_FORMAT (const location_type& l) + { + return symbol_type (token::TOKEN_NCR_FORMAT, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_ALWAYS_INCLUDE_FQDN (const location_type& l) + { + return symbol_type (token::TOKEN_ALWAYS_INCLUDE_FQDN, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_ALLOW_CLIENT_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_ALLOW_CLIENT_UPDATE, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_OVERRIDE_NO_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_OVERRIDE_CLIENT_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_REPLACE_CLIENT_NAME (const location_type& l) + { + return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_GENERATED_PREFIX (const location_type& l) + { + return symbol_type (token::TOKEN_GENERATED_PREFIX, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_UDP (const location_type& l) + { + return symbol_type (token::TOKEN_UDP, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_TCP (const location_type& l) + { + return symbol_type (token::TOKEN_TCP, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_JSON (const location_type& l) + { + return symbol_type (token::TOKEN_JSON, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_WHEN_PRESENT (const location_type& l) + { + return symbol_type (token::TOKEN_WHEN_PRESENT, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_NEVER (const location_type& l) + { + return symbol_type (token::TOKEN_NEVER, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_ALWAYS (const location_type& l) + { + return symbol_type (token::TOKEN_ALWAYS, l); + } + + Dhcp4Parser::symbol_type + Dhcp4Parser::make_WHEN_NOT_PRESENT (const location_type& l) + { + return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, l); + } + Dhcp4Parser::symbol_type Dhcp4Parser::make_LOGGING (const location_type& l) { @@ -2187,6 +2354,12 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, l); } + Dhcp4Parser::symbol_type + Dhcp4Parser::make_SUB_DHCP_DDNS (const location_type& l) + { + return symbol_type (token::TOKEN_SUB_DHCP_DDNS, l); + } + Dhcp4Parser::symbol_type Dhcp4Parser::make_STRING (const std::string& v, const location_type& l) { @@ -2214,7 +2387,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp4_parser.yy" // lalr1.cc:377 } } // isc::dhcp -#line 2218 "dhcp4_parser.h" // lalr1.cc:377 +#line 2391 "dhcp4_parser.h" // lalr1.cc:377 diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy index 730e4de45c..34f9e8b261 100644 --- a/src/bin/dhcp4/dhcp4_parser.yy +++ b/src/bin/dhcp4/dhcp4_parser.yy @@ -142,26 +142,28 @@ using namespace std; SOCKET_NAME "socket-name" DHCP_DDNS "dhcp-ddns" - - /// @todo: Implement proper parsing for those parameters in Dhcp4/dhcp-ddns/*. - /// This should be part of the #5043 ticket. Listing the keywords here for - /// completeness. - - // These are tokens defined in Dhcp4/dhcp-ddns/* - // They're not - // ENABLE_UPDATES "enable-updates" - // SERVER_IP "server-ip" - // SENDER_IP "sender-ip" - // SENDER_PORT "sender-port" - // MAX_QUEUE_SIZE "max-queue-size" - // NCR_PROTOCOL "ncr-protocol" - // NCR_FORMAT "ncr-format" - // ALWAYS_INCLUDE_FQDN "always-include-fqdn" - // OVERRDIDE_NO_UPDATE "override-no-update" - // OVERRDIDE_CLIENT_UPDATE "override-client-update" - // REPLACE_CLIENT_NAME "replace-client-name" - // GENERATED_PREFIX "generated-prefix" - // QUALIFYING_SUFFIX "qualifying-suffix" + ENABLE_UPDATES "enable-updates" + QUALIFYING_SUFFIX "qualifying-suffix" + SERVER_IP "server-ip" + SERVER_PORT "server-port" + SENDER_IP "sender-ip" + SENDER_PORT "sender-port" + MAX_QUEUE_SIZE "max-queue-size" + NCR_PROTOCOL "ncr-protocol" + NCR_FORMAT "ncr-format" + ALWAYS_INCLUDE_FQDN "always-include-fqdn" + ALLOW_CLIENT_UPDATE "allow-client-update" + OVERRIDE_NO_UPDATE "override-no-update" + OVERRIDE_CLIENT_UPDATE "override-client-update" + REPLACE_CLIENT_NAME "replace-client-name" + GENERATED_PREFIX "generated-prefix" + UDP "UDP" + TCP "TCP" + JSON "JSON" + WHEN_PRESENT "when-present" + NEVER "never" + ALWAYS "always" + WHEN_NOT_PRESENT "when-not-present" LOGGING "Logging" LOGGERS "loggers" @@ -185,6 +187,7 @@ using namespace std; SUB_OPTION_DEF SUB_OPTION_DATA SUB_HOOKS_LIBRARY + SUB_DHCP_DDNS ; %token STRING "constant string" @@ -194,6 +197,8 @@ using namespace std; %type value %type socket_type +%type ncr_protocol_value +%type replace_client_name_value %printer { yyoutput << $$; } <*>; @@ -214,6 +219,7 @@ start: TOPLEVEL_JSON { ctx.ctx_ = ctx.NO_KEYWORD; } sub_json | SUB_OPTION_DEF { ctx.ctx_ = ctx.OPTION_DEF; } sub_option_def | SUB_OPTION_DATA { ctx.ctx_ = ctx.OPTION_DATA; } sub_option_data | SUB_HOOKS_LIBRARY { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } sub_hooks_library + | SUB_DHCP_DDNS { ctx.ctx_ = ctx.DHCP_DDNS; } sub_dhcp_ddns ; // ---- generic JSON parser --------------------------------- @@ -1431,12 +1437,160 @@ dhcp_ddns: DHCP_DDNS { ElementPtr m(new MapElement(ctx.loc2pos(@1))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); - ctx.enter(ctx.NO_KEYWORD); -} COLON LCURLY_BRACKET not_empty_map RCURLY_BRACKET { + ctx.enter(ctx.DHCP_DDNS); +} COLON LCURLY_BRACKET dhcp_ddns_params RCURLY_BRACKET { ctx.stack_.pop_back(); ctx.leave(); }; +sub_dhcp_ddns: LCURLY_BRACKET { + // Parse the dhcp-ddns map + ElementPtr m(new MapElement(ctx.loc2pos(@1))); + ctx.stack_.push_back(m); +} dhcp_ddns_params RCURLY_BRACKET { + // parsing completed +}; + +dhcp_ddns_params: dhcp_ddns_param + | dhcp_ddns_params COMMA dhcp_ddns_param + ; + +dhcp_ddns_param: enable_updates + | qualifying_suffix + | server_ip + | server_port + | sender_ip + | sender_port + | max_queue_size + | ncr_protocol + | ncr_format + | always_include_fqdn + | allow_client_update + | override_no_update + | override_client_update + | replace_client_name + | generated_prefix + | unknown_map_entry + ; + +enable_updates: ENABLE_UPDATES COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("enable-updates", b); +}; + +qualifying_suffix: QUALIFYING_SUFFIX { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("qualifying-suffix", s); + ctx.leave(); +}; + +server_ip: SERVER_IP { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("server-ip", s); + ctx.leave(); +}; + +server_port: SERVER_PORT COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("server-port", i); +}; + +sender_ip: SENDER_IP { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("sender-ip", s); + ctx.leave(); +}; + +sender_port: SENDER_PORT COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("sender-port", i); +}; + +max_queue_size: MAX_QUEUE_SIZE COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("max-queue-size", i); +}; + +ncr_protocol: NCR_PROTOCOL { + ctx.enter(ctx.NCR_PROTOCOL); +} COLON ncr_protocol_value { + ctx.stack_.back()->set("ncr-protocol", $4); + ctx.leave(); +}; + +ncr_protocol_value: + UDP { $$ = ElementPtr(new StringElement("UDP", ctx.loc2pos(@1))); } + | TCP { $$ = ElementPtr(new StringElement("TCP", ctx.loc2pos(@1))); } + ; + +ncr_format: NCR_FORMAT { + ctx.enter(ctx.NCR_FORMAT); +} COLON JSON { + ElementPtr json(new StringElement("JSON", ctx.loc2pos(@4))); + ctx.stack_.back()->set("ncr-format", json); + ctx.leave(); +}; + +always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("always-include-fqdn", b); +}; + +allow_client_update: ALLOW_CLIENT_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("allow-client-update", b); +}; + +override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("override-no-update", b); +}; + +override_client_update: OVERRIDE_CLIENT_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("override-client-update", b); +}; + +replace_client_name: REPLACE_CLIENT_NAME { + ctx.enter(ctx.REPLACE_CLIENT_NAME); +} COLON replace_client_name_value { + ctx.stack_.back()->set("replace-client-name", $4); + ctx.leave(); +}; + +replace_client_name_value: + WHEN_PRESENT { + $$ = ElementPtr(new StringElement("when-present", ctx.loc2pos(@1))); + } + | NEVER { + $$ = ElementPtr(new StringElement("never", ctx.loc2pos(@1))); + } + | ALWAYS { + $$ = ElementPtr(new StringElement("always", ctx.loc2pos(@1))); + } + | WHEN_NOT_PRESENT { + $$ = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(@1))); + } + | BOOLEAN { + error(@1, "boolean values for the replace-client-name are " + "no longer supported"); + } + ; + +generated_prefix: GENERATED_PREFIX { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("generated-prefix", s); + ctx.leave(); +}; + // JSON entries for Dhcp4 and DhcpDdns dhcp6_json_object: DHCP6 { diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc index bd78f531f2..b8eb27b2f1 100644 --- a/src/bin/dhcp4/json_config_parser.cc +++ b/src/bin/dhcp4/json_config_parser.cc @@ -432,8 +432,7 @@ DhcpConfigParser* createGlobalDhcp4ConfigParser(const std::string& config_id, // hooks-libraries are now migrated to SimpleParser. } else if (config_id.compare("echo-client-id") == 0) { parser = new BooleanParser(config_id, globalContext()->boolean_values_); - } else if (config_id.compare("dhcp-ddns") == 0) { - parser = new D2ClientConfigParser(config_id); + // dhcp-ddns has been converted to SimpleParser. } else if (config_id.compare("match-client-id") == 0) { parser = new BooleanParser(config_id, globalContext()->boolean_values_); // control-socket has been converted to SimpleParser already. @@ -667,6 +666,17 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) { } // Legacy DhcpConfigParser stuff below + if (config_pair.first == "dhcp-ddns") { + // Apply defaults if not in short cut + if (!D2ClientConfigParser::isShortCutDisabled(config_pair.second)) { + D2ClientConfigParser::setAllDefaults(config_pair.second); + } + D2ClientConfigParser parser; + D2ClientConfigPtr cfg = parser.parse(config_pair.second); + CfgMgr::instance().getStagingCfg()->setD2ClientConfig(cfg); + continue; + } + ParserPtr parser(createGlobalDhcp4ConfigParser(config_pair.first, config_pair.second)); LOG_DEBUG(dhcp4_logger, DBG_DHCP4_DETAIL, DHCP4_PARSER_CREATED) @@ -752,6 +762,11 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) { // revert it. As a result, the failure to commit a subsequent // change causes problems when trying to roll back. hooks_parser.loadLibraries(); + + // Apply the staged D2ClientConfig, used to be done by parser commit + D2ClientConfigPtr cfg; + cfg = CfgMgr::instance().getStagingCfg()->getD2ClientConfig(); + CfgMgr::instance().setD2ClientConfig(cfg); } catch (const isc::Exception& ex) { LOG_ERROR(dhcp4_logger, DHCP4_PARSER_COMMIT_FAIL).arg(ex.what()); diff --git a/src/bin/dhcp4/parser_context.cc b/src/bin/dhcp4/parser_context.cc index ffb16cc8bb..862362ca46 100644 --- a/src/bin/dhcp4/parser_context.cc +++ b/src/bin/dhcp4/parser_context.cc @@ -163,6 +163,14 @@ Parser4Context::contextName() return ("loggers"); case OUTPUT_OPTIONS: return ("output-options"); + case DHCP_DDNS: + return ("dhcp-ddns"); + case NCR_PROTOCOL: + return ("ncr-protocol"); + case NCR_FORMAT: + return ("ncr-format"); + case REPLACE_CLIENT_NAME: + return ("replace-client-name"); default: return ("__unknown__"); } diff --git a/src/bin/dhcp4/parser_context.h b/src/bin/dhcp4/parser_context.h index f0dfd0aa36..0be34fbe08 100644 --- a/src/bin/dhcp4/parser_context.h +++ b/src/bin/dhcp4/parser_context.h @@ -80,7 +80,10 @@ public: PARSER_OPTION_DATA, /// This will parse the input as hooks-library. - PARSER_HOOKS_LIBRARY + PARSER_HOOKS_LIBRARY, + + /// This will parse the input as dhcp-ddns. + PARSER_DHCP_DDNS } ParserType; /// @brief Default constructor. @@ -184,8 +187,7 @@ public: ///< Used while parsing content of Dhcp4. DHCP4, - // not yet DHCP6, - // not yet DHCP_DDNS, + // not yet Dhcp6, DhcpDdns, ///< Used while parsing content of Logging LOGGING, @@ -247,7 +249,20 @@ public: LOGGERS, /// Used while parsing Logging/loggers/output_options structures. - OUTPUT_OPTIONS + OUTPUT_OPTIONS, + + /// Used while parsing Dhcp4/dhcp-ddns. + DHCP_DDNS, + + /// Used while parsing Dhcp4/dhcp-ddns/ncr-protocol + NCR_PROTOCOL, + + /// Used while parsing Dhcp4/dhcp-ddns/ncr-format + NCR_FORMAT, + + /// Used while parsing Dhcp4/dhcp-ddns/replace-client-name. + REPLACE_CLIENT_NAME + } ParserContext; /// @brief File name diff --git a/src/bin/dhcp4/position.hh b/src/bin/dhcp4/position.hh index 02c1781402..445ade3194 100644 --- a/src/bin/dhcp4/position.hh +++ b/src/bin/dhcp4/position.hh @@ -1,4 +1,4 @@ -// Generated 201701102225 +// Generated 201701131911 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/dhcp4/stack.hh b/src/bin/dhcp4/stack.hh index fec618b6b9..88540886c9 100644 --- a/src/bin/dhcp4/stack.hh +++ b/src/bin/dhcp4/stack.hh @@ -1,4 +1,4 @@ -// Generated 201701102225 +// Generated 201701131911 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index a975b564dc..5cccb18499 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -3301,7 +3301,7 @@ TEST_F(Dhcp4ParserTest, d2ClientConfig) { // Convert the JSON string to configuration elements. ConstElementPtr config; - ASSERT_NO_THROW(config = parseDHCP4(config_str)); + ASSERT_NO_THROW(config = parseDHCP4(config_str, true)); // Pass the configuration in for parsing. EXPECT_NO_THROW(status = configureDhcp4Server(*srv_, config)); diff --git a/src/bin/dhcp4/tests/d2_unittest.cc b/src/bin/dhcp4/tests/d2_unittest.cc index c7084bb95c..840e79403a 100644 --- a/src/bin/dhcp4/tests/d2_unittest.cc +++ b/src/bin/dhcp4/tests/d2_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -112,7 +112,7 @@ Dhcp4SrvD2Test::configureD2(bool enable_d2, const bool exp_result, " \"allow-client-update\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " - " \"replace-client-name\" : true, " + " \"replace-client-name\" : \"when-present\", " " \"generated-prefix\" : \"test.prefix\", " " \"qualifying-suffix\" : \"test.suffix.\" }," "\"valid-lifetime\": 4000 }"; diff --git a/src/bin/dhcp4/tests/fqdn_unittest.cc b/src/bin/dhcp4/tests/fqdn_unittest.cc index afb469cd46..179c2ae2fa 100644 --- a/src/bin/dhcp4/tests/fqdn_unittest.cc +++ b/src/bin/dhcp4/tests/fqdn_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -427,10 +427,7 @@ public: // in a client request correctly, according to the replace-client-name // mode configuration parameter. // - // @param mode - value to use client-name-replacment parameter - for - // mode labels such as NEVER and ALWAYS must incluce enclosing quotes: - // "\"NEVER\"". This allows us to also pass in boolean literals which - // are unquoted. + // @param mode - value to use for replace-client-name // @param client_name_flag - specifies whether or not the client request // should contain a hostname option // @param exp_replacement_flag - specifies whether or not the server is @@ -452,7 +449,7 @@ public: "\"dhcp-ddns\": {" "\"enable-updates\": true," "\"qualifying-suffix\": \"fake-suffix.isc.org.\"," - "\"replace-client-name\": %s" + "\"replace-client-name\": \"%s\"" "}}"; // Create the configuration and configure the server @@ -1551,39 +1548,25 @@ TEST_F(NameDhcpv4SrvTest, emptyFqdn) { // the supported modes. TEST_F(NameDhcpv4SrvTest, replaceClientNameModeTest) { - // We pass mode labels in with enclosing quotes so we can also test - // unquoted boolean literals true/false - testReplaceClientNameMode("\"never\"", + testReplaceClientNameMode("never", CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"never\"", + testReplaceClientNameMode("never", CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"always\"", + testReplaceClientNameMode("always", CLIENT_NAME_NOT_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"always\"", + testReplaceClientNameMode("always", CLIENT_NAME_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-present\"", + testReplaceClientNameMode("when-present", CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"when-present\"", + testReplaceClientNameMode("when-present", CLIENT_NAME_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-not-present\"", + testReplaceClientNameMode("when-not-present", CLIENT_NAME_NOT_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-not-present\"", + testReplaceClientNameMode("when-not-present", CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - - // Verify that boolean false produces the same result as RCM_NEVER - testReplaceClientNameMode("false", - CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("false", - CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - - // Verify that boolean true produces the same result as RCM_WHEN_PRESENT - testReplaceClientNameMode("true", - CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("true", - CLIENT_NAME_PRESENT, NAME_REPLACED); } } // end of anonymous namespace diff --git a/src/bin/dhcp4/tests/parser_unittest.cc b/src/bin/dhcp4/tests/parser_unittest.cc index 20f6c849d8..6b37b4fbc9 100644 --- a/src/bin/dhcp4/tests/parser_unittest.cc +++ b/src/bin/dhcp4/tests/parser_unittest.cc @@ -250,7 +250,8 @@ TEST(ParserTest, file) { "pgsql-reservations.json", "reservations.json", "several-subnets.json", - "single-subnet.json" }; + "single-subnet.json", + "with-ddns.json" }; for (int i = 0; i= 889 ) + if ( yy_current_state >= 1014 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; ++yy_cp; } - while ( yy_current_state != 888 ); + while ( yy_current_state != 1013 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1580,13 +1671,13 @@ do_action: /* This label is used only to access EOF actions. */ { if ( yy_act == 0 ) fprintf( stderr, "--scanner backing up\n" ); - else if ( yy_act < 117 ) + else if ( yy_act < 132 ) fprintf( stderr, "--accepting rule at line %ld (\"%s\")\n", (long)yy_rule_linenum[yy_act], parser6_text ); - else if ( yy_act == 117 ) + else if ( yy_act == 132 ) fprintf( stderr, "--accepting default rule (\"%s\")\n", parser6_text ); - else if ( yy_act == 118 ) + else if ( yy_act == 133 ) fprintf( stderr, "--(end of buffer or a NUL)\n" ); else fprintf( stderr, "--EOF (start condition %d)\n", YY_START ); @@ -1604,17 +1695,17 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 130 "dhcp6_lexer.ll" +#line 132 "dhcp6_lexer.ll" ; YY_BREAK case 2: YY_RULE_SETUP -#line 132 "dhcp6_lexer.ll" +#line 134 "dhcp6_lexer.ll" ; YY_BREAK case 3: YY_RULE_SETUP -#line 134 "dhcp6_lexer.ll" +#line 136 "dhcp6_lexer.ll" { BEGIN(COMMENT); comment_start_line = driver.loc_.end.line;; @@ -1622,33 +1713,33 @@ YY_RULE_SETUP YY_BREAK case 4: YY_RULE_SETUP -#line 139 "dhcp6_lexer.ll" +#line 141 "dhcp6_lexer.ll" BEGIN(INITIAL); YY_BREAK case 5: YY_RULE_SETUP -#line 140 "dhcp6_lexer.ll" +#line 142 "dhcp6_lexer.ll" ; YY_BREAK case YY_STATE_EOF(COMMENT): -#line 141 "dhcp6_lexer.ll" +#line 143 "dhcp6_lexer.ll" { isc_throw(Dhcp6ParseError, "Comment not closed. (/* in line " << comment_start_line); } YY_BREAK case 6: YY_RULE_SETUP -#line 145 "dhcp6_lexer.ll" +#line 147 "dhcp6_lexer.ll" BEGIN(DIR_ENTER); YY_BREAK case 7: YY_RULE_SETUP -#line 146 "dhcp6_lexer.ll" +#line 148 "dhcp6_lexer.ll" BEGIN(DIR_INCLUDE); YY_BREAK case 8: YY_RULE_SETUP -#line 147 "dhcp6_lexer.ll" +#line 149 "dhcp6_lexer.ll" { // Include directive. @@ -1662,19 +1753,19 @@ YY_RULE_SETUP case YY_STATE_EOF(DIR_ENTER): case YY_STATE_EOF(DIR_INCLUDE): case YY_STATE_EOF(DIR_EXIT): -#line 156 "dhcp6_lexer.ll" +#line 158 "dhcp6_lexer.ll" { isc_throw(Dhcp6ParseError, "Directive not closed."); } YY_BREAK case 9: YY_RULE_SETUP -#line 159 "dhcp6_lexer.ll" +#line 161 "dhcp6_lexer.ll" BEGIN(INITIAL); YY_BREAK case 10: YY_RULE_SETUP -#line 162 "dhcp6_lexer.ll" +#line 164 "dhcp6_lexer.ll" { // Ok, we found a with space. Let's ignore it and update loc variable. driver.loc_.step(); @@ -1683,7 +1774,7 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 167 "dhcp6_lexer.ll" +#line 169 "dhcp6_lexer.ll" { // Newline found. Let's update the location and continue. driver.loc_.lines(parser6_leng); @@ -1692,7 +1783,304 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 174 "dhcp6_lexer.ll" +#line 176 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ENABLE_UPDATES(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("enable-updates", driver.loc_); + } +} + YY_BREAK +case 13: +YY_RULE_SETUP +#line 185 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_QUALIFYING_SUFFIX(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("qualifying-suffix", driver.loc_); + } +} + YY_BREAK +case 14: +YY_RULE_SETUP +#line 194 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SERVER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("server-ip", driver.loc_); + } +} + YY_BREAK +case 15: +YY_RULE_SETUP +#line 203 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SERVER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("server-port", driver.loc_); + } +} + YY_BREAK +case 16: +YY_RULE_SETUP +#line 212 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SENDER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("sender-ip", driver.loc_); + } +} + YY_BREAK +case 17: +YY_RULE_SETUP +#line 221 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SENDER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("sender-port", driver.loc_); + } +} + YY_BREAK +case 18: +YY_RULE_SETUP +#line 230 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_MAX_QUEUE_SIZE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("max-queue-size", driver.loc_); + } +} + YY_BREAK +case 19: +YY_RULE_SETUP +#line 239 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_NCR_PROTOCOL(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("ncr-protocol", driver.loc_); + } +} + YY_BREAK +case 20: +YY_RULE_SETUP +#line 248 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_NCR_FORMAT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("ncr-format", driver.loc_); + } +} + YY_BREAK +case 21: +YY_RULE_SETUP +#line 257 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("always-include-fqdn", driver.loc_); + } +} + YY_BREAK +case 22: +YY_RULE_SETUP +#line 266 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("allow-client-update", driver.loc_); + } +} + YY_BREAK +case 23: +YY_RULE_SETUP +#line 275 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_OVERRIDE_NO_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("override-no-update", driver.loc_); + } +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 284 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_OVERRIDE_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("override-client-update", driver.loc_); + } +} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 293 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_REPLACE_CLIENT_NAME(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("replace-client-name", driver.loc_); + } +} + YY_BREAK +case 26: +YY_RULE_SETUP +#line 302 "dhcp6_lexer.ll" +{ + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_GENERATED_PREFIX(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("generated-prefix", driver.loc_); + } +} + YY_BREAK +case 27: +YY_RULE_SETUP +#line 311 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp6Parser::make_UDP(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 28: +YY_RULE_SETUP +#line 321 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp6Parser::make_TCP(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 29: +YY_RULE_SETUP +#line 331 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_FORMAT) { + return isc::dhcp::Dhcp6Parser::make_JSON(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 30: +YY_RULE_SETUP +#line 341 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 31: +YY_RULE_SETUP +#line 351 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 32: +YY_RULE_SETUP +#line 361 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_NEVER(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 33: +YY_RULE_SETUP +#line 371 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_NEVER(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 34: +YY_RULE_SETUP +#line 381 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_ALWAYS(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 35: +YY_RULE_SETUP +#line 391 "dhcp6_lexer.ll" +{ + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_NOT_PRESENT(driver.loc_); + } + std::string tmp(parser6_text+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + YY_BREAK +case 36: +YY_RULE_SETUP +#line 401 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -1702,9 +2090,9 @@ YY_RULE_SETUP } } YY_BREAK -case 13: +case 37: YY_RULE_SETUP -#line 183 "dhcp6_lexer.ll" +#line 410 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1714,9 +2102,9 @@ YY_RULE_SETUP } } YY_BREAK -case 14: +case 38: YY_RULE_SETUP -#line 192 "dhcp6_lexer.ll" +#line 419 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::INTERFACES_CONFIG: @@ -1726,9 +2114,9 @@ YY_RULE_SETUP } } YY_BREAK -case 15: +case 39: YY_RULE_SETUP -#line 201 "dhcp6_lexer.ll" +#line 428 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1738,9 +2126,9 @@ YY_RULE_SETUP } } YY_BREAK -case 16: +case 40: YY_RULE_SETUP -#line 210 "dhcp6_lexer.ll" +#line 437 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1750,9 +2138,9 @@ YY_RULE_SETUP } } YY_BREAK -case 17: +case 41: YY_RULE_SETUP -#line 219 "dhcp6_lexer.ll" +#line 446 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOSTS_DATABASE: @@ -1762,9 +2150,9 @@ YY_RULE_SETUP } } YY_BREAK -case 18: +case 42: YY_RULE_SETUP -#line 228 "dhcp6_lexer.ll" +#line 455 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1777,9 +2165,9 @@ YY_RULE_SETUP } } YY_BREAK -case 19: +case 43: YY_RULE_SETUP -#line 240 "dhcp6_lexer.ll" +#line 467 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1790,9 +2178,9 @@ YY_RULE_SETUP } } YY_BREAK -case 20: +case 44: YY_RULE_SETUP -#line 250 "dhcp6_lexer.ll" +#line 477 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1803,9 +2191,9 @@ YY_RULE_SETUP } } YY_BREAK -case 21: +case 45: YY_RULE_SETUP -#line 260 "dhcp6_lexer.ll" +#line 487 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1816,9 +2204,9 @@ YY_RULE_SETUP } } YY_BREAK -case 22: +case 46: YY_RULE_SETUP -#line 270 "dhcp6_lexer.ll" +#line 497 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1830,9 +2218,9 @@ YY_RULE_SETUP } } YY_BREAK -case 23: +case 47: YY_RULE_SETUP -#line 281 "dhcp6_lexer.ll" +#line 508 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1843,9 +2231,9 @@ YY_RULE_SETUP } } YY_BREAK -case 24: +case 48: YY_RULE_SETUP -#line 291 "dhcp6_lexer.ll" +#line 518 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1856,9 +2244,9 @@ YY_RULE_SETUP } } YY_BREAK -case 25: +case 49: YY_RULE_SETUP -#line 301 "dhcp6_lexer.ll" +#line 528 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1869,9 +2257,9 @@ YY_RULE_SETUP } } YY_BREAK -case 26: +case 50: YY_RULE_SETUP -#line 311 "dhcp6_lexer.ll" +#line 538 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1882,9 +2270,9 @@ YY_RULE_SETUP } } YY_BREAK -case 27: +case 51: YY_RULE_SETUP -#line 321 "dhcp6_lexer.ll" +#line 548 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1895,9 +2283,9 @@ YY_RULE_SETUP } } YY_BREAK -case 28: +case 52: YY_RULE_SETUP -#line 331 "dhcp6_lexer.ll" +#line 558 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1907,9 +2295,9 @@ YY_RULE_SETUP } } YY_BREAK -case 29: +case 53: YY_RULE_SETUP -#line 340 "dhcp6_lexer.ll" +#line 567 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1919,9 +2307,9 @@ YY_RULE_SETUP } } YY_BREAK -case 30: +case 54: YY_RULE_SETUP -#line 349 "dhcp6_lexer.ll" +#line 576 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1931,9 +2319,9 @@ YY_RULE_SETUP } } YY_BREAK -case 31: +case 55: YY_RULE_SETUP -#line 358 "dhcp6_lexer.ll" +#line 585 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -1949,9 +2337,9 @@ YY_RULE_SETUP } } YY_BREAK -case 32: +case 56: YY_RULE_SETUP -#line 373 "dhcp6_lexer.ll" +#line 600 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LEASE_DATABASE: @@ -1967,9 +2355,9 @@ YY_RULE_SETUP } } YY_BREAK -case 33: +case 57: YY_RULE_SETUP -#line 388 "dhcp6_lexer.ll" +#line 615 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -1979,9 +2367,9 @@ YY_RULE_SETUP } } YY_BREAK -case 34: +case 58: YY_RULE_SETUP -#line 397 "dhcp6_lexer.ll" +#line 624 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -1991,9 +2379,9 @@ YY_RULE_SETUP } } YY_BREAK -case 35: +case 59: YY_RULE_SETUP -#line 406 "dhcp6_lexer.ll" +#line 633 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2003,9 +2391,9 @@ YY_RULE_SETUP } } YY_BREAK -case 36: +case 60: YY_RULE_SETUP -#line 415 "dhcp6_lexer.ll" +#line 642 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2015,9 +2403,9 @@ YY_RULE_SETUP } } YY_BREAK -case 37: +case 61: YY_RULE_SETUP -#line 424 "dhcp6_lexer.ll" +#line 651 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2027,9 +2415,9 @@ YY_RULE_SETUP } } YY_BREAK -case 38: +case 62: YY_RULE_SETUP -#line 433 "dhcp6_lexer.ll" +#line 660 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2039,9 +2427,9 @@ YY_RULE_SETUP } } YY_BREAK -case 39: +case 63: YY_RULE_SETUP -#line 442 "dhcp6_lexer.ll" +#line 669 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2051,9 +2439,9 @@ YY_RULE_SETUP } } YY_BREAK -case 40: +case 64: YY_RULE_SETUP -#line 451 "dhcp6_lexer.ll" +#line 678 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::PD_POOLS: @@ -2063,9 +2451,9 @@ YY_RULE_SETUP } } YY_BREAK -case 41: +case 65: YY_RULE_SETUP -#line 460 "dhcp6_lexer.ll" +#line 687 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::POOLS: @@ -2075,9 +2463,9 @@ YY_RULE_SETUP } } YY_BREAK -case 42: +case 66: YY_RULE_SETUP -#line 469 "dhcp6_lexer.ll" +#line 696 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2087,9 +2475,9 @@ YY_RULE_SETUP } } YY_BREAK -case 43: +case 67: YY_RULE_SETUP -#line 478 "dhcp6_lexer.ll" +#line 705 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2099,9 +2487,9 @@ YY_RULE_SETUP } } YY_BREAK -case 44: +case 68: YY_RULE_SETUP -#line 487 "dhcp6_lexer.ll" +#line 714 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2111,9 +2499,9 @@ YY_RULE_SETUP } } YY_BREAK -case 45: +case 69: YY_RULE_SETUP -#line 496 "dhcp6_lexer.ll" +#line 723 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2123,9 +2511,9 @@ YY_RULE_SETUP } } YY_BREAK -case 46: +case 70: YY_RULE_SETUP -#line 505 "dhcp6_lexer.ll" +#line 732 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2135,9 +2523,9 @@ YY_RULE_SETUP } } YY_BREAK -case 47: +case 71: YY_RULE_SETUP -#line 514 "dhcp6_lexer.ll" +#line 741 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2147,9 +2535,9 @@ YY_RULE_SETUP } } YY_BREAK -case 48: +case 72: YY_RULE_SETUP -#line 523 "dhcp6_lexer.ll" +#line 750 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2160,9 +2548,9 @@ YY_RULE_SETUP } } YY_BREAK -case 49: +case 73: YY_RULE_SETUP -#line 533 "dhcp6_lexer.ll" +#line 760 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2172,9 +2560,9 @@ YY_RULE_SETUP } } YY_BREAK -case 50: +case 74: YY_RULE_SETUP -#line 542 "dhcp6_lexer.ll" +#line 769 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2184,9 +2572,9 @@ YY_RULE_SETUP } } YY_BREAK -case 51: +case 75: YY_RULE_SETUP -#line 551 "dhcp6_lexer.ll" +#line 778 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2196,9 +2584,9 @@ YY_RULE_SETUP } } YY_BREAK -case 52: +case 76: YY_RULE_SETUP -#line 560 "dhcp6_lexer.ll" +#line 787 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2208,9 +2596,9 @@ YY_RULE_SETUP } } YY_BREAK -case 53: +case 77: YY_RULE_SETUP -#line 569 "dhcp6_lexer.ll" +#line 796 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGING: @@ -2220,9 +2608,9 @@ YY_RULE_SETUP } } YY_BREAK -case 54: +case 78: YY_RULE_SETUP -#line 578 "dhcp6_lexer.ll" +#line 805 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2232,9 +2620,9 @@ YY_RULE_SETUP } } YY_BREAK -case 55: +case 79: YY_RULE_SETUP -#line 587 "dhcp6_lexer.ll" +#line 814 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OUTPUT_OPTIONS: @@ -2244,9 +2632,9 @@ YY_RULE_SETUP } } YY_BREAK -case 56: +case 80: YY_RULE_SETUP -#line 596 "dhcp6_lexer.ll" +#line 823 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2256,9 +2644,9 @@ YY_RULE_SETUP } } YY_BREAK -case 57: +case 81: YY_RULE_SETUP -#line 605 "dhcp6_lexer.ll" +#line 832 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::LOGGERS: @@ -2268,9 +2656,9 @@ YY_RULE_SETUP } } YY_BREAK -case 58: +case 82: YY_RULE_SETUP -#line 614 "dhcp6_lexer.ll" +#line 841 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2281,9 +2669,9 @@ YY_RULE_SETUP } } YY_BREAK -case 59: +case 83: YY_RULE_SETUP -#line 624 "dhcp6_lexer.ll" +#line 851 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2294,9 +2682,9 @@ YY_RULE_SETUP } } YY_BREAK -case 60: +case 84: YY_RULE_SETUP -#line 634 "dhcp6_lexer.ll" +#line 861 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CLIENT_CLASSES: @@ -2307,9 +2695,9 @@ YY_RULE_SETUP } } YY_BREAK -case 61: +case 85: YY_RULE_SETUP -#line 644 "dhcp6_lexer.ll" +#line 871 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2319,9 +2707,9 @@ YY_RULE_SETUP } } YY_BREAK -case 62: +case 86: YY_RULE_SETUP -#line 653 "dhcp6_lexer.ll" +#line 880 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2331,9 +2719,9 @@ YY_RULE_SETUP } } YY_BREAK -case 63: +case 87: YY_RULE_SETUP -#line 662 "dhcp6_lexer.ll" +#line 889 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2343,9 +2731,9 @@ YY_RULE_SETUP } } YY_BREAK -case 64: +case 88: YY_RULE_SETUP -#line 671 "dhcp6_lexer.ll" +#line 898 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::MAC_SOURCES: @@ -2357,9 +2745,9 @@ YY_RULE_SETUP } } YY_BREAK -case 65: +case 89: YY_RULE_SETUP -#line 682 "dhcp6_lexer.ll" +#line 909 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOST_RESERVATION_IDENTIFIERS: @@ -2370,9 +2758,9 @@ YY_RULE_SETUP } } YY_BREAK -case 66: +case 90: YY_RULE_SETUP -#line 692 "dhcp6_lexer.ll" +#line 919 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RESERVATIONS: @@ -2382,9 +2770,9 @@ YY_RULE_SETUP } } YY_BREAK -case 67: +case 91: YY_RULE_SETUP -#line 701 "dhcp6_lexer.ll" +#line 928 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2395,9 +2783,9 @@ YY_RULE_SETUP } } YY_BREAK -case 68: +case 92: YY_RULE_SETUP -#line 711 "dhcp6_lexer.ll" +#line 938 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DATA: @@ -2407,9 +2795,9 @@ YY_RULE_SETUP } } YY_BREAK -case 69: +case 93: YY_RULE_SETUP -#line 720 "dhcp6_lexer.ll" +#line 947 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2419,9 +2807,9 @@ YY_RULE_SETUP } } YY_BREAK -case 70: +case 94: YY_RULE_SETUP -#line 729 "dhcp6_lexer.ll" +#line 956 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2431,9 +2819,9 @@ YY_RULE_SETUP } } YY_BREAK -case 71: +case 95: YY_RULE_SETUP -#line 738 "dhcp6_lexer.ll" +#line 965 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::OPTION_DEF: @@ -2443,9 +2831,9 @@ YY_RULE_SETUP } } YY_BREAK -case 72: +case 96: YY_RULE_SETUP -#line 747 "dhcp6_lexer.ll" +#line 974 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SUBNET6: @@ -2455,9 +2843,9 @@ YY_RULE_SETUP } } YY_BREAK -case 73: +case 97: YY_RULE_SETUP -#line 756 "dhcp6_lexer.ll" +#line 983 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::RELAY: @@ -2467,9 +2855,9 @@ YY_RULE_SETUP } } YY_BREAK -case 74: +case 98: YY_RULE_SETUP -#line 765 "dhcp6_lexer.ll" +#line 992 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2479,9 +2867,9 @@ YY_RULE_SETUP } } YY_BREAK -case 75: +case 99: YY_RULE_SETUP -#line 775 "dhcp6_lexer.ll" +#line 1002 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -2491,9 +2879,9 @@ YY_RULE_SETUP } } YY_BREAK -case 76: +case 100: YY_RULE_SETUP -#line 784 "dhcp6_lexer.ll" +#line 1011 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::HOOKS_LIBRARIES: @@ -2503,9 +2891,9 @@ YY_RULE_SETUP } } YY_BREAK -case 77: +case 101: YY_RULE_SETUP -#line 793 "dhcp6_lexer.ll" +#line 1020 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2515,45 +2903,9 @@ YY_RULE_SETUP } } YY_BREAK -case 78: +case 102: YY_RULE_SETUP -#line 802 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DUID_TYPE: - return isc::dhcp::Dhcp6Parser::make_LLT(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("LLT", driver.loc_); - } -} - YY_BREAK -case 79: -YY_RULE_SETUP -#line 811 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DUID_TYPE: - return isc::dhcp::Dhcp6Parser::make_EN(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("EN", driver.loc_); - } -} - YY_BREAK -case 80: -YY_RULE_SETUP -#line 820 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::DUID_TYPE: - return isc::dhcp::Dhcp6Parser::make_LL(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("LL", driver.loc_); - } -} - YY_BREAK -case 81: -YY_RULE_SETUP -#line 829 "dhcp6_lexer.ll" +#line 1029 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -2563,9 +2915,9 @@ YY_RULE_SETUP } } YY_BREAK -case 82: +case 103: YY_RULE_SETUP -#line 838 "dhcp6_lexer.ll" +#line 1038 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -2575,9 +2927,9 @@ YY_RULE_SETUP } } YY_BREAK -case 83: +case 104: YY_RULE_SETUP -#line 847 "dhcp6_lexer.ll" +#line 1047 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -2587,9 +2939,9 @@ YY_RULE_SETUP } } YY_BREAK -case 84: +case 105: YY_RULE_SETUP -#line 856 "dhcp6_lexer.ll" +#line 1056 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::SERVER_ID: @@ -2599,9 +2951,9 @@ YY_RULE_SETUP } } YY_BREAK -case 85: +case 106: YY_RULE_SETUP -#line 865 "dhcp6_lexer.ll" +#line 1065 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2611,81 +2963,9 @@ YY_RULE_SETUP } } YY_BREAK -case 86: +case 107: YY_RULE_SETUP -#line 874 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_RECLAIM_TIMER_WAIT_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("reclaim-timer-wait-time", driver.loc_); - } -} - YY_BREAK -case 87: -YY_RULE_SETUP -#line 883 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("flush-reclaimed-timer-wait-time", driver.loc_); - } -} - YY_BREAK -case 88: -YY_RULE_SETUP -#line 892 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_HOLD_RECLAIMED_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("hold-reclaimed-time", driver.loc_); - } -} - YY_BREAK -case 89: -YY_RULE_SETUP -#line 901 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_MAX_RECLAIM_LEASES(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("max-reclaim-leases", driver.loc_); - } -} - YY_BREAK -case 90: -YY_RULE_SETUP -#line 910 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_MAX_RECLAIM_TIME(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("max-reclaim-time", driver.loc_); - } -} - YY_BREAK -case 91: -YY_RULE_SETUP -#line 919 "dhcp6_lexer.ll" -{ - switch(driver.ctx_) { - case isc::dhcp::Parser6Context::EXPIRED_LEASES_PROCESSING: - return isc::dhcp::Dhcp6Parser::make_UNWARNED_RECLAIM_CYCLES(driver.loc_); - default: - return isc::dhcp::Dhcp6Parser::make_STRING("unwarned-reclaim-cycles", driver.loc_); - } -} - YY_BREAK -case 92: -YY_RULE_SETUP -#line 928 "dhcp6_lexer.ll" +#line 1074 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2695,9 +2975,9 @@ YY_RULE_SETUP } } YY_BREAK -case 93: +case 108: YY_RULE_SETUP -#line 937 "dhcp6_lexer.ll" +#line 1083 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2707,9 +2987,9 @@ YY_RULE_SETUP } } YY_BREAK -case 94: +case 109: YY_RULE_SETUP -#line 946 "dhcp6_lexer.ll" +#line 1092 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -2719,9 +2999,9 @@ YY_RULE_SETUP } } YY_BREAK -case 95: +case 110: YY_RULE_SETUP -#line 955 "dhcp6_lexer.ll" +#line 1101 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONTROL_SOCKET: @@ -2731,9 +3011,9 @@ YY_RULE_SETUP } } YY_BREAK -case 96: +case 111: YY_RULE_SETUP -#line 964 "dhcp6_lexer.ll" +#line 1110 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::DHCP6: @@ -2743,9 +3023,9 @@ YY_RULE_SETUP } } YY_BREAK -case 97: +case 112: YY_RULE_SETUP -#line 973 "dhcp6_lexer.ll" +#line 1119 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2755,9 +3035,9 @@ YY_RULE_SETUP } } YY_BREAK -case 98: +case 113: YY_RULE_SETUP -#line 982 "dhcp6_lexer.ll" +#line 1128 "dhcp6_lexer.ll" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: @@ -2767,9 +3047,9 @@ YY_RULE_SETUP } } YY_BREAK -case 99: +case 114: YY_RULE_SETUP -#line 991 "dhcp6_lexer.ll" +#line 1137 "dhcp6_lexer.ll" { // A string has been matched. It contains the actual string and single quotes. // We need to get those quotes out of the way and just use its content, e.g. @@ -2868,65 +3148,65 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_STRING(decoded, driver.loc_); } YY_BREAK -case 100: -/* rule 100 can match eol */ +case 115: +/* rule 115 can match eol */ YY_RULE_SETUP -#line 1089 "dhcp6_lexer.ll" +#line 1235 "dhcp6_lexer.ll" { // Bad string with a forbidden control character inside driver.error(driver.loc_, "Invalid control in " + std::string(parser6_text)); } YY_BREAK -case 101: -/* rule 101 can match eol */ +case 116: +/* rule 116 can match eol */ YY_RULE_SETUP -#line 1094 "dhcp6_lexer.ll" +#line 1240 "dhcp6_lexer.ll" { // Bad string with a bad escape inside driver.error(driver.loc_, "Bad escape in " + std::string(parser6_text)); } YY_BREAK -case 102: +case 117: YY_RULE_SETUP -#line 1099 "dhcp6_lexer.ll" +#line 1245 "dhcp6_lexer.ll" { // Bad string with an open escape at the end driver.error(driver.loc_, "Overflow escape in " + std::string(parser6_text)); } YY_BREAK -case 103: +case 118: YY_RULE_SETUP -#line 1104 "dhcp6_lexer.ll" +#line 1250 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_LSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 104: +case 119: YY_RULE_SETUP -#line 1105 "dhcp6_lexer.ll" +#line 1251 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_RSQUARE_BRACKET(driver.loc_); } YY_BREAK -case 105: +case 120: YY_RULE_SETUP -#line 1106 "dhcp6_lexer.ll" +#line 1252 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_LCURLY_BRACKET(driver.loc_); } YY_BREAK -case 106: +case 121: YY_RULE_SETUP -#line 1107 "dhcp6_lexer.ll" +#line 1253 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_RCURLY_BRACKET(driver.loc_); } YY_BREAK -case 107: +case 122: YY_RULE_SETUP -#line 1108 "dhcp6_lexer.ll" +#line 1254 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_COMMA(driver.loc_); } YY_BREAK -case 108: +case 123: YY_RULE_SETUP -#line 1109 "dhcp6_lexer.ll" +#line 1255 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_COLON(driver.loc_); } YY_BREAK -case 109: +case 124: YY_RULE_SETUP -#line 1111 "dhcp6_lexer.ll" +#line 1257 "dhcp6_lexer.ll" { // An integer was found. std::string tmp(parser6_text); @@ -2945,9 +3225,9 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_INTEGER(integer, driver.loc_); } YY_BREAK -case 110: +case 125: YY_RULE_SETUP -#line 1129 "dhcp6_lexer.ll" +#line 1275 "dhcp6_lexer.ll" { // A floating point was found. std::string tmp(parser6_text); @@ -2961,43 +3241,43 @@ YY_RULE_SETUP return isc::dhcp::Dhcp6Parser::make_FLOAT(fp, driver.loc_); } YY_BREAK -case 111: +case 126: YY_RULE_SETUP -#line 1142 "dhcp6_lexer.ll" +#line 1288 "dhcp6_lexer.ll" { string tmp(parser6_text); return isc::dhcp::Dhcp6Parser::make_BOOLEAN(tmp == "true", driver.loc_); } YY_BREAK -case 112: +case 127: YY_RULE_SETUP -#line 1147 "dhcp6_lexer.ll" +#line 1293 "dhcp6_lexer.ll" { return isc::dhcp::Dhcp6Parser::make_NULL_TYPE(driver.loc_); } YY_BREAK -case 113: +case 128: YY_RULE_SETUP -#line 1151 "dhcp6_lexer.ll" +#line 1297 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON true reserved keyword is lower case only"); YY_BREAK -case 114: +case 129: YY_RULE_SETUP -#line 1153 "dhcp6_lexer.ll" +#line 1299 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON false reserved keyword is lower case only"); YY_BREAK -case 115: +case 130: YY_RULE_SETUP -#line 1155 "dhcp6_lexer.ll" +#line 1301 "dhcp6_lexer.ll" driver.error (driver.loc_, "JSON null reserved keyword is lower case only"); YY_BREAK -case 116: +case 131: YY_RULE_SETUP -#line 1157 "dhcp6_lexer.ll" +#line 1303 "dhcp6_lexer.ll" driver.error (driver.loc_, "Invalid character: " + std::string(parser6_text)); YY_BREAK case YY_STATE_EOF(INITIAL): -#line 1159 "dhcp6_lexer.ll" +#line 1305 "dhcp6_lexer.ll" { if (driver.states_.empty()) { return isc::dhcp::Dhcp6Parser::make_END(driver.loc_); @@ -3021,12 +3301,12 @@ case YY_STATE_EOF(INITIAL): BEGIN(DIR_EXIT); } YY_BREAK -case 117: +case 132: YY_RULE_SETUP -#line 1182 "dhcp6_lexer.ll" +#line 1328 "dhcp6_lexer.ll" ECHO; YY_BREAK -#line 3030 "dhcp6_lexer.cc" +#line 3310 "dhcp6_lexer.cc" case YY_END_OF_BUFFER: { @@ -3343,7 +3623,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 889 ) + if ( yy_current_state >= 1014 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; @@ -3376,11 +3656,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 889 ) + if ( yy_current_state >= 1014 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c]; - yy_is_jam = (yy_current_state == 888); + yy_is_jam = (yy_current_state == 1013); return yy_is_jam ? 0 : yy_current_state; } @@ -4129,7 +4409,7 @@ void parser6_free (void * ptr ) /* %ok-for-header */ -#line 1182 "dhcp6_lexer.ll" +#line 1328 "dhcp6_lexer.ll" diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll index 26a4588e5f..d31da6e41c 100644 --- a/src/bin/dhcp6/dhcp6_lexer.ll +++ b/src/bin/dhcp6/dhcp6_lexer.ll @@ -123,6 +123,8 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} return isc::dhcp::Dhcp6Parser::make_SUB_OPTION_DATA(driver.loc_); case Parser6Context::PARSER_HOOKS_LIBRARY: return isc::dhcp::Dhcp6Parser::make_SUB_HOOKS_LIBRARY(driver.loc_); + case Parser6Context::PARSER_DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SUB_DHCP_DDNS(driver.loc_); } } %} @@ -171,6 +173,231 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} } +\"enable-updates\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ENABLE_UPDATES(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("enable-updates", driver.loc_); + } +} + +\"qualifying-suffix\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_QUALIFYING_SUFFIX(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("qualifying-suffix", driver.loc_); + } +} + +\"server-ip\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SERVER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("server-ip", driver.loc_); + } +} + +\"server-port\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SERVER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("server-port", driver.loc_); + } +} + +\"sender-ip\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SENDER_IP(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("sender-ip", driver.loc_); + } +} + +\"sender-port\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_SENDER_PORT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("sender-port", driver.loc_); + } +} + +\"max-queue-size\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_MAX_QUEUE_SIZE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("max-queue-size", driver.loc_); + } +} + +\"ncr-protocol\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_NCR_PROTOCOL(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("ncr-protocol", driver.loc_); + } +} + +\"ncr-format\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_NCR_FORMAT(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("ncr-format", driver.loc_); + } +} + +\"always-include-fqdn\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ALWAYS_INCLUDE_FQDN(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("always-include-fqdn", driver.loc_); + } +} + +\"allow-client-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_ALLOW_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("allow-client-update", driver.loc_); + } +} + +\"override-no-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_OVERRIDE_NO_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("override-no-update", driver.loc_); + } +} + +\"override-client-update\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_OVERRIDE_CLIENT_UPDATE(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("override-client-update", driver.loc_); + } +} + +\"replace-client-name\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_REPLACE_CLIENT_NAME(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("replace-client-name", driver.loc_); + } +} + +\"generated-prefix\" { + switch(driver.ctx_) { + case isc::dhcp::Parser6Context::DHCP_DDNS: + return isc::dhcp::Dhcp6Parser::make_GENERATED_PREFIX(driver.loc_); + default: + return isc::dhcp::Dhcp6Parser::make_STRING("generated-prefix", driver.loc_); + } +} + +(?i:\"UDP\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp6Parser::make_UDP(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"TCP\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_PROTOCOL) { + return isc::dhcp::Dhcp6Parser::make_TCP(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"JSON\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::NCR_FORMAT) { + return isc::dhcp::Dhcp6Parser::make_JSON(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"when-present\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"true\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"never\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_NEVER(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"false\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_NEVER(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"always\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_ALWAYS(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + +(?i:\"when-not-present\") { + /* dhcp-ddns value keywords are case insensitive */ + if (driver.ctx_ == isc::dhcp::Parser6Context::REPLACE_CLIENT_NAME) { + return isc::dhcp::Dhcp6Parser::make_WHEN_NOT_PRESENT(driver.loc_); + } + std::string tmp(yytext+1); + tmp.resize(tmp.size() - 1); + return isc::dhcp::Dhcp6Parser::make_STRING(tmp, driver.loc_); +} + \"Dhcp6\" { switch(driver.ctx_) { case isc::dhcp::Parser6Context::CONFIG: diff --git a/src/bin/dhcp6/dhcp6_parser.cc b/src/bin/dhcp6/dhcp6_parser.cc index 15a89469f5..e45534d279 100644 --- a/src/bin/dhcp6/dhcp6_parser.cc +++ b/src/bin/dhcp6/dhcp6_parser.cc @@ -253,24 +253,25 @@ namespace isc { namespace dhcp { { switch (that.type_get ()) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.move< ElementPtr > (that.value); break; - case 111: // "boolean" + case 125: // "boolean" value.move< bool > (that.value); break; - case 110: // "floating point" + case 124: // "floating point" value.move< double > (that.value); break; - case 109: // "integer" + case 123: // "integer" value.move< int64_t > (that.value); break; - case 108: // "constant string" + case 122: // "constant string" value.move< std::string > (that.value); break; @@ -289,24 +290,25 @@ namespace isc { namespace dhcp { state = that.state; switch (that.type_get ()) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.copy< ElementPtr > (that.value); break; - case 111: // "boolean" + case 125: // "boolean" value.copy< bool > (that.value); break; - case 110: // "floating point" + case 124: // "floating point" value.copy< double > (that.value); break; - case 109: // "integer" + case 123: // "integer" value.copy< int64_t > (that.value); break; - case 108: // "constant string" + case 122: // "constant string" value.copy< std::string > (that.value); break; @@ -346,46 +348,53 @@ namespace isc { namespace dhcp { << yysym.location << ": "; switch (yytype) { - case 108: // "constant string" + case 122: // "constant string" -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< std::string > (); } -#line 354 "dhcp6_parser.cc" // lalr1.cc:636 +#line 356 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 109: // "integer" + case 123: // "integer" -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< int64_t > (); } -#line 361 "dhcp6_parser.cc" // lalr1.cc:636 +#line 363 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 110: // "floating point" + case 124: // "floating point" -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< double > (); } -#line 368 "dhcp6_parser.cc" // lalr1.cc:636 +#line 370 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 111: // "boolean" + case 125: // "boolean" -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< bool > (); } -#line 375 "dhcp6_parser.cc" // lalr1.cc:636 +#line 377 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 125: // value + case 140: // value -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } -#line 382 "dhcp6_parser.cc" // lalr1.cc:636 +#line 384 "dhcp6_parser.cc" // lalr1.cc:636 break; - case 350: // duid_type + case 388: // ncr_protocol_value -#line 199 "dhcp6_parser.yy" // lalr1.cc:636 +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 { yyoutput << yysym.value.template as< ElementPtr > (); } -#line 389 "dhcp6_parser.cc" // lalr1.cc:636 +#line 391 "dhcp6_parser.cc" // lalr1.cc:636 + break; + + case 397: // replace_client_name_value + +#line 194 "dhcp6_parser.yy" // lalr1.cc:636 + { yyoutput << yysym.value.template as< ElementPtr > (); } +#line 398 "dhcp6_parser.cc" // lalr1.cc:636 break; @@ -585,24 +594,25 @@ namespace isc { namespace dhcp { when using variants. */ switch (yyr1_[yyn]) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value yylhs.value.build< ElementPtr > (); break; - case 111: // "boolean" + case 125: // "boolean" yylhs.value.build< bool > (); break; - case 110: // "floating point" + case 124: // "floating point" yylhs.value.build< double > (); break; - case 109: // "integer" + case 123: // "integer" yylhs.value.build< int64_t > (); break; - case 108: // "constant string" + case 122: // "constant string" yylhs.value.build< std::string > (); break; @@ -624,248 +634,254 @@ namespace isc { namespace dhcp { switch (yyn) { case 2: -#line 208 "dhcp6_parser.yy" // lalr1.cc:859 +#line 203 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.NO_KEYWORD; } -#line 630 "dhcp6_parser.cc" // lalr1.cc:859 +#line 640 "dhcp6_parser.cc" // lalr1.cc:859 break; case 4: -#line 209 "dhcp6_parser.yy" // lalr1.cc:859 +#line 204 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.CONFIG; } -#line 636 "dhcp6_parser.cc" // lalr1.cc:859 +#line 646 "dhcp6_parser.cc" // lalr1.cc:859 break; case 6: -#line 210 "dhcp6_parser.yy" // lalr1.cc:859 +#line 205 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.DHCP6; } -#line 642 "dhcp6_parser.cc" // lalr1.cc:859 +#line 652 "dhcp6_parser.cc" // lalr1.cc:859 break; case 8: -#line 211 "dhcp6_parser.yy" // lalr1.cc:859 +#line 206 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.INTERFACES_CONFIG; } -#line 648 "dhcp6_parser.cc" // lalr1.cc:859 +#line 658 "dhcp6_parser.cc" // lalr1.cc:859 break; case 10: -#line 212 "dhcp6_parser.yy" // lalr1.cc:859 +#line 207 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.SUBNET6; } -#line 654 "dhcp6_parser.cc" // lalr1.cc:859 +#line 664 "dhcp6_parser.cc" // lalr1.cc:859 break; case 12: -#line 213 "dhcp6_parser.yy" // lalr1.cc:859 +#line 208 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.POOLS; } -#line 660 "dhcp6_parser.cc" // lalr1.cc:859 +#line 670 "dhcp6_parser.cc" // lalr1.cc:859 break; case 14: -#line 214 "dhcp6_parser.yy" // lalr1.cc:859 +#line 209 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.PD_POOLS; } -#line 666 "dhcp6_parser.cc" // lalr1.cc:859 +#line 676 "dhcp6_parser.cc" // lalr1.cc:859 break; case 16: -#line 215 "dhcp6_parser.yy" // lalr1.cc:859 +#line 210 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.RESERVATIONS; } -#line 672 "dhcp6_parser.cc" // lalr1.cc:859 +#line 682 "dhcp6_parser.cc" // lalr1.cc:859 break; case 18: -#line 216 "dhcp6_parser.yy" // lalr1.cc:859 +#line 211 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DEF; } -#line 678 "dhcp6_parser.cc" // lalr1.cc:859 +#line 688 "dhcp6_parser.cc" // lalr1.cc:859 break; case 20: -#line 217 "dhcp6_parser.yy" // lalr1.cc:859 +#line 212 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.OPTION_DATA; } -#line 684 "dhcp6_parser.cc" // lalr1.cc:859 +#line 694 "dhcp6_parser.cc" // lalr1.cc:859 break; case 22: -#line 218 "dhcp6_parser.yy" // lalr1.cc:859 +#line 213 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } -#line 690 "dhcp6_parser.cc" // lalr1.cc:859 +#line 700 "dhcp6_parser.cc" // lalr1.cc:859 break; case 24: -#line 226 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } -#line 696 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 25: -#line 227 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } -#line 702 "dhcp6_parser.cc" // lalr1.cc:859 +#line 214 "dhcp6_parser.yy" // lalr1.cc:859 + { ctx.ctx_ = ctx.DHCP_DDNS; } +#line 706 "dhcp6_parser.cc" // lalr1.cc:859 break; case 26: -#line 228 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } -#line 708 "dhcp6_parser.cc" // lalr1.cc:859 +#line 222 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); } +#line 712 "dhcp6_parser.cc" // lalr1.cc:859 break; case 27: -#line 229 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } -#line 714 "dhcp6_parser.cc" // lalr1.cc:859 +#line 223 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new DoubleElement(yystack_[0].value.as< double > (), ctx.loc2pos(yystack_[0].location))); } +#line 718 "dhcp6_parser.cc" // lalr1.cc:859 break; case 28: -#line 230 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } -#line 720 "dhcp6_parser.cc" // lalr1.cc:859 +#line 224 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); } +#line 724 "dhcp6_parser.cc" // lalr1.cc:859 break; case 29: -#line 231 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } -#line 726 "dhcp6_parser.cc" // lalr1.cc:859 +#line 225 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); } +#line 730 "dhcp6_parser.cc" // lalr1.cc:859 break; case 30: -#line 232 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } -#line 732 "dhcp6_parser.cc" // lalr1.cc:859 +#line 226 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new NullElement(ctx.loc2pos(yystack_[0].location))); } +#line 736 "dhcp6_parser.cc" // lalr1.cc:859 break; case 31: -#line 235 "dhcp6_parser.yy" // lalr1.cc:859 +#line 227 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } +#line 742 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 32: +#line 228 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ctx.stack_.back(); ctx.stack_.pop_back(); } +#line 748 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 33: +#line 231 "dhcp6_parser.yy" // lalr1.cc:859 { // Push back the JSON value on the stack ctx.stack_.push_back(yystack_[0].value.as< ElementPtr > ()); } -#line 741 "dhcp6_parser.cc" // lalr1.cc:859 +#line 757 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 32: -#line 240 "dhcp6_parser.yy" // lalr1.cc:859 + case 34: +#line 236 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 752 "dhcp6_parser.cc" // lalr1.cc:859 +#line 768 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 33: -#line 245 "dhcp6_parser.yy" // lalr1.cc:859 + case 35: +#line 241 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place // for it. } -#line 762 "dhcp6_parser.cc" // lalr1.cc:859 +#line 778 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 36: -#line 256 "dhcp6_parser.yy" // lalr1.cc:859 + case 38: +#line 252 "dhcp6_parser.yy" // lalr1.cc:859 { // map containing a single entry ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); } -#line 771 "dhcp6_parser.cc" // lalr1.cc:859 +#line 787 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 37: -#line 260 "dhcp6_parser.yy" // lalr1.cc:859 + case 39: +#line 256 "dhcp6_parser.yy" // lalr1.cc:859 { // map consisting of a shorter map followed by // comma and string:value ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), yystack_[0].value.as< ElementPtr > ()); } -#line 781 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 38: -#line 267 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); - ctx.stack_.push_back(l); -} -#line 790 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 39: -#line 270 "dhcp6_parser.yy" // lalr1.cc:859 - { - // list parsing complete. Put any sanity checking here -} -#line 798 "dhcp6_parser.cc" // lalr1.cc:859 +#line 797 "dhcp6_parser.cc" // lalr1.cc:859 break; case 40: -#line 275 "dhcp6_parser.yy" // lalr1.cc:859 +#line 263 "dhcp6_parser.yy" // lalr1.cc:859 { - // List parsing about to start + ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.push_back(l); } #line 806 "dhcp6_parser.cc" // lalr1.cc:859 break; case 41: -#line 277 "dhcp6_parser.yy" // lalr1.cc:859 +#line 266 "dhcp6_parser.yy" // lalr1.cc:859 + { + // list parsing complete. Put any sanity checking here +} +#line 814 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 42: +#line 271 "dhcp6_parser.yy" // lalr1.cc:859 + { + // List parsing about to start +} +#line 822 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 43: +#line 273 "dhcp6_parser.yy" // lalr1.cc:859 { // list parsing complete. Put any sanity checking here //ctx.stack_.pop_back(); } -#line 815 "dhcp6_parser.cc" // lalr1.cc:859 +#line 831 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 44: -#line 286 "dhcp6_parser.yy" // lalr1.cc:859 + case 46: +#line 282 "dhcp6_parser.yy" // lalr1.cc:859 { // List consisting of a single element. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); } -#line 824 "dhcp6_parser.cc" // lalr1.cc:859 +#line 840 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 45: -#line 290 "dhcp6_parser.yy" // lalr1.cc:859 + case 47: +#line 286 "dhcp6_parser.yy" // lalr1.cc:859 { // List ending with , and a value. ctx.stack_.back()->add(yystack_[0].value.as< ElementPtr > ()); } -#line 833 "dhcp6_parser.cc" // lalr1.cc:859 +#line 849 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 46: -#line 301 "dhcp6_parser.yy" // lalr1.cc:859 + case 48: +#line 297 "dhcp6_parser.yy" // lalr1.cc:859 { const std::string& where = ctx.contextName(); const std::string& keyword = yystack_[1].value.as< std::string > (); error(yystack_[1].location, "got unexpected keyword \"" + keyword + "\" in " + where + " map."); } -#line 844 "dhcp6_parser.cc" // lalr1.cc:859 +#line 860 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 47: -#line 311 "dhcp6_parser.yy" // lalr1.cc:859 + case 49: +#line 307 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 855 "dhcp6_parser.cc" // lalr1.cc:859 +#line 871 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 48: -#line 316 "dhcp6_parser.yy" // lalr1.cc:859 + case 50: +#line 312 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place // for it. } -#line 865 "dhcp6_parser.cc" // lalr1.cc:859 +#line 881 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 56: -#line 335 "dhcp6_parser.yy" // lalr1.cc:859 + case 58: +#line 331 "dhcp6_parser.yy" // lalr1.cc:859 { // This code is executed when we're about to start parsing // the content of the map @@ -874,11 +890,11 @@ namespace isc { namespace dhcp { ctx.stack_.push_back(m); ctx.enter(ctx.DHCP6); } -#line 878 "dhcp6_parser.cc" // lalr1.cc:859 +#line 894 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 57: -#line 342 "dhcp6_parser.yy" // lalr1.cc:859 + case 59: +#line 338 "dhcp6_parser.yy" // lalr1.cc:859 { // map parsing completed. If we ever want to do any wrap up // (maybe some sanity checking), this would be the best place @@ -886,571 +902,526 @@ namespace isc { namespace dhcp { ctx.stack_.pop_back(); ctx.leave(); } -#line 890 "dhcp6_parser.cc" // lalr1.cc:859 +#line 906 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 58: -#line 352 "dhcp6_parser.yy" // lalr1.cc:859 + case 60: +#line 348 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the Dhcp6 map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 900 "dhcp6_parser.cc" // lalr1.cc:859 +#line 916 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 59: -#line 356 "dhcp6_parser.yy" // lalr1.cc:859 + case 61: +#line 352 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 908 "dhcp6_parser.cc" // lalr1.cc:859 +#line 924 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 84: -#line 390 "dhcp6_parser.yy" // lalr1.cc:859 + case 86: +#line 386 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("preferred-lifetime", prf); } -#line 917 "dhcp6_parser.cc" // lalr1.cc:859 +#line 933 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 85: -#line 395 "dhcp6_parser.yy" // lalr1.cc:859 + case 87: +#line 391 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("valid-lifetime", prf); } -#line 926 "dhcp6_parser.cc" // lalr1.cc:859 +#line 942 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 86: -#line 400 "dhcp6_parser.yy" // lalr1.cc:859 + case 88: +#line 396 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("renew-timer", prf); } -#line 935 "dhcp6_parser.cc" // lalr1.cc:859 +#line 951 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 87: -#line 405 "dhcp6_parser.yy" // lalr1.cc:859 + case 89: +#line 401 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rebind-timer", prf); } -#line 944 "dhcp6_parser.cc" // lalr1.cc:859 +#line 960 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 88: -#line 410 "dhcp6_parser.yy" // lalr1.cc:859 + case 90: +#line 406 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr dpp(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("decline-probation-period", dpp); } -#line 953 "dhcp6_parser.cc" // lalr1.cc:859 +#line 969 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 89: -#line 415 "dhcp6_parser.yy" // lalr1.cc:859 + case 91: +#line 411 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces-config", i); ctx.stack_.push_back(i); ctx.enter(ctx.INTERFACES_CONFIG); } -#line 964 "dhcp6_parser.cc" // lalr1.cc:859 +#line 980 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 90: -#line 420 "dhcp6_parser.yy" // lalr1.cc:859 + case 92: +#line 416 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 973 "dhcp6_parser.cc" // lalr1.cc:859 +#line 989 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 91: -#line 425 "dhcp6_parser.yy" // lalr1.cc:859 + case 93: +#line 421 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the interfaces-config map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 983 "dhcp6_parser.cc" // lalr1.cc:859 +#line 999 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 92: -#line 429 "dhcp6_parser.yy" // lalr1.cc:859 + case 94: +#line 425 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 991 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1007 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 93: -#line 433 "dhcp6_parser.yy" // lalr1.cc:859 + case 95: +#line 429 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interfaces", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 1002 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1018 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 94: -#line 438 "dhcp6_parser.yy" // lalr1.cc:859 + case 96: +#line 434 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1011 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1027 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 95: -#line 443 "dhcp6_parser.yy" // lalr1.cc:859 + case 97: +#line 439 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lease-database", i); ctx.stack_.push_back(i); ctx.enter(ctx.LEASE_DATABASE); } -#line 1022 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1038 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 96: -#line 448 "dhcp6_parser.yy" // lalr1.cc:859 + case 98: +#line 444 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1031 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1047 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 97: -#line 453 "dhcp6_parser.yy" // lalr1.cc:859 + case 99: +#line 449 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr i(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hosts-database", i); ctx.stack_.push_back(i); ctx.enter(ctx.HOSTS_DATABASE); } -#line 1042 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1058 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 98: -#line 458 "dhcp6_parser.yy" // lalr1.cc:859 + case 100: +#line 454 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1051 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1067 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 110: -#line 478 "dhcp6_parser.yy" // lalr1.cc:859 + case 112: +#line 474 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1059 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1075 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 111: -#line 480 "dhcp6_parser.yy" // lalr1.cc:859 + case 113: +#line 476 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("type", prf); ctx.leave(); } -#line 1069 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1085 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 112: -#line 486 "dhcp6_parser.yy" // lalr1.cc:859 + case 114: +#line 482 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1077 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1093 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 113: -#line 488 "dhcp6_parser.yy" // lalr1.cc:859 + case 115: +#line 484 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr user(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("user", user); ctx.leave(); } -#line 1087 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1103 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 114: -#line 494 "dhcp6_parser.yy" // lalr1.cc:859 + case 116: +#line 490 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1095 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1111 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 115: -#line 496 "dhcp6_parser.yy" // lalr1.cc:859 + case 117: +#line 492 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr pwd(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("password", pwd); ctx.leave(); } -#line 1105 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1121 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 116: -#line 502 "dhcp6_parser.yy" // lalr1.cc:859 + case 118: +#line 498 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1113 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1129 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 117: -#line 504 "dhcp6_parser.yy" // lalr1.cc:859 + case 119: +#line 500 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr h(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host", h); ctx.leave(); } -#line 1123 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1139 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 118: -#line 510 "dhcp6_parser.yy" // lalr1.cc:859 + case 120: +#line 506 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1131 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1147 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 119: -#line 512 "dhcp6_parser.yy" // lalr1.cc:859 + case 121: +#line 508 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("name", name); ctx.leave(); } -#line 1141 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1157 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 120: -#line 518 "dhcp6_parser.yy" // lalr1.cc:859 + case 122: +#line 514 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("persist", n); } -#line 1150 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1166 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 121: -#line 523 "dhcp6_parser.yy" // lalr1.cc:859 + case 123: +#line 519 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("lfc-interval", n); } -#line 1159 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1175 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 122: -#line 528 "dhcp6_parser.yy" // lalr1.cc:859 + case 124: +#line 524 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr n(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("readonly", n); } -#line 1168 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1184 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 123: -#line 533 "dhcp6_parser.yy" // lalr1.cc:859 + case 125: +#line 529 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("mac-sources", l); ctx.stack_.push_back(l); ctx.enter(ctx.MAC_SOURCES); } -#line 1179 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1195 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 124: -#line 538 "dhcp6_parser.yy" // lalr1.cc:859 + case 126: +#line 534 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1188 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1204 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 129: -#line 551 "dhcp6_parser.yy" // lalr1.cc:859 + case 131: +#line 547 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr duid(new StringElement("duid", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); } -#line 1197 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1213 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 130: -#line 556 "dhcp6_parser.yy" // lalr1.cc:859 + case 132: +#line 552 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr duid(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(duid); } -#line 1206 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1222 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 131: -#line 561 "dhcp6_parser.yy" // lalr1.cc:859 + case 133: +#line 557 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("host-reservation-identifiers", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOST_RESERVATION_IDENTIFIERS); } -#line 1217 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1233 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 132: -#line 566 "dhcp6_parser.yy" // lalr1.cc:859 + case 134: +#line 562 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1226 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1242 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 137: -#line 579 "dhcp6_parser.yy" // lalr1.cc:859 + case 139: +#line 575 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr hwaddr(new StringElement("hw-address", ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(hwaddr); } -#line 1235 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1251 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 138: -#line 584 "dhcp6_parser.yy" // lalr1.cc:859 + case 140: +#line 580 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay-supplied-options", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 1246 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1262 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 139: -#line 589 "dhcp6_parser.yy" // lalr1.cc:859 + case 141: +#line 585 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1255 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1271 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 140: -#line 594 "dhcp6_parser.yy" // lalr1.cc:859 + case 142: +#line 590 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hooks-libraries", l); ctx.stack_.push_back(l); ctx.enter(ctx.HOOKS_LIBRARIES); } -#line 1266 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1282 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 141: -#line 599 "dhcp6_parser.yy" // lalr1.cc:859 + case 143: +#line 595 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1275 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1291 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 146: -#line 612 "dhcp6_parser.yy" // lalr1.cc:859 + case 148: +#line 608 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1285 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1301 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 147: -#line 616 "dhcp6_parser.yy" // lalr1.cc:859 + case 149: +#line 612 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1293 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1309 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 148: -#line 620 "dhcp6_parser.yy" // lalr1.cc:859 + case 150: +#line 616 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the hooks-libraries list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1303 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 149: -#line 624 "dhcp6_parser.yy" // lalr1.cc:859 - { - // parsing completed -} -#line 1311 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 155: -#line 637 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} #line 1319 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 156: -#line 639 "dhcp6_parser.yy" // lalr1.cc:859 + case 151: +#line 620 "dhcp6_parser.yy" // lalr1.cc:859 + { + // parsing completed +} +#line 1327 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 157: +#line 633 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 1335 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 158: +#line 635 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr lib(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("library", lib); ctx.leave(); } -#line 1329 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1345 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 157: -#line 645 "dhcp6_parser.yy" // lalr1.cc:859 + case 159: +#line 641 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1337 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1353 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 158: -#line 647 "dhcp6_parser.yy" // lalr1.cc:859 + case 160: +#line 643 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.back()->set("parameters", yystack_[0].value.as< ElementPtr > ()); ctx.leave(); } -#line 1346 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1362 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 159: -#line 653 "dhcp6_parser.yy" // lalr1.cc:859 + case 161: +#line 649 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("expired-leases-processing", m); ctx.stack_.push_back(m); - ctx.enter(ctx.EXPIRED_LEASES_PROCESSING); + ctx.enter(ctx.NO_KEYWORD); } -#line 1357 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1373 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 160: -#line 658 "dhcp6_parser.yy" // lalr1.cc:859 + case 162: +#line 654 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1366 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1382 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 169: -#line 675 "dhcp6_parser.yy" // lalr1.cc:859 + case 165: +#line 666 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("reclaim-timer-wait-time", value); + ctx.stack_.back()->set(yystack_[2].value.as< std::string > (), value); } -#line 1375 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1391 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 170: -#line 680 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("flush-reclaimed-timer-wait-time", value); -} -#line 1384 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 171: -#line 685 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("hold-reclaimed-time", value); -} -#line 1393 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 172: -#line 690 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-reclaim-leases", value); -} -#line 1402 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 173: -#line 695 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("max-reclaim-time", value); -} -#line 1411 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 174: -#line 700 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr value(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("unwarned-reclaim-cycles", value); -} -#line 1420 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 175: -#line 708 "dhcp6_parser.yy" // lalr1.cc:859 + case 166: +#line 674 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet6", l); ctx.stack_.push_back(l); ctx.enter(ctx.SUBNET6); } -#line 1431 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1402 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 176: -#line 713 "dhcp6_parser.yy" // lalr1.cc:859 + case 167: +#line 679 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1440 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1411 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 181: -#line 733 "dhcp6_parser.yy" // lalr1.cc:859 + case 172: +#line 699 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1450 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1421 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 182: -#line 737 "dhcp6_parser.yy" // lalr1.cc:859 + case 173: +#line 703 "dhcp6_parser.yy" // lalr1.cc:859 { // Once we reached this place, the subnet parsing is now complete. // If we want to, we can implement default values here. @@ -1469,1183 +1440,1397 @@ namespace isc { namespace dhcp { // } ctx.stack_.pop_back(); } -#line 1473 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1444 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 183: -#line 756 "dhcp6_parser.yy" // lalr1.cc:859 + case 174: +#line 722 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the subnet6 list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1483 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1454 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 184: -#line 760 "dhcp6_parser.yy" // lalr1.cc:859 + case 175: +#line 726 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1491 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1462 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 204: -#line 789 "dhcp6_parser.yy" // lalr1.cc:859 + case 195: +#line 755 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1499 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1470 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 205: -#line 791 "dhcp6_parser.yy" // lalr1.cc:859 + case 196: +#line 757 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr subnet(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("subnet", subnet); ctx.leave(); } -#line 1509 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1480 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 206: -#line 797 "dhcp6_parser.yy" // lalr1.cc:859 + case 197: +#line 763 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1517 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1488 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 207: -#line 799 "dhcp6_parser.yy" // lalr1.cc:859 + case 198: +#line 765 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface", iface); ctx.leave(); } -#line 1527 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1498 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 208: -#line 805 "dhcp6_parser.yy" // lalr1.cc:859 + case 199: +#line 771 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1535 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1506 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 209: -#line 807 "dhcp6_parser.yy" // lalr1.cc:859 + case 200: +#line 773 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr iface(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("interface-id", iface); ctx.leave(); } -#line 1545 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1516 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 210: -#line 813 "dhcp6_parser.yy" // lalr1.cc:859 + case 201: +#line 779 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.CLIENT_CLASS); } -#line 1553 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1524 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 211: -#line 815 "dhcp6_parser.yy" // lalr1.cc:859 + case 202: +#line 781 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr cls(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-class", cls); ctx.leave(); } -#line 1563 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1534 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 212: -#line 821 "dhcp6_parser.yy" // lalr1.cc:859 + case 203: +#line 787 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1571 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1542 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 213: -#line 823 "dhcp6_parser.yy" // lalr1.cc:859 + case 204: +#line 789 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rm(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservation-mode", rm); ctx.leave(); } -#line 1581 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1552 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 214: -#line 829 "dhcp6_parser.yy" // lalr1.cc:859 + case 205: +#line 795 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr id(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("id", id); } -#line 1590 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1561 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 215: -#line 834 "dhcp6_parser.yy" // lalr1.cc:859 + case 206: +#line 800 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rc(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("rapid-commit", rc); } -#line 1599 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1570 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 216: -#line 843 "dhcp6_parser.yy" // lalr1.cc:859 + case 207: +#line 809 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-def", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DEF); } -#line 1610 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1581 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 217: -#line 848 "dhcp6_parser.yy" // lalr1.cc:859 + case 208: +#line 814 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1619 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1590 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 222: -#line 865 "dhcp6_parser.yy" // lalr1.cc:859 + case 213: +#line 831 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1629 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1600 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 223: -#line 869 "dhcp6_parser.yy" // lalr1.cc:859 + case 214: +#line 835 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1637 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1608 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 224: -#line 876 "dhcp6_parser.yy" // lalr1.cc:859 + case 215: +#line 842 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the option-def list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1647 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1618 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 225: -#line 880 "dhcp6_parser.yy" // lalr1.cc:859 + case 216: +#line 846 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1655 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1626 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 239: -#line 906 "dhcp6_parser.yy" // lalr1.cc:859 + case 230: +#line 872 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr code(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("code", code); } -#line 1664 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1635 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 241: -#line 913 "dhcp6_parser.yy" // lalr1.cc:859 + case 233: +#line 881 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1672 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1643 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 242: -#line 915 "dhcp6_parser.yy" // lalr1.cc:859 - { - ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); - ctx.stack_.back()->set("type", prf); - ctx.leave(); -} -#line 1682 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 243: -#line 921 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.NO_KEYWORD); -} -#line 1690 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 244: -#line 923 "dhcp6_parser.yy" // lalr1.cc:859 + case 234: +#line 883 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr rtypes(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("record-types", rtypes); ctx.leave(); } -#line 1700 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1653 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 245: -#line 929 "dhcp6_parser.yy" // lalr1.cc:859 + case 235: +#line 889 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1708 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1661 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 246: -#line 931 "dhcp6_parser.yy" // lalr1.cc:859 + case 236: +#line 891 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr space(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("space", space); ctx.leave(); } -#line 1718 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1671 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 248: -#line 939 "dhcp6_parser.yy" // lalr1.cc:859 + case 238: +#line 899 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1726 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1679 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 249: -#line 941 "dhcp6_parser.yy" // lalr1.cc:859 + case 239: +#line 901 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr encap(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("encapsulate", encap); ctx.leave(); } -#line 1736 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1689 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 250: -#line 947 "dhcp6_parser.yy" // lalr1.cc:859 + case 240: +#line 907 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr array(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("array", array); } -#line 1745 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1698 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 251: -#line 956 "dhcp6_parser.yy" // lalr1.cc:859 + case 241: +#line 916 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("option-data", l); ctx.stack_.push_back(l); ctx.enter(ctx.OPTION_DATA); } -#line 1756 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1709 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 252: -#line 961 "dhcp6_parser.yy" // lalr1.cc:859 + case 242: +#line 921 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1765 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1718 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 257: -#line 980 "dhcp6_parser.yy" // lalr1.cc:859 + case 247: +#line 940 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1775 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1728 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 258: -#line 984 "dhcp6_parser.yy" // lalr1.cc:859 + case 248: +#line 944 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1783 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1736 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 259: -#line 991 "dhcp6_parser.yy" // lalr1.cc:859 + case 249: +#line 951 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the option-data list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1793 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1746 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 260: -#line 995 "dhcp6_parser.yy" // lalr1.cc:859 + case 250: +#line 955 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1801 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1754 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 272: -#line 1024 "dhcp6_parser.yy" // lalr1.cc:859 + case 262: +#line 984 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1809 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1762 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 273: -#line 1026 "dhcp6_parser.yy" // lalr1.cc:859 + case 263: +#line 986 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr data(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("data", data); ctx.leave(); } -#line 1819 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1772 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 276: -#line 1036 "dhcp6_parser.yy" // lalr1.cc:859 + case 266: +#line 996 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr space(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("csv-format", space); } -#line 1828 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1781 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 277: -#line 1044 "dhcp6_parser.yy" // lalr1.cc:859 + case 267: +#line 1004 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.POOLS); } -#line 1839 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1792 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 278: -#line 1049 "dhcp6_parser.yy" // lalr1.cc:859 + case 268: +#line 1009 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1848 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1801 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 283: -#line 1064 "dhcp6_parser.yy" // lalr1.cc:859 + case 273: +#line 1024 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1858 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1811 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 284: -#line 1068 "dhcp6_parser.yy" // lalr1.cc:859 + case 274: +#line 1028 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1866 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1819 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 285: -#line 1072 "dhcp6_parser.yy" // lalr1.cc:859 + case 275: +#line 1032 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1876 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1829 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 286: -#line 1076 "dhcp6_parser.yy" // lalr1.cc:859 + case 276: +#line 1036 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1884 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1837 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 292: -#line 1089 "dhcp6_parser.yy" // lalr1.cc:859 + case 282: +#line 1049 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1892 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1845 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 293: -#line 1091 "dhcp6_parser.yy" // lalr1.cc:859 + case 283: +#line 1051 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr pool(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pool", pool); ctx.leave(); } -#line 1902 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1855 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 294: -#line 1100 "dhcp6_parser.yy" // lalr1.cc:859 + case 284: +#line 1060 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("pd-pools", l); ctx.stack_.push_back(l); ctx.enter(ctx.PD_POOLS); } -#line 1913 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1866 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 295: -#line 1105 "dhcp6_parser.yy" // lalr1.cc:859 + case 285: +#line 1065 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 1922 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1875 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 300: -#line 1120 "dhcp6_parser.yy" // lalr1.cc:859 + case 290: +#line 1080 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 1932 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1885 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 301: -#line 1124 "dhcp6_parser.yy" // lalr1.cc:859 + case 291: +#line 1084 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 1940 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1893 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 302: -#line 1128 "dhcp6_parser.yy" // lalr1.cc:859 + case 292: +#line 1088 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the pd-pool list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 1950 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1903 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 303: -#line 1132 "dhcp6_parser.yy" // lalr1.cc:859 + case 293: +#line 1092 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 1958 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1911 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 313: -#line 1149 "dhcp6_parser.yy" // lalr1.cc:859 + case 303: +#line 1109 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1966 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1919 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 314: -#line 1151 "dhcp6_parser.yy" // lalr1.cc:859 + case 304: +#line 1111 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("prefix", prf); ctx.leave(); } -#line 1976 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1929 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 315: -#line 1157 "dhcp6_parser.yy" // lalr1.cc:859 + case 305: +#line 1117 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("prefix-len", prf); } -#line 1985 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1938 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 316: -#line 1162 "dhcp6_parser.yy" // lalr1.cc:859 + case 306: +#line 1122 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 1993 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1946 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 317: -#line 1164 "dhcp6_parser.yy" // lalr1.cc:859 + case 307: +#line 1124 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("excluded-prefix", prf); ctx.leave(); } -#line 2003 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1956 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 318: -#line 1170 "dhcp6_parser.yy" // lalr1.cc:859 + case 308: +#line 1130 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr prf(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("excluded-prefix-len", prf); } -#line 2012 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1965 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 319: -#line 1175 "dhcp6_parser.yy" // lalr1.cc:859 + case 309: +#line 1135 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr deleg(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("delegated-len", deleg); } -#line 2021 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1974 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 320: -#line 1183 "dhcp6_parser.yy" // lalr1.cc:859 + case 310: +#line 1143 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("reservations", l); ctx.stack_.push_back(l); ctx.enter(ctx.RESERVATIONS); } -#line 2032 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1985 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 321: -#line 1188 "dhcp6_parser.yy" // lalr1.cc:859 + case 311: +#line 1148 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2041 "dhcp6_parser.cc" // lalr1.cc:859 +#line 1994 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 326: -#line 1201 "dhcp6_parser.yy" // lalr1.cc:859 + case 316: +#line 1161 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2051 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2004 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 327: -#line 1205 "dhcp6_parser.yy" // lalr1.cc:859 + case 317: +#line 1165 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2059 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2012 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 328: -#line 1209 "dhcp6_parser.yy" // lalr1.cc:859 + case 318: +#line 1169 "dhcp6_parser.yy" // lalr1.cc:859 { // Parse the reservations list entry map ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.push_back(m); } -#line 2069 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2022 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 329: -#line 1213 "dhcp6_parser.yy" // lalr1.cc:859 + case 319: +#line 1173 "dhcp6_parser.yy" // lalr1.cc:859 { // parsing completed } -#line 2077 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2030 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 342: -#line 1236 "dhcp6_parser.yy" // lalr1.cc:859 + case 332: +#line 1196 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-addresses", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 2088 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2041 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 343: -#line 1241 "dhcp6_parser.yy" // lalr1.cc:859 + case 333: +#line 1201 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2097 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2050 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 344: -#line 1246 "dhcp6_parser.yy" // lalr1.cc:859 + case 334: +#line 1206 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("prefixes", l); ctx.stack_.push_back(l); ctx.enter(ctx.NO_KEYWORD); } -#line 2108 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2061 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 345: -#line 1251 "dhcp6_parser.yy" // lalr1.cc:859 + case 335: +#line 1211 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2117 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2070 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 346: -#line 1256 "dhcp6_parser.yy" // lalr1.cc:859 + case 336: +#line 1216 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2125 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2078 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 347: -#line 1258 "dhcp6_parser.yy" // lalr1.cc:859 + case 337: +#line 1218 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr d(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("duid", d); ctx.leave(); } -#line 2135 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2088 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 348: -#line 1264 "dhcp6_parser.yy" // lalr1.cc:859 + case 338: +#line 1224 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2143 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2096 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 349: -#line 1266 "dhcp6_parser.yy" // lalr1.cc:859 + case 339: +#line 1226 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr hw(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hw-address", hw); ctx.leave(); } -#line 2153 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2106 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 350: -#line 1272 "dhcp6_parser.yy" // lalr1.cc:859 + case 340: +#line 1232 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2161 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2114 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 351: -#line 1274 "dhcp6_parser.yy" // lalr1.cc:859 + case 341: +#line 1234 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr host(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("hostname", host); ctx.leave(); } -#line 2171 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2124 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 352: -#line 1280 "dhcp6_parser.yy" // lalr1.cc:859 + case 342: +#line 1240 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr c(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", c); ctx.stack_.push_back(c); ctx.enter(ctx.NO_KEYWORD); } -#line 2182 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2135 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 353: -#line 1285 "dhcp6_parser.yy" // lalr1.cc:859 + case 343: +#line 1245 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2191 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2144 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 354: -#line 1293 "dhcp6_parser.yy" // lalr1.cc:859 + case 344: +#line 1253 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("relay", m); ctx.stack_.push_back(m); ctx.enter(ctx.RELAY); } -#line 2202 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2155 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 355: -#line 1298 "dhcp6_parser.yy" // lalr1.cc:859 + case 345: +#line 1258 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2211 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2164 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 356: -#line 1303 "dhcp6_parser.yy" // lalr1.cc:859 + case 346: +#line 1263 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2219 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2172 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 357: -#line 1305 "dhcp6_parser.yy" // lalr1.cc:859 + case 347: +#line 1265 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr ip(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("ip-address", ip); ctx.leave(); } -#line 2229 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2182 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 358: -#line 1314 "dhcp6_parser.yy" // lalr1.cc:859 + case 348: +#line 1274 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("client-classes", l); ctx.stack_.push_back(l); ctx.enter(ctx.CLIENT_CLASSES); } -#line 2240 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2193 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 359: -#line 1319 "dhcp6_parser.yy" // lalr1.cc:859 + case 349: +#line 1279 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2249 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2202 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 362: -#line 1328 "dhcp6_parser.yy" // lalr1.cc:859 + case 352: +#line 1288 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2259 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2212 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 363: -#line 1332 "dhcp6_parser.yy" // lalr1.cc:859 + case 353: +#line 1292 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2267 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2220 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 373: -#line 1352 "dhcp6_parser.yy" // lalr1.cc:859 + case 363: +#line 1312 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2275 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2228 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 374: -#line 1354 "dhcp6_parser.yy" // lalr1.cc:859 + case 364: +#line 1314 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr test(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("test", test); ctx.leave(); } -#line 2285 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2238 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 375: -#line 1363 "dhcp6_parser.yy" // lalr1.cc:859 + case 365: +#line 1323 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("server-id", m); ctx.stack_.push_back(m); ctx.enter(ctx.SERVER_ID); } -#line 2296 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2249 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 376: -#line 1368 "dhcp6_parser.yy" // lalr1.cc:859 + case 366: +#line 1328 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2305 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2258 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 386: -#line 1386 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.enter(ctx.DUID_TYPE); -} -#line 2313 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 387: -#line 1388 "dhcp6_parser.yy" // lalr1.cc:859 - { - ctx.stack_.back()->set("type", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); -} -#line 2322 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 388: -#line 1393 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LLT", ctx.loc2pos(yystack_[0].location))); } -#line 2328 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 389: -#line 1394 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("EN", ctx.loc2pos(yystack_[0].location))); } -#line 2334 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 390: -#line 1395 "dhcp6_parser.yy" // lalr1.cc:859 - { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("LL", ctx.loc2pos(yystack_[0].location))); } -#line 2340 "dhcp6_parser.cc" // lalr1.cc:859 - break; - - case 391: -#line 1398 "dhcp6_parser.yy" // lalr1.cc:859 + case 376: +#line 1346 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr htype(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("htype", htype); } -#line 2349 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2267 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 392: -#line 1403 "dhcp6_parser.yy" // lalr1.cc:859 + case 377: +#line 1351 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2357 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2275 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 393: -#line 1405 "dhcp6_parser.yy" // lalr1.cc:859 + case 378: +#line 1353 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr id(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("identifier", id); ctx.leave(); } -#line 2367 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2285 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 394: -#line 1411 "dhcp6_parser.yy" // lalr1.cc:859 + case 379: +#line 1359 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("time", time); } -#line 2376 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2294 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 395: -#line 1416 "dhcp6_parser.yy" // lalr1.cc:859 + case 380: +#line 1364 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("enterprise-id", time); } -#line 2385 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2303 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 396: -#line 1423 "dhcp6_parser.yy" // lalr1.cc:859 + case 381: +#line 1371 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr time(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp4o6-port", time); } -#line 2394 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2312 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 397: -#line 1430 "dhcp6_parser.yy" // lalr1.cc:859 + case 382: +#line 1378 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("control-socket", m); ctx.stack_.push_back(m); ctx.enter(ctx.CONTROL_SOCKET); } -#line 2405 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2323 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 398: -#line 1435 "dhcp6_parser.yy" // lalr1.cc:859 + case 383: +#line 1383 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2414 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2332 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 403: -#line 1448 "dhcp6_parser.yy" // lalr1.cc:859 + case 388: +#line 1396 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2422 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2340 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 404: -#line 1450 "dhcp6_parser.yy" // lalr1.cc:859 + case 389: +#line 1398 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr stype(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-type", stype); ctx.leave(); } -#line 2432 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2350 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 405: -#line 1456 "dhcp6_parser.yy" // lalr1.cc:859 + case 390: +#line 1404 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2440 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2358 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 406: -#line 1458 "dhcp6_parser.yy" // lalr1.cc:859 + case 391: +#line 1406 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr name(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("socket-name", name); ctx.leave(); } -#line 2450 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2368 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 407: -#line 1466 "dhcp6_parser.yy" // lalr1.cc:859 + case 392: +#line 1414 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); - ctx.enter(ctx.NO_KEYWORD); + ctx.enter(ctx.DHCP_DDNS); } -#line 2461 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2379 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 408: -#line 1471 "dhcp6_parser.yy" // lalr1.cc:859 + case 393: +#line 1419 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2470 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2388 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 409: -#line 1478 "dhcp6_parser.yy" // lalr1.cc:859 + case 394: +#line 1424 "dhcp6_parser.yy" // lalr1.cc:859 + { + // Parse the dhcp-ddns map + ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); + ctx.stack_.push_back(m); +} +#line 2398 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 395: +#line 1428 "dhcp6_parser.yy" // lalr1.cc:859 + { + // parsing completed +} +#line 2406 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 414: +#line 1454 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("enable-updates", b); +} +#line 2415 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 415: +#line 1459 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } +#line 2423 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 416: +#line 1461 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("qualifying-suffix", s); + ctx.leave(); +} +#line 2433 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 417: +#line 1467 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2441 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 418: +#line 1469 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-ip", s); + ctx.leave(); +} +#line 2451 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 419: +#line 1475 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("server-port", i); +} +#line 2460 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 420: +#line 1480 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2468 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 421: +#line 1482 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("sender-ip", s); + ctx.leave(); +} #line 2478 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 410: -#line 1480 "dhcp6_parser.yy" // lalr1.cc:859 + case 422: +#line 1488 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("sender-port", i); } #line 2487 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 411: -#line 1485 "dhcp6_parser.yy" // lalr1.cc:859 + case 423: +#line 1493 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.enter(ctx.NO_KEYWORD); + ElementPtr i(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("max-queue-size", i); } -#line 2495 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2496 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 412: -#line 1487 "dhcp6_parser.yy" // lalr1.cc:859 + case 424: +#line 1498 "dhcp6_parser.yy" // lalr1.cc:859 { - ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); - ctx.leave(); + ctx.enter(ctx.NCR_PROTOCOL); } #line 2504 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 413: -#line 1497 "dhcp6_parser.yy" // lalr1.cc:859 + case 425: +#line 1500 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("ncr-protocol", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2513 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 426: +#line 1506 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("UDP", ctx.loc2pos(yystack_[0].location))); } +#line 2519 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 427: +#line 1507 "dhcp6_parser.yy" // lalr1.cc:859 + { yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("TCP", ctx.loc2pos(yystack_[0].location))); } +#line 2525 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 428: +#line 1510 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NCR_FORMAT); +} +#line 2533 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 429: +#line 1512 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr json(new StringElement("JSON", ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("ncr-format", json); + ctx.leave(); +} +#line 2543 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 430: +#line 1518 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("always-include-fqdn", b); +} +#line 2552 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 431: +#line 1523 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("allow-client-update", b); +} +#line 2561 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 432: +#line 1528 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-no-update", b); +} +#line 2570 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 433: +#line 1533 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr b(new BoolElement(yystack_[0].value.as< bool > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("override-client-update", b); +} +#line 2579 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 434: +#line 1538 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.REPLACE_CLIENT_NAME); +} +#line 2587 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 435: +#line 1540 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("replace-client-name", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2596 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 436: +#line 1546 "dhcp6_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-present", ctx.loc2pos(yystack_[0].location))); + } +#line 2604 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 437: +#line 1549 "dhcp6_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("never", ctx.loc2pos(yystack_[0].location))); + } +#line 2612 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 438: +#line 1552 "dhcp6_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("always", ctx.loc2pos(yystack_[0].location))); + } +#line 2620 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 439: +#line 1555 "dhcp6_parser.yy" // lalr1.cc:859 + { + yylhs.value.as< ElementPtr > () = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(yystack_[0].location))); + } +#line 2628 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 440: +#line 1558 "dhcp6_parser.yy" // lalr1.cc:859 + { + error(yystack_[0].location, "boolean values for the replace-client-name are " + "no longer supported"); + } +#line 2637 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 441: +#line 1564 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2645 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 442: +#line 1566 "dhcp6_parser.yy" // lalr1.cc:859 + { + ElementPtr s(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); + ctx.stack_.back()->set("generated-prefix", s); + ctx.leave(); +} +#line 2655 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 443: +#line 1574 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2663 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 444: +#line 1576 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("Dhcp4", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2672 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 445: +#line 1581 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.enter(ctx.NO_KEYWORD); +} +#line 2680 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 446: +#line 1583 "dhcp6_parser.yy" // lalr1.cc:859 + { + ctx.stack_.back()->set("DhcpDdns", yystack_[0].value.as< ElementPtr > ()); + ctx.leave(); +} +#line 2689 "dhcp6_parser.cc" // lalr1.cc:859 + break; + + case 447: +#line 1593 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("Logging", m); ctx.stack_.push_back(m); ctx.enter(ctx.LOGGING); } -#line 2515 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2700 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 414: -#line 1502 "dhcp6_parser.yy" // lalr1.cc:859 + case 448: +#line 1598 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2524 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2709 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 418: -#line 1519 "dhcp6_parser.yy" // lalr1.cc:859 + case 452: +#line 1615 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("loggers", l); ctx.stack_.push_back(l); ctx.enter(ctx.LOGGERS); } -#line 2535 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2720 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 419: -#line 1524 "dhcp6_parser.yy" // lalr1.cc:859 + case 453: +#line 1620 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2544 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2729 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 422: -#line 1536 "dhcp6_parser.yy" // lalr1.cc:859 + case 456: +#line 1632 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(l); ctx.stack_.push_back(l); } -#line 2554 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2739 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 423: -#line 1540 "dhcp6_parser.yy" // lalr1.cc:859 + case 457: +#line 1636 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2562 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2747 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 431: -#line 1555 "dhcp6_parser.yy" // lalr1.cc:859 + case 465: +#line 1651 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr dl(new IntElement(yystack_[0].value.as< int64_t > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("debuglevel", dl); } -#line 2571 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2756 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 432: -#line 1559 "dhcp6_parser.yy" // lalr1.cc:859 + case 466: +#line 1655 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2579 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2764 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 433: -#line 1561 "dhcp6_parser.yy" // lalr1.cc:859 + case 467: +#line 1657 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("severity", sev); ctx.leave(); } -#line 2589 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2774 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 434: -#line 1567 "dhcp6_parser.yy" // lalr1.cc:859 + case 468: +#line 1663 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr l(new ListElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output_options", l); ctx.stack_.push_back(l); ctx.enter(ctx.OUTPUT_OPTIONS); } -#line 2600 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2785 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 435: -#line 1572 "dhcp6_parser.yy" // lalr1.cc:859 + case 469: +#line 1668 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); ctx.leave(); } -#line 2609 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2794 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 438: -#line 1581 "dhcp6_parser.yy" // lalr1.cc:859 + case 472: +#line 1677 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr m(new MapElement(ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->add(m); ctx.stack_.push_back(m); } -#line 2619 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2804 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 439: -#line 1585 "dhcp6_parser.yy" // lalr1.cc:859 + case 473: +#line 1681 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.stack_.pop_back(); } -#line 2627 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2812 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 442: -#line 1593 "dhcp6_parser.yy" // lalr1.cc:859 + case 476: +#line 1689 "dhcp6_parser.yy" // lalr1.cc:859 { ctx.enter(ctx.NO_KEYWORD); } -#line 2635 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2820 "dhcp6_parser.cc" // lalr1.cc:859 break; - case 443: -#line 1595 "dhcp6_parser.yy" // lalr1.cc:859 + case 477: +#line 1691 "dhcp6_parser.yy" // lalr1.cc:859 { ElementPtr sev(new StringElement(yystack_[0].value.as< std::string > (), ctx.loc2pos(yystack_[0].location))); ctx.stack_.back()->set("output", sev); ctx.leave(); } -#line 2645 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2830 "dhcp6_parser.cc" // lalr1.cc:859 break; -#line 2649 "dhcp6_parser.cc" // lalr1.cc:859 +#line 2834 "dhcp6_parser.cc" // lalr1.cc:859 default: break; } @@ -2900,510 +3085,540 @@ namespace isc { namespace dhcp { } - const short int Dhcp6Parser::yypact_ninf_ = -427; + const short int Dhcp6Parser::yypact_ninf_ = -499; const signed char Dhcp6Parser::yytable_ninf_ = -1; const short int Dhcp6Parser::yypact_[] = { - 107, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, 29, 21, 32, 56, 58, 60, 67, 71, - 73, 83, 103, 108, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, 21, -56, 12, 59, - 42, 11, -8, 95, 93, 61, 72, 50, -427, 117, - 124, 129, 134, 148, -427, -427, -427, -427, 153, -427, - 45, -427, -427, -427, -427, -427, -427, -427, -427, 196, - 198, 237, 245, 246, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, 265, -427, -427, -427, 47, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, 217, -427, -427, -427, -427, -427, -427, 266, - 267, -427, -427, -427, -427, -427, -427, -427, -427, -427, - 63, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, 118, -427, -427, - -427, 268, -427, 270, 272, -427, -427, 138, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, 250, 274, -427, -427, -427, -427, -427, -427, - -427, -427, -427, 275, -427, -427, -427, 276, -427, -427, - 273, 279, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, 280, -427, -427, -427, -427, 277, 283, - -427, -427, -427, -427, -427, -427, -427, -427, -427, 156, - -427, -427, -427, -427, 21, 21, -427, 170, 284, 285, - 286, 287, -427, 12, -427, 288, 289, 290, 174, 187, - 192, 193, 194, 291, 293, 294, 295, 296, 300, 301, - 302, 303, 304, 200, 306, 307, 59, -427, 308, -427, - 8, 309, 310, 311, 312, 313, 209, 176, 315, 316, - 317, 318, 11, -427, 319, -8, -427, 320, 216, 322, - 218, 219, 95, -427, 325, 326, 327, 328, 329, 330, - -427, 93, 331, 332, 231, 335, 337, 338, 234, -427, - 61, 339, 235, -427, 72, 340, 343, 82, -427, -427, - -427, 344, 342, 346, 21, 21, -427, 347, 348, 349, - -427, -427, -427, -427, -427, 345, 352, 355, 356, 357, - 358, 359, 360, 361, 364, -427, 365, 366, -427, 357, - -427, -427, -427, -427, 367, 363, -427, -427, -427, 362, - 369, 269, 271, 278, -427, -427, 281, 282, 373, 374, - -427, 292, -427, 297, -427, 298, -427, -427, -427, 357, - 357, 357, 299, 314, 321, -427, 323, 324, -427, 333, - 334, 336, -427, -427, 341, -427, -427, 350, 21, -427, - 21, 59, 305, -427, -427, 42, 26, 26, 375, 376, - 378, -29, -427, -427, 123, 20, 380, 146, 80, 181, - -56, -427, 384, -427, 8, 385, 386, -427, -427, -427, - -427, -427, 387, 351, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, 163, -427, 171, -427, -427, 372, -427, -427, - -427, -427, 392, 393, 394, -427, 175, -427, -427, -427, - -427, -427, -427, -427, -427, -427, 178, -427, 395, 388, - -427, -427, 396, 400, -427, -427, 398, 405, -427, -427, - -427, 86, -427, -427, -427, 21, -427, -427, 162, -427, - -427, -427, 233, -427, 403, 407, -427, 408, 410, 411, - 413, 414, 415, 188, -427, -427, -427, -427, -427, -427, - -427, -427, -427, 416, 417, 419, -427, -427, 189, -427, - -427, -427, -427, -427, -427, -427, -427, 190, -427, -427, - -427, 191, 353, -427, -427, 418, 422, -427, -427, 420, - 424, -427, -427, 427, 425, -427, -427, 391, -427, 426, - 305, -427, -427, 430, 431, 432, 433, 354, 368, 370, - 26, -427, -427, 11, -427, 375, 61, -427, 376, 72, - -427, 378, -29, -427, 434, 123, -427, 20, -427, 50, - -427, 380, 371, 377, 379, 381, 382, 383, 146, -427, - 435, 439, 389, 390, 397, 80, -427, 441, 442, 181, - -427, -427, -427, -8, -427, 385, 95, -427, 386, 93, - -427, 387, 443, -427, 445, -427, 399, 401, 402, 404, - -427, -427, -427, -427, 220, -427, 440, -427, 444, -427, - -427, -427, -427, -427, 221, -427, -427, -427, -427, -427, - -427, -427, -427, 186, 406, -427, -427, -427, -427, 409, - 412, -427, 223, -427, 224, -427, 446, -427, 421, 448, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - 240, -427, 79, 448, -427, -427, 447, -427, -427, -427, - 230, -427, -427, -427, -427, -427, 449, 423, 452, 79, - -427, 454, -427, 428, -427, 450, -427, -427, 254, -427, - 429, 450, -427, -427, 232, -427, -427, 456, 429, -427, - 436, -427, -427 + 212, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, 56, 26, 66, 91, 108, 129, 138, + 148, 150, 157, 180, 187, 199, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + 26, -60, 12, 77, 63, 19, 22, 51, 99, 17, + 93, 11, 151, -499, 170, 207, 174, 208, 224, -499, + -499, -499, -499, 250, -499, 55, -499, -499, -499, -499, + -499, -499, -499, -499, 251, 252, 254, 255, 256, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, 257, + -499, -499, -499, 132, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, 239, -499, -499, + -499, -499, -499, -499, 258, 259, -499, -499, -499, -499, + -499, -499, -499, -499, -499, 134, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, 169, -499, -499, -499, 260, -499, 262, 263, + -499, -499, 171, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, 266, 265, -499, + -499, -499, -499, -499, -499, -499, -499, -499, 267, -499, + -499, -499, 271, -499, -499, -499, 268, 275, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, 277, + -499, -499, -499, -499, 274, 280, -499, -499, -499, -499, + -499, -499, -499, -499, -499, 172, -499, -499, -499, 281, + -499, -499, 288, -499, 289, 291, -499, -499, 296, 298, + 299, 300, -499, -499, -499, 181, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, 26, 26, -499, 162, 301, 302, 303, + 305, -499, 12, -499, 307, 308, 309, 147, 191, 192, + 195, 196, 312, 313, 316, 330, 331, 332, 333, 334, + 335, 336, 218, 338, 339, 77, -499, 340, -499, 16, + 341, 342, 343, 344, 345, 227, 226, 348, 349, 350, + 351, 19, -499, 352, 22, -499, 353, 235, 355, 237, + 238, 51, -499, 358, 359, 360, 361, 362, 363, -499, + 99, 364, 365, 247, 367, 368, 369, 249, -499, 17, + 371, 253, -499, 93, 372, 373, -29, -499, 261, 375, + 376, 264, 377, 269, 270, 378, 379, 272, 273, 276, + 278, 380, 381, 151, -499, -499, -499, 384, 382, 383, + 26, 26, -499, 387, 388, 389, -499, -499, -499, -499, + -499, 386, 394, 395, 397, 399, 402, 403, 404, 405, + 406, -499, 407, 408, -499, 399, -499, -499, -499, -499, + 409, 413, -499, -499, -499, 416, 417, 306, 310, 311, + -499, -499, 314, 317, 418, 411, -499, 319, -499, 320, + -499, 321, -499, -499, -499, 399, 399, 399, 323, 324, + 325, -499, 326, 327, -499, 328, 329, 337, -499, -499, + 346, -499, -499, 347, 26, -499, -499, 354, 356, -499, + 366, -499, -499, -68, 357, -499, -499, -499, -499, 70, + 370, -499, 26, 77, 322, -499, -499, 63, 92, 92, + 422, 423, 424, -25, -499, -499, 20, 27, 427, 374, + 45, 175, 151, -499, 420, -499, 16, 428, 446, -499, + -499, -499, -499, -499, 448, 391, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, 182, -499, + 183, -499, -499, 449, -499, -499, -499, 454, 456, 457, + -499, 190, -499, -499, -499, -499, -499, -499, -499, -499, + -499, 193, -499, 458, 459, -499, -499, 460, 462, -499, + -499, 461, 467, -499, -499, -499, 34, -499, -499, -499, + 26, -499, -499, 68, -499, -499, -499, 223, -499, 465, + 469, -499, 470, 194, -499, -499, 471, 473, 476, -499, + -499, -499, 197, -499, -499, -499, -499, -499, -499, -499, + 200, -499, -499, -499, 201, 385, -499, -499, 475, 479, + -499, -499, 477, 481, -499, -499, 480, 482, -499, -499, + 455, -499, 483, 322, -499, -499, 485, 486, 487, 285, + 390, 286, 92, -499, -499, 19, -499, 422, 17, -499, + 423, 93, -499, 424, -25, -499, 488, 20, -499, 27, + -499, 11, -499, 427, 392, 374, -499, 489, 393, 396, + 398, 45, -499, 491, 494, 175, -499, -499, -499, 22, + -499, 428, 51, -499, 446, 99, -499, 448, 495, -499, + 468, -499, 400, 401, 410, -499, -499, -499, -499, 204, + -499, 492, -499, 493, -499, -499, -499, -499, -499, 210, + -499, -499, -499, 412, -499, -499, -499, -499, 414, 415, + -499, 214, -499, 216, -499, 496, -499, 419, 498, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, 243, -499, 59, 498, -499, -499, + 499, -499, -499, -499, 217, -499, -499, -499, -499, -499, + 502, 421, 504, 59, -499, 497, -499, 425, -499, 503, + -499, -499, 245, -499, 426, 503, -499, -499, 220, -499, + -499, 505, 426, -499, 429, -499, -499 }; const unsigned short int Dhcp6Parser::yydefact_[] = { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, - 20, 22, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 38, 32, 28, 27, 24, - 25, 26, 31, 3, 29, 30, 47, 5, 58, 7, - 91, 9, 183, 11, 285, 13, 302, 15, 328, 17, - 224, 19, 259, 21, 148, 23, 42, 34, 0, 0, - 0, 0, 0, 0, 330, 226, 261, 0, 44, 0, - 43, 0, 0, 35, 56, 413, 409, 411, 0, 55, - 0, 49, 51, 53, 54, 52, 89, 95, 97, 0, - 0, 0, 0, 0, 175, 216, 251, 123, 138, 131, - 358, 140, 159, 375, 0, 397, 407, 83, 0, 60, - 62, 63, 64, 65, 66, 68, 69, 70, 71, 73, - 72, 77, 78, 67, 75, 76, 74, 79, 80, 81, - 82, 93, 0, 362, 277, 294, 204, 206, 208, 0, - 0, 212, 210, 320, 354, 203, 187, 188, 189, 190, - 0, 185, 194, 195, 196, 199, 201, 197, 198, 191, - 192, 193, 200, 202, 292, 291, 290, 0, 287, 289, - 313, 0, 316, 0, 0, 312, 309, 0, 304, 306, - 307, 310, 311, 308, 352, 342, 344, 346, 348, 350, - 341, 340, 0, 331, 332, 336, 337, 334, 338, 339, - 335, 241, 118, 0, 245, 243, 248, 0, 237, 238, - 0, 227, 228, 230, 240, 231, 232, 233, 247, 234, - 235, 236, 272, 0, 270, 271, 274, 275, 0, 262, - 263, 265, 266, 267, 268, 269, 155, 157, 152, 0, - 150, 153, 154, 39, 0, 0, 33, 0, 0, 0, - 0, 0, 46, 0, 48, 0, 0, 0, 0, 0, + 20, 22, 24, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 40, 34, 30, + 29, 26, 27, 28, 33, 3, 31, 32, 49, 5, + 60, 7, 93, 9, 174, 11, 275, 13, 292, 15, + 318, 17, 215, 19, 249, 21, 150, 23, 394, 25, + 44, 36, 0, 0, 0, 0, 0, 0, 320, 217, + 251, 0, 0, 46, 0, 45, 0, 0, 37, 58, + 447, 443, 445, 0, 57, 0, 51, 53, 55, 56, + 54, 91, 97, 99, 0, 0, 0, 0, 0, 166, + 207, 241, 125, 140, 133, 348, 142, 161, 365, 0, + 382, 392, 85, 0, 62, 64, 65, 66, 67, 68, + 70, 71, 72, 73, 75, 74, 79, 80, 69, 77, + 78, 76, 81, 82, 83, 84, 95, 0, 352, 267, + 284, 195, 197, 199, 0, 0, 203, 201, 310, 344, + 194, 178, 179, 180, 181, 0, 176, 185, 186, 187, + 190, 192, 188, 189, 182, 183, 184, 191, 193, 282, + 281, 280, 0, 277, 279, 303, 0, 306, 0, 0, + 302, 299, 0, 294, 296, 297, 300, 301, 298, 342, + 332, 334, 336, 338, 340, 331, 330, 0, 321, 322, + 326, 327, 324, 328, 329, 325, 112, 120, 0, 235, + 233, 238, 0, 228, 232, 229, 0, 218, 219, 221, + 231, 222, 223, 224, 237, 225, 226, 227, 262, 0, + 260, 261, 264, 265, 0, 252, 253, 255, 256, 257, + 258, 259, 157, 159, 154, 0, 152, 155, 156, 0, + 415, 417, 0, 420, 0, 0, 424, 428, 0, 0, + 0, 0, 434, 441, 413, 0, 396, 398, 399, 400, + 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, + 411, 412, 41, 0, 0, 35, 0, 0, 0, 0, + 0, 48, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 59, 0, 92, - 364, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 184, 0, 0, 286, 0, 0, 0, - 0, 0, 0, 303, 0, 0, 0, 0, 0, 0, - 329, 0, 0, 0, 0, 0, 0, 0, 0, 225, - 0, 0, 0, 260, 0, 0, 0, 0, 149, 45, - 36, 0, 0, 0, 0, 0, 50, 0, 0, 0, - 84, 85, 86, 87, 88, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 396, 0, 0, 61, 0, - 373, 371, 372, 370, 0, 365, 366, 368, 369, 0, - 0, 0, 0, 0, 214, 215, 0, 0, 0, 0, - 186, 0, 288, 0, 315, 0, 318, 319, 305, 0, - 0, 0, 0, 0, 0, 333, 0, 0, 239, 0, - 0, 0, 250, 229, 0, 276, 264, 0, 0, 151, - 0, 0, 0, 410, 412, 0, 0, 0, 177, 218, - 253, 0, 40, 139, 0, 0, 142, 0, 0, 0, - 0, 94, 0, 363, 0, 279, 296, 205, 207, 209, - 213, 211, 322, 0, 293, 314, 317, 353, 343, 345, - 347, 349, 351, 242, 119, 246, 244, 249, 273, 156, - 158, 37, 0, 418, 0, 415, 417, 0, 110, 112, - 114, 116, 0, 0, 0, 109, 0, 99, 101, 102, - 103, 104, 105, 106, 107, 108, 0, 181, 0, 178, - 179, 222, 0, 219, 220, 257, 0, 254, 255, 129, - 130, 0, 125, 127, 128, 42, 137, 135, 0, 133, - 136, 360, 0, 146, 0, 143, 144, 0, 0, 0, - 0, 0, 0, 0, 161, 163, 164, 165, 166, 167, - 168, 386, 392, 0, 0, 0, 385, 384, 0, 377, - 379, 382, 380, 381, 383, 403, 405, 0, 399, 401, - 402, 0, 0, 367, 283, 0, 280, 281, 300, 0, - 297, 298, 326, 0, 323, 324, 356, 0, 57, 0, - 0, 414, 90, 0, 0, 0, 0, 0, 0, 0, - 0, 96, 98, 0, 176, 0, 226, 217, 0, 261, - 252, 0, 0, 124, 0, 0, 132, 0, 359, 0, - 141, 0, 0, 0, 0, 0, 0, 0, 0, 160, - 0, 0, 0, 0, 0, 0, 376, 0, 0, 0, - 398, 408, 374, 0, 278, 0, 0, 295, 0, 330, - 321, 0, 0, 355, 0, 416, 0, 0, 0, 0, - 120, 121, 122, 100, 0, 180, 0, 221, 0, 256, - 126, 41, 134, 361, 0, 145, 169, 170, 171, 172, - 173, 174, 162, 0, 0, 391, 394, 395, 378, 0, - 0, 400, 0, 282, 0, 299, 0, 325, 0, 0, - 111, 113, 115, 117, 182, 223, 258, 147, 388, 389, - 390, 387, 393, 404, 406, 284, 301, 327, 357, 422, - 0, 420, 0, 0, 419, 434, 0, 432, 430, 426, - 0, 424, 428, 429, 427, 421, 0, 0, 0, 0, - 423, 0, 431, 0, 425, 0, 433, 438, 0, 436, - 0, 0, 435, 442, 0, 440, 437, 0, 0, 439, - 0, 441, 443 + 0, 0, 0, 0, 0, 0, 61, 0, 94, 354, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 175, 0, 0, 276, 0, 0, 0, 0, + 0, 0, 293, 0, 0, 0, 0, 0, 0, 319, + 0, 0, 0, 0, 0, 0, 0, 0, 216, 0, + 0, 0, 250, 0, 0, 0, 0, 151, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 395, 47, 38, 0, 0, 0, + 0, 0, 52, 0, 0, 0, 86, 87, 88, 89, + 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 381, 0, 0, 63, 0, 363, 361, 362, 360, + 0, 355, 356, 358, 359, 0, 0, 0, 0, 0, + 205, 206, 0, 0, 0, 0, 177, 0, 278, 0, + 305, 0, 308, 309, 295, 0, 0, 0, 0, 0, + 0, 323, 0, 0, 230, 0, 0, 0, 240, 220, + 0, 266, 254, 0, 0, 153, 414, 0, 0, 419, + 0, 422, 423, 0, 0, 430, 431, 432, 433, 0, + 0, 397, 0, 0, 0, 444, 446, 0, 0, 0, + 168, 209, 243, 0, 42, 141, 0, 0, 144, 0, + 0, 0, 0, 96, 0, 353, 0, 269, 286, 196, + 198, 200, 204, 202, 312, 0, 283, 304, 307, 343, + 333, 335, 337, 339, 341, 113, 121, 236, 234, 239, + 263, 158, 160, 416, 418, 421, 426, 427, 425, 429, + 436, 437, 438, 439, 440, 435, 442, 39, 0, 452, + 0, 449, 451, 0, 114, 116, 118, 0, 0, 0, + 111, 0, 101, 103, 104, 105, 106, 107, 108, 109, + 110, 0, 172, 0, 169, 170, 213, 0, 210, 211, + 247, 0, 244, 245, 131, 132, 0, 127, 129, 130, + 44, 139, 137, 0, 135, 138, 350, 0, 148, 0, + 145, 146, 0, 0, 163, 377, 0, 0, 0, 375, + 369, 374, 0, 367, 372, 370, 371, 373, 388, 390, + 0, 384, 386, 387, 0, 0, 357, 273, 0, 270, + 271, 290, 0, 287, 288, 316, 0, 313, 314, 346, + 0, 59, 0, 0, 448, 92, 0, 0, 0, 0, + 0, 0, 0, 98, 100, 0, 167, 0, 217, 208, + 0, 251, 242, 0, 0, 126, 0, 0, 134, 0, + 349, 0, 143, 0, 0, 0, 162, 0, 0, 0, + 0, 0, 366, 0, 0, 0, 383, 393, 364, 0, + 268, 0, 0, 285, 0, 320, 311, 0, 0, 345, + 0, 450, 0, 0, 0, 122, 123, 124, 102, 0, + 171, 0, 212, 0, 246, 128, 43, 136, 351, 0, + 147, 165, 164, 0, 376, 379, 380, 368, 0, 0, + 385, 0, 272, 0, 289, 0, 315, 0, 0, 115, + 117, 119, 173, 214, 248, 149, 378, 389, 391, 274, + 291, 317, 347, 456, 0, 454, 0, 0, 453, 468, + 0, 466, 464, 460, 0, 458, 462, 463, 461, 455, + 0, 0, 0, 0, 457, 0, 465, 0, 459, 0, + 467, 472, 0, 470, 0, 0, 469, 476, 0, 474, + 471, 0, 0, 473, 0, 475, 477 }; const short int Dhcp6Parser::yypgoto_[] = { - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, 3, -427, -427, -427, -427, 33, -427, - -427, -214, -427, -67, -427, -58, -427, -427, -427, 211, - -427, -427, -427, -427, 51, 195, -41, -38, -37, -36, - -427, -427, -427, -427, -427, 52, -427, -427, -427, -427, - -427, 49, -112, -427, -427, -427, -427, -427, -427, -427, - -427, -65, -427, -426, -427, -427, -427, -427, -427, -123, - -405, -427, -427, -427, -427, -125, -427, -427, -427, -427, - -427, -427, -427, -129, -427, -427, -427, -126, 147, -427, - -427, -427, -427, -427, -427, -427, -133, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -109, -427, -427, - -427, -105, 197, -427, -427, -427, -427, -427, -427, -415, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -106, - -427, -427, -427, -107, -427, 164, -427, -51, -427, -427, - -427, -427, -427, -49, -427, -427, -427, -427, -427, -50, - -427, -427, -427, -108, -427, -427, -427, -104, -427, 169, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -138, -427, -427, -427, -128, 199, -427, -427, -427, -427, - -427, -427, -132, -427, -427, -427, -124, 201, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -134, - -427, -427, -427, -121, -427, 202, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, 66, -427, - -427, -427, -427, -427, -427, -114, -427, -427, -427, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -115, -427, - -427, -427, -427, -427, -427, -427, -427, -427, -427, -427, - -427, -427, -59, -427, -427, -427, -198, -427, -427, -203, - -427, -427, -427, -427, -427, -427, -213, -427, -427, -219, - -427 + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, 15, -499, -499, -499, -499, -499, + -499, -499, -360, -499, -79, -499, -62, -499, -499, -499, + 222, -499, -499, -499, -499, 29, 202, -45, -42, -41, + -40, -499, -499, -499, -499, -499, 31, -499, -499, -499, + -499, -499, 35, -132, -470, -499, -499, -499, -499, -499, + -499, -499, -69, -499, -498, -499, -499, -499, -499, -499, + -139, -475, -499, -499, -499, -499, -141, -499, -499, -499, + -499, -499, -499, -499, -146, -499, -499, -499, -143, 163, + -499, -499, -499, -499, -499, -499, -499, -145, -499, -499, + -499, -499, -124, -499, -499, -499, -120, 209, -499, -499, + -499, -499, -499, -499, -481, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -122, -499, -499, -499, -119, -499, + 184, -499, -55, -499, -499, -499, -499, -53, -499, -499, + -499, -499, -499, -54, -499, -499, -499, -121, -499, -499, + -499, -116, -499, 185, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -142, -499, -499, -499, -137, 219, + -499, -499, -499, -499, -499, -499, -148, -499, -499, -499, + -138, 215, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -147, -499, -499, -499, -140, -499, 211, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, 52, -499, -499, -499, -499, -499, -499, -118, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -128, + -499, -499, -499, -499, -499, -499, -499, -499, 57, 177, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -499, -499, -499, -499, -499, -499, -499, -499, -499, + -499, -81, -499, -499, -499, -193, -499, -499, -208, -499, + -499, -499, -499, -499, -499, -219, -499, -499, -225, -499 }; const short int Dhcp6Parser::yydefgoto_[] = { - -1, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 68, 33, 34, 57, 72, 73, 35, - 56, 423, 505, 69, 70, 107, 37, 58, 80, 81, - 82, 248, 39, 59, 108, 109, 110, 111, 112, 113, - 114, 115, 255, 41, 60, 132, 278, 116, 256, 117, - 257, 476, 477, 478, 573, 479, 574, 480, 575, 481, - 576, 209, 313, 483, 484, 485, 118, 266, 501, 502, - 503, 504, 119, 268, 508, 509, 510, 120, 267, 121, - 270, 514, 515, 516, 599, 55, 67, 239, 240, 241, - 325, 242, 326, 122, 271, 523, 524, 525, 526, 527, - 528, 529, 530, 123, 263, 488, 489, 490, 583, 43, - 61, 150, 151, 152, 283, 153, 284, 154, 285, 155, - 289, 156, 288, 157, 158, 124, 264, 492, 493, 494, - 586, 51, 65, 210, 211, 212, 213, 214, 215, 216, - 312, 217, 316, 218, 315, 219, 220, 317, 221, 125, - 265, 496, 497, 498, 589, 53, 66, 228, 229, 230, - 231, 232, 321, 233, 234, 235, 160, 281, 555, 556, - 557, 623, 45, 62, 167, 168, 169, 294, 161, 282, - 559, 560, 561, 626, 47, 63, 177, 178, 179, 297, - 180, 181, 299, 182, 183, 162, 290, 563, 564, 565, - 629, 49, 64, 192, 193, 194, 195, 305, 196, 306, - 197, 307, 198, 308, 199, 309, 200, 304, 163, 291, - 567, 632, 126, 269, 512, 280, 364, 365, 366, 367, - 368, 432, 127, 272, 538, 539, 540, 610, 691, 541, - 542, 611, 543, 544, 128, 129, 274, 547, 548, 549, - 617, 550, 618, 130, 275, 83, 250, 84, 251, 85, - 249, 464, 465, 466, 569, 700, 701, 702, 710, 711, - 712, 713, 718, 714, 716, 728, 729, 730, 734, 735, - 737 + -1, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 73, 35, 36, 61, 77, 78, + 37, 60, 495, 590, 74, 75, 112, 39, 62, 85, + 86, 87, 287, 41, 63, 113, 114, 115, 116, 117, + 118, 119, 120, 294, 43, 64, 137, 317, 121, 295, + 122, 296, 561, 562, 214, 351, 564, 646, 565, 647, + 566, 648, 215, 352, 568, 569, 570, 123, 305, 586, + 587, 588, 589, 124, 307, 593, 594, 595, 125, 306, + 126, 309, 599, 600, 601, 671, 57, 71, 245, 246, + 247, 364, 248, 365, 127, 310, 603, 604, 128, 302, + 573, 574, 575, 655, 45, 65, 155, 156, 157, 322, + 158, 323, 159, 324, 160, 328, 161, 327, 162, 163, + 129, 303, 577, 578, 579, 658, 53, 69, 216, 217, + 218, 219, 220, 221, 222, 223, 355, 224, 354, 225, + 226, 356, 227, 130, 304, 581, 582, 583, 661, 55, + 70, 234, 235, 236, 237, 238, 360, 239, 240, 241, + 165, 320, 628, 629, 630, 689, 47, 66, 172, 173, + 174, 333, 166, 321, 632, 633, 634, 692, 49, 67, + 182, 183, 184, 336, 185, 186, 338, 187, 188, 167, + 329, 636, 637, 638, 695, 51, 68, 197, 198, 199, + 200, 344, 201, 345, 202, 346, 203, 347, 204, 348, + 205, 343, 168, 330, 640, 698, 131, 308, 597, 319, + 420, 421, 422, 423, 424, 504, 132, 311, 612, 613, + 614, 615, 677, 616, 617, 133, 134, 313, 620, 621, + 622, 683, 623, 684, 135, 314, 59, 72, 265, 266, + 267, 268, 369, 269, 370, 270, 271, 372, 272, 273, + 274, 375, 538, 275, 376, 276, 277, 278, 279, 280, + 381, 545, 281, 382, 88, 289, 89, 290, 90, 288, + 550, 551, 552, 642, 754, 755, 756, 764, 765, 766, + 767, 772, 768, 770, 782, 783, 784, 788, 789, 791 }; const unsigned short int Dhcp6Parser::yytable_[] = { - 79, 225, 537, 145, 165, 175, 190, 208, 224, 238, - 511, 159, 166, 176, 191, 226, 32, 227, 133, 507, - 146, 96, 74, 147, 148, 149, 25, 133, 26, 24, - 27, 164, 499, 89, 90, 91, 92, 96, 202, 36, - 96, 468, 469, 470, 471, 472, 473, 474, 253, 134, - 276, 135, 71, 254, 131, 277, 202, 136, 137, 138, - 139, 140, 141, 38, 360, 40, 292, 42, 142, 143, - 86, 293, 87, 88, 44, 144, 201, 142, 46, 500, - 48, 89, 90, 91, 92, 93, 94, 95, 96, 592, - 50, 202, 593, 203, 204, 531, 205, 206, 207, 472, - 78, 75, 202, 222, 203, 204, 223, 76, 77, 202, - 52, 97, 98, 99, 100, 54, 78, 236, 237, 78, - 78, 295, 96, 243, 96, 101, 296, 244, 102, 28, - 29, 30, 31, 245, 78, 103, 170, 171, 172, 173, - 174, 302, 246, 104, 105, 431, 303, 106, 184, 236, - 237, 247, 185, 186, 187, 188, 189, 252, 78, 327, - 532, 533, 534, 535, 328, 595, 276, 78, 596, 78, - 705, 568, 706, 707, 570, 447, 448, 449, 580, 571, - 78, 580, 653, 581, 499, 506, 582, 78, 78, 537, - 507, 608, 615, 619, 247, 79, 609, 616, 620, 621, - 258, 78, 259, 78, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 362, 517, 518, 519, 520, - 521, 522, 361, 292, 327, 279, 295, 302, 684, 687, - 363, 695, 696, 719, 145, 738, 597, 165, 720, 598, - 739, 260, 159, 703, 175, 166, 704, 329, 330, 261, - 262, 146, 176, 190, 147, 148, 149, 731, 310, 225, - 732, 191, 208, 688, 689, 690, 224, 545, 546, 273, - 286, 287, 298, 226, 300, 227, 301, 311, 331, 314, - 318, 319, 320, 340, 322, 323, 324, 375, 332, 333, - 334, 335, 337, 338, 339, 345, 341, 346, 347, 348, - 349, 342, 343, 344, 350, 351, 352, 353, 354, 355, - 356, 357, 359, 369, 370, 371, 372, 373, 374, 376, - 377, 378, 379, 381, 383, 384, 385, 386, 387, 389, - 390, 391, 392, 393, 394, 396, 397, 413, 414, 399, - 398, 400, 401, 404, 407, 402, 405, 408, 410, 411, - 418, 482, 482, 412, 415, 416, 417, 419, 475, 475, - 420, 421, 422, 424, 425, 426, 434, 435, 427, 362, - 536, 428, 429, 430, 436, 433, 361, 437, 442, 438, - 572, 443, 487, 491, 363, 495, 439, 513, 552, 440, - 441, 585, 554, 558, 562, 463, 577, 578, 579, 633, - 444, 584, 587, 588, 590, 445, 446, 450, 591, 600, - 601, 460, 602, 461, 603, 604, 566, 605, 606, 607, - 612, 613, 451, 614, 624, 625, 627, 628, 631, 452, - 634, 453, 454, 630, 636, 637, 638, 639, 594, 663, - 651, 455, 456, 664, 457, 669, 670, 678, 685, 458, - 679, 717, 686, 721, 697, 699, 723, 727, 459, 725, - 740, 622, 462, 551, 336, 640, 486, 467, 643, 650, - 652, 358, 655, 654, 409, 662, 645, 641, 644, 646, - 656, 642, 647, 649, 403, 648, 657, 673, 658, 380, - 659, 660, 661, 406, 382, 672, 675, 677, 665, 666, - 553, 668, 674, 388, 671, 715, 667, 680, 676, 681, - 682, 635, 683, 395, 692, 482, 724, 693, 736, 741, - 694, 733, 475, 0, 225, 145, 0, 0, 208, 698, - 0, 224, 722, 159, 0, 0, 726, 0, 226, 0, - 227, 238, 146, 0, 742, 147, 148, 149, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 536, 0, 0, - 0, 0, 0, 0, 0, 165, 0, 0, 175, 0, - 0, 190, 0, 166, 0, 0, 176, 0, 0, 191, + 84, 231, 611, 150, 170, 180, 195, 213, 230, 244, + 264, 164, 171, 181, 196, 232, 596, 233, 563, 563, + 151, 592, 79, 152, 153, 154, 138, 536, 537, 34, + 610, 27, 206, 28, 138, 29, 584, 664, 242, 243, + 665, 94, 95, 96, 97, 101, 207, 207, 101, 208, + 209, 101, 210, 211, 212, 503, 26, 139, 292, 140, + 206, 169, 76, 293, 557, 141, 142, 143, 144, 145, + 146, 667, 416, 38, 668, 136, 147, 148, 242, 243, + 101, 584, 591, 149, 147, 519, 520, 521, 91, 207, + 92, 93, 175, 176, 177, 178, 179, 585, 40, 94, + 95, 96, 97, 98, 99, 100, 101, 206, 554, 555, + 556, 557, 558, 559, 80, 42, 605, 606, 607, 608, + 81, 82, 207, 207, 228, 208, 209, 229, 101, 102, + 103, 104, 105, 83, 83, 315, 44, 331, 83, 83, + 316, 83, 332, 106, 83, 46, 107, 108, 30, 31, + 32, 33, 109, 110, 189, 48, 111, 50, 190, 191, + 192, 193, 194, 759, 52, 760, 761, 83, 540, 541, + 542, 543, 334, 83, 341, 366, 282, 335, 284, 342, + 367, 83, 563, 611, 383, 315, 643, 54, 718, 384, + 641, 644, 592, 652, 56, 544, 652, 675, 653, 83, + 681, 654, 676, 685, 383, 682, 58, 331, 686, 687, + 283, 610, 742, 366, 83, 83, 285, 334, 745, 341, + 773, 83, 749, 792, 750, 774, 669, 286, 793, 670, + 84, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 258, 259, 260, 261, 262, 263, 757, 318, 785, 758, + 418, 786, 618, 619, 291, 297, 298, 417, 299, 300, + 301, 312, 325, 326, 337, 419, 339, 340, 350, 150, + 396, 353, 170, 83, 349, 357, 358, 164, 359, 180, + 171, 361, 362, 363, 387, 368, 151, 181, 195, 152, + 153, 154, 371, 373, 231, 374, 196, 213, 385, 386, + 377, 230, 378, 379, 380, 388, 389, 390, 232, 391, + 233, 393, 394, 395, 397, 398, 401, 402, 399, 400, + 403, 264, 1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 404, 405, 406, 407, 408, 409, + 410, 411, 412, 413, 415, 425, 426, 427, 428, 429, + 430, 431, 432, 433, 434, 435, 437, 439, 440, 441, + 442, 443, 445, 446, 447, 448, 449, 450, 452, 453, + 454, 455, 456, 457, 458, 460, 463, 464, 461, 467, + 468, 470, 473, 474, 479, 480, 466, 469, 482, 483, + 484, 490, 471, 472, 487, 488, 489, 475, 476, 491, + 492, 477, 493, 478, 494, 485, 486, 496, 497, 498, + 705, 707, 499, 500, 501, 502, 506, 505, 515, 567, + 567, 507, 508, 514, 625, 549, 560, 560, 509, 572, + 576, 580, 510, 511, 598, 627, 512, 418, 609, 513, + 264, 516, 517, 518, 417, 522, 523, 524, 525, 526, + 527, 528, 419, 631, 539, 635, 639, 645, 649, 529, + 650, 651, 657, 699, 656, 660, 659, 662, 530, 531, + 663, 672, 673, 738, 674, 678, 533, 679, 534, 532, + 680, 690, 691, 693, 694, 697, 696, 700, 535, 702, + 703, 704, 546, 723, 716, 728, 602, 547, 729, 737, + 743, 744, 779, 771, 751, 753, 775, 688, 777, 794, + 781, 666, 548, 706, 392, 721, 724, 414, 553, 725, + 708, 726, 739, 740, 571, 715, 717, 720, 719, 465, + 722, 787, 741, 710, 746, 709, 747, 748, 712, 711, + 436, 752, 714, 459, 776, 713, 734, 780, 462, 732, + 736, 796, 731, 438, 733, 735, 444, 730, 626, 624, + 481, 451, 701, 727, 769, 778, 790, 795, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 567, 0, 0, 0, 0, 0, 0, + 560, 0, 231, 150, 0, 0, 213, 0, 0, 230, + 0, 164, 0, 0, 0, 0, 232, 0, 233, 244, + 151, 0, 0, 152, 153, 154, 0, 0, 0, 609, + 0, 0, 0, 0, 0, 0, 0, 170, 0, 0, + 180, 0, 0, 195, 0, 171, 0, 0, 181, 0, + 0, 196, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 709, 0, 0, - 0, 0, 0, 0, 708, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 709, 0, 0, 0, 0, 0, - 0, 708 + 0, 0, 0, 0, 0, 0, 0, 763, 0, 0, + 0, 0, 0, 0, 762, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 763, 0, 0, 0, 0, 0, + 0, 762 }; const short int Dhcp6Parser::yycheck_[] = { - 58, 66, 428, 61, 62, 63, 64, 65, 66, 67, - 425, 61, 62, 63, 64, 66, 13, 66, 7, 424, - 61, 29, 10, 61, 61, 61, 5, 7, 7, 0, - 9, 39, 61, 22, 23, 24, 25, 29, 30, 7, - 29, 15, 16, 17, 18, 19, 20, 21, 3, 38, - 3, 40, 108, 8, 12, 8, 30, 46, 47, 48, - 49, 50, 51, 7, 56, 7, 3, 7, 57, 58, - 11, 8, 13, 14, 7, 64, 15, 57, 7, 108, - 7, 22, 23, 24, 25, 26, 27, 28, 29, 3, - 7, 30, 6, 32, 33, 15, 35, 36, 37, 19, - 108, 89, 30, 31, 32, 33, 34, 95, 96, 30, - 7, 52, 53, 54, 55, 7, 108, 67, 68, 108, - 108, 3, 29, 6, 29, 66, 8, 3, 69, 108, - 109, 110, 111, 4, 108, 76, 41, 42, 43, 44, - 45, 3, 8, 84, 85, 359, 8, 88, 55, 67, - 68, 3, 59, 60, 61, 62, 63, 4, 108, 3, - 80, 81, 82, 83, 8, 3, 3, 108, 6, 108, - 91, 8, 93, 94, 3, 389, 390, 391, 3, 8, - 108, 3, 597, 8, 61, 62, 8, 108, 108, 615, - 595, 3, 3, 3, 3, 253, 8, 8, 8, 8, - 4, 108, 4, 108, 97, 98, 99, 100, 101, 102, - 103, 104, 105, 106, 107, 280, 70, 71, 72, 73, - 74, 75, 280, 3, 3, 8, 3, 3, 8, 8, - 280, 8, 8, 3, 292, 3, 3, 295, 8, 6, - 8, 4, 292, 3, 302, 295, 6, 244, 245, 4, - 4, 292, 302, 311, 292, 292, 292, 3, 8, 324, - 6, 311, 320, 77, 78, 79, 324, 86, 87, 4, - 4, 4, 4, 324, 4, 324, 4, 3, 108, 4, - 4, 8, 3, 109, 4, 8, 3, 111, 4, 4, - 4, 4, 4, 4, 4, 4, 109, 4, 4, 4, - 4, 109, 109, 109, 4, 4, 4, 4, 4, 109, - 4, 4, 4, 4, 4, 4, 4, 4, 109, 4, - 4, 4, 4, 4, 4, 109, 4, 109, 109, 4, - 4, 4, 4, 4, 4, 4, 4, 334, 335, 4, - 109, 4, 4, 4, 4, 111, 111, 4, 4, 7, - 5, 416, 417, 7, 7, 7, 7, 5, 416, 417, - 5, 5, 5, 5, 5, 5, 3, 5, 7, 434, - 428, 7, 7, 7, 5, 8, 434, 108, 5, 108, - 8, 7, 7, 7, 434, 7, 108, 7, 4, 108, - 108, 3, 7, 7, 7, 90, 4, 4, 4, 8, - 108, 6, 6, 3, 6, 108, 108, 108, 3, 6, - 3, 408, 4, 410, 4, 4, 65, 4, 4, 4, - 4, 4, 108, 4, 6, 3, 6, 3, 3, 108, - 4, 108, 108, 6, 4, 4, 4, 4, 505, 4, - 6, 108, 108, 4, 108, 4, 4, 4, 8, 108, - 5, 4, 8, 4, 8, 7, 4, 7, 108, 5, - 4, 108, 411, 430, 253, 111, 417, 415, 580, 592, - 595, 276, 601, 599, 327, 608, 585, 109, 583, 586, - 109, 111, 588, 591, 320, 589, 109, 625, 109, 292, - 109, 109, 109, 324, 295, 623, 628, 631, 109, 109, - 434, 615, 626, 302, 619, 703, 109, 108, 629, 108, - 108, 570, 108, 311, 108, 580, 719, 108, 731, 738, - 108, 92, 580, -1, 589, 583, -1, -1, 586, 108, - -1, 589, 109, 583, -1, -1, 108, -1, 589, -1, - 589, 599, 583, -1, 108, 583, 583, 583, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 615, -1, -1, - -1, -1, -1, -1, -1, 623, -1, -1, 626, -1, - -1, 629, -1, 623, -1, -1, 626, -1, -1, 629, + 62, 70, 500, 65, 66, 67, 68, 69, 70, 71, + 72, 65, 66, 67, 68, 70, 497, 70, 488, 489, + 65, 496, 10, 65, 65, 65, 7, 95, 96, 14, + 500, 5, 15, 7, 7, 9, 61, 3, 67, 68, + 6, 22, 23, 24, 25, 29, 30, 30, 29, 32, + 33, 29, 35, 36, 37, 415, 0, 38, 3, 40, + 15, 39, 122, 8, 19, 46, 47, 48, 49, 50, + 51, 3, 56, 7, 6, 12, 57, 58, 67, 68, + 29, 61, 62, 64, 57, 445, 446, 447, 11, 30, + 13, 14, 41, 42, 43, 44, 45, 122, 7, 22, + 23, 24, 25, 26, 27, 28, 29, 15, 16, 17, + 18, 19, 20, 21, 102, 7, 71, 72, 73, 74, + 108, 109, 30, 30, 31, 32, 33, 34, 29, 52, + 53, 54, 55, 122, 122, 3, 7, 3, 122, 122, + 8, 122, 8, 66, 122, 7, 69, 70, 122, 123, + 124, 125, 75, 76, 55, 7, 79, 7, 59, 60, + 61, 62, 63, 104, 7, 106, 107, 122, 98, 99, + 100, 101, 3, 122, 3, 3, 6, 8, 4, 8, + 8, 122, 652, 681, 3, 3, 3, 7, 669, 8, + 8, 8, 667, 3, 7, 125, 3, 3, 8, 122, + 3, 8, 8, 3, 3, 8, 7, 3, 8, 8, + 3, 681, 8, 3, 122, 122, 8, 3, 8, 3, + 3, 122, 8, 3, 8, 8, 3, 3, 8, 6, + 292, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 90, 91, 92, 93, 94, 3, 8, 3, 6, + 319, 6, 77, 78, 4, 4, 4, 319, 4, 4, + 4, 4, 4, 4, 4, 319, 4, 4, 3, 331, + 123, 4, 334, 122, 8, 4, 8, 331, 3, 341, + 334, 4, 8, 3, 122, 4, 331, 341, 350, 331, + 331, 331, 4, 4, 363, 4, 350, 359, 283, 284, + 4, 363, 4, 4, 4, 4, 4, 4, 363, 4, + 363, 4, 4, 4, 123, 123, 4, 4, 123, 123, + 4, 383, 110, 111, 112, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 4, 4, 4, 4, 4, 4, + 4, 123, 4, 4, 4, 4, 4, 4, 4, 4, + 123, 125, 4, 4, 4, 4, 4, 4, 123, 4, + 123, 123, 4, 4, 4, 4, 4, 4, 4, 4, + 123, 4, 4, 4, 125, 4, 4, 4, 125, 4, + 4, 4, 4, 4, 4, 4, 125, 123, 4, 7, + 7, 5, 123, 123, 7, 7, 7, 125, 125, 5, + 5, 125, 5, 125, 5, 390, 391, 5, 5, 5, + 125, 125, 7, 7, 7, 7, 3, 8, 7, 488, + 489, 5, 5, 5, 4, 103, 488, 489, 122, 7, + 7, 7, 122, 122, 7, 7, 122, 506, 500, 122, + 502, 122, 122, 122, 506, 122, 122, 122, 122, 122, + 122, 122, 506, 7, 97, 7, 65, 8, 4, 122, + 4, 4, 3, 8, 6, 3, 6, 6, 122, 122, + 3, 6, 3, 5, 4, 4, 122, 4, 122, 464, + 4, 6, 3, 6, 3, 3, 6, 4, 122, 4, + 4, 4, 122, 4, 6, 4, 122, 482, 4, 4, + 8, 8, 5, 4, 8, 7, 4, 122, 4, 4, + 7, 590, 483, 123, 292, 123, 123, 315, 487, 123, + 652, 123, 122, 122, 489, 664, 667, 673, 671, 366, + 675, 105, 122, 657, 122, 655, 122, 122, 660, 658, + 331, 122, 663, 359, 123, 661, 694, 122, 363, 691, + 697, 122, 689, 334, 692, 695, 341, 685, 506, 502, + 383, 350, 643, 681, 757, 773, 785, 792, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 652, -1, -1, -1, -1, -1, -1, + 652, -1, 661, 655, -1, -1, 658, -1, -1, 661, + -1, 655, -1, -1, -1, -1, 661, -1, 661, 671, + 655, -1, -1, 655, 655, 655, -1, -1, -1, 681, + -1, -1, -1, -1, -1, -1, -1, 689, -1, -1, + 692, -1, -1, 695, -1, 689, -1, -1, 692, -1, + -1, 695, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 702, -1, -1, - -1, -1, -1, -1, 702, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 719, -1, -1, -1, -1, -1, - -1, 719 + -1, -1, -1, -1, -1, -1, -1, 756, -1, -1, + -1, -1, -1, -1, 756, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 773, -1, -1, -1, -1, -1, + -1, 773 }; const unsigned short int Dhcp6Parser::yystos_[] = { - 0, 97, 98, 99, 100, 101, 102, 103, 104, 105, - 106, 107, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 0, 5, 7, 9, 108, 109, - 110, 111, 125, 126, 127, 131, 7, 138, 7, 144, - 7, 155, 7, 221, 7, 284, 7, 296, 7, 313, - 7, 243, 7, 267, 7, 197, 132, 128, 139, 145, - 156, 222, 285, 297, 314, 244, 268, 198, 125, 135, - 136, 108, 129, 130, 10, 89, 95, 96, 108, 137, - 140, 141, 142, 367, 369, 371, 11, 13, 14, 22, - 23, 24, 25, 26, 27, 28, 29, 52, 53, 54, - 55, 66, 69, 76, 84, 85, 88, 137, 146, 147, - 148, 149, 150, 151, 152, 153, 159, 161, 178, 184, - 189, 191, 205, 215, 237, 261, 334, 344, 356, 357, - 365, 12, 157, 7, 38, 40, 46, 47, 48, 49, - 50, 51, 57, 58, 64, 137, 148, 149, 150, 151, - 223, 224, 225, 227, 229, 231, 233, 235, 236, 261, - 278, 290, 307, 330, 39, 137, 261, 286, 287, 288, - 41, 42, 43, 44, 45, 137, 261, 298, 299, 300, - 302, 303, 305, 306, 55, 59, 60, 61, 62, 63, - 137, 261, 315, 316, 317, 318, 320, 322, 324, 326, - 328, 15, 30, 32, 33, 35, 36, 37, 137, 173, - 245, 246, 247, 248, 249, 250, 251, 253, 255, 257, - 258, 260, 31, 34, 137, 173, 249, 255, 269, 270, - 271, 272, 273, 275, 276, 277, 67, 68, 137, 199, - 200, 201, 203, 6, 3, 4, 8, 3, 143, 372, - 368, 370, 4, 3, 8, 154, 160, 162, 4, 4, - 4, 4, 4, 216, 238, 262, 179, 190, 185, 335, - 192, 206, 345, 4, 358, 366, 3, 8, 158, 8, - 337, 279, 291, 226, 228, 230, 4, 4, 234, 232, - 308, 331, 3, 8, 289, 3, 8, 301, 4, 304, - 4, 4, 3, 8, 329, 319, 321, 323, 325, 327, - 8, 3, 252, 174, 4, 256, 254, 259, 4, 8, - 3, 274, 4, 8, 3, 202, 204, 3, 8, 125, - 125, 108, 4, 4, 4, 4, 141, 4, 4, 4, - 109, 109, 109, 109, 109, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 109, 4, 4, 147, 4, - 56, 137, 173, 261, 338, 339, 340, 341, 342, 4, - 4, 4, 4, 4, 109, 111, 4, 4, 4, 4, - 224, 4, 287, 4, 109, 4, 109, 109, 299, 4, - 4, 4, 4, 4, 4, 317, 4, 4, 109, 4, - 4, 4, 111, 247, 4, 111, 271, 4, 4, 200, - 4, 7, 7, 125, 125, 7, 7, 7, 5, 5, - 5, 5, 5, 133, 5, 5, 5, 7, 7, 7, - 7, 133, 343, 8, 3, 5, 5, 108, 108, 108, - 108, 108, 5, 7, 108, 108, 108, 133, 133, 133, - 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 125, 125, 146, 90, 373, 374, 375, 157, 15, 16, - 17, 18, 19, 20, 21, 137, 163, 164, 165, 167, - 169, 171, 173, 175, 176, 177, 163, 7, 217, 218, - 219, 7, 239, 240, 241, 7, 263, 264, 265, 61, - 108, 180, 181, 182, 183, 134, 62, 182, 186, 187, - 188, 231, 336, 7, 193, 194, 195, 70, 71, 72, - 73, 74, 75, 207, 208, 209, 210, 211, 212, 213, - 214, 15, 80, 81, 82, 83, 137, 175, 346, 347, - 348, 351, 352, 354, 355, 86, 87, 359, 360, 361, - 363, 130, 4, 340, 7, 280, 281, 282, 7, 292, - 293, 294, 7, 309, 310, 311, 65, 332, 8, 376, - 3, 8, 8, 166, 168, 170, 172, 4, 4, 4, - 3, 8, 8, 220, 6, 3, 242, 6, 3, 266, - 6, 3, 3, 6, 135, 3, 6, 3, 6, 196, - 6, 3, 4, 4, 4, 4, 4, 4, 3, 8, - 349, 353, 4, 4, 4, 3, 8, 362, 364, 3, - 8, 8, 108, 283, 6, 3, 295, 6, 3, 312, - 6, 3, 333, 8, 4, 374, 4, 4, 4, 4, - 111, 109, 111, 164, 223, 219, 245, 241, 269, 265, - 181, 6, 187, 231, 199, 195, 109, 109, 109, 109, - 109, 109, 208, 4, 4, 109, 109, 109, 347, 4, - 4, 360, 286, 282, 298, 294, 315, 311, 4, 5, - 108, 108, 108, 108, 8, 8, 8, 8, 77, 78, - 79, 350, 108, 108, 108, 8, 8, 8, 108, 7, - 377, 378, 379, 3, 6, 91, 93, 94, 137, 173, - 380, 381, 382, 383, 385, 378, 386, 4, 384, 3, - 8, 4, 109, 4, 381, 5, 108, 7, 387, 388, - 389, 3, 6, 92, 390, 391, 388, 392, 3, 8, - 4, 391, 108 + 0, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 0, 5, 7, 9, + 122, 123, 124, 125, 140, 141, 142, 146, 7, 153, + 7, 159, 7, 170, 7, 230, 7, 292, 7, 304, + 7, 321, 7, 252, 7, 275, 7, 212, 7, 372, + 147, 143, 154, 160, 171, 231, 293, 305, 322, 253, + 276, 213, 373, 140, 150, 151, 122, 144, 145, 10, + 102, 108, 109, 122, 152, 155, 156, 157, 400, 402, + 404, 11, 13, 14, 22, 23, 24, 25, 26, 27, + 28, 29, 52, 53, 54, 55, 66, 69, 70, 75, + 76, 79, 152, 161, 162, 163, 164, 165, 166, 167, + 168, 174, 176, 193, 199, 204, 206, 220, 224, 246, + 269, 342, 352, 361, 362, 370, 12, 172, 7, 38, + 40, 46, 47, 48, 49, 50, 51, 57, 58, 64, + 152, 163, 164, 165, 166, 232, 233, 234, 236, 238, + 240, 242, 244, 245, 269, 286, 298, 315, 338, 39, + 152, 269, 294, 295, 296, 41, 42, 43, 44, 45, + 152, 269, 306, 307, 308, 310, 311, 313, 314, 55, + 59, 60, 61, 62, 63, 152, 269, 323, 324, 325, + 326, 328, 330, 332, 334, 336, 15, 30, 32, 33, + 35, 36, 37, 152, 180, 188, 254, 255, 256, 257, + 258, 259, 260, 261, 263, 265, 266, 268, 31, 34, + 152, 188, 258, 263, 277, 278, 279, 280, 281, 283, + 284, 285, 67, 68, 152, 214, 215, 216, 218, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, + 91, 92, 93, 94, 152, 374, 375, 376, 377, 379, + 381, 382, 384, 385, 386, 389, 391, 392, 393, 394, + 395, 398, 6, 3, 4, 8, 3, 158, 405, 401, + 403, 4, 3, 8, 169, 175, 177, 4, 4, 4, + 4, 4, 225, 247, 270, 194, 205, 200, 343, 207, + 221, 353, 4, 363, 371, 3, 8, 173, 8, 345, + 287, 299, 235, 237, 239, 4, 4, 243, 241, 316, + 339, 3, 8, 297, 3, 8, 309, 4, 312, 4, + 4, 3, 8, 337, 327, 329, 331, 333, 335, 8, + 3, 181, 189, 4, 264, 262, 267, 4, 8, 3, + 282, 4, 8, 3, 217, 219, 3, 8, 4, 378, + 380, 4, 383, 4, 4, 387, 390, 4, 4, 4, + 4, 396, 399, 3, 8, 140, 140, 122, 4, 4, + 4, 4, 156, 4, 4, 4, 123, 123, 123, 123, + 123, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 123, 4, 4, 162, 4, 56, 152, 188, 269, + 346, 347, 348, 349, 350, 4, 4, 4, 4, 4, + 123, 125, 4, 4, 4, 4, 233, 4, 295, 4, + 123, 4, 123, 123, 307, 4, 4, 4, 4, 4, + 4, 325, 4, 4, 123, 4, 4, 4, 125, 256, + 4, 125, 279, 4, 4, 215, 125, 4, 4, 123, + 4, 123, 123, 4, 4, 125, 125, 125, 125, 4, + 4, 375, 4, 7, 7, 140, 140, 7, 7, 7, + 5, 5, 5, 5, 5, 148, 5, 5, 5, 7, + 7, 7, 7, 148, 351, 8, 3, 5, 5, 122, + 122, 122, 122, 122, 5, 7, 122, 122, 122, 148, + 148, 148, 122, 122, 122, 122, 122, 122, 122, 122, + 122, 122, 140, 122, 122, 122, 95, 96, 388, 97, + 98, 99, 100, 101, 125, 397, 122, 140, 161, 103, + 406, 407, 408, 172, 16, 17, 18, 19, 20, 21, + 152, 178, 179, 180, 182, 184, 186, 188, 190, 191, + 192, 178, 7, 226, 227, 228, 7, 248, 249, 250, + 7, 271, 272, 273, 61, 122, 195, 196, 197, 198, + 149, 62, 197, 201, 202, 203, 240, 344, 7, 208, + 209, 210, 122, 222, 223, 71, 72, 73, 74, 152, + 180, 190, 354, 355, 356, 357, 359, 360, 77, 78, + 364, 365, 366, 368, 374, 4, 348, 7, 288, 289, + 290, 7, 300, 301, 302, 7, 317, 318, 319, 65, + 340, 8, 409, 3, 8, 8, 183, 185, 187, 4, + 4, 4, 3, 8, 8, 229, 6, 3, 251, 6, + 3, 274, 6, 3, 3, 6, 150, 3, 6, 3, + 6, 211, 6, 3, 4, 3, 8, 358, 4, 4, + 4, 3, 8, 367, 369, 3, 8, 8, 122, 291, + 6, 3, 303, 6, 3, 320, 6, 3, 341, 8, + 4, 407, 4, 4, 4, 125, 123, 125, 179, 232, + 228, 254, 250, 277, 273, 196, 6, 202, 240, 214, + 210, 123, 223, 4, 123, 123, 123, 355, 4, 4, + 365, 294, 290, 306, 302, 323, 319, 4, 5, 122, + 122, 122, 8, 8, 8, 8, 122, 122, 122, 8, + 8, 8, 122, 7, 410, 411, 412, 3, 6, 104, + 106, 107, 152, 188, 413, 414, 415, 416, 418, 411, + 419, 4, 417, 3, 8, 4, 123, 4, 414, 5, + 122, 7, 420, 421, 422, 3, 6, 105, 423, 424, + 421, 425, 3, 8, 4, 424, 122 }; const unsigned short int Dhcp6Parser::yyr1_[] = { - 0, 112, 114, 113, 115, 113, 116, 113, 117, 113, - 118, 113, 119, 113, 120, 113, 121, 113, 122, 113, - 123, 113, 124, 113, 125, 125, 125, 125, 125, 125, - 125, 126, 128, 127, 129, 129, 130, 130, 132, 131, - 134, 133, 135, 135, 136, 136, 137, 139, 138, 140, - 140, 141, 141, 141, 141, 141, 143, 142, 145, 144, - 146, 146, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, - 147, 147, 147, 147, 148, 149, 150, 151, 152, 154, - 153, 156, 155, 158, 157, 160, 159, 162, 161, 163, - 163, 164, 164, 164, 164, 164, 164, 164, 164, 164, - 166, 165, 168, 167, 170, 169, 172, 171, 174, 173, - 175, 176, 177, 179, 178, 180, 180, 181, 181, 182, - 183, 185, 184, 186, 186, 187, 187, 188, 190, 189, - 192, 191, 193, 193, 194, 194, 196, 195, 198, 197, - 199, 199, 199, 200, 200, 202, 201, 204, 203, 206, - 205, 207, 207, 208, 208, 208, 208, 208, 208, 209, - 210, 211, 212, 213, 214, 216, 215, 217, 217, 218, - 218, 220, 219, 222, 221, 223, 223, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, 224, 224, - 224, 224, 224, 224, 226, 225, 228, 227, 230, 229, - 232, 231, 234, 233, 235, 236, 238, 237, 239, 239, - 240, 240, 242, 241, 244, 243, 245, 245, 246, 246, - 247, 247, 247, 247, 247, 247, 247, 247, 248, 249, - 250, 252, 251, 254, 253, 256, 255, 257, 259, 258, - 260, 262, 261, 263, 263, 264, 264, 266, 265, 268, - 267, 269, 269, 270, 270, 271, 271, 271, 271, 271, - 271, 272, 274, 273, 275, 276, 277, 279, 278, 280, - 280, 281, 281, 283, 282, 285, 284, 286, 286, 287, - 287, 287, 289, 288, 291, 290, 292, 292, 293, 293, - 295, 294, 297, 296, 298, 298, 299, 299, 299, 299, - 299, 299, 299, 301, 300, 302, 304, 303, 305, 306, - 308, 307, 309, 309, 310, 310, 312, 311, 314, 313, - 315, 315, 316, 316, 317, 317, 317, 317, 317, 317, - 317, 317, 319, 318, 321, 320, 323, 322, 325, 324, - 327, 326, 329, 328, 331, 330, 333, 332, 335, 334, - 336, 336, 337, 231, 338, 338, 339, 339, 340, 340, - 340, 340, 341, 343, 342, 345, 344, 346, 346, 347, - 347, 347, 347, 347, 347, 347, 349, 348, 350, 350, - 350, 351, 353, 352, 354, 355, 356, 358, 357, 359, - 359, 360, 360, 362, 361, 364, 363, 366, 365, 368, - 367, 370, 369, 372, 371, 373, 373, 374, 376, 375, - 377, 377, 379, 378, 380, 380, 381, 381, 381, 381, - 381, 382, 384, 383, 386, 385, 387, 387, 389, 388, - 390, 390, 392, 391 + 0, 126, 128, 127, 129, 127, 130, 127, 131, 127, + 132, 127, 133, 127, 134, 127, 135, 127, 136, 127, + 137, 127, 138, 127, 139, 127, 140, 140, 140, 140, + 140, 140, 140, 141, 143, 142, 144, 144, 145, 145, + 147, 146, 149, 148, 150, 150, 151, 151, 152, 154, + 153, 155, 155, 156, 156, 156, 156, 156, 158, 157, + 160, 159, 161, 161, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 163, 164, 165, 166, + 167, 169, 168, 171, 170, 173, 172, 175, 174, 177, + 176, 178, 178, 179, 179, 179, 179, 179, 179, 179, + 179, 179, 181, 180, 183, 182, 185, 184, 187, 186, + 189, 188, 190, 191, 192, 194, 193, 195, 195, 196, + 196, 197, 198, 200, 199, 201, 201, 202, 202, 203, + 205, 204, 207, 206, 208, 208, 209, 209, 211, 210, + 213, 212, 214, 214, 214, 215, 215, 217, 216, 219, + 218, 221, 220, 222, 222, 223, 225, 224, 226, 226, + 227, 227, 229, 228, 231, 230, 232, 232, 233, 233, + 233, 233, 233, 233, 233, 233, 233, 233, 233, 233, + 233, 233, 233, 233, 233, 235, 234, 237, 236, 239, + 238, 241, 240, 243, 242, 244, 245, 247, 246, 248, + 248, 249, 249, 251, 250, 253, 252, 254, 254, 255, + 255, 256, 256, 256, 256, 256, 256, 256, 256, 257, + 258, 259, 260, 262, 261, 264, 263, 265, 267, 266, + 268, 270, 269, 271, 271, 272, 272, 274, 273, 276, + 275, 277, 277, 278, 278, 279, 279, 279, 279, 279, + 279, 280, 282, 281, 283, 284, 285, 287, 286, 288, + 288, 289, 289, 291, 290, 293, 292, 294, 294, 295, + 295, 295, 297, 296, 299, 298, 300, 300, 301, 301, + 303, 302, 305, 304, 306, 306, 307, 307, 307, 307, + 307, 307, 307, 309, 308, 310, 312, 311, 313, 314, + 316, 315, 317, 317, 318, 318, 320, 319, 322, 321, + 323, 323, 324, 324, 325, 325, 325, 325, 325, 325, + 325, 325, 327, 326, 329, 328, 331, 330, 333, 332, + 335, 334, 337, 336, 339, 338, 341, 340, 343, 342, + 344, 344, 345, 240, 346, 346, 347, 347, 348, 348, + 348, 348, 349, 351, 350, 353, 352, 354, 354, 355, + 355, 355, 355, 355, 355, 355, 356, 358, 357, 359, + 360, 361, 363, 362, 364, 364, 365, 365, 367, 366, + 369, 368, 371, 370, 373, 372, 374, 374, 375, 375, + 375, 375, 375, 375, 375, 375, 375, 375, 375, 375, + 375, 375, 375, 375, 376, 378, 377, 380, 379, 381, + 383, 382, 384, 385, 387, 386, 388, 388, 390, 389, + 391, 392, 393, 394, 396, 395, 397, 397, 397, 397, + 397, 399, 398, 401, 400, 403, 402, 405, 404, 406, + 406, 407, 409, 408, 410, 410, 412, 411, 413, 413, + 414, 414, 414, 414, 414, 415, 417, 416, 419, 418, + 420, 420, 422, 421, 423, 423, 425, 424 }; const unsigned char @@ -3411,29 +3626,28 @@ namespace isc { namespace dhcp { { 0, 2, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, - 0, 3, 0, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 4, 0, 1, 3, 5, 0, 4, - 0, 4, 0, 1, 1, 3, 2, 0, 4, 1, - 3, 1, 1, 1, 1, 1, 0, 6, 0, 4, - 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 3, 0, 3, 0, 3, 1, 1, 1, 1, + 1, 1, 1, 1, 0, 4, 0, 1, 3, 5, + 0, 4, 0, 4, 0, 1, 1, 3, 2, 0, + 4, 1, 3, 1, 1, 1, 1, 1, 0, 6, + 0, 4, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 3, 3, 3, 3, 0, - 6, 0, 4, 0, 4, 0, 6, 0, 6, 1, + 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, + 3, 0, 6, 0, 4, 0, 4, 0, 6, 0, + 6, 1, 3, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 4, 0, 4, 0, 4, 0, 4, + 0, 4, 3, 3, 3, 0, 6, 1, 3, 1, + 1, 1, 1, 0, 6, 1, 3, 1, 1, 1, + 0, 4, 0, 6, 0, 1, 1, 3, 0, 4, + 0, 4, 1, 3, 1, 1, 1, 0, 4, 0, + 4, 0, 6, 1, 3, 3, 0, 6, 0, 1, + 1, 3, 0, 4, 0, 4, 1, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 4, 3, 3, 0, 6, 0, + 1, 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 0, 4, 0, 4, 0, 4, 0, 4, - 3, 3, 3, 0, 6, 1, 3, 1, 1, 1, - 1, 0, 6, 1, 3, 1, 1, 1, 0, 4, - 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, - 1, 3, 1, 1, 1, 0, 4, 0, 4, 0, - 6, 1, 3, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 3, 3, 3, 0, 6, 0, 1, 1, - 3, 0, 4, 0, 4, 1, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 4, 0, 4, 0, 4, - 0, 4, 0, 4, 3, 3, 0, 6, 0, 1, - 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 1, 0, 4, 0, 4, 0, 4, 1, 0, 4, + 3, 1, 1, 0, 4, 0, 4, 1, 0, 4, 3, 0, 6, 0, 1, 1, 3, 0, 4, 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 0, 4, 1, 1, 3, 0, 6, 0, @@ -3447,13 +3661,17 @@ namespace isc { namespace dhcp { 0, 4, 0, 4, 0, 6, 0, 4, 0, 6, 1, 3, 0, 4, 0, 1, 1, 3, 1, 1, 1, 1, 1, 0, 4, 0, 6, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 0, 4, 1, 1, - 1, 3, 0, 4, 3, 3, 3, 0, 6, 1, - 3, 1, 1, 0, 4, 0, 4, 0, 6, 0, - 4, 0, 4, 0, 6, 1, 3, 1, 0, 6, - 1, 3, 0, 4, 1, 3, 1, 1, 1, 1, - 1, 3, 0, 4, 0, 6, 1, 3, 0, 4, - 1, 3, 0, 4 + 1, 1, 1, 1, 1, 1, 3, 0, 4, 3, + 3, 3, 0, 6, 1, 3, 1, 1, 0, 4, + 0, 4, 0, 6, 0, 4, 1, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 0, 4, 0, 4, 3, + 0, 4, 3, 3, 0, 4, 1, 1, 0, 4, + 3, 3, 3, 3, 0, 4, 1, 1, 1, 1, + 1, 0, 4, 0, 4, 0, 4, 0, 6, 1, + 3, 1, 0, 6, 1, 3, 0, 4, 1, 3, + 1, 1, 1, 1, 1, 3, 0, 4, 0, 6, + 1, 3, 0, 4, 1, 3, 0, 4 }; @@ -3481,51 +3699,53 @@ namespace isc { namespace dhcp { "\"ip-addresses\"", "\"prefixes\"", "\"duid\"", "\"hw-address\"", "\"hostname\"", "\"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\"", + "\"server-id\"", "\"identifier\"", "\"htype\"", "\"time\"", "\"enterprise-id\"", "\"dhcp4o6-port\"", "\"control-socket\"", - "\"socket-type\"", "\"socket-name\"", "\"dhcp-ddns\"", "\"Logging\"", - "\"loggers\"", "\"output_options\"", "\"output\"", "\"debuglevel\"", - "\"severity\"", "\"Dhcp4\"", "\"DhcpDdns\"", "TOPLEVEL_JSON", - "TOPLEVEL_DHCP6", "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6", - "SUB_POOL6", "SUB_PD_POOL", "SUB_RESERVATION", "SUB_OPTION_DEF", - "SUB_OPTION_DATA", "SUB_HOOKS_LIBRARY", "\"constant string\"", + "\"socket-type\"", "\"socket-name\"", "\"dhcp-ddns\"", + "\"enable-updates\"", "\"qualifying-suffix\"", "\"server-ip\"", + "\"server-port\"", "\"sender-ip\"", "\"sender-port\"", + "\"max-queue-size\"", "\"ncr-protocol\"", "\"ncr-format\"", + "\"always-include-fqdn\"", "\"allow-client-update\"", + "\"override-no-update\"", "\"override-client-update\"", + "\"replace-client-name\"", "\"generated-prefix\"", "\"UDP\"", "\"TCP\"", + "\"JSON\"", "\"when-present\"", "\"never\"", "\"always\"", + "\"when-not-present\"", "\"Logging\"", "\"loggers\"", + "\"output_options\"", "\"output\"", "\"debuglevel\"", "\"severity\"", + "\"Dhcp4\"", "\"DhcpDdns\"", "TOPLEVEL_JSON", "TOPLEVEL_DHCP6", + "SUB_DHCP6", "SUB_INTERFACES6", "SUB_SUBNET6", "SUB_POOL6", + "SUB_PD_POOL", "SUB_RESERVATION", "SUB_OPTION_DEF", "SUB_OPTION_DATA", + "SUB_HOOKS_LIBRARY", "SUB_DHCP_DDNS", "\"constant string\"", "\"integer\"", "\"floating point\"", "\"boolean\"", "$accept", "start", "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "$@7", "$@8", "$@9", "$@10", - "$@11", "value", "sub_json", "map2", "$@12", "map_content", - "not_empty_map", "list_generic", "$@13", "list2", "$@14", "list_content", - "not_empty_list", "unknown_map_entry", "syntax_map", "$@15", - "global_objects", "global_object", "dhcp6_object", "$@16", "sub_dhcp6", - "$@17", "global_params", "global_param", "preferred_lifetime", + "$@11", "$@12", "value", "sub_json", "map2", "$@13", "map_content", + "not_empty_map", "list_generic", "$@14", "list2", "$@15", "list_content", + "not_empty_list", "unknown_map_entry", "syntax_map", "$@16", + "global_objects", "global_object", "dhcp6_object", "$@17", "sub_dhcp6", + "$@18", "global_params", "global_param", "preferred_lifetime", "valid_lifetime", "renew_timer", "rebind_timer", - "decline_probation_period", "interfaces_config", "$@18", - "sub_interfaces6", "$@19", "interface_config_map", "$@20", - "lease_database", "$@21", "hosts_database", "$@22", - "database_map_params", "database_map_param", "database_type", "$@23", - "user", "$@24", "password", "$@25", "host", "$@26", "name", "$@27", - "persist", "lfc_interval", "readonly", "mac_sources", "$@28", - "mac_sources_list", "mac_sources_value", "duid_id", "string_id", - "host_reservation_identifiers", "$@29", + "decline_probation_period", "interfaces_config", "$@19", + "sub_interfaces6", "$@20", "interface_config_map", "$@21", + "lease_database", "$@22", "hosts_database", "$@23", + "database_map_params", "database_map_param", "type", "$@24", "user", + "$@25", "password", "$@26", "host", "$@27", "name", "$@28", "persist", + "lfc_interval", "readonly", "mac_sources", "$@29", "mac_sources_list", + "mac_sources_value", "duid_id", "string_id", + "host_reservation_identifiers", "$@30", "host_reservation_identifiers_list", "host_reservation_identifier", - "hw_address_id", "relay_supplied_options", "$@30", "hooks_libraries", - "$@31", "hooks_libraries_list", "not_empty_hooks_libraries_list", - "hooks_library", "$@32", "sub_hooks_library", "$@33", "hooks_params", - "hooks_param", "library", "$@34", "parameters", "$@35", - "expired_leases_processing", "$@36", "expired_leases_params", - "expired_leases_param", "reclaim_timer_wait_time", - "flush_reclaimed_timer_wait_time", "hold_reclaimed_time", - "max_reclaim_leases", "max_reclaim_time", "unwarned_reclaim_cycles", - "subnet6_list", "$@37", "subnet6_list_content", "not_empty_subnet6_list", - "subnet6", "$@38", "sub_subnet6", "$@39", "subnet6_params", - "subnet6_param", "subnet", "$@40", "interface", "$@41", "interface_id", - "$@42", "client_class", "$@43", "reservation_mode", "$@44", "id", - "rapid_commit", "option_def_list", "$@45", "option_def_list_content", - "not_empty_option_def_list", "option_def_entry", "$@46", - "sub_option_def", "$@47", "option_def_params", - "not_empty_option_def_params", "option_def_param", "option_def_name", - "code", "option_def_code", "option_def_type", "$@48", + "hw_address_id", "relay_supplied_options", "$@31", "hooks_libraries", + "$@32", "hooks_libraries_list", "not_empty_hooks_libraries_list", + "hooks_library", "$@33", "sub_hooks_library", "$@34", "hooks_params", + "hooks_param", "library", "$@35", "parameters", "$@36", + "expired_leases_processing", "$@37", "expired_leases_params", + "expired_leases_param", "subnet6_list", "$@38", "subnet6_list_content", + "not_empty_subnet6_list", "subnet6", "$@39", "sub_subnet6", "$@40", + "subnet6_params", "subnet6_param", "subnet", "$@41", "interface", "$@42", + "interface_id", "$@43", "client_class", "$@44", "reservation_mode", + "$@45", "id", "rapid_commit", "option_def_list", "$@46", + "option_def_list_content", "not_empty_option_def_list", + "option_def_entry", "$@47", "sub_option_def", "$@48", + "option_def_params", "not_empty_option_def_params", "option_def_param", + "option_def_name", "code", "option_def_code", "option_def_type", "option_def_record_types", "$@49", "space", "$@50", "option_def_space", "option_def_encapsulate", "$@51", "option_def_array", "option_data_list", "$@52", "option_data_list_content", "not_empty_option_data_list", @@ -3549,67 +3769,77 @@ namespace isc { namespace dhcp { "client_classes_list", "$@77", "client_class_params", "not_empty_client_class_params", "client_class_param", "client_class_name", "client_class_test", "$@78", "server_id", "$@79", - "server_id_params", "server_id_param", "server_id_type", "$@80", - "duid_type", "htype", "identifier", "$@81", "time", "enterprise_id", - "dhcp4o6_port", "control_socket", "$@82", "control_socket_params", - "control_socket_param", "socket_type", "$@83", "socket_name", "$@84", - "dhcp_ddns", "$@85", "dhcp4_json_object", "$@86", "dhcpddns_json_object", - "$@87", "logging_object", "$@88", "logging_params", "logging_param", - "loggers", "$@89", "loggers_entries", "logger_entry", "$@90", - "logger_params", "logger_param", "debuglevel", "severity", "$@91", - "output_options_list", "$@92", "output_options_list_content", - "output_entry", "$@93", "output_params", "output_param", "$@94", YY_NULLPTR + "server_id_params", "server_id_param", "htype", "identifier", "$@80", + "time", "enterprise_id", "dhcp4o6_port", "control_socket", "$@81", + "control_socket_params", "control_socket_param", "socket_type", "$@82", + "socket_name", "$@83", "dhcp_ddns", "$@84", "sub_dhcp_ddns", "$@85", + "dhcp_ddns_params", "dhcp_ddns_param", "enable_updates", + "qualifying_suffix", "$@86", "server_ip", "$@87", "server_port", + "sender_ip", "$@88", "sender_port", "max_queue_size", "ncr_protocol", + "$@89", "ncr_protocol_value", "ncr_format", "$@90", + "always_include_fqdn", "allow_client_update", "override_no_update", + "override_client_update", "replace_client_name", "$@91", + "replace_client_name_value", "generated_prefix", "$@92", + "dhcp4_json_object", "$@93", "dhcpddns_json_object", "$@94", + "logging_object", "$@95", "logging_params", "logging_param", "loggers", + "$@96", "loggers_entries", "logger_entry", "$@97", "logger_params", + "logger_param", "debuglevel", "severity", "$@98", "output_options_list", + "$@99", "output_options_list_content", "output_entry", "$@100", + "output_params", "output_param", "$@101", YY_NULLPTR }; #if PARSER6_DEBUG const unsigned short int Dhcp6Parser::yyrline_[] = { - 0, 208, 208, 208, 209, 209, 210, 210, 211, 211, - 212, 212, 213, 213, 214, 214, 215, 215, 216, 216, - 217, 217, 218, 218, 226, 227, 228, 229, 230, 231, - 232, 235, 240, 240, 252, 253, 256, 260, 267, 267, - 275, 275, 282, 283, 286, 290, 301, 311, 311, 323, - 324, 328, 329, 330, 331, 332, 335, 335, 352, 352, - 360, 361, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, - 384, 385, 386, 387, 390, 395, 400, 405, 410, 415, - 415, 425, 425, 433, 433, 443, 443, 453, 453, 463, - 464, 467, 468, 469, 470, 471, 472, 473, 474, 475, - 478, 478, 486, 486, 494, 494, 502, 502, 510, 510, - 518, 523, 528, 533, 533, 543, 544, 547, 548, 551, - 556, 561, 561, 571, 572, 575, 576, 579, 584, 584, - 594, 594, 604, 605, 608, 609, 612, 612, 620, 620, - 628, 629, 630, 633, 634, 637, 637, 645, 645, 653, - 653, 663, 664, 667, 668, 669, 670, 671, 672, 675, - 680, 685, 690, 695, 700, 708, 708, 721, 722, 725, - 726, 733, 733, 756, 756, 765, 766, 770, 771, 772, - 773, 774, 775, 776, 777, 778, 779, 780, 781, 782, - 783, 784, 785, 786, 789, 789, 797, 797, 805, 805, - 813, 813, 821, 821, 829, 834, 843, 843, 855, 856, - 859, 860, 865, 865, 876, 876, 886, 887, 890, 891, - 894, 895, 896, 897, 898, 899, 900, 901, 904, 906, - 911, 913, 913, 921, 921, 929, 929, 937, 939, 939, - 947, 956, 956, 968, 969, 974, 975, 980, 980, 991, - 991, 1002, 1003, 1008, 1009, 1014, 1015, 1016, 1017, 1018, - 1019, 1022, 1024, 1024, 1032, 1034, 1036, 1044, 1044, 1056, - 1057, 1060, 1061, 1064, 1064, 1072, 1072, 1080, 1081, 1084, - 1085, 1086, 1089, 1089, 1100, 1100, 1112, 1113, 1116, 1117, - 1120, 1120, 1128, 1128, 1136, 1137, 1140, 1141, 1142, 1143, - 1144, 1145, 1146, 1149, 1149, 1157, 1162, 1162, 1170, 1175, - 1183, 1183, 1193, 1194, 1197, 1198, 1201, 1201, 1209, 1209, - 1217, 1218, 1221, 1222, 1226, 1227, 1228, 1229, 1230, 1231, - 1232, 1233, 1236, 1236, 1246, 1246, 1256, 1256, 1264, 1264, - 1272, 1272, 1280, 1280, 1293, 1293, 1303, 1303, 1314, 1314, - 1324, 1325, 1328, 1328, 1336, 1337, 1340, 1341, 1344, 1345, - 1346, 1347, 1350, 1352, 1352, 1363, 1363, 1373, 1374, 1377, - 1378, 1379, 1380, 1381, 1382, 1383, 1386, 1386, 1393, 1394, - 1395, 1398, 1403, 1403, 1411, 1416, 1423, 1430, 1430, 1440, - 1441, 1444, 1445, 1448, 1448, 1456, 1456, 1466, 1466, 1478, - 1478, 1485, 1485, 1497, 1497, 1510, 1511, 1515, 1519, 1519, - 1531, 1532, 1536, 1536, 1544, 1545, 1548, 1549, 1550, 1551, - 1552, 1555, 1559, 1559, 1567, 1567, 1577, 1578, 1581, 1581, - 1589, 1590, 1593, 1593 + 0, 203, 203, 203, 204, 204, 205, 205, 206, 206, + 207, 207, 208, 208, 209, 209, 210, 210, 211, 211, + 212, 212, 213, 213, 214, 214, 222, 223, 224, 225, + 226, 227, 228, 231, 236, 236, 248, 249, 252, 256, + 263, 263, 271, 271, 278, 279, 282, 286, 297, 307, + 307, 319, 320, 324, 325, 326, 327, 328, 331, 331, + 348, 348, 356, 357, 362, 363, 364, 365, 366, 367, + 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, + 378, 379, 380, 381, 382, 383, 386, 391, 396, 401, + 406, 411, 411, 421, 421, 429, 429, 439, 439, 449, + 449, 459, 460, 463, 464, 465, 466, 467, 468, 469, + 470, 471, 474, 474, 482, 482, 490, 490, 498, 498, + 506, 506, 514, 519, 524, 529, 529, 539, 540, 543, + 544, 547, 552, 557, 557, 567, 568, 571, 572, 575, + 580, 580, 590, 590, 600, 601, 604, 605, 608, 608, + 616, 616, 624, 625, 626, 629, 630, 633, 633, 641, + 641, 649, 649, 659, 660, 666, 674, 674, 687, 688, + 691, 692, 699, 699, 722, 722, 731, 732, 736, 737, + 738, 739, 740, 741, 742, 743, 744, 745, 746, 747, + 748, 749, 750, 751, 752, 755, 755, 763, 763, 771, + 771, 779, 779, 787, 787, 795, 800, 809, 809, 821, + 822, 825, 826, 831, 831, 842, 842, 852, 853, 856, + 857, 860, 861, 862, 863, 864, 865, 866, 867, 870, + 872, 877, 879, 881, 881, 889, 889, 897, 899, 899, + 907, 916, 916, 928, 929, 934, 935, 940, 940, 951, + 951, 962, 963, 968, 969, 974, 975, 976, 977, 978, + 979, 982, 984, 984, 992, 994, 996, 1004, 1004, 1016, + 1017, 1020, 1021, 1024, 1024, 1032, 1032, 1040, 1041, 1044, + 1045, 1046, 1049, 1049, 1060, 1060, 1072, 1073, 1076, 1077, + 1080, 1080, 1088, 1088, 1096, 1097, 1100, 1101, 1102, 1103, + 1104, 1105, 1106, 1109, 1109, 1117, 1122, 1122, 1130, 1135, + 1143, 1143, 1153, 1154, 1157, 1158, 1161, 1161, 1169, 1169, + 1177, 1178, 1181, 1182, 1186, 1187, 1188, 1189, 1190, 1191, + 1192, 1193, 1196, 1196, 1206, 1206, 1216, 1216, 1224, 1224, + 1232, 1232, 1240, 1240, 1253, 1253, 1263, 1263, 1274, 1274, + 1284, 1285, 1288, 1288, 1296, 1297, 1300, 1301, 1304, 1305, + 1306, 1307, 1310, 1312, 1312, 1323, 1323, 1333, 1334, 1337, + 1338, 1339, 1340, 1341, 1342, 1343, 1346, 1351, 1351, 1359, + 1364, 1371, 1378, 1378, 1388, 1389, 1392, 1393, 1396, 1396, + 1404, 1404, 1414, 1414, 1424, 1424, 1432, 1433, 1436, 1437, + 1438, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1447, + 1448, 1449, 1450, 1451, 1454, 1459, 1459, 1467, 1467, 1475, + 1480, 1480, 1488, 1493, 1498, 1498, 1506, 1507, 1510, 1510, + 1518, 1523, 1528, 1533, 1538, 1538, 1546, 1549, 1552, 1555, + 1558, 1564, 1564, 1574, 1574, 1581, 1581, 1593, 1593, 1606, + 1607, 1611, 1615, 1615, 1627, 1628, 1632, 1632, 1640, 1641, + 1644, 1645, 1646, 1647, 1648, 1651, 1655, 1655, 1663, 1663, + 1673, 1674, 1677, 1677, 1685, 1686, 1689, 1689 }; // Print the state stack on the debug stream. @@ -3644,8 +3874,8 @@ namespace isc { namespace dhcp { #line 14 "dhcp6_parser.yy" // lalr1.cc:1167 } } // isc::dhcp -#line 3648 "dhcp6_parser.cc" // lalr1.cc:1167 -#line 1601 "dhcp6_parser.yy" // lalr1.cc:1168 +#line 3878 "dhcp6_parser.cc" // lalr1.cc:1167 +#line 1697 "dhcp6_parser.yy" // lalr1.cc:1168 void diff --git a/src/bin/dhcp6/dhcp6_parser.h b/src/bin/dhcp6/dhcp6_parser.h index 302ae838aa..76469de023 100644 --- a/src/bin/dhcp6/dhcp6_parser.h +++ b/src/bin/dhcp6/dhcp6_parser.h @@ -305,7 +305,8 @@ namespace isc { namespace dhcp { union union_type { // value - // duid_type + // ncr_protocol_value + // replace_client_name_value char dummy1[sizeof(ElementPtr)]; // "boolean" @@ -409,48 +410,62 @@ namespace isc { namespace dhcp { TOKEN_LIBRARY = 322, TOKEN_PARAMETERS = 323, TOKEN_EXPIRED_LEASES_PROCESSING = 324, - TOKEN_RECLAIM_TIMER_WAIT_TIME = 325, - TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME = 326, - TOKEN_HOLD_RECLAIMED_TIME = 327, - TOKEN_MAX_RECLAIM_LEASES = 328, - TOKEN_MAX_RECLAIM_TIME = 329, - TOKEN_UNWARNED_RECLAIM_CYCLES = 330, - TOKEN_SERVER_ID = 331, - TOKEN_LLT = 332, - TOKEN_EN = 333, - TOKEN_LL = 334, - TOKEN_IDENTIFIER = 335, - TOKEN_HTYPE = 336, - TOKEN_TIME = 337, - TOKEN_ENTERPRISE_ID = 338, - TOKEN_DHCP4O6_PORT = 339, - TOKEN_CONTROL_SOCKET = 340, - TOKEN_SOCKET_TYPE = 341, - TOKEN_SOCKET_NAME = 342, - TOKEN_DHCP_DDNS = 343, - TOKEN_LOGGING = 344, - TOKEN_LOGGERS = 345, - TOKEN_OUTPUT_OPTIONS = 346, - TOKEN_OUTPUT = 347, - TOKEN_DEBUGLEVEL = 348, - TOKEN_SEVERITY = 349, - TOKEN_DHCP4 = 350, - TOKEN_DHCPDDNS = 351, - TOKEN_TOPLEVEL_JSON = 352, - TOKEN_TOPLEVEL_DHCP6 = 353, - TOKEN_SUB_DHCP6 = 354, - TOKEN_SUB_INTERFACES6 = 355, - TOKEN_SUB_SUBNET6 = 356, - TOKEN_SUB_POOL6 = 357, - TOKEN_SUB_PD_POOL = 358, - TOKEN_SUB_RESERVATION = 359, - TOKEN_SUB_OPTION_DEF = 360, - TOKEN_SUB_OPTION_DATA = 361, - TOKEN_SUB_HOOKS_LIBRARY = 362, - TOKEN_STRING = 363, - TOKEN_INTEGER = 364, - TOKEN_FLOAT = 365, - TOKEN_BOOLEAN = 366 + TOKEN_SERVER_ID = 325, + TOKEN_IDENTIFIER = 326, + TOKEN_HTYPE = 327, + TOKEN_TIME = 328, + TOKEN_ENTERPRISE_ID = 329, + TOKEN_DHCP4O6_PORT = 330, + TOKEN_CONTROL_SOCKET = 331, + TOKEN_SOCKET_TYPE = 332, + TOKEN_SOCKET_NAME = 333, + TOKEN_DHCP_DDNS = 334, + TOKEN_ENABLE_UPDATES = 335, + TOKEN_QUALIFYING_SUFFIX = 336, + TOKEN_SERVER_IP = 337, + TOKEN_SERVER_PORT = 338, + TOKEN_SENDER_IP = 339, + TOKEN_SENDER_PORT = 340, + TOKEN_MAX_QUEUE_SIZE = 341, + TOKEN_NCR_PROTOCOL = 342, + TOKEN_NCR_FORMAT = 343, + TOKEN_ALWAYS_INCLUDE_FQDN = 344, + TOKEN_ALLOW_CLIENT_UPDATE = 345, + TOKEN_OVERRIDE_NO_UPDATE = 346, + TOKEN_OVERRIDE_CLIENT_UPDATE = 347, + TOKEN_REPLACE_CLIENT_NAME = 348, + TOKEN_GENERATED_PREFIX = 349, + TOKEN_UDP = 350, + TOKEN_TCP = 351, + TOKEN_JSON = 352, + TOKEN_WHEN_PRESENT = 353, + TOKEN_NEVER = 354, + TOKEN_ALWAYS = 355, + TOKEN_WHEN_NOT_PRESENT = 356, + TOKEN_LOGGING = 357, + TOKEN_LOGGERS = 358, + TOKEN_OUTPUT_OPTIONS = 359, + TOKEN_OUTPUT = 360, + TOKEN_DEBUGLEVEL = 361, + TOKEN_SEVERITY = 362, + TOKEN_DHCP4 = 363, + TOKEN_DHCPDDNS = 364, + TOKEN_TOPLEVEL_JSON = 365, + TOKEN_TOPLEVEL_DHCP6 = 366, + TOKEN_SUB_DHCP6 = 367, + TOKEN_SUB_INTERFACES6 = 368, + TOKEN_SUB_SUBNET6 = 369, + TOKEN_SUB_POOL6 = 370, + TOKEN_SUB_PD_POOL = 371, + TOKEN_SUB_RESERVATION = 372, + TOKEN_SUB_OPTION_DEF = 373, + TOKEN_SUB_OPTION_DATA = 374, + TOKEN_SUB_HOOKS_LIBRARY = 375, + TOKEN_SUB_DHCP_DDNS = 376, + TOKEN_STRING = 377, + TOKEN_INTEGER = 378, + TOKEN_FLOAT = 379, + TOKEN_BOOLEAN = 380 }; }; @@ -837,46 +852,10 @@ namespace isc { namespace dhcp { symbol_type make_EXPIRED_LEASES_PROCESSING (const location_type& l); - static inline - symbol_type - make_RECLAIM_TIMER_WAIT_TIME (const location_type& l); - - static inline - symbol_type - make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l); - - static inline - symbol_type - make_HOLD_RECLAIMED_TIME (const location_type& l); - - static inline - symbol_type - make_MAX_RECLAIM_LEASES (const location_type& l); - - static inline - symbol_type - make_MAX_RECLAIM_TIME (const location_type& l); - - static inline - symbol_type - make_UNWARNED_RECLAIM_CYCLES (const location_type& l); - static inline symbol_type make_SERVER_ID (const location_type& l); - static inline - symbol_type - make_LLT (const location_type& l); - - static inline - symbol_type - make_EN (const location_type& l); - - static inline - symbol_type - make_LL (const location_type& l); - static inline symbol_type make_IDENTIFIER (const location_type& l); @@ -913,6 +892,94 @@ namespace isc { namespace dhcp { symbol_type make_DHCP_DDNS (const location_type& l); + static inline + symbol_type + make_ENABLE_UPDATES (const location_type& l); + + static inline + symbol_type + make_QUALIFYING_SUFFIX (const location_type& l); + + static inline + symbol_type + make_SERVER_IP (const location_type& l); + + static inline + symbol_type + make_SERVER_PORT (const location_type& l); + + static inline + symbol_type + make_SENDER_IP (const location_type& l); + + static inline + symbol_type + make_SENDER_PORT (const location_type& l); + + static inline + symbol_type + make_MAX_QUEUE_SIZE (const location_type& l); + + static inline + symbol_type + make_NCR_PROTOCOL (const location_type& l); + + static inline + symbol_type + make_NCR_FORMAT (const location_type& l); + + static inline + symbol_type + make_ALWAYS_INCLUDE_FQDN (const location_type& l); + + static inline + symbol_type + make_ALLOW_CLIENT_UPDATE (const location_type& l); + + static inline + symbol_type + make_OVERRIDE_NO_UPDATE (const location_type& l); + + static inline + symbol_type + make_OVERRIDE_CLIENT_UPDATE (const location_type& l); + + static inline + symbol_type + make_REPLACE_CLIENT_NAME (const location_type& l); + + static inline + symbol_type + make_GENERATED_PREFIX (const location_type& l); + + static inline + symbol_type + make_UDP (const location_type& l); + + static inline + symbol_type + make_TCP (const location_type& l); + + static inline + symbol_type + make_JSON (const location_type& l); + + static inline + symbol_type + make_WHEN_PRESENT (const location_type& l); + + static inline + symbol_type + make_NEVER (const location_type& l); + + static inline + symbol_type + make_ALWAYS (const location_type& l); + + static inline + symbol_type + make_WHEN_NOT_PRESENT (const location_type& l); + static inline symbol_type make_LOGGING (const location_type& l); @@ -989,6 +1056,10 @@ namespace isc { namespace dhcp { symbol_type make_SUB_HOOKS_LIBRARY (const location_type& l); + static inline + symbol_type + make_SUB_DHCP_DDNS (const location_type& l); + static inline symbol_type make_STRING (const std::string& v, const location_type& l); @@ -1210,12 +1281,12 @@ namespace isc { namespace dhcp { enum { yyeof_ = 0, - yylast_ = 661, ///< Last index in yytable_. - yynnts_ = 281, ///< Number of nonterminal symbols. - yyfinal_ = 24, ///< Termination state number. + yylast_ = 711, ///< Last index in yytable_. + yynnts_ = 300, ///< Number of nonterminal symbols. + yyfinal_ = 26, ///< Termination state number. yyterror_ = 1, yyerrcode_ = 256, - yyntokens_ = 112 ///< Number of tokens. + yyntokens_ = 126 ///< Number of tokens. }; @@ -1268,9 +1339,11 @@ namespace isc { namespace dhcp { 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111 + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125 }; - const unsigned int user_token_number_max_ = 366; + const unsigned int user_token_number_max_ = 380; const token_number_type undef_token_ = 2; if (static_cast(t) <= yyeof_) @@ -1303,24 +1376,25 @@ namespace isc { namespace dhcp { { switch (other.type_get ()) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.copy< ElementPtr > (other.value); break; - case 111: // "boolean" + case 125: // "boolean" value.copy< bool > (other.value); break; - case 110: // "floating point" + case 124: // "floating point" value.copy< double > (other.value); break; - case 109: // "integer" + case 123: // "integer" value.copy< int64_t > (other.value); break; - case 108: // "constant string" + case 122: // "constant string" value.copy< std::string > (other.value); break; @@ -1341,24 +1415,25 @@ namespace isc { namespace dhcp { (void) v; switch (this->type_get ()) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.copy< ElementPtr > (v); break; - case 111: // "boolean" + case 125: // "boolean" value.copy< bool > (v); break; - case 110: // "floating point" + case 124: // "floating point" value.copy< double > (v); break; - case 109: // "integer" + case 123: // "integer" value.copy< int64_t > (v); break; - case 108: // "constant string" + case 122: // "constant string" value.copy< std::string > (v); break; @@ -1438,24 +1513,25 @@ namespace isc { namespace dhcp { // Type destructor. switch (yytype) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.template destroy< ElementPtr > (); break; - case 111: // "boolean" + case 125: // "boolean" value.template destroy< bool > (); break; - case 110: // "floating point" + case 124: // "floating point" value.template destroy< double > (); break; - case 109: // "integer" + case 123: // "integer" value.template destroy< int64_t > (); break; - case 108: // "constant string" + case 122: // "constant string" value.template destroy< std::string > (); break; @@ -1482,24 +1558,25 @@ namespace isc { namespace dhcp { super_type::move(s); switch (this->type_get ()) { - case 125: // value - case 350: // duid_type + case 140: // value + case 388: // ncr_protocol_value + case 397: // replace_client_name_value value.move< ElementPtr > (s.value); break; - case 111: // "boolean" + case 125: // "boolean" value.move< bool > (s.value); break; - case 110: // "floating point" + case 124: // "floating point" value.move< double > (s.value); break; - case 109: // "integer" + case 123: // "integer" value.move< int64_t > (s.value); break; - case 108: // "constant string" + case 122: // "constant string" value.move< std::string > (s.value); break; @@ -1569,7 +1646,8 @@ namespace isc { namespace dhcp { 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, - 365, 366 + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 380 }; return static_cast (yytoken_number_[type]); } @@ -1982,66 +2060,12 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_EXPIRED_LEASES_PROCESSING, l); } - Dhcp6Parser::symbol_type - Dhcp6Parser::make_RECLAIM_TIMER_WAIT_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_RECLAIM_TIMER_WAIT_TIME, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_FLUSH_RECLAIMED_TIMER_WAIT_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_FLUSH_RECLAIMED_TIMER_WAIT_TIME, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_HOLD_RECLAIMED_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_HOLD_RECLAIMED_TIME, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_MAX_RECLAIM_LEASES (const location_type& l) - { - return symbol_type (token::TOKEN_MAX_RECLAIM_LEASES, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_MAX_RECLAIM_TIME (const location_type& l) - { - return symbol_type (token::TOKEN_MAX_RECLAIM_TIME, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_UNWARNED_RECLAIM_CYCLES (const location_type& l) - { - return symbol_type (token::TOKEN_UNWARNED_RECLAIM_CYCLES, l); - } - Dhcp6Parser::symbol_type Dhcp6Parser::make_SERVER_ID (const location_type& l) { return symbol_type (token::TOKEN_SERVER_ID, l); } - Dhcp6Parser::symbol_type - Dhcp6Parser::make_LLT (const location_type& l) - { - return symbol_type (token::TOKEN_LLT, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_EN (const location_type& l) - { - return symbol_type (token::TOKEN_EN, l); - } - - Dhcp6Parser::symbol_type - Dhcp6Parser::make_LL (const location_type& l) - { - return symbol_type (token::TOKEN_LL, l); - } - Dhcp6Parser::symbol_type Dhcp6Parser::make_IDENTIFIER (const location_type& l) { @@ -2096,6 +2120,138 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_DHCP_DDNS, l); } + Dhcp6Parser::symbol_type + Dhcp6Parser::make_ENABLE_UPDATES (const location_type& l) + { + return symbol_type (token::TOKEN_ENABLE_UPDATES, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_QUALIFYING_SUFFIX (const location_type& l) + { + return symbol_type (token::TOKEN_QUALIFYING_SUFFIX, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_SERVER_IP (const location_type& l) + { + return symbol_type (token::TOKEN_SERVER_IP, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_SERVER_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_SERVER_PORT, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_SENDER_IP (const location_type& l) + { + return symbol_type (token::TOKEN_SENDER_IP, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_SENDER_PORT (const location_type& l) + { + return symbol_type (token::TOKEN_SENDER_PORT, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_MAX_QUEUE_SIZE (const location_type& l) + { + return symbol_type (token::TOKEN_MAX_QUEUE_SIZE, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_NCR_PROTOCOL (const location_type& l) + { + return symbol_type (token::TOKEN_NCR_PROTOCOL, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_NCR_FORMAT (const location_type& l) + { + return symbol_type (token::TOKEN_NCR_FORMAT, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_ALWAYS_INCLUDE_FQDN (const location_type& l) + { + return symbol_type (token::TOKEN_ALWAYS_INCLUDE_FQDN, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_ALLOW_CLIENT_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_ALLOW_CLIENT_UPDATE, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_OVERRIDE_NO_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_OVERRIDE_NO_UPDATE, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_OVERRIDE_CLIENT_UPDATE (const location_type& l) + { + return symbol_type (token::TOKEN_OVERRIDE_CLIENT_UPDATE, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_REPLACE_CLIENT_NAME (const location_type& l) + { + return symbol_type (token::TOKEN_REPLACE_CLIENT_NAME, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_GENERATED_PREFIX (const location_type& l) + { + return symbol_type (token::TOKEN_GENERATED_PREFIX, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_UDP (const location_type& l) + { + return symbol_type (token::TOKEN_UDP, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_TCP (const location_type& l) + { + return symbol_type (token::TOKEN_TCP, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_JSON (const location_type& l) + { + return symbol_type (token::TOKEN_JSON, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_WHEN_PRESENT (const location_type& l) + { + return symbol_type (token::TOKEN_WHEN_PRESENT, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_NEVER (const location_type& l) + { + return symbol_type (token::TOKEN_NEVER, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_ALWAYS (const location_type& l) + { + return symbol_type (token::TOKEN_ALWAYS, l); + } + + Dhcp6Parser::symbol_type + Dhcp6Parser::make_WHEN_NOT_PRESENT (const location_type& l) + { + return symbol_type (token::TOKEN_WHEN_NOT_PRESENT, l); + } + Dhcp6Parser::symbol_type Dhcp6Parser::make_LOGGING (const location_type& l) { @@ -2210,6 +2366,12 @@ namespace isc { namespace dhcp { return symbol_type (token::TOKEN_SUB_HOOKS_LIBRARY, l); } + Dhcp6Parser::symbol_type + Dhcp6Parser::make_SUB_DHCP_DDNS (const location_type& l) + { + return symbol_type (token::TOKEN_SUB_DHCP_DDNS, l); + } + Dhcp6Parser::symbol_type Dhcp6Parser::make_STRING (const std::string& v, const location_type& l) { @@ -2237,7 +2399,7 @@ namespace isc { namespace dhcp { #line 14 "dhcp6_parser.yy" // lalr1.cc:377 } } // isc::dhcp -#line 2241 "dhcp6_parser.h" // lalr1.cc:377 +#line 2403 "dhcp6_parser.h" // lalr1.cc:377 diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 03d3b3893e..107bb1b4b8 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -142,26 +142,28 @@ using namespace std; SOCKET_NAME "socket-name" DHCP_DDNS "dhcp-ddns" - - /// @todo: Implement proper parsing for those parameters in Dhcp6/dhcp-ddns/*. - /// This should be part of the #5043 ticket. Listing the keywords here for - /// completeness. - - // These are tokens defined in Dhcp6/dhcp-ddns/* - // They're not - // ENABLE_UPDATES "enable-updates" - // SERVER_IP "server-ip" - // SENDER_IP "sender-ip" - // SENDER_PORT "sender-port" - // MAX_QUEUE_SIZE "max-queue-size" - // NCR_PROTOCOL "ncr-protocol" - // NCR_FORMAT "ncr-format" - // ALWAYS_INCLUDE_FQDN "always-include-fqdn" - // OVERRDIDE_NO_UPDATE "override-no-update" - // OVERRDIDE_CLIENT_UPDATE "override-client-update" - // REPLACE_CLIENT_NAME "replace-client-name" - // GENERATED_PREFIX "generated-prefix" - // QUALIFYING_SUFFIX "qualifying-suffix" + ENABLE_UPDATES "enable-updates" + QUALIFYING_SUFFIX "qualifying-suffix" + SERVER_IP "server-ip" + SERVER_PORT "server-port" + SENDER_IP "sender-ip" + SENDER_PORT "sender-port" + MAX_QUEUE_SIZE "max-queue-size" + NCR_PROTOCOL "ncr-protocol" + NCR_FORMAT "ncr-format" + ALWAYS_INCLUDE_FQDN "always-include-fqdn" + ALLOW_CLIENT_UPDATE "allow-client-update" + OVERRIDE_NO_UPDATE "override-no-update" + OVERRIDE_CLIENT_UPDATE "override-client-update" + REPLACE_CLIENT_NAME "replace-client-name" + GENERATED_PREFIX "generated-prefix" + UDP "UDP" + TCP "TCP" + JSON "JSON" + WHEN_PRESENT "when-present" + NEVER "never" + ALWAYS "always" + WHEN_NOT_PRESENT "when-not-present" LOGGING "Logging" LOGGERS "loggers" @@ -186,6 +188,7 @@ using namespace std; SUB_OPTION_DEF SUB_OPTION_DATA SUB_HOOKS_LIBRARY + SUB_DHCP_DDNS ; %token STRING "constant string" @@ -195,6 +198,8 @@ using namespace std; %type value %type duid_type +%type ncr_protocol_value +%type replace_client_name_value %printer { yyoutput << $$; } <*>; @@ -216,6 +221,7 @@ start: TOPLEVEL_JSON { ctx.ctx_ = ctx.NO_KEYWORD; } sub_json | SUB_OPTION_DEF { ctx.ctx_ = ctx.OPTION_DEF; } sub_option_def | SUB_OPTION_DATA { ctx.ctx_ = ctx.OPTION_DATA; } sub_option_data | SUB_HOOKS_LIBRARY { ctx.ctx_ = ctx.HOOKS_LIBRARIES; } sub_hooks_library + | SUB_DHCP_DDNS { ctx.ctx_ = ctx.DHCP_DDNS; } sub_dhcp_ddns ; // ---- generic JSON parser --------------------------------- @@ -1467,12 +1473,160 @@ dhcp_ddns: DHCP_DDNS { ElementPtr m(new MapElement(ctx.loc2pos(@1))); ctx.stack_.back()->set("dhcp-ddns", m); ctx.stack_.push_back(m); - ctx.enter(ctx.NO_KEYWORD); -} COLON LCURLY_BRACKET not_empty_map RCURLY_BRACKET { + ctx.enter(ctx.DHCP_DDNS); +} COLON LCURLY_BRACKET dhcp_ddns_params RCURLY_BRACKET { ctx.stack_.pop_back(); ctx.leave(); }; +sub_dhcp_ddns: LCURLY_BRACKET { + // Parse the dhcp-ddns map + ElementPtr m(new MapElement(ctx.loc2pos(@1))); + ctx.stack_.push_back(m); +} dhcp_ddns_params RCURLY_BRACKET { + // parsing completed +}; + +dhcp_ddns_params: dhcp_ddns_param + | dhcp_ddns_params COMMA dhcp_ddns_param + ; + +dhcp_ddns_param: enable_updates + | qualifying_suffix + | server_ip + | server_port + | sender_ip + | sender_port + | max_queue_size + | ncr_protocol + | ncr_format + | always_include_fqdn + | allow_client_update + | override_no_update + | override_client_update + | replace_client_name + | generated_prefix + | unknown_map_entry + ; + +enable_updates: ENABLE_UPDATES COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("enable-updates", b); +}; + +qualifying_suffix: QUALIFYING_SUFFIX { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("qualifying-suffix", s); + ctx.leave(); +}; + +server_ip: SERVER_IP { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("server-ip", s); + ctx.leave(); +}; + +server_port: SERVER_PORT COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("server-port", i); +}; + +sender_ip: SENDER_IP { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("sender-ip", s); + ctx.leave(); +}; + +sender_port: SENDER_PORT COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("sender-port", i); +}; + +max_queue_size: MAX_QUEUE_SIZE COLON INTEGER { + ElementPtr i(new IntElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("max-queue-size", i); +}; + +ncr_protocol: NCR_PROTOCOL { + ctx.enter(ctx.NCR_PROTOCOL); +} COLON ncr_protocol_value { + ctx.stack_.back()->set("ncr-protocol", $4); + ctx.leave(); +}; + +ncr_protocol_value: + UDP { $$ = ElementPtr(new StringElement("UDP", ctx.loc2pos(@1))); } + | TCP { $$ = ElementPtr(new StringElement("TCP", ctx.loc2pos(@1))); } + ; + +ncr_format: NCR_FORMAT { + ctx.enter(ctx.NCR_FORMAT); +} COLON JSON { + ElementPtr json(new StringElement("JSON", ctx.loc2pos(@4))); + ctx.stack_.back()->set("ncr-format", json); + ctx.leave(); +}; + +always_include_fqdn: ALWAYS_INCLUDE_FQDN COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("always-include-fqdn", b); +}; + +allow_client_update: ALLOW_CLIENT_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("allow-client-update", b); +}; + +override_no_update: OVERRIDE_NO_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("override-no-update", b); +}; + +override_client_update: OVERRIDE_CLIENT_UPDATE COLON BOOLEAN { + ElementPtr b(new BoolElement($3, ctx.loc2pos(@3))); + ctx.stack_.back()->set("override-client-update", b); +}; + +replace_client_name: REPLACE_CLIENT_NAME { + ctx.enter(ctx.REPLACE_CLIENT_NAME); +} COLON replace_client_name_value { + ctx.stack_.back()->set("replace-client-name", $4); + ctx.leave(); +}; + +replace_client_name_value: + WHEN_PRESENT { + $$ = ElementPtr(new StringElement("when-present", ctx.loc2pos(@1))); + } + | NEVER { + $$ = ElementPtr(new StringElement("never", ctx.loc2pos(@1))); + } + | ALWAYS { + $$ = ElementPtr(new StringElement("always", ctx.loc2pos(@1))); + } + | WHEN_NOT_PRESENT { + $$ = ElementPtr(new StringElement("when-not-present", ctx.loc2pos(@1))); + } + | BOOLEAN { + error(@1, "boolean values for the replace-client-name are " + "no longer supported"); + } + ; + +generated_prefix: GENERATED_PREFIX { + ctx.enter(ctx.NO_KEYWORD); +} COLON STRING { + ElementPtr s(new StringElement($4, ctx.loc2pos(@4))); + ctx.stack_.back()->set("generated-prefix", s); + ctx.leave(); +}; + // JSON entries for Dhcp4 and DhcpDdns dhcp4_json_object: DHCP4 { diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc index a038682438..16cc495ae1 100644 --- a/src/bin/dhcp6/json_config_parser.cc +++ b/src/bin/dhcp6/json_config_parser.cc @@ -710,9 +710,8 @@ DhcpConfigParser* createGlobal6DhcpConfigParser(const std::string& config_id, } else if (config_id.compare("hosts-database") == 0) { parser = new DbAccessParser(config_id, DbAccessParser::HOSTS_DB); // hooks-libraries is now converted to SimpleParser. - } else if (config_id.compare("dhcp-ddns") == 0) { - parser = new D2ClientConfigParser(config_id); // mac-source has been converted to SimpleParser. + // dhcp-ddns has been converted to SimpleParser } else if (config_id.compare("relay-supplied-options") == 0) { parser = new RSOOListConfigParser(config_id); // control-socket has been converted to SimpleParser. @@ -949,6 +948,17 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { continue; } + if (config_pair.first == "dhcp-ddns") { + // Apply defaults if not in short cut + if (!D2ClientConfigParser::isShortCutDisabled(config_pair.second)) { + D2ClientConfigParser::setAllDefaults(config_pair.second); + } + D2ClientConfigParser parser; + D2ClientConfigPtr cfg = parser.parse(config_pair.second); + CfgMgr::instance().getStagingCfg()->setD2ClientConfig(cfg); + continue; + } + ParserPtr parser(createGlobal6DhcpConfigParser(config_pair.first, config_pair.second)); LOG_DEBUG(dhcp6_logger, DBG_DHCP6_DETAIL, DHCP6_PARSER_CREATED) @@ -1036,6 +1046,11 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) { // revert it. As a result, the failure to commit a subsequent // change causes problems when trying to roll back. hooks_parser.loadLibraries(); + + // Apply staged D2ClientConfig, used to be done by parser commit + D2ClientConfigPtr cfg; + cfg = CfgMgr::instance().getStagingCfg()->getD2ClientConfig(); + CfgMgr::instance().setD2ClientConfig(cfg); } catch (const isc::Exception& ex) { LOG_ERROR(dhcp6_logger, DHCP6_PARSER_COMMIT_FAIL).arg(ex.what()); diff --git a/src/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh index ca85a553e8..864d8c25d5 100644 --- a/src/bin/dhcp6/location.hh +++ b/src/bin/dhcp6/location.hh @@ -1,4 +1,4 @@ -// Generated 201701102225 +// Generated 201701131911 // A Bison parser, made by GNU Bison 3.0.4. // Locations for Bison parsers in C++ diff --git a/src/bin/dhcp6/parser_context.cc b/src/bin/dhcp6/parser_context.cc index 96ac1203d6..e1578b24df 100644 --- a/src/bin/dhcp6/parser_context.cc +++ b/src/bin/dhcp6/parser_context.cc @@ -167,6 +167,14 @@ Parser6Context::contextName() return ("loggers"); case OUTPUT_OPTIONS: return ("output-options"); + case DHCP_DDNS: + return ("dhcp-ddns"); + case NCR_PROTOCOL: + return ("ncr-protocol"); + case NCR_FORMAT: + return ("ncr-format"); + case REPLACE_CLIENT_NAME: + return ("replace-client-name"); default: return ("__unknown__"); } diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h index 327ebffcf4..eb31e020d2 100644 --- a/src/bin/dhcp6/parser_context.h +++ b/src/bin/dhcp6/parser_context.h @@ -83,7 +83,10 @@ public: PARSER_OPTION_DATA, /// This will parse the input as hooks-library. - PARSER_HOOKS_LIBRARY + PARSER_HOOKS_LIBRARY, + + /// This will parse the input as dhcp-ddns. (D2 client config) + PARSER_DHCP_DDNS } ParserType; /// @brief Default constructor. @@ -187,8 +190,7 @@ public: ///< Used while parsing content of Dhcp6. DHCP6, - // not yet DHCP4, - // not yet DHCP_DDNS, + // not yet Dhcp4, DhcpDdns, ///< Used while parsing content of Logging LOGGING, @@ -256,7 +258,20 @@ public: LOGGERS, /// Used while parsing Logging/loggers/output_options structures. - OUTPUT_OPTIONS + OUTPUT_OPTIONS, + + /// Used while parsing Dhcp6/dhcp-ddns. + DHCP_DDNS, + + /// Used while parsing Dhcp6/dhcp-ddns/ncr-protocol + NCR_PROTOCOL, + + /// Used while parsing Dhcp6/dhcp-ddns/ncr-format + NCR_FORMAT, + + /// Used while parsing Dhcp6/dhcp-ddns/replace-client-name. + REPLACE_CLIENT_NAME + } ParserContext; /// @brief File name diff --git a/src/bin/dhcp6/position.hh b/src/bin/dhcp6/position.hh index 9a4005eb75..8521ec6005 100644 --- a/src/bin/dhcp6/position.hh +++ b/src/bin/dhcp6/position.hh @@ -1,4 +1,4 @@ -// Generated 201701102225 +// Generated 201701131911 // A Bison parser, made by GNU Bison 3.0.4. // Positions for Bison parsers in C++ diff --git a/src/bin/dhcp6/stack.hh b/src/bin/dhcp6/stack.hh index 1b934c7596..6835f301f1 100644 --- a/src/bin/dhcp6/stack.hh +++ b/src/bin/dhcp6/stack.hh @@ -1,4 +1,4 @@ -// Generated 201701102225 +// Generated 201701131911 // A Bison parser, made by GNU Bison 3.0.4. // Stack handling for Bison parsers in C++ diff --git a/src/bin/dhcp6/tests/d2_unittest.cc b/src/bin/dhcp6/tests/d2_unittest.cc index 09d0528928..5112ff4fc3 100644 --- a/src/bin/dhcp6/tests/d2_unittest.cc +++ b/src/bin/dhcp6/tests/d2_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -117,7 +117,7 @@ Dhcp6SrvD2Test::configureD2(bool enable_d2, const bool exp_result, " \"allow-client-update\" : true, " " \"override-no-update\" : true, " " \"override-client-update\" : true, " - " \"replace-client-name\" : true, " + " \"replace-client-name\" : \"when-present\", " " \"generated-prefix\" : \"test.prefix\", " " \"qualifying-suffix\" : \"test.suffix.\" }," "\"valid-lifetime\": 4000 }"; diff --git a/src/bin/dhcp6/tests/fqdn_unittest.cc b/src/bin/dhcp6/tests/fqdn_unittest.cc index d645995f9d..b7702bcb01 100644 --- a/src/bin/dhcp6/tests/fqdn_unittest.cc +++ b/src/bin/dhcp6/tests/fqdn_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2013-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -391,10 +391,8 @@ public: // in a client request correctly, according to the replace-client-name // mode configuration parameter. // - // @param mode - value to use client-name-replacment parameter - for - // mode labels such as NEVER and ALWAYS must incluce enclosing quotes: - // "\"NEVER\"". This allows us to also pass in boolean literals which - // are unquoted. + // @param mode - value to use for replace-client-name mode + // // @param client_name_flag - specifies whether or not the client request // should contain a hostname option // @param exp_replacement_flag - specifies whether or not the server is @@ -420,7 +418,7 @@ public: "\"dhcp-ddns\": { \n" "\"enable-updates\": true, \n" "\"qualifying-suffix\": \"fake-suffix.isc.org.\", \n" - "\"replace-client-name\": %s \n" + "\"replace-client-name\": \"%s\" \n" "}} \n"; // Create the configuration and configure the server @@ -1494,39 +1492,25 @@ TEST_F(FqdnDhcpv6SrvTest, hostnameReservationDdnsDisabled) { TEST_F(FqdnDhcpv6SrvTest, replaceClientNameModeTest) { isc::dhcp::test::IfaceMgrTestConfig test_config(true); - // We pass mode labels in with enclosing quotes so we can also test - // unquoted boolean literals true/false - testReplaceClientNameMode("\"never\"", + testReplaceClientNameMode("never", CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"never\"", + testReplaceClientNameMode("never", CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"always\"", + testReplaceClientNameMode("always", CLIENT_NAME_NOT_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"always\"", + testReplaceClientNameMode("always", CLIENT_NAME_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-present\"", + testReplaceClientNameMode("when-present", CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("\"when-present\"", + testReplaceClientNameMode("when-present", CLIENT_NAME_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-not-present\"", + testReplaceClientNameMode("when-not-present", CLIENT_NAME_NOT_PRESENT, NAME_REPLACED); - testReplaceClientNameMode("\"when-not-present\"", + testReplaceClientNameMode("when-not-present", CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - - // Verify that boolean false produces the same result as RCM_NEVER - testReplaceClientNameMode("false", - CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("false", - CLIENT_NAME_PRESENT, NAME_NOT_REPLACED); - - // Verify that boolean true produces the same result as RCM_WHEN_PRESENT - testReplaceClientNameMode("true", - CLIENT_NAME_NOT_PRESENT, NAME_NOT_REPLACED); - testReplaceClientNameMode("true", - CLIENT_NAME_PRESENT, NAME_REPLACED); } } // end of anonymous namespace diff --git a/src/bin/dhcp6/tests/parser_unittest.cc b/src/bin/dhcp6/tests/parser_unittest.cc index 821ad2de2a..d0262225c9 100644 --- a/src/bin/dhcp6/tests/parser_unittest.cc +++ b/src/bin/dhcp6/tests/parser_unittest.cc @@ -257,6 +257,7 @@ TEST(ParserTest, file) { configs.push_back("several-subnets.json"); configs.push_back("simple.json"); configs.push_back("stateless.json"); + configs.push_back("with-ddns.json"); for (int i = 0; isetD2ClientConfig(new_config); } bool diff --git a/src/lib/dhcpsrv/cfgmgr.h b/src/lib/dhcpsrv/cfgmgr.h index 9a95b25d98..403ccd0c7d 100644 --- a/src/lib/dhcpsrv/cfgmgr.h +++ b/src/lib/dhcpsrv/cfgmgr.h @@ -1,4 +1,4 @@ -// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -148,6 +148,11 @@ public: /// @brief Updates the DHCP-DDNS client configuration to the given value. /// + /// Passes the new configuration to the D2ClientMgr instance, + /// d2_client_mgr_, which will attempt to apply the new configuration + /// by shutting down its sender and opening a new connection per the new + /// configuration (see @c D2ClientMgr::setD2ClientConfig()). + /// /// @param new_config pointer to the new client configuration. /// /// @throw Underlying method(s) will throw D2ClientError if given an empty diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc index d09d7e5797..5cce39a0a0 100644 --- a/src/lib/dhcpsrv/parsers/dhcp_parsers.cc +++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.cc @@ -1222,133 +1222,222 @@ SubnetConfigParser::getOptionalParam(const std::string& name) { } //**************************** D2ClientConfigParser ********************** -D2ClientConfigParser::D2ClientConfigParser(const std::string& entry_name) - : entry_name_(entry_name), boolean_values_(new BooleanStorage()), - uint32_values_(new Uint32Storage()), string_values_(new StringStorage()), - local_client_config_() { + +namespace { + +template int_type +getInt(const std::string& name, ConstElementPtr value) { + int64_t val_int = value->intValue(); + if ((val_int < std::numeric_limits::min()) || + (val_int > std::numeric_limits::max())) { + isc_throw(DhcpConfigError, "out of range value (" << val_int + << ") specified for parameter '" << name + << "' (" << value->getPosition() << ")"); + } + return (static_cast(val_int)); } -D2ClientConfigParser::~D2ClientConfigParser() { +uint32_t +getUint32(const std::string& name, ConstElementPtr value) { + return (getInt(name, value)); } -void -D2ClientConfigParser::build(isc::data::ConstElementPtr client_config) { - BOOST_FOREACH(ConfigPair param, client_config->mapValue()) { - ParserPtr parser; - try { - parser = createConfigParser(param.first); - } catch (std::exception& ex) { - // Catch exception in case the configuration contains the - // unsupported parameter. In this case, we will need to - // append the position of this element. - isc_throw(DhcpConfigError, ex.what() << " (" - << param.second->getPosition() << ")"); - } +IOAddress +getIOAddress(const std::string& name, ConstElementPtr value) { + std::string str = value->stringValue(); + try { + return (IOAddress(str)); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, "invalid address (" << str + << ") specified for parameter '" << name + << "' (" << value->getPosition() << ")"); + } +} - parser->build(param.second); - parser->commit(); +dhcp_ddns::NameChangeProtocol +getProtocol(const std::string& name, ConstElementPtr value) { + std::string str = value->stringValue(); + try { + return (dhcp_ddns::stringToNcrProtocol(str)); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, + "invalid NameChangeRequest protocol (" << str + << ") specified for parameter '" << name + << "' (" << value->getPosition() << ")"); + } +} + +dhcp_ddns::NameChangeFormat +getFormat(const std::string& name, ConstElementPtr value) { + std::string str = value->stringValue(); + try { + return (dhcp_ddns::stringToNcrFormat(str)); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, + "invalid NameChangeRequest format (" << str + << ") specified for parameter '" << name + << "' (" << value->getPosition() << ")"); + } +} + +D2ClientConfig::ReplaceClientNameMode +getMode(const std::string& name, ConstElementPtr value) { + std::string str = value->stringValue(); + try { + return (D2ClientConfig::stringToReplaceClientNameMode(str)); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, + "invalid ReplaceClientName mode (" << str + << ") specified for parameter '" << name + << "' (" << value->getPosition() << ")"); + } +} + +}; + +D2ClientConfigPtr +D2ClientConfigParser::parse(isc::data::ConstElementPtr client_config) { + D2ClientConfigPtr new_config; + + if (isShortCutDisabled(client_config)) { + // If enable-updates is the only parameter and it is false then + // we're done. This allows for an abbreviated configuration entry + // that only contains that flag. Use the default D2ClientConfig + // constructor to a create a disabled instance. + new_config.reset(new D2ClientConfig()); + return (new_config); } - /// @todo Create configuration from the configuration parameters. Because - /// the validation of the D2 configuration is atomic, there is no way to - /// tell which parameter is invalid. Therefore, we catch all exceptions - /// and append the line number of the parent element. In the future we - /// may should extend D2ClientConfig code so as it returns the name of - /// the invalid parameter. - try { - bool enable_updates = boolean_values_->getParam("enable-updates"); - if (!enable_updates && (client_config->mapValue().size() == 1)) { - // If enable-updates is the only parameter and it is false then - // we're done. This allows for an abbreviated configuration entry - // that only contains that flag. Use the default D2ClientConfig - // constructor to a create a disabled instance. - local_client_config_.reset(new D2ClientConfig()); + // As isShortCutDisabled() was called this cannot fail + bool enable_updates = client_config->get("enable-updates")->boolValue(); - return; + // Get all parameters that are needed to create the D2ClientConfig. + std::string qualifying_suffix; + bool found_qualifying_suffix = false; + IOAddress server_ip(0); + uint32_t server_port; + std::string sender_ip_str; + uint32_t sender_port; + uint32_t max_queue_size; + dhcp_ddns::NameChangeProtocol ncr_protocol; + dhcp_ddns::NameChangeFormat ncr_format; + bool always_include_fqdn; + bool allow_client_update; + bool override_no_update; + bool override_client_update; + D2ClientConfig::ReplaceClientNameMode replace_client_name_mode; + std::string generated_prefix; + + BOOST_FOREACH(ConfigPair param, client_config->mapValue()) { + std::string entry(param.first); + ConstElementPtr value(param.second); + try { + if (entry == "enable-updates") { + // already done. + } else if (entry == "qualifying-suffix") { + qualifying_suffix = value->stringValue(); + found_qualifying_suffix = true; + } else if (entry == "server-ip") { + server_ip = getIOAddress("server-ip", value); + } else if (entry == "server-port") { + server_port = getUint32("server-port", value); + } else if (entry == "sender-ip") { + sender_ip_str = value->stringValue(); + } else if (entry == "sender-port") { + sender_port = getUint32("sender-port", value); + } else if (entry == "max-queue-size") { + max_queue_size = getUint32("max-queue-size", value); + } else if (entry == "ncr-protocol") { + ncr_protocol = getProtocol("ncr-protocol", value); + } else if (entry == "ncr-format") { + ncr_format = getFormat("ncr-format", value); + } else if (entry == "always-include-fqdn") { + always_include_fqdn = value->boolValue(); + } else if (entry == "allow-client-update") { + allow_client_update = value->boolValue(); + // currently unused + (void)allow_client_update; + } else if (entry == "override-no-update") { + override_no_update = value->boolValue(); + } else if (entry == "override-client-update") { + override_client_update = value->boolValue(); + } else if (entry == "replace-client-name") { + replace_client_name_mode = getMode("replace-client-name", value); + } else if (entry == "generated-prefix") { + generated_prefix = value->stringValue(); + } else { + isc_throw(DhcpConfigError, + "unsupported parameter '" << entry + << " (" << value->getPosition() << ")"); + } + } catch (const isc::data::TypeError&) { + isc_throw(DhcpConfigError, + "invalid value type specified for parameter '" << entry + << " (" << value->getPosition() << ")"); } + } - // Get all parameters that are needed to create the D2ClientConfig. - - // The qualifying suffix is mandatory when updates are enabled - std::string qualifying_suffix = - string_values_->getParam("qualifying-suffix"); - - IOAddress server_ip = - IOAddress(string_values_->getOptionalParam("server-ip", - D2ClientConfig:: - DFT_SERVER_IP)); - - uint32_t server_port = - uint32_values_->getOptionalParam("server-port", - D2ClientConfig::DFT_SERVER_PORT); + // Qualifying-suffix is required when updates are enabled + if (enable_updates && !found_qualifying_suffix) { + isc_throw(DhcpConfigError, + "parameter 'qualifying-suffix' is required when " + "updates are enabled (" + << client_config->getPosition() << ")"); + } + IOAddress sender_ip(0); + if (sender_ip_str.empty()) { // The default sender IP depends on the server IP family - asiolink::IOAddress - sender_ip(string_values_-> - getOptionalParam("sender-ip", - (server_ip.isV4() ? - D2ClientConfig::DFT_V4_SENDER_IP : - D2ClientConfig::DFT_V6_SENDER_IP))); - - uint32_t sender_port = - uint32_values_->getOptionalParam("sender-port", - D2ClientConfig:: - DFT_SENDER_PORT); - uint32_t max_queue_size - = uint32_values_->getOptionalParam("max-queue-size", - D2ClientConfig:: - DFT_MAX_QUEUE_SIZE); - - dhcp_ddns::NameChangeProtocol ncr_protocol = - dhcp_ddns::stringToNcrProtocol(string_values_-> - getOptionalParam("ncr-protocol", - D2ClientConfig:: - DFT_NCR_PROTOCOL)); - dhcp_ddns::NameChangeFormat ncr_format - = dhcp_ddns::stringToNcrFormat(string_values_-> - getOptionalParam("ncr-format", - D2ClientConfig:: - DFT_NCR_FORMAT)); - std::string generated_prefix = - string_values_->getOptionalParam("generated-prefix", - D2ClientConfig:: - DFT_GENERATED_PREFIX); - bool always_include_fqdn = - boolean_values_->getOptionalParam("always-include-fqdn", - D2ClientConfig:: - DFT_ALWAYS_INCLUDE_FQDN); - - bool override_no_update = - boolean_values_->getOptionalParam("override-no-update", - D2ClientConfig:: - DFT_OVERRIDE_NO_UPDATE); - - bool override_client_update = - boolean_values_->getOptionalParam("override-client-update", - D2ClientConfig:: - DFT_OVERRIDE_CLIENT_UPDATE); - - // Formerly, replace-client-name was boolean, so for now we'll support boolean - // values by mapping them to the appropriate mode - D2ClientConfig::ReplaceClientNameMode replace_client_name_mode; - std::string mode_str; - mode_str = string_values_->getOptionalParam("replace-client-name", - D2ClientConfig:: - DFT_REPLACE_CLIENT_NAME_MODE); - if (boost::iequals(mode_str, "false")) { - // @todo add a debug log - replace_client_name_mode = D2ClientConfig::RCM_NEVER; - } - else if (boost::iequals(mode_str, "true")) { - // @todo add a debug log - replace_client_name_mode = D2ClientConfig::RCM_WHEN_PRESENT; - } else { - replace_client_name_mode = D2ClientConfig:: - stringToReplaceClientNameMode(mode_str); + sender_ip = (server_ip.isV4() ? IOAddress::IPV4_ZERO_ADDRESS() : + IOAddress::IPV6_ZERO_ADDRESS()); + } else { + try { + sender_ip = IOAddress(sender_ip_str); + } catch (const std::exception& ex) { + isc_throw(DhcpConfigError, "invalid address (" << sender_ip_str + << ") specified for parameter 'sender-ip' (" + << getPosition("sender-ip", client_config) << ")"); } + } + // Now we check for logical errors. This repeats what is done in + // D2ClientConfig::validate(), but doing it here permits us to + // emit meaningful parameter position info in the error. + if (ncr_format != dhcp_ddns::FMT_JSON) { + isc_throw(D2ClientError, "D2ClientConfig error: NCR Format: " + << dhcp_ddns::ncrFormatToString(ncr_format) + << " is not supported. (" + << getPosition("ncr-format", client_config) << ")"); + } + + if (ncr_protocol != dhcp_ddns::NCR_UDP) { + isc_throw(D2ClientError, "D2ClientConfig error: NCR Protocol: " + << dhcp_ddns::ncrProtocolToString(ncr_protocol) + << " is not supported. (" + << getPosition("ncr-protocol", client_config) << ")"); + } + + if (sender_ip.getFamily() != server_ip.getFamily()) { + isc_throw(D2ClientError, + "D2ClientConfig error: address family mismatch: " + << "server-ip: " << server_ip.toText() + << " is: " << (server_ip.isV4() ? "IPv4" : "IPv6") + << " while sender-ip: " << sender_ip.toText() + << " is: " << (sender_ip.isV4() ? "IPv4" : "IPv6") + << " (" << getPosition("sender-ip", client_config) << ")"); + } + + if (server_ip == sender_ip && server_port == sender_port) { + isc_throw(D2ClientError, + "D2ClientConfig error: server and sender cannot" + " share the exact same IP address/port: " + << server_ip.toText() << "/" << server_port + << " (" << getPosition("sender-ip", client_config) << ")"); + } + + try { // Attempt to create the new client config. - local_client_config_.reset(new D2ClientConfig(enable_updates, + new_config.reset(new D2ClientConfig(enable_updates, server_ip, server_port, sender_ip, @@ -1367,49 +1456,50 @@ D2ClientConfigParser::build(isc::data::ConstElementPtr client_config) { isc_throw(DhcpConfigError, ex.what() << " (" << client_config->getPosition() << ")"); } + + return(new_config); } -isc::dhcp::ParserPtr -D2ClientConfigParser::createConfigParser(const std::string& config_id) { - DhcpConfigParser* parser = NULL; - if ((config_id.compare("server-port") == 0) || - (config_id.compare("sender-port") == 0) || - (config_id.compare("max-queue-size") == 0)) { - parser = new Uint32Parser(config_id, uint32_values_); - } else if ((config_id.compare("server-ip") == 0) || - (config_id.compare("ncr-protocol") == 0) || - (config_id.compare("ncr-format") == 0) || - (config_id.compare("generated-prefix") == 0) || - (config_id.compare("sender-ip") == 0) || - (config_id.compare("qualifying-suffix") == 0) || - (config_id.compare("replace-client-name") == 0)) { - parser = new StringParser(config_id, string_values_); - } else if ((config_id.compare("enable-updates") == 0) || - (config_id.compare("always-include-fqdn") == 0) || - (config_id.compare("allow-client-update") == 0) || - (config_id.compare("override-no-update") == 0) || - (config_id.compare("override-client-update") == 0)) { - parser = new BooleanParser(config_id, boolean_values_); - } else { - isc_throw(NotImplemented, - "parser error: D2ClientConfig parameter not supported: " - << config_id); +bool +D2ClientConfigParser::isShortCutDisabled(isc::data::ConstElementPtr d2_config) { + if (!d2_config->contains("enable-updates")) { + isc_throw(DhcpConfigError, + "Mandatory parameter 'enable-updates' missing (" + << d2_config->getPosition() << ")"); } - - return (isc::dhcp::ParserPtr(parser)); + ConstElementPtr enable = d2_config->get("enable-updates"); + if (enable->getType() != Element::boolean) { + isc_throw(DhcpConfigError, + "invalid value type specified for parameter" + " 'enable-updates' (" << enable->getPosition() << ")"); + } + return (!enable->boolValue() && (d2_config->mapValue().size() == 1)); } -void -D2ClientConfigParser::commit() { - // @todo if local_client_config_ is empty then shutdown the listener... - // @todo Should this also attempt to start a listener? - // In keeping with Interface, Subnet, and Hooks parsers, then this - // should initialize the listener. Failure to init it, should cause - // rollback. This gets sticky, because who owns the listener instance? - // Does CfgMgr maintain it or does the server class? If the latter - // how do we get that value here? - // I'm thinkikng D2ClientConfig could contain the listener instance - CfgMgr::instance().setD2ClientConfig(local_client_config_); +/// @brief This table defines default values for D2 client configuration +const SimpleDefaults D2ClientConfigParser::D2_CLIENT_CONFIG_DEFAULTS = { + // enable-updates is unconditionally required + { "server-ip", Element::string, "127.0.0.1" }, + { "server-port", Element::integer, "53001" }, + // default sender-ip depends on server-ip family, so we leave default blank + // parser knows to use the appropriate ZERO address based on server-ip + { "sender-ip", Element::string, "" }, + { "sender-port", Element::integer, "0" }, + { "max-queue-size", Element::integer, "1024" }, + { "ncr-protocol", Element::string, "UDP" }, + { "ncr-format", Element::string, "JSON" }, + { "always-include-fqdn", Element::boolean, "false" }, + { "override-no-update", Element::boolean, "false" }, + { "override-client-update", Element::boolean, "false" }, + { "replace-client-name", Element::string, "never" }, + { "generated-prefix", Element::string, "myhost" } + // qualifying-suffix has no default +}; + +size_t +D2ClientConfigParser::setAllDefaults(isc::data::ConstElementPtr d2_config) { + ElementPtr mutable_d2 = boost::const_pointer_cast(d2_config); + return (SimpleParser::setDefaults(mutable_d2, D2_CLIENT_CONFIG_DEFAULTS)); } }; // namespace dhcp diff --git a/src/lib/dhcpsrv/parsers/dhcp_parsers.h b/src/lib/dhcpsrv/parsers/dhcp_parsers.h index c9d2bc9432..b16b497b37 100644 --- a/src/lib/dhcpsrv/parsers/dhcp_parsers.h +++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h @@ -987,31 +987,14 @@ protected: /// @brief Parser for D2ClientConfig /// /// This class parses the configuration element "dhcp-ddns" common to the -/// spec files for both dhcp4 and dhcp6. It creates an instance of a +/// config files for both dhcp4 and dhcp6. It creates an instance of a /// D2ClientConfig. -class D2ClientConfigParser : public isc::dhcp::DhcpConfigParser { +class D2ClientConfigParser : public isc::data::SimpleParser { public: - /// @brief Constructor - /// - /// @param entry_name is an arbitrary label assigned to this configuration - /// definition. - D2ClientConfigParser(const std::string& entry_name); - /// @brief Destructor - virtual ~D2ClientConfigParser(); - - /// @brief Performs the parsing of the given dhcp-ddns element. - /// - /// The results of the parsing are retained internally for use during - /// commit. - /// @todo This parser supplies hard-coded default values for all - /// optional parameters. This should be changed once a new plan - /// for configuration is determined. + /// @brief Parses a given dhcp-ddns element into D2ClientConfig. /// /// @param client_config is the "dhcp-ddns" configuration to parse - virtual void build(isc::data::ConstElementPtr client_config); - - /// @brief Creates a parser for the given "dhcp-ddns" member element id. /// /// The elements currently supported are (see isc::dhcp::D2ClientConfig /// for details on each): @@ -1019,9 +1002,11 @@ public: /// -# qualifying-suffix /// -# server-ip /// -# server-port + /// -# sender-ip + /// -# sender-port + /// -# max-queue-size /// -# ncr-protocol /// -# ncr-format - /// -# remove-on-renew /// -# always-include-fqdn /// -# allow-client-update /// -# override-no-update @@ -1029,33 +1014,32 @@ public: /// -# replace-client-name /// -# generated-prefix /// - /// @param config_id is the "item_name" for a specific member element of - /// the "dns_server" specification. + /// @return returns a pointer to newly created D2ClientConfig. + D2ClientConfigPtr parse(isc::data::ConstElementPtr d2_client_cfg); + + /// @brief Check the short cut disabled updates condition /// - /// @return returns a pointer to newly created parser. - virtual isc::dhcp::ParserPtr createConfigParser(const std::string& - config_id); + /// The condition is that the d2 client configuration is + /// reduced to "enable-updates": false + /// + /// @param d2_config d2 client configuration + /// @return true if and only if the condition matches. + /// @throw DhcpConfigError if enable-updates is not present or + /// is not a boolean + static bool isShortCutDisabled(isc::data::ConstElementPtr d2_config); - /// @brief Instantiates a D2ClientConfig from internal data values - /// passes to CfgMgr singleton. - virtual void commit(); + /// @brief Defaults for the D2 client configuration. + static const isc::data::SimpleDefaults D2_CLIENT_CONFIG_DEFAULTS; -private: - /// @brief Arbitrary label assigned to this parser instance. - /// Primarily used for diagnostics. - std::string entry_name_; - - /// Storage for subnet-specific boolean values. - BooleanStoragePtr boolean_values_; - - /// Storage for subnet-specific integer values. - Uint32StoragePtr uint32_values_; - - /// Storage for subnet-specific string values. - StringStoragePtr string_values_; - - /// @brief Pointer to temporary local instance created during build. - D2ClientConfigPtr local_client_config_ ; + /// @brief Sets all defaults for D2 client configuration. + /// + /// This method sets defaults value. It must not be called + /// before the short cut disabled updates condition was checked. + /// + /// @param d2_config d2 client configuration (will be const cast + // to ElementPtr) + /// @return number of parameters inserted + static size_t setAllDefaults(isc::data::ConstElementPtr d2_config); }; // Pointers to various parser objects. diff --git a/src/lib/dhcpsrv/srv_config.cc b/src/lib/dhcpsrv/srv_config.cc index 7c7830966f..cb69f7d30f 100644 --- a/src/lib/dhcpsrv/srv_config.cc +++ b/src/lib/dhcpsrv/srv_config.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -29,7 +29,8 @@ SrvConfig::SrvConfig() cfg_host_operations4_(CfgHostOperations::createConfig4()), cfg_host_operations6_(CfgHostOperations::createConfig6()), class_dictionary_(new ClientClassDictionary()), - decline_timer_(0), dhcp4o6_port_(0) { + decline_timer_(0), dhcp4o6_port_(0), + d2_client_config_(new D2ClientConfig()) { } SrvConfig::SrvConfig(const uint32_t sequence) @@ -42,7 +43,8 @@ SrvConfig::SrvConfig(const uint32_t sequence) cfg_host_operations4_(CfgHostOperations::createConfig4()), cfg_host_operations6_(CfgHostOperations::createConfig6()), class_dictionary_(new ClientClassDictionary()), - decline_timer_(0), dhcp4o6_port_(0) { + decline_timer_(0), dhcp4o6_port_(0), + d2_client_config_(new D2ClientConfig()) { } std::string @@ -70,7 +72,7 @@ SrvConfig::getConfigSummary(const uint32_t selection) const { } if ((selection & CFGSEL_DDNS) == CFGSEL_DDNS) { - bool ddns_enabled = CfgMgr::instance().ddnsEnabled(); + bool ddns_enabled = getD2ClientConfig()->getEnableUpdates(); s << "DDNS: " << (ddns_enabled ? "enabled" : "disabled") << "; "; } @@ -106,7 +108,8 @@ SrvConfig::copy(SrvConfig& new_config) const { cfg_option_->copyTo(*new_config.cfg_option_); // Replace the client class dictionary new_config.class_dictionary_.reset(new ClientClassDictionary(*class_dictionary_)); - + // Replace the D2 client configuration + new_config.setD2ClientConfig(getD2ClientConfig()); } void @@ -151,7 +154,8 @@ SrvConfig::equals(const SrvConfig& other) const { return ((*cfg_iface_ == *other.cfg_iface_) && (*cfg_option_def_ == *other.cfg_option_def_) && (*cfg_option_ == *other.cfg_option_) && - (*class_dictionary_ == *other.class_dictionary_)); + (*class_dictionary_ == *other.class_dictionary_) && + (*d2_client_config_ == *other.d2_client_config_)); } void diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h index 5ab02d1b15..5554cb6c71 100644 --- a/src/lib/dhcpsrv/srv_config.h +++ b/src/lib/dhcpsrv/srv_config.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -481,12 +482,28 @@ public: /// @brief Returns DHCP4o6 IPC port /// - /// See @ref setDhcp4o6Port or brief discussion. + /// See @ref setDhcp4o6Port for brief discussion. /// @return value of DHCP4o6 IPC port uint32_t getDhcp4o6Port() { return (dhcp4o6_port_); } + /// @brief Returns pointer to the D2 client configuration + D2ClientConfigPtr getD2ClientConfig() { + return (d2_client_config_); + } + + /// @brief Returns pointer to const D2 client configuration + const D2ClientConfigPtr getD2ClientConfig() const { + return (d2_client_config_); + } + + /// @brief Sets the D2 client configuration + /// @param dictionary pointer to the new D2 client configuration + void setD2ClientConfig(const D2ClientConfigPtr& d2_client_config) { + d2_client_config_ = d2_client_config; + } + private: /// @brief Sequence number identifying the configuration. @@ -570,6 +587,8 @@ private: /// DHCPv4-over-DHCPv6 uses a UDP socket for interserver communication, /// this socket is bound and connected to this port and port + 1 uint32_t dhcp4o6_port_; + + D2ClientConfigPtr d2_client_config_; }; /// @name Pointers to the @c SrvConfig object. diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc index 185b3eb8cb..4f5469948d 100644 --- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc +++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc @@ -349,9 +349,6 @@ public: return (answer); } - // option parsing must be done last, so save it if we hit if first - ParserPtr option_parser; - ConfigPair config_pair; try { // Iterate over the config elements. @@ -361,17 +358,18 @@ public: // These are the simple parsers. No need to go through // the ParserPtr hooplas with them. - if ( (config_pair.first == "option-data") || - (config_pair.first == "option-def")) { + if ((config_pair.first == "option-data") || + (config_pair.first == "option-def") || + (config_pair.first == "dhcp-ddns")) { continue; } // We also don't care about the default values that may be been // inserted - if ( (config_pair.first == "preferred-lifetime") || - (config_pair.first == "valid-lifetime") || - (config_pair.first == "renew-timer") || - (config_pair.first == "rebind-timer")) { + if ((config_pair.first == "preferred-lifetime") || + (config_pair.first == "valid-lifetime") || + (config_pair.first == "renew-timer") || + (config_pair.first == "rebind-timer")) { continue; } @@ -388,14 +386,8 @@ public: // Create the parser based on element name. ParserPtr parser(createConfigParser(config_pair.first)); - // Options must be parsed last - if (config_pair.first == "option-data") { - option_parser = parser; - } else { - // Anything else we can call build straight away. - parser->build(config_pair.second); - parser->commit(); - } + parser->build(config_pair.second); + parser->commit(); } int family = parser_context_->universe_ == Option::V4 @@ -421,6 +413,16 @@ public: option_list_parser.parse(cfg_option, option_config->second); } + // The dhcp-ddns parser is the next one to be run. + std::map::const_iterator + d2_client_config = values_map.find("dhcp-ddns"); + if (d2_client_config != values_map.end()) { + // Used to be done by parser commit + D2ClientConfigParser parser; + D2ClientConfigPtr cfg = parser.parse(d2_client_config->second); + CfgMgr::instance().setD2ClientConfig(cfg); + } + // Everything was fine. Configuration is successful. answer = isc::config::createAnswer(0, "Configuration committed."); } catch (const isc::Exception& ex) { @@ -452,8 +454,10 @@ public: ParserPtr parser; // option-data and option-def converted to SimpleParser, so they // are no longer here. - if (config_id.compare("dhcp-ddns") == 0) { - parser.reset(new D2ClientConfigParser(config_id)); + if (config_id.compare("hooks-libraries") == 0) { + parser.reset(new HooksLibrariesParser(config_id)); + hooks_libraries_parser_ = + boost::dynamic_pointer_cast(parser); } else { isc_throw(NotImplemented, "Parser error: configuration parameter not supported: " @@ -507,6 +511,10 @@ public: /// src/bin/dhcp{4,6}, the most straightforward way is to simply copy the /// minimum code here. Hence this method. /// + /// @todo - TKM, I think this is fairly hideous and we should figure out a + /// a way to not have to replicate in this fashion. It may be minimum code + /// now, but it won't be fairly soon. + /// /// @param config configuration structure to be filled with default values /// @param v6 true = DHCPv6, false = DHCPv4 void setAllDefaults(ElementPtr config, bool v6) { @@ -555,6 +563,13 @@ public: setAllDefaults(config, GLOBAL6_DEFAULTS, OPTION4_DEFAULTS, OPTION4_DEF_DEFAULTS); } + + /// D2 client configuration code is in this library + ConstElementPtr d2_client = config->get("dhcp-ddns"); + if (d2_client && + !D2ClientConfigParser::isShortCutDisabled(d2_client)) { + D2ClientConfigParser::setAllDefaults(d2_client); + } } /// @brief Convenience method for parsing a configuration @@ -580,6 +595,7 @@ public: // If error was reported, the error string should contain // position of the data element which caused failure. if (rcode_ != 0) { + std::cout << "Error text:" << error_text_ << std::endl; EXPECT_TRUE(errorContainsPosition(status, "")); } } @@ -852,7 +868,6 @@ TEST_F(ParseConfigTest, escapedOptionDataTest) { " \"data\": \"\\\\SMSBoot\\\\x64\\\\wdsnbp.com\"" " } ]" "}"; - std::cout << config << std::endl; // Verify that the configuration string parses. int rcode = parseConfiguration(config); @@ -1858,12 +1873,30 @@ TEST_F(ParseConfigTest, parserDefaultsD2Config) { /// @brief Check various invalid D2 client configurations. TEST_F(ParseConfigTest, invalidD2Config) { - std::string invalid_configs[] = { + std::string invalid_shortcuts[] = { // Must supply at least enable-updates "{ \"dhcp-ddns\" :" " {" " }" "}", + // Enable-updates must be a boolean + "{ \"dhcp-ddns\" :" + " {" + " \"enable-updates\" : 0" + " }" + "}", + // stop + "" + }; + int i = 0; + while (!invalid_shortcuts[i].empty()) { + // Verify that the configuration string parsing throws + EXPECT_THROW(parseConfiguration(invalid_shortcuts[i]), + DhcpConfigError); + i++; + } + + std::string invalid_configs[] = { // Must supply qualifying-suffix when updates are enabled "{ \"dhcp-ddns\" :" " {" @@ -2018,7 +2051,7 @@ TEST_F(ParseConfigTest, invalidD2Config) { // Iterate through the invalid configuration strings, attempting to // parse each one. They should fail to parse, but fail gracefully. D2ClientConfigPtr current_config; - int i = 0; + i = 0; while (!invalid_configs[i].empty()) { // Verify that the configuration string parses without throwing. int rcode = parseConfiguration(invalid_configs[i]); diff --git a/src/lib/dhcpsrv/tests/srv_config_unittest.cc b/src/lib/dhcpsrv/tests/srv_config_unittest.cc index 1890157f0a..86f48b4357 100644 --- a/src/lib/dhcpsrv/tests/srv_config_unittest.cc +++ b/src/lib/dhcpsrv/tests/srv_config_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2014-2017 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -141,8 +141,9 @@ SrvConfigTest::addSubnet6(const unsigned int index) { void SrvConfigTest::enableDDNS(const bool enable) { - // D2 configuration should always be non-NULL. - CfgMgr::instance().getD2ClientConfig()->enableUpdates(enable); + const D2ClientConfigPtr& d2_config = conf_.getD2ClientConfig(); + ASSERT_TRUE(d2_config); + d2_config->enableUpdates(enable); } // Check that by default there are no logging entries