]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-dhcp-protocol: rename DHCP option 43, 124, and 125
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 27 Apr 2026 02:38:25 +0000 (11:38 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 12 May 2026 11:06:28 +0000 (20:06 +0900)
There are four DHCP options with confusing names:
Option 43: Vendor-Specific Information
Option 60: Vendor Class Identifier
Option 124: Vendor-Identifying Vendor Class
Option 125: Vendor-Identifying Vendor-Specific Information

Let's use their full names for their corresponding enums.

src/libsystemd-network/dhcp-option.c
src/libsystemd-network/dhcp-protocol.c
src/libsystemd-network/sd-dhcp-client.c
src/libsystemd-network/sd-dhcp-lease.c
src/libsystemd-network/sd-dhcp-server.c
src/systemd/sd-dhcp-protocol.h

index a195a4b0983538e4c48c0888fe5a57b1536f69d7..74bc21e95ba237cd45e2fc35d35c65fa3ce5faea 100644 (file)
@@ -107,7 +107,7 @@ static int option_append(uint8_t options[], size_t size, size_t *offset,
                 *offset += 3 + optlen;
 
                 break;
-        case SD_DHCP_OPTION_VENDOR_SPECIFIC: {
+        case SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION: {
                 /* When called with raw data (optlen > 0), e.g. from SendOption=, append as a plain TLV.
                  * The structured handling below expects optval to be an OrderedSet*. */
                 if (optlen > 0)
index 3a22e0f225aaac148c4d633bd2a1253b8aa778b6..caf92c494ef340dad1c69513332a429fa1de905c 100644 (file)
@@ -34,157 +34,157 @@ static const char * const dhcp_message_type_table[_DHCP_MESSAGE_TYPE_MAX] = {
 DEFINE_STRING_TABLE_LOOKUP_TO_STRING(dhcp_message_type, DHCPMessageType);
 
 static const char * const dhcp_option_code_table[] = {
-        [SD_DHCP_OPTION_PAD]                            = "pad",
-        [SD_DHCP_OPTION_SUBNET_MASK]                    = "subnet mask",
-        [SD_DHCP_OPTION_TIME_OFFSET]                    = "time offset",
-        [SD_DHCP_OPTION_ROUTER]                         = "router",
-        [SD_DHCP_OPTION_TIME_SERVER]                    = "time server",
-        [SD_DHCP_OPTION_NAME_SERVER]                    = "name server",
-        [SD_DHCP_OPTION_DOMAIN_NAME_SERVER]             = "domain name server",
-        [SD_DHCP_OPTION_LOG_SERVER]                     = "log server",
-        [SD_DHCP_OPTION_QUOTES_SERVER]                  = "quotes server",
-        [SD_DHCP_OPTION_LPR_SERVER]                     = "LPR server",
-        [SD_DHCP_OPTION_IMPRESS_SERVER]                 = "impress server",
-        [SD_DHCP_OPTION_RLP_SERVER]                     = "RLP server",
-        [SD_DHCP_OPTION_HOST_NAME]                      = "hostname",
-        [SD_DHCP_OPTION_BOOT_FILE_SIZE]                 = "boot file size",
-        [SD_DHCP_OPTION_MERIT_DUMP_FILE]                = "merit dump file",
-        [SD_DHCP_OPTION_DOMAIN_NAME]                    = "domain name",
-        [SD_DHCP_OPTION_SWAP_SERVER]                    = "swap server",
-        [SD_DHCP_OPTION_ROOT_PATH]                      = "root path",
-        [SD_DHCP_OPTION_EXTENSION_FILE]                 = "extension file",
-        [SD_DHCP_OPTION_FORWARD]                        = "IP forwarding",
-        [SD_DHCP_OPTION_SOURCE_ROUTE]                   = "source routing",
-        [SD_DHCP_OPTION_POLICY_FILTER]                  = "policy filter",
-        [SD_DHCP_OPTION_MAX_DATAGRAM_ASSEMBLY]          = "max datagram assembly",
-        [SD_DHCP_OPTION_DEFAULT_IP_TTL]                 = "default IP TTL",
-        [SD_DHCP_OPTION_MTU_TIMEOUT]                    = "MTU timeout",
-        [SD_DHCP_OPTION_MTU_PLATEAU]                    = "MTU plateau",
-        [SD_DHCP_OPTION_MTU_INTERFACE]                  = "MTU size",
-        [SD_DHCP_OPTION_MTU_SUBNET]                     = "MTU subnet",
-        [SD_DHCP_OPTION_BROADCAST]                      = "broadcast address",
-        [SD_DHCP_OPTION_MASK_DISCOVERY]                 = "mask discovery",
-        [SD_DHCP_OPTION_MASK_SUPPLIER]                  = "mask supplier",
-        [SD_DHCP_OPTION_ROUTER_DISCOVERY]               = "router discovery",
-        [SD_DHCP_OPTION_ROUTER_REQUEST]                 = "router request",
-        [SD_DHCP_OPTION_STATIC_ROUTE]                   = "static route",
-        [SD_DHCP_OPTION_TRAILERS]                       = "trailers",
-        [SD_DHCP_OPTION_ARP_TIMEOUT]                    = "ARP timeout",
-        [SD_DHCP_OPTION_ETHERNET]                       = "Ethernet encapsulation",
-        [SD_DHCP_OPTION_DEFAULT_TCP_TTL]                = "default TCP TTL",
-        [SD_DHCP_OPTION_KEEPALIVE_TIME]                 = "keepalive time",
-        [SD_DHCP_OPTION_KEEPALIVE_DATA]                 = "keepalive data",
-        [SD_DHCP_OPTION_NIS_DOMAIN]                     = "NIS domain",
-        [SD_DHCP_OPTION_NIS_SERVER]                     = "NIS server",
-        [SD_DHCP_OPTION_NTP_SERVER]                     = "NTP server",
-        [SD_DHCP_OPTION_VENDOR_SPECIFIC]                = "vendor specific",
-        [SD_DHCP_OPTION_NETBIOS_NAME_SERVER]            = "NETBIOS name server",
-        [SD_DHCP_OPTION_NETBIOS_DIST_SERVER]            = "NETBIOS distribution server",
-        [SD_DHCP_OPTION_NETBIOS_NODE_TYPE]              = "NETBIOS node type",
-        [SD_DHCP_OPTION_NETBIOS_SCOPE]                  = "NETBIOS scope",
-        [SD_DHCP_OPTION_X_WINDOW_FONT]                  = "X Window font",
-        [SD_DHCP_OPTION_X_WINDOW_MANAGER]               = "X Window manager",
-        [SD_DHCP_OPTION_REQUESTED_IP_ADDRESS]           = "requested IP address",
-        [SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME]          = "lease time",
-        [SD_DHCP_OPTION_OVERLOAD]                       = "overload",
-        [SD_DHCP_OPTION_MESSAGE_TYPE]                   = "message type",
-        [SD_DHCP_OPTION_SERVER_IDENTIFIER]              = "server identifier",
-        [SD_DHCP_OPTION_PARAMETER_REQUEST_LIST]         = "parameter request list",
-        [SD_DHCP_OPTION_ERROR_MESSAGE]                  = "error message",
-        [SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE]           = "max message size",
-        [SD_DHCP_OPTION_RENEWAL_TIME]                   = "renewal time",
-        [SD_DHCP_OPTION_REBINDING_TIME]                 = "rebinding time",
-        [SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER]        = "vendor class identifier",
-        [SD_DHCP_OPTION_CLIENT_IDENTIFIER]              = "client identifier",
-        [SD_DHCP_OPTION_NETWARE_IP_DOMAIN]              = "NetWare IP domain",
-        [SD_DHCP_OPTION_NETWARE_IP_OPTION]              = "NetWare IP option",
-        [SD_DHCP_OPTION_NIS_DOMAIN_NAME]                = "NIS+ v3 domain",
-        [SD_DHCP_OPTION_NIS_SERVER_ADDR]                = "NIS+ v3 server",
-        [SD_DHCP_OPTION_BOOT_SERVER_NAME]               = "TFTP server name",
-        [SD_DHCP_OPTION_BOOT_FILENAME]                  = "boot file name",
-        [SD_DHCP_OPTION_HOME_AGENT_ADDRESS]             = "home agent address",
-        [SD_DHCP_OPTION_SMTP_SERVER]                    = "SMTP server",
-        [SD_DHCP_OPTION_POP3_SERVER]                    = "POP3 server",
-        [SD_DHCP_OPTION_NNTP_SERVER]                    = "NNTP server",
-        [SD_DHCP_OPTION_WWW_SERVER]                     = "WWW server",
-        [SD_DHCP_OPTION_FINGER_SERVER]                  = "finger server",
-        [SD_DHCP_OPTION_IRC_SERVER]                     = "IRC server",
-        [SD_DHCP_OPTION_STREETTALK_SERVER]              = "StreetTalk server",
-        [SD_DHCP_OPTION_STDA_SERVER]                    = "STDA server",
-        [SD_DHCP_OPTION_USER_CLASS]                     = "user class",
-        [SD_DHCP_OPTION_DIRECTORY_AGENT]                = "directory agent",
-        [SD_DHCP_OPTION_SERVICE_SCOPE]                  = "service scope",
-        [SD_DHCP_OPTION_RAPID_COMMIT]                   = "rapid commit",
-        [SD_DHCP_OPTION_FQDN]                           = "FQDN",
-        [SD_DHCP_OPTION_RELAY_AGENT_INFORMATION]        = "relay agent information",
-        [SD_DHCP_OPTION_ISNS]                           = "iSNS",
-        [SD_DHCP_OPTION_NDS_SERVER]                     = "NDS server",
-        [SD_DHCP_OPTION_NDS_TREE_NAME]                  = "NDS tree name",
-        [SD_DHCP_OPTION_NDS_CONTEXT]                    = "NDS context",
-        [SD_DHCP_OPTION_BCMCS_CONTROLLER_DOMAIN_NAME]   = "BCMCS controller domain name",
-        [SD_DHCP_OPTION_BCMCS_CONTROLLER_ADDRESS]       = "BCMCS controller address",
-        [SD_DHCP_OPTION_AUTHENTICATION]                 = "authentication",
-        [SD_DHCP_OPTION_CLIENT_LAST_TRANSACTION_TIME]   = "client last transaction time",
-        [SD_DHCP_OPTION_ASSOCIATED_IP]                  = "associated IP",
-        [SD_DHCP_OPTION_CLIENT_SYSTEM]                  = "client system",
-        [SD_DHCP_OPTION_CLIENT_NDI]                     = "client NDI",
-        [SD_DHCP_OPTION_LDAP]                           = "LDAP",
-        [SD_DHCP_OPTION_UUID]                           = "UUID",
-        [SD_DHCP_OPTION_USER_AUTHENTICATION]            = "user authentication",
-        [SD_DHCP_OPTION_GEOCONF_CIVIC]                  = "geoconf civic",
-        [SD_DHCP_OPTION_POSIX_TIMEZONE]                 = "posix timezone",
-        [SD_DHCP_OPTION_TZDB_TIMEZONE]                  = "tzdb timezone",
-        [SD_DHCP_OPTION_IPV6_ONLY_PREFERRED]            = "IPv6-only preferred",
-        [SD_DHCP_OPTION_DHCP4O6_SOURCE_ADDRESS]         = "DHCPv4 over DHCPv6 source address",
-        [SD_DHCP_OPTION_NETINFO_ADDRESS]                = "Netinfo address",
-        [SD_DHCP_OPTION_NETINFO_TAG]                    = "Netinfo tag",
-        [SD_DHCP_OPTION_DHCP_CAPTIVE_PORTAL]            = "captive portal",
-        [SD_DHCP_OPTION_AUTO_CONFIG]                    = "auto config",
-        [SD_DHCP_OPTION_NAME_SERVICE_SEARCH]            = "name service search",
-        [SD_DHCP_OPTION_SUBNET_SELECTION]               = "subnet selection",
-        [SD_DHCP_OPTION_DOMAIN_SEARCH]                  = "domain search",
-        [SD_DHCP_OPTION_SIP_SERVER]                     = "SIP server",
-        [SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE]         = "classless static route",
-        [SD_DHCP_OPTION_CABLELABS_CLIENT_CONFIGURATION] = "CableLabs client configuration",
-        [SD_DHCP_OPTION_GEOCONF]                        = "geoconf",
-        [SD_DHCP_OPTION_VENDOR_CLASS]                   = "vendor class",
-        [SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION]    = "vendor specific information",
-        [SD_DHCP_OPTION_PANA_AGENT]                     = "PANA agent",
-        [SD_DHCP_OPTION_LOST_SERVER_FQDN]               = "LoST server",
-        [SD_DHCP_OPTION_CAPWAP_AC_ADDRESS]              = "CAPWAP access controller address",
-        [SD_DHCP_OPTION_MOS_ADDRESS]                    = "MoS address",
-        [SD_DHCP_OPTION_MOS_FQDN]                       = "MoS FQDN",
-        [SD_DHCP_OPTION_SIP_SERVICE_DOMAIN]             = "SIP service domain",
-        [SD_DHCP_OPTION_ANDSF_ADDRESS]                  = "ANDSF address",
-        [SD_DHCP_OPTION_SZTP_REDIRECT]                  = "SZTP server",
-        [SD_DHCP_OPTION_GEOLOC]                         = "geospatial location",
-        [SD_DHCP_OPTION_FORCERENEW_NONCE_CAPABLE]       = "forcerenew nonce capable",
-        [SD_DHCP_OPTION_RDNSS_SELECTION]                = "RDNSS selection",
-        [SD_DHCP_OPTION_DOTS_RI]                        = "DOTS agent name",
-        [SD_DHCP_OPTION_DOTS_ADDRESS]                   = "DOTS agent address",
-        [SD_DHCP_OPTION_TFTP_SERVER_ADDRESS]            = "TFTP server address",
-        [SD_DHCP_OPTION_STATUS_CODE]                    = "status code",
-        [SD_DHCP_OPTION_BASE_TIME]                      = "base time",
-        [SD_DHCP_OPTION_START_TIME_OF_STATE]            = "start time of state",
-        [SD_DHCP_OPTION_QUERY_START_TIME]               = "query start time",
-        [SD_DHCP_OPTION_QUERY_END_TIME]                 = "query end time",
-        [SD_DHCP_OPTION_DHCP_STATE]                     = "DHCP state",
-        [SD_DHCP_OPTION_DATA_SOURCE]                    = "data source",
-        [SD_DHCP_OPTION_PCP_SERVER]                     = "PCP server",
-        [SD_DHCP_OPTION_PORT_PARAMS]                    = "port parameter",
-        [SD_DHCP_OPTION_MUD_URL]                        = "MUD URL",
-        [SD_DHCP_OPTION_V4_DNR]                         = "encrypted DNS server",
-        [SD_DHCP_OPTION_PXELINUX_MAGIC]                 = "PXELinux magic",
-        [SD_DHCP_OPTION_CONFIGURATION_FILE]             = "configuration file",
-        [SD_DHCP_OPTION_PATH_PREFIX]                    = "path prefix",
-        [SD_DHCP_OPTION_REBOOT_TIME]                    = "reboot time",
-        [SD_DHCP_OPTION_6RD]                            = "6rd",
-        [SD_DHCP_OPTION_ACCESS_DOMAIN]                  = "access network domain",
-        [SD_DHCP_OPTION_SUBNET_ALLOCATION]              = "subnet allocation",
-        [SD_DHCP_OPTION_VIRTUAL_SUBNET_SELECTION]       = "virtual subnet selection",
-        [SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE] = "(private) classless static route",
-        [SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY]    = "(private) proxy autodiscovery",
-        [SD_DHCP_OPTION_END]                            = "end",
+        [SD_DHCP_OPTION_PAD]                                            = "pad",
+        [SD_DHCP_OPTION_SUBNET_MASK]                                    = "subnet mask",
+        [SD_DHCP_OPTION_TIME_OFFSET]                                    = "time offset",
+        [SD_DHCP_OPTION_ROUTER]                                         = "router",
+        [SD_DHCP_OPTION_TIME_SERVER]                                    = "time server",
+        [SD_DHCP_OPTION_NAME_SERVER]                                    = "name server",
+        [SD_DHCP_OPTION_DOMAIN_NAME_SERVER]                             = "domain name server",
+        [SD_DHCP_OPTION_LOG_SERVER]                                     = "log server",
+        [SD_DHCP_OPTION_QUOTES_SERVER]                                  = "quotes server",
+        [SD_DHCP_OPTION_LPR_SERVER]                                     = "LPR server",
+        [SD_DHCP_OPTION_IMPRESS_SERVER]                                 = "impress server",
+        [SD_DHCP_OPTION_RLP_SERVER]                                     = "RLP server",
+        [SD_DHCP_OPTION_HOST_NAME]                                      = "hostname",
+        [SD_DHCP_OPTION_BOOT_FILE_SIZE]                                 = "boot file size",
+        [SD_DHCP_OPTION_MERIT_DUMP_FILE]                                = "merit dump file",
+        [SD_DHCP_OPTION_DOMAIN_NAME]                                    = "domain name",
+        [SD_DHCP_OPTION_SWAP_SERVER]                                    = "swap server",
+        [SD_DHCP_OPTION_ROOT_PATH]                                      = "root path",
+        [SD_DHCP_OPTION_EXTENSION_FILE]                                 = "extension file",
+        [SD_DHCP_OPTION_FORWARD]                                        = "IP forwarding",
+        [SD_DHCP_OPTION_SOURCE_ROUTE]                                   = "source routing",
+        [SD_DHCP_OPTION_POLICY_FILTER]                                  = "policy filter",
+        [SD_DHCP_OPTION_MAX_DATAGRAM_ASSEMBLY]                          = "max datagram assembly",
+        [SD_DHCP_OPTION_DEFAULT_IP_TTL]                                 = "default IP TTL",
+        [SD_DHCP_OPTION_MTU_TIMEOUT]                                    = "MTU timeout",
+        [SD_DHCP_OPTION_MTU_PLATEAU]                                    = "MTU plateau",
+        [SD_DHCP_OPTION_MTU_INTERFACE]                                  = "MTU size",
+        [SD_DHCP_OPTION_MTU_SUBNET]                                     = "MTU subnet",
+        [SD_DHCP_OPTION_BROADCAST]                                      = "broadcast address",
+        [SD_DHCP_OPTION_MASK_DISCOVERY]                                 = "mask discovery",
+        [SD_DHCP_OPTION_MASK_SUPPLIER]                                  = "mask supplier",
+        [SD_DHCP_OPTION_ROUTER_DISCOVERY]                               = "router discovery",
+        [SD_DHCP_OPTION_ROUTER_REQUEST]                                 = "router request",
+        [SD_DHCP_OPTION_STATIC_ROUTE]                                   = "static route",
+        [SD_DHCP_OPTION_TRAILERS]                                       = "trailers",
+        [SD_DHCP_OPTION_ARP_TIMEOUT]                                    = "ARP timeout",
+        [SD_DHCP_OPTION_ETHERNET]                                       = "Ethernet encapsulation",
+        [SD_DHCP_OPTION_DEFAULT_TCP_TTL]                                = "default TCP TTL",
+        [SD_DHCP_OPTION_KEEPALIVE_TIME]                                 = "keepalive time",
+        [SD_DHCP_OPTION_KEEPALIVE_DATA]                                 = "keepalive data",
+        [SD_DHCP_OPTION_NIS_DOMAIN]                                     = "NIS domain",
+        [SD_DHCP_OPTION_NIS_SERVER]                                     = "NIS server",
+        [SD_DHCP_OPTION_NTP_SERVER]                                     = "NTP server",
+        [SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION]                    = "vendor-specific information",
+        [SD_DHCP_OPTION_NETBIOS_NAME_SERVER]                            = "NETBIOS name server",
+        [SD_DHCP_OPTION_NETBIOS_DIST_SERVER]                            = "NETBIOS distribution server",
+        [SD_DHCP_OPTION_NETBIOS_NODE_TYPE]                              = "NETBIOS node type",
+        [SD_DHCP_OPTION_NETBIOS_SCOPE]                                  = "NETBIOS scope",
+        [SD_DHCP_OPTION_X_WINDOW_FONT]                                  = "X Window font",
+        [SD_DHCP_OPTION_X_WINDOW_MANAGER]                               = "X Window manager",
+        [SD_DHCP_OPTION_REQUESTED_IP_ADDRESS]                           = "requested IP address",
+        [SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME]                          = "lease time",
+        [SD_DHCP_OPTION_OVERLOAD]                                       = "overload",
+        [SD_DHCP_OPTION_MESSAGE_TYPE]                                   = "message type",
+        [SD_DHCP_OPTION_SERVER_IDENTIFIER]                              = "server identifier",
+        [SD_DHCP_OPTION_PARAMETER_REQUEST_LIST]                         = "parameter request list",
+        [SD_DHCP_OPTION_ERROR_MESSAGE]                                  = "error message",
+        [SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE]                           = "max message size",
+        [SD_DHCP_OPTION_RENEWAL_TIME]                                   = "renewal time",
+        [SD_DHCP_OPTION_REBINDING_TIME]                                 = "rebinding time",
+        [SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER]                        = "vendor class identifier",
+        [SD_DHCP_OPTION_CLIENT_IDENTIFIER]                              = "client identifier",
+        [SD_DHCP_OPTION_NETWARE_IP_DOMAIN]                              = "NetWare IP domain",
+        [SD_DHCP_OPTION_NETWARE_IP_OPTION]                              = "NetWare IP option",
+        [SD_DHCP_OPTION_NIS_DOMAIN_NAME]                                = "NIS+ v3 domain",
+        [SD_DHCP_OPTION_NIS_SERVER_ADDR]                                = "NIS+ v3 server",
+        [SD_DHCP_OPTION_BOOT_SERVER_NAME]                               = "TFTP server name",
+        [SD_DHCP_OPTION_BOOT_FILENAME]                                  = "boot file name",
+        [SD_DHCP_OPTION_HOME_AGENT_ADDRESS]                             = "home agent address",
+        [SD_DHCP_OPTION_SMTP_SERVER]                                    = "SMTP server",
+        [SD_DHCP_OPTION_POP3_SERVER]                                    = "POP3 server",
+        [SD_DHCP_OPTION_NNTP_SERVER]                                    = "NNTP server",
+        [SD_DHCP_OPTION_WWW_SERVER]                                     = "WWW server",
+        [SD_DHCP_OPTION_FINGER_SERVER]                                  = "finger server",
+        [SD_DHCP_OPTION_IRC_SERVER]                                     = "IRC server",
+        [SD_DHCP_OPTION_STREETTALK_SERVER]                              = "StreetTalk server",
+        [SD_DHCP_OPTION_STDA_SERVER]                                    = "STDA server",
+        [SD_DHCP_OPTION_USER_CLASS]                                     = "user class",
+        [SD_DHCP_OPTION_DIRECTORY_AGENT]                                = "directory agent",
+        [SD_DHCP_OPTION_SERVICE_SCOPE]                                  = "service scope",
+        [SD_DHCP_OPTION_RAPID_COMMIT]                                   = "rapid commit",
+        [SD_DHCP_OPTION_FQDN]                                           = "FQDN",
+        [SD_DHCP_OPTION_RELAY_AGENT_INFORMATION]                        = "relay agent information",
+        [SD_DHCP_OPTION_ISNS]                                           = "iSNS",
+        [SD_DHCP_OPTION_NDS_SERVER]                                     = "NDS server",
+        [SD_DHCP_OPTION_NDS_TREE_NAME]                                  = "NDS tree name",
+        [SD_DHCP_OPTION_NDS_CONTEXT]                                    = "NDS context",
+        [SD_DHCP_OPTION_BCMCS_CONTROLLER_DOMAIN_NAME]                   = "BCMCS controller domain name",
+        [SD_DHCP_OPTION_BCMCS_CONTROLLER_ADDRESS]                       = "BCMCS controller address",
+        [SD_DHCP_OPTION_AUTHENTICATION]                                 = "authentication",
+        [SD_DHCP_OPTION_CLIENT_LAST_TRANSACTION_TIME]                   = "client last transaction time",
+        [SD_DHCP_OPTION_ASSOCIATED_IP]                                  = "associated IP",
+        [SD_DHCP_OPTION_CLIENT_SYSTEM]                                  = "client system",
+        [SD_DHCP_OPTION_CLIENT_NDI]                                     = "client NDI",
+        [SD_DHCP_OPTION_LDAP]                                           = "LDAP",
+        [SD_DHCP_OPTION_UUID]                                           = "UUID",
+        [SD_DHCP_OPTION_USER_AUTHENTICATION]                            = "user authentication",
+        [SD_DHCP_OPTION_GEOCONF_CIVIC]                                  = "geoconf civic",
+        [SD_DHCP_OPTION_POSIX_TIMEZONE]                                 = "posix timezone",
+        [SD_DHCP_OPTION_TZDB_TIMEZONE]                                  = "tzdb timezone",
+        [SD_DHCP_OPTION_IPV6_ONLY_PREFERRED]                            = "IPv6-only preferred",
+        [SD_DHCP_OPTION_DHCP4O6_SOURCE_ADDRESS]                         = "DHCPv4 over DHCPv6 source address",
+        [SD_DHCP_OPTION_NETINFO_ADDRESS]                                = "Netinfo address",
+        [SD_DHCP_OPTION_NETINFO_TAG]                                    = "Netinfo tag",
+        [SD_DHCP_OPTION_DHCP_CAPTIVE_PORTAL]                            = "captive portal",
+        [SD_DHCP_OPTION_AUTO_CONFIG]                                    = "auto config",
+        [SD_DHCP_OPTION_NAME_SERVICE_SEARCH]                            = "name service search",
+        [SD_DHCP_OPTION_SUBNET_SELECTION]                               = "subnet selection",
+        [SD_DHCP_OPTION_DOMAIN_SEARCH]                                  = "domain search",
+        [SD_DHCP_OPTION_SIP_SERVER]                                     = "SIP server",
+        [SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE]                         = "classless static route",
+        [SD_DHCP_OPTION_CABLELABS_CLIENT_CONFIGURATION]                 = "CableLabs client configuration",
+        [SD_DHCP_OPTION_GEOCONF]                                        = "geoconf",
+        [SD_DHCP_OPTION_VENDOR_IDENTIFYING_VENDOR_CLASS]                = "vendor-identifying vendor class",
+        [SD_DHCP_OPTION_VENDOR_IDENTIFYING_VENDOR_SPECIFIC_INFORMATION] = "vendor-identifying vendor-specific information",
+        [SD_DHCP_OPTION_PANA_AGENT]                                     = "PANA agent",
+        [SD_DHCP_OPTION_LOST_SERVER_FQDN]                               = "LoST server",
+        [SD_DHCP_OPTION_CAPWAP_AC_ADDRESS]                              = "CAPWAP access controller address",
+        [SD_DHCP_OPTION_MOS_ADDRESS]                                    = "MoS address",
+        [SD_DHCP_OPTION_MOS_FQDN]                                       = "MoS FQDN",
+        [SD_DHCP_OPTION_SIP_SERVICE_DOMAIN]                             = "SIP service domain",
+        [SD_DHCP_OPTION_ANDSF_ADDRESS]                                  = "ANDSF address",
+        [SD_DHCP_OPTION_SZTP_REDIRECT]                                  = "SZTP server",
+        [SD_DHCP_OPTION_GEOLOC]                                         = "geospatial location",
+        [SD_DHCP_OPTION_FORCERENEW_NONCE_CAPABLE]                       = "forcerenew nonce capable",
+        [SD_DHCP_OPTION_RDNSS_SELECTION]                                = "RDNSS selection",
+        [SD_DHCP_OPTION_DOTS_RI]                                        = "DOTS agent name",
+        [SD_DHCP_OPTION_DOTS_ADDRESS]                                   = "DOTS agent address",
+        [SD_DHCP_OPTION_TFTP_SERVER_ADDRESS]                            = "TFTP server address",
+        [SD_DHCP_OPTION_STATUS_CODE]                                    = "status code",
+        [SD_DHCP_OPTION_BASE_TIME]                                      = "base time",
+        [SD_DHCP_OPTION_START_TIME_OF_STATE]                            = "start time of state",
+        [SD_DHCP_OPTION_QUERY_START_TIME]                               = "query start time",
+        [SD_DHCP_OPTION_QUERY_END_TIME]                                 = "query end time",
+        [SD_DHCP_OPTION_DHCP_STATE]                                     = "DHCP state",
+        [SD_DHCP_OPTION_DATA_SOURCE]                                    = "data source",
+        [SD_DHCP_OPTION_PCP_SERVER]                                     = "PCP server",
+        [SD_DHCP_OPTION_PORT_PARAMS]                                    = "port parameter",
+        [SD_DHCP_OPTION_MUD_URL]                                        = "MUD URL",
+        [SD_DHCP_OPTION_V4_DNR]                                         = "encrypted DNS server",
+        [SD_DHCP_OPTION_PXELINUX_MAGIC]                                 = "PXELinux magic",
+        [SD_DHCP_OPTION_CONFIGURATION_FILE]                             = "configuration file",
+        [SD_DHCP_OPTION_PATH_PREFIX]                                    = "path prefix",
+        [SD_DHCP_OPTION_REBOOT_TIME]                                    = "reboot time",
+        [SD_DHCP_OPTION_6RD]                                            = "6rd",
+        [SD_DHCP_OPTION_ACCESS_DOMAIN]                                  = "access network domain",
+        [SD_DHCP_OPTION_SUBNET_ALLOCATION]                              = "subnet allocation",
+        [SD_DHCP_OPTION_VIRTUAL_SUBNET_SELECTION]                       = "virtual subnet selection",
+        [SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE]                 = "(private) classless static route",
+        [SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY]                    = "(private) proxy autodiscovery",
+        [SD_DHCP_OPTION_END]                                            = "end",
 };
 
 DEFINE_STRING_TABLE_LOOKUP_TO_STRING(dhcp_option_code, int);
index c6a4d02f965a46b2065c3009fbb80e96d75354f4..45a0eb8674a905b3276bae8cae935384d939a6e2 100644 (file)
@@ -65,7 +65,7 @@ static const uint8_t default_req_opts_anonymize[] = {
         SD_DHCP_OPTION_DOMAIN_NAME,                     /* 15 */
         SD_DHCP_OPTION_ROUTER_DISCOVERY,                /* 31 */
         SD_DHCP_OPTION_STATIC_ROUTE,                    /* 33 */
-        SD_DHCP_OPTION_VENDOR_SPECIFIC,                 /* 43 */
+        SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION,     /* 43 */
         SD_DHCP_OPTION_NETBIOS_NAME_SERVER,             /* 44 */
         SD_DHCP_OPTION_NETBIOS_NODE_TYPE,               /* 46 */
         SD_DHCP_OPTION_NETBIOS_SCOPE,                   /* 47 */
@@ -972,7 +972,7 @@ static int client_append_common_discover_request_options(sd_dhcp_client *client,
         if (!ordered_hashmap_isempty(client->vendor_options)) {
                 r = dhcp_option_append(
                                 &packet->dhcp, optlen, optoffset, 0,
-                                SD_DHCP_OPTION_VENDOR_SPECIFIC,
+                                SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION,
                                 /* optlen= */ 0, client->vendor_options);
                 if (r < 0)
                         return r;
index fa41d293da2f3d0d620b4412c947b6732bd0d3e6..1eec439d81065ad9c47244d9f6dfeb17ec22c7b0 100644 (file)
@@ -1092,7 +1092,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
 
                 break;
 
-        case SD_DHCP_OPTION_VENDOR_SPECIFIC:
+        case SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION:
 
                 if (len <= 0)
                         lease->vendor_specific = mfree(lease->vendor_specific);
index ba2b035821918af13d2fe0ee94a66d40a5c32332..7519189229ca080b5b995cc67d7fae8289274857 100644 (file)
@@ -728,7 +728,7 @@ static int server_send_offer_or_ack(
         if (!ordered_set_isempty(server->vendor_options)) {
                 r = dhcp_option_append(
                                 &packet->dhcp, req->max_optlen, &offset, 0,
-                                SD_DHCP_OPTION_VENDOR_SPECIFIC,
+                                SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION,
                                 /* optlen= */ 0, server->vendor_options);
                 if (r < 0)
                         return r;
index 1d3b635c31effb0d2e843bf8e9644d8148ec3af0..55ce189cf4979c73c6ea71a2be88ab1645373e28 100644 (file)
@@ -23,174 +23,174 @@ _SD_BEGIN_DECLARATIONS;
 
 /* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml#options */
 enum {
-        SD_DHCP_OPTION_PAD                            = 0,   /* [RFC2132] */
-        SD_DHCP_OPTION_SUBNET_MASK                    = 1,   /* [RFC2132] */
-        SD_DHCP_OPTION_TIME_OFFSET                    = 2,   /* [RFC2132], deprecated by 100 and 101 */
-        SD_DHCP_OPTION_ROUTER                         = 3,   /* [RFC2132] */
-        SD_DHCP_OPTION_TIME_SERVER                    = 4,   /* [RFC2132] */
-        SD_DHCP_OPTION_NAME_SERVER                    = 5,   /* [RFC2132] */
-        SD_DHCP_OPTION_DOMAIN_NAME_SERVER             = 6,   /* [RFC2132] */
-        SD_DHCP_OPTION_LOG_SERVER                     = 7,   /* [RFC2132] */
-        SD_DHCP_OPTION_QUOTES_SERVER                  = 8,   /* [RFC2132] */
-        SD_DHCP_OPTION_LPR_SERVER                     = 9,   /* [RFC2132] */
-        SD_DHCP_OPTION_IMPRESS_SERVER                 = 10,  /* [RFC2132] */
-        SD_DHCP_OPTION_RLP_SERVER                     = 11,  /* [RFC2132] */
-        SD_DHCP_OPTION_HOST_NAME                      = 12,  /* [RFC2132] */
-        SD_DHCP_OPTION_BOOT_FILE_SIZE                 = 13,  /* [RFC2132] */
-        SD_DHCP_OPTION_MERIT_DUMP_FILE                = 14,  /* [RFC2132] */
-        SD_DHCP_OPTION_DOMAIN_NAME                    = 15,  /* [RFC2132] */
-        SD_DHCP_OPTION_SWAP_SERVER                    = 16,  /* [RFC2132] */
-        SD_DHCP_OPTION_ROOT_PATH                      = 17,  /* [RFC2132] */
-        SD_DHCP_OPTION_EXTENSION_FILE                 = 18,  /* [RFC2132] */
-        SD_DHCP_OPTION_FORWARD                        = 19,  /* [RFC2132] */
-        SD_DHCP_OPTION_SOURCE_ROUTE                   = 20,  /* [RFC2132] */
-        SD_DHCP_OPTION_POLICY_FILTER                  = 21,  /* [RFC2132] */
-        SD_DHCP_OPTION_MAX_DATAGRAM_ASSEMBLY          = 22,  /* [RFC2132] */
-        SD_DHCP_OPTION_DEFAULT_IP_TTL                 = 23,  /* [RFC2132] */
-        SD_DHCP_OPTION_MTU_TIMEOUT                    = 24,  /* [RFC2132] */
-        SD_DHCP_OPTION_MTU_PLATEAU                    = 25,  /* [RFC2132] */
-        SD_DHCP_OPTION_MTU_INTERFACE                  = 26,  /* [RFC2132] */
-        SD_DHCP_OPTION_MTU_SUBNET                     = 27,  /* [RFC2132] */
-        SD_DHCP_OPTION_BROADCAST                      = 28,  /* [RFC2132] */
-        SD_DHCP_OPTION_MASK_DISCOVERY                 = 29,  /* [RFC2132] */
-        SD_DHCP_OPTION_MASK_SUPPLIER                  = 30,  /* [RFC2132] */
-        SD_DHCP_OPTION_ROUTER_DISCOVERY               = 31,  /* [RFC2132] */
-        SD_DHCP_OPTION_ROUTER_REQUEST                 = 32,  /* [RFC2132] */
-        SD_DHCP_OPTION_STATIC_ROUTE                   = 33,  /* [RFC2132] */
-        SD_DHCP_OPTION_TRAILERS                       = 34,  /* [RFC2132] */
-        SD_DHCP_OPTION_ARP_TIMEOUT                    = 35,  /* [RFC2132] */
-        SD_DHCP_OPTION_ETHERNET                       = 36,  /* [RFC2132] */
-        SD_DHCP_OPTION_DEFAULT_TCP_TTL                = 37,  /* [RFC2132] */
-        SD_DHCP_OPTION_KEEPALIVE_TIME                 = 38,  /* [RFC2132] */
-        SD_DHCP_OPTION_KEEPALIVE_DATA                 = 39,  /* [RFC2132] */
-        SD_DHCP_OPTION_NIS_DOMAIN                     = 40,  /* [RFC2132] */
-        SD_DHCP_OPTION_NIS_SERVER                     = 41,  /* [RFC2132] */
-        SD_DHCP_OPTION_NTP_SERVER                     = 42,  /* [RFC2132] */
-        SD_DHCP_OPTION_VENDOR_SPECIFIC                = 43,  /* [RFC2132] */
-        SD_DHCP_OPTION_NETBIOS_NAME_SERVER            = 44,  /* [RFC2132] */
-        SD_DHCP_OPTION_NETBIOS_DIST_SERVER            = 45,  /* [RFC2132] */
-        SD_DHCP_OPTION_NETBIOS_NODE_TYPE              = 46,  /* [RFC2132] */
-        SD_DHCP_OPTION_NETBIOS_SCOPE                  = 47,  /* [RFC2132] */
-        SD_DHCP_OPTION_X_WINDOW_FONT                  = 48,  /* [RFC2132] */
-        SD_DHCP_OPTION_X_WINDOW_MANAGER               = 49,  /* [RFC2132] */
-        SD_DHCP_OPTION_REQUESTED_IP_ADDRESS           = 50,  /* [RFC2132] */
-        SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME          = 51,  /* [RFC2132] */
-        SD_DHCP_OPTION_OVERLOAD                       = 52,  /* [RFC2132] */
-        SD_DHCP_OPTION_MESSAGE_TYPE                   = 53,  /* [RFC2132] */
-        SD_DHCP_OPTION_SERVER_IDENTIFIER              = 54,  /* [RFC2132] */
-        SD_DHCP_OPTION_PARAMETER_REQUEST_LIST         = 55,  /* [RFC2132] */
-        SD_DHCP_OPTION_ERROR_MESSAGE                  = 56,  /* [RFC2132] */
-        SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE           = 57,  /* [RFC2132] */
-        SD_DHCP_OPTION_RENEWAL_TIME                   = 58,  /* [RFC2132] */
-        SD_DHCP_OPTION_REBINDING_TIME                 = 59,  /* [RFC2132] */
-        SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER        = 60,  /* [RFC2132] */
-        SD_DHCP_OPTION_CLIENT_IDENTIFIER              = 61,  /* [RFC2132] */
-        SD_DHCP_OPTION_NETWARE_IP_DOMAIN              = 62,  /* [RFC2242] */
-        SD_DHCP_OPTION_NETWARE_IP_OPTION              = 63,  /* [RFC2242] */
-        SD_DHCP_OPTION_NIS_DOMAIN_NAME                = 64,  /* [RFC2132] */
-        SD_DHCP_OPTION_NIS_SERVER_ADDR                = 65,  /* [RFC2132] */
-        SD_DHCP_OPTION_BOOT_SERVER_NAME               = 66,  /* [RFC2132] */
-        SD_DHCP_OPTION_BOOT_FILENAME                  = 67,  /* [RFC2132] */
-        SD_DHCP_OPTION_HOME_AGENT_ADDRESS             = 68,  /* [RFC2132] */
-        SD_DHCP_OPTION_SMTP_SERVER                    = 69,  /* [RFC2132] */
-        SD_DHCP_OPTION_POP3_SERVER                    = 70,  /* [RFC2132] */
-        SD_DHCP_OPTION_NNTP_SERVER                    = 71,  /* [RFC2132] */
-        SD_DHCP_OPTION_WWW_SERVER                     = 72,  /* [RFC2132] */
-        SD_DHCP_OPTION_FINGER_SERVER                  = 73,  /* [RFC2132] */
-        SD_DHCP_OPTION_IRC_SERVER                     = 74,  /* [RFC2132] */
-        SD_DHCP_OPTION_STREETTALK_SERVER              = 75,  /* [RFC2132] */
-        SD_DHCP_OPTION_STDA_SERVER                    = 76,  /* [RFC2132] */
-        SD_DHCP_OPTION_USER_CLASS                     = 77,  /* [RFC3004] */
-        SD_DHCP_OPTION_DIRECTORY_AGENT                = 78,  /* [RFC2610] */
-        SD_DHCP_OPTION_SERVICE_SCOPE                  = 79,  /* [RFC2610] */
-        SD_DHCP_OPTION_RAPID_COMMIT                   = 80,  /* [RFC4039] */
-        SD_DHCP_OPTION_FQDN                           = 81,  /* [RFC4702] */
-        SD_DHCP_OPTION_RELAY_AGENT_INFORMATION        = 82,  /* [RFC3046] */
-        SD_DHCP_OPTION_ISNS                           = 83,  /* [RFC4174] */
+        SD_DHCP_OPTION_PAD                                            = 0,   /* [RFC2132] */
+        SD_DHCP_OPTION_SUBNET_MASK                                    = 1,   /* [RFC2132] */
+        SD_DHCP_OPTION_TIME_OFFSET                                    = 2,   /* [RFC2132], deprecated by 100 and 101 */
+        SD_DHCP_OPTION_ROUTER                                         = 3,   /* [RFC2132] */
+        SD_DHCP_OPTION_TIME_SERVER                                    = 4,   /* [RFC2132] */
+        SD_DHCP_OPTION_NAME_SERVER                                    = 5,   /* [RFC2132] */
+        SD_DHCP_OPTION_DOMAIN_NAME_SERVER                             = 6,   /* [RFC2132] */
+        SD_DHCP_OPTION_LOG_SERVER                                     = 7,   /* [RFC2132] */
+        SD_DHCP_OPTION_QUOTES_SERVER                                  = 8,   /* [RFC2132] */
+        SD_DHCP_OPTION_LPR_SERVER                                     = 9,   /* [RFC2132] */
+        SD_DHCP_OPTION_IMPRESS_SERVER                                 = 10,  /* [RFC2132] */
+        SD_DHCP_OPTION_RLP_SERVER                                     = 11,  /* [RFC2132] */
+        SD_DHCP_OPTION_HOST_NAME                                      = 12,  /* [RFC2132] */
+        SD_DHCP_OPTION_BOOT_FILE_SIZE                                 = 13,  /* [RFC2132] */
+        SD_DHCP_OPTION_MERIT_DUMP_FILE                                = 14,  /* [RFC2132] */
+        SD_DHCP_OPTION_DOMAIN_NAME                                    = 15,  /* [RFC2132] */
+        SD_DHCP_OPTION_SWAP_SERVER                                    = 16,  /* [RFC2132] */
+        SD_DHCP_OPTION_ROOT_PATH                                      = 17,  /* [RFC2132] */
+        SD_DHCP_OPTION_EXTENSION_FILE                                 = 18,  /* [RFC2132] */
+        SD_DHCP_OPTION_FORWARD                                        = 19,  /* [RFC2132] */
+        SD_DHCP_OPTION_SOURCE_ROUTE                                   = 20,  /* [RFC2132] */
+        SD_DHCP_OPTION_POLICY_FILTER                                  = 21,  /* [RFC2132] */
+        SD_DHCP_OPTION_MAX_DATAGRAM_ASSEMBLY                          = 22,  /* [RFC2132] */
+        SD_DHCP_OPTION_DEFAULT_IP_TTL                                 = 23,  /* [RFC2132] */
+        SD_DHCP_OPTION_MTU_TIMEOUT                                    = 24,  /* [RFC2132] */
+        SD_DHCP_OPTION_MTU_PLATEAU                                    = 25,  /* [RFC2132] */
+        SD_DHCP_OPTION_MTU_INTERFACE                                  = 26,  /* [RFC2132] */
+        SD_DHCP_OPTION_MTU_SUBNET                                     = 27,  /* [RFC2132] */
+        SD_DHCP_OPTION_BROADCAST                                      = 28,  /* [RFC2132] */
+        SD_DHCP_OPTION_MASK_DISCOVERY                                 = 29,  /* [RFC2132] */
+        SD_DHCP_OPTION_MASK_SUPPLIER                                  = 30,  /* [RFC2132] */
+        SD_DHCP_OPTION_ROUTER_DISCOVERY                               = 31,  /* [RFC2132] */
+        SD_DHCP_OPTION_ROUTER_REQUEST                                 = 32,  /* [RFC2132] */
+        SD_DHCP_OPTION_STATIC_ROUTE                                   = 33,  /* [RFC2132] */
+        SD_DHCP_OPTION_TRAILERS                                       = 34,  /* [RFC2132] */
+        SD_DHCP_OPTION_ARP_TIMEOUT                                    = 35,  /* [RFC2132] */
+        SD_DHCP_OPTION_ETHERNET                                       = 36,  /* [RFC2132] */
+        SD_DHCP_OPTION_DEFAULT_TCP_TTL                                = 37,  /* [RFC2132] */
+        SD_DHCP_OPTION_KEEPALIVE_TIME                                 = 38,  /* [RFC2132] */
+        SD_DHCP_OPTION_KEEPALIVE_DATA                                 = 39,  /* [RFC2132] */
+        SD_DHCP_OPTION_NIS_DOMAIN                                     = 40,  /* [RFC2132] */
+        SD_DHCP_OPTION_NIS_SERVER                                     = 41,  /* [RFC2132] */
+        SD_DHCP_OPTION_NTP_SERVER                                     = 42,  /* [RFC2132] */
+        SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION                    = 43,  /* [RFC2132] */
+        SD_DHCP_OPTION_NETBIOS_NAME_SERVER                            = 44,  /* [RFC2132] */
+        SD_DHCP_OPTION_NETBIOS_DIST_SERVER                            = 45,  /* [RFC2132] */
+        SD_DHCP_OPTION_NETBIOS_NODE_TYPE                              = 46,  /* [RFC2132] */
+        SD_DHCP_OPTION_NETBIOS_SCOPE                                  = 47,  /* [RFC2132] */
+        SD_DHCP_OPTION_X_WINDOW_FONT                                  = 48,  /* [RFC2132] */
+        SD_DHCP_OPTION_X_WINDOW_MANAGER                               = 49,  /* [RFC2132] */
+        SD_DHCP_OPTION_REQUESTED_IP_ADDRESS                           = 50,  /* [RFC2132] */
+        SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME                          = 51,  /* [RFC2132] */
+        SD_DHCP_OPTION_OVERLOAD                                       = 52,  /* [RFC2132] */
+        SD_DHCP_OPTION_MESSAGE_TYPE                                   = 53,  /* [RFC2132] */
+        SD_DHCP_OPTION_SERVER_IDENTIFIER                              = 54,  /* [RFC2132] */
+        SD_DHCP_OPTION_PARAMETER_REQUEST_LIST                         = 55,  /* [RFC2132] */
+        SD_DHCP_OPTION_ERROR_MESSAGE                                  = 56,  /* [RFC2132] */
+        SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE                           = 57,  /* [RFC2132] */
+        SD_DHCP_OPTION_RENEWAL_TIME                                   = 58,  /* [RFC2132] */
+        SD_DHCP_OPTION_REBINDING_TIME                                 = 59,  /* [RFC2132] */
+        SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER                        = 60,  /* [RFC2132] */
+        SD_DHCP_OPTION_CLIENT_IDENTIFIER                              = 61,  /* [RFC2132] */
+        SD_DHCP_OPTION_NETWARE_IP_DOMAIN                              = 62,  /* [RFC2242] */
+        SD_DHCP_OPTION_NETWARE_IP_OPTION                              = 63,  /* [RFC2242] */
+        SD_DHCP_OPTION_NIS_DOMAIN_NAME                                = 64,  /* [RFC2132] */
+        SD_DHCP_OPTION_NIS_SERVER_ADDR                                = 65,  /* [RFC2132] */
+        SD_DHCP_OPTION_BOOT_SERVER_NAME                               = 66,  /* [RFC2132] */
+        SD_DHCP_OPTION_BOOT_FILENAME                                  = 67,  /* [RFC2132] */
+        SD_DHCP_OPTION_HOME_AGENT_ADDRESS                             = 68,  /* [RFC2132] */
+        SD_DHCP_OPTION_SMTP_SERVER                                    = 69,  /* [RFC2132] */
+        SD_DHCP_OPTION_POP3_SERVER                                    = 70,  /* [RFC2132] */
+        SD_DHCP_OPTION_NNTP_SERVER                                    = 71,  /* [RFC2132] */
+        SD_DHCP_OPTION_WWW_SERVER                                     = 72,  /* [RFC2132] */
+        SD_DHCP_OPTION_FINGER_SERVER                                  = 73,  /* [RFC2132] */
+        SD_DHCP_OPTION_IRC_SERVER                                     = 74,  /* [RFC2132] */
+        SD_DHCP_OPTION_STREETTALK_SERVER                              = 75,  /* [RFC2132] */
+        SD_DHCP_OPTION_STDA_SERVER                                    = 76,  /* [RFC2132] */
+        SD_DHCP_OPTION_USER_CLASS                                     = 77,  /* [RFC3004] */
+        SD_DHCP_OPTION_DIRECTORY_AGENT                                = 78,  /* [RFC2610] */
+        SD_DHCP_OPTION_SERVICE_SCOPE                                  = 79,  /* [RFC2610] */
+        SD_DHCP_OPTION_RAPID_COMMIT                                   = 80,  /* [RFC4039] */
+        SD_DHCP_OPTION_FQDN                                           = 81,  /* [RFC4702] */
+        SD_DHCP_OPTION_RELAY_AGENT_INFORMATION                        = 82,  /* [RFC3046] */
+        SD_DHCP_OPTION_ISNS                                           = 83,  /* [RFC4174] */
         /* option code 84 is unassigned [RFC3679] */
-        SD_DHCP_OPTION_NDS_SERVER                     = 85,  /* [RFC2241] */
-        SD_DHCP_OPTION_NDS_TREE_NAME                  = 86,  /* [RFC2241] */
-        SD_DHCP_OPTION_NDS_CONTEXT                    = 87,  /* [RFC2241] */
-        SD_DHCP_OPTION_BCMCS_CONTROLLER_DOMAIN_NAME   = 88,  /* [RFC4280] */
-        SD_DHCP_OPTION_BCMCS_CONTROLLER_ADDRESS       = 89,  /* [RFC4280] */
-        SD_DHCP_OPTION_AUTHENTICATION                 = 90,  /* [RFC3118] */
-        SD_DHCP_OPTION_CLIENT_LAST_TRANSACTION_TIME   = 91,  /* [RFC4388] */
-        SD_DHCP_OPTION_ASSOCIATED_IP                  = 92,  /* [RFC4388] */
-        SD_DHCP_OPTION_CLIENT_SYSTEM                  = 93,  /* [RFC4578] */
-        SD_DHCP_OPTION_CLIENT_NDI                     = 94,  /* [RFC4578] */
-        SD_DHCP_OPTION_LDAP                           = 95,  /* [RFC3679] */
+        SD_DHCP_OPTION_NDS_SERVER                                     = 85,  /* [RFC2241] */
+        SD_DHCP_OPTION_NDS_TREE_NAME                                  = 86,  /* [RFC2241] */
+        SD_DHCP_OPTION_NDS_CONTEXT                                    = 87,  /* [RFC2241] */
+        SD_DHCP_OPTION_BCMCS_CONTROLLER_DOMAIN_NAME                   = 88,  /* [RFC4280] */
+        SD_DHCP_OPTION_BCMCS_CONTROLLER_ADDRESS                       = 89,  /* [RFC4280] */
+        SD_DHCP_OPTION_AUTHENTICATION                                 = 90,  /* [RFC3118] */
+        SD_DHCP_OPTION_CLIENT_LAST_TRANSACTION_TIME                   = 91,  /* [RFC4388] */
+        SD_DHCP_OPTION_ASSOCIATED_IP                                  = 92,  /* [RFC4388] */
+        SD_DHCP_OPTION_CLIENT_SYSTEM                                  = 93,  /* [RFC4578] */
+        SD_DHCP_OPTION_CLIENT_NDI                                     = 94,  /* [RFC4578] */
+        SD_DHCP_OPTION_LDAP                                           = 95,  /* [RFC3679] */
         /* option code 96 is unassigned [RFC3679] */
-        SD_DHCP_OPTION_UUID                           = 97,  /* [RFC4578] */
-        SD_DHCP_OPTION_USER_AUTHENTICATION            = 98,  /* [RFC2485] */
-        SD_DHCP_OPTION_GEOCONF_CIVIC                  = 99,  /* [RFC4776] */
-        SD_DHCP_OPTION_POSIX_TIMEZONE                 = 100, /* [RFC4833] */
-        SD_DHCP_OPTION_TZDB_TIMEZONE                  = 101, /* [RFC4833] */
+        SD_DHCP_OPTION_UUID                                           = 97,  /* [RFC4578] */
+        SD_DHCP_OPTION_USER_AUTHENTICATION                            = 98,  /* [RFC2485] */
+        SD_DHCP_OPTION_GEOCONF_CIVIC                                  = 99,  /* [RFC4776] */
+        SD_DHCP_OPTION_POSIX_TIMEZONE                                 = 100, /* [RFC4833] */
+        SD_DHCP_OPTION_TZDB_TIMEZONE                                  = 101, /* [RFC4833] */
         /* option codes 102-107 are unassigned [RFC3679] */
-        SD_DHCP_OPTION_IPV6_ONLY_PREFERRED            = 108, /* [RFC8925] */
-        SD_DHCP_OPTION_DHCP4O6_SOURCE_ADDRESS         = 109, /* [RFC8539] */
+        SD_DHCP_OPTION_IPV6_ONLY_PREFERRED                            = 108, /* [RFC8925] */
+        SD_DHCP_OPTION_DHCP4O6_SOURCE_ADDRESS                         = 109, /* [RFC8539] */
         /* option codes 110-111 are unassigned [RFC3679] */
-        SD_DHCP_OPTION_NETINFO_ADDRESS                = 112, /* [RFC3679] */
-        SD_DHCP_OPTION_NETINFO_TAG                    = 113, /* [RFC3679] */
-        SD_DHCP_OPTION_DHCP_CAPTIVE_PORTAL            = 114, /* [RFC8910] */
+        SD_DHCP_OPTION_NETINFO_ADDRESS                                = 112, /* [RFC3679] */
+        SD_DHCP_OPTION_NETINFO_TAG                                    = 113, /* [RFC3679] */
+        SD_DHCP_OPTION_DHCP_CAPTIVE_PORTAL                            = 114, /* [RFC8910] */
         /* option code 115 is unassigned [RFC3679] */
-        SD_DHCP_OPTION_AUTO_CONFIG                    = 116, /* [RFC2563] */
-        SD_DHCP_OPTION_NAME_SERVICE_SEARCH            = 117, /* [RFC2937] */
-        SD_DHCP_OPTION_SUBNET_SELECTION               = 118, /* [RFC3011] */
-        SD_DHCP_OPTION_DOMAIN_SEARCH                  = 119, /* [RFC3397] */
-        SD_DHCP_OPTION_SIP_SERVER                     = 120, /* [RFC3361] */
-        SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE         = 121, /* [RFC3442] */
-        SD_DHCP_OPTION_CABLELABS_CLIENT_CONFIGURATION = 122, /* [RFC3495] */
-        SD_DHCP_OPTION_GEOCONF                        = 123, /* [RFC6225] */
-        SD_DHCP_OPTION_VENDOR_CLASS                   = 124, /* [RFC3925] */
-        SD_DHCP_OPTION_VENDOR_SPECIFIC_INFORMATION    = 125, /* [RFC3925] */
+        SD_DHCP_OPTION_AUTO_CONFIG                                    = 116, /* [RFC2563] */
+        SD_DHCP_OPTION_NAME_SERVICE_SEARCH                            = 117, /* [RFC2937] */
+        SD_DHCP_OPTION_SUBNET_SELECTION                               = 118, /* [RFC3011] */
+        SD_DHCP_OPTION_DOMAIN_SEARCH                                  = 119, /* [RFC3397] */
+        SD_DHCP_OPTION_SIP_SERVER                                     = 120, /* [RFC3361] */
+        SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE                         = 121, /* [RFC3442] */
+        SD_DHCP_OPTION_CABLELABS_CLIENT_CONFIGURATION                 = 122, /* [RFC3495] */
+        SD_DHCP_OPTION_GEOCONF                                        = 123, /* [RFC6225] */
+        SD_DHCP_OPTION_VENDOR_IDENTIFYING_VENDOR_CLASS                = 124, /* [RFC3925] */
+        SD_DHCP_OPTION_VENDOR_IDENTIFYING_VENDOR_SPECIFIC_INFORMATION = 125, /* [RFC3925] */
         /* option codes 126-127 are unassigned [RFC3679] */
         /* option codes 128-135 are assigned to use by PXE, but they are vendor specific [RFC4578] */
-        SD_DHCP_OPTION_PANA_AGENT                     = 136, /* [RFC5192] */
-        SD_DHCP_OPTION_LOST_SERVER_FQDN               = 137, /* [RFC5223] */
-        SD_DHCP_OPTION_CAPWAP_AC_ADDRESS              = 138, /* [RFC5417] */
-        SD_DHCP_OPTION_MOS_ADDRESS                    = 139, /* [RFC5678] */
-        SD_DHCP_OPTION_MOS_FQDN                       = 140, /* [RFC5678] */
-        SD_DHCP_OPTION_SIP_SERVICE_DOMAIN             = 141, /* [RFC6011] */
-        SD_DHCP_OPTION_ANDSF_ADDRESS                  = 142, /* [RFC6153] */
-        SD_DHCP_OPTION_SZTP_REDIRECT                  = 143, /* [RFC8572] */
-        SD_DHCP_OPTION_GEOLOC                         = 144, /* [RFC6225] */
-        SD_DHCP_OPTION_FORCERENEW_NONCE_CAPABLE       = 145, /* [RFC6704] */
-        SD_DHCP_OPTION_RDNSS_SELECTION                = 146, /* [RFC6731] */
-        SD_DHCP_OPTION_DOTS_RI                        = 147, /* [RFC8973] */
-        SD_DHCP_OPTION_DOTS_ADDRESS                   = 148, /* [RFC8973] */
+        SD_DHCP_OPTION_PANA_AGENT                                     = 136, /* [RFC5192] */
+        SD_DHCP_OPTION_LOST_SERVER_FQDN                               = 137, /* [RFC5223] */
+        SD_DHCP_OPTION_CAPWAP_AC_ADDRESS                              = 138, /* [RFC5417] */
+        SD_DHCP_OPTION_MOS_ADDRESS                                    = 139, /* [RFC5678] */
+        SD_DHCP_OPTION_MOS_FQDN                                       = 140, /* [RFC5678] */
+        SD_DHCP_OPTION_SIP_SERVICE_DOMAIN                             = 141, /* [RFC6011] */
+        SD_DHCP_OPTION_ANDSF_ADDRESS                                  = 142, /* [RFC6153] */
+        SD_DHCP_OPTION_SZTP_REDIRECT                                  = 143, /* [RFC8572] */
+        SD_DHCP_OPTION_GEOLOC                                         = 144, /* [RFC6225] */
+        SD_DHCP_OPTION_FORCERENEW_NONCE_CAPABLE                       = 145, /* [RFC6704] */
+        SD_DHCP_OPTION_RDNSS_SELECTION                                = 146, /* [RFC6731] */
+        SD_DHCP_OPTION_DOTS_RI                                        = 147, /* [RFC8973] */
+        SD_DHCP_OPTION_DOTS_ADDRESS                                   = 148, /* [RFC8973] */
         /* option code 149 is unassigned [RFC3942] */
-        SD_DHCP_OPTION_TFTP_SERVER_ADDRESS            = 150, /* [RFC5859] */
-        SD_DHCP_OPTION_STATUS_CODE                    = 151, /* [RFC6926] */
-        SD_DHCP_OPTION_BASE_TIME                      = 152, /* [RFC6926] */
-        SD_DHCP_OPTION_START_TIME_OF_STATE            = 153, /* [RFC6926] */
-        SD_DHCP_OPTION_QUERY_START_TIME               = 154, /* [RFC6926] */
-        SD_DHCP_OPTION_QUERY_END_TIME                 = 155, /* [RFC6926] */
-        SD_DHCP_OPTION_DHCP_STATE                     = 156, /* [RFC6926] */
-        SD_DHCP_OPTION_DATA_SOURCE                    = 157, /* [RFC6926] */
-        SD_DHCP_OPTION_PCP_SERVER                     = 158, /* [RFC7291] */
-        SD_DHCP_OPTION_PORT_PARAMS                    = 159, /* [RFC7618] */
+        SD_DHCP_OPTION_TFTP_SERVER_ADDRESS                            = 150, /* [RFC5859] */
+        SD_DHCP_OPTION_STATUS_CODE                                    = 151, /* [RFC6926] */
+        SD_DHCP_OPTION_BASE_TIME                                      = 152, /* [RFC6926] */
+        SD_DHCP_OPTION_START_TIME_OF_STATE                            = 153, /* [RFC6926] */
+        SD_DHCP_OPTION_QUERY_START_TIME                               = 154, /* [RFC6926] */
+        SD_DHCP_OPTION_QUERY_END_TIME                                 = 155, /* [RFC6926] */
+        SD_DHCP_OPTION_DHCP_STATE                                     = 156, /* [RFC6926] */
+        SD_DHCP_OPTION_DATA_SOURCE                                    = 157, /* [RFC6926] */
+        SD_DHCP_OPTION_PCP_SERVER                                     = 158, /* [RFC7291] */
+        SD_DHCP_OPTION_PORT_PARAMS                                    = 159, /* [RFC7618] */
         /* option code 160 is unassigned [RFC7710][RFC8910] */
-        SD_DHCP_OPTION_MUD_URL                        = 161, /* [RFC8520] */
-        SD_DHCP_OPTION_V4_DNR                         = 162, /* [RFC9463] */
+        SD_DHCP_OPTION_MUD_URL                                        = 161, /* [RFC8520] */
+        SD_DHCP_OPTION_V4_DNR                                         = 162, /* [RFC9463] */
         /* option codes 163-174 are unassigned [RFC3942] */
         /* option codes 175-177 are temporary assigned. */
         /* option codes 178-207 are unassigned [RFC3942] */
-        SD_DHCP_OPTION_PXELINUX_MAGIC                 = 208, /* [RFC5071] Deprecated */
-        SD_DHCP_OPTION_CONFIGURATION_FILE             = 209, /* [RFC5071] */
-        SD_DHCP_OPTION_PATH_PREFIX                    = 210, /* [RFC5071] */
-        SD_DHCP_OPTION_REBOOT_TIME                    = 211, /* [RFC5071] */
-        SD_DHCP_OPTION_6RD                            = 212, /* [RFC5969] */
-        SD_DHCP_OPTION_ACCESS_DOMAIN                  = 213, /* [RFC5986] */
+        SD_DHCP_OPTION_PXELINUX_MAGIC                                 = 208, /* [RFC5071] Deprecated */
+        SD_DHCP_OPTION_CONFIGURATION_FILE                             = 209, /* [RFC5071] */
+        SD_DHCP_OPTION_PATH_PREFIX                                    = 210, /* [RFC5071] */
+        SD_DHCP_OPTION_REBOOT_TIME                                    = 211, /* [RFC5071] */
+        SD_DHCP_OPTION_6RD                                            = 212, /* [RFC5969] */
+        SD_DHCP_OPTION_ACCESS_DOMAIN                                  = 213, /* [RFC5986] */
         /* option codes 214-219 are unassigned */
-        SD_DHCP_OPTION_SUBNET_ALLOCATION              = 220, /* [RFC6656] */
-        SD_DHCP_OPTION_VIRTUAL_SUBNET_SELECTION       = 221, /* [RFC6607] */
+        SD_DHCP_OPTION_SUBNET_ALLOCATION                              = 220, /* [RFC6656] */
+        SD_DHCP_OPTION_VIRTUAL_SUBNET_SELECTION                       = 221, /* [RFC6607] */
         /* option codes 222-223 are unassigned [RFC3942] */
         /* option codes 224-254 are reserved for private use */
-        SD_DHCP_OPTION_PRIVATE_BASE                   = 224,
-        SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE = 249, /* [RFC7844] */
-        SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY    = 252, /* [RFC7844] */
-        SD_DHCP_OPTION_PRIVATE_LAST                   = 254,
-        SD_DHCP_OPTION_END                            = 255  /* [RFC2132] */
+        SD_DHCP_OPTION_PRIVATE_BASE                                   = 224,
+        SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE                 = 249, /* [RFC7844] */
+        SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY                    = 252, /* [RFC7844] */
+        SD_DHCP_OPTION_PRIVATE_LAST                                   = 254,
+        SD_DHCP_OPTION_END                                            = 255  /* [RFC2132] */
 };
 
 /* Suboptions for SD_DHCP_OPTION_RELAY_AGENT_INFORMATION option */