Merge pull request #21634 from yuwata/dhcp-header-cleanups

dhcp: trivial header cleanups

diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h
index 4b73e0cfe0555a8b67f10e9c23d7cedb4bb836d2..8ae2ecd6d94efe70efe4bc589510c231d9c0e925 100644 (file)
--- a/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/libsystemd-network/dhcp6-lease-internal.h
@@ -55,7 +55,7 @@ int dhcp6_lease_get_rapid_commit(sd_dhcp6_lease *lease, bool *rapid_commit);
 int dhcp6_lease_add_dns(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
 int dhcp6_lease_add_domains(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
 int dhcp6_lease_add_ntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
-int dhcp6_lease_add_sntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) ;
+int dhcp6_lease_add_sntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
 int dhcp6_lease_set_fqdn(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen);
 
 int dhcp6_lease_new(sd_dhcp6_lease **ret);

diff --git a/src/systemd/sd-dhcp-client.h b/src/systemd/sd-dhcp-client.h
index 23979b1232da20913bf72ffb3e00627b6cdc4573..285febd0d4dc6e378af74c32e80e6092e5584246 100644 (file)
--- a/src/systemd/sd-dhcp-client.h
+++ b/src/systemd/sd-dhcp-client.h
@@ -45,65 +45,65 @@ enum {
 };
 
 enum {
-        SD_DHCP_OPTION_PAD                         = 0,
-        SD_DHCP_OPTION_SUBNET_MASK                 = 1,
-        SD_DHCP_OPTION_TIME_OFFSET                 = 2,
-        SD_DHCP_OPTION_ROUTER                      = 3,
-        SD_DHCP_OPTION_DOMAIN_NAME_SERVER          = 6,
-        SD_DHCP_OPTION_LPR_SERVER                  = 9,
-        SD_DHCP_OPTION_HOST_NAME                   = 12,
-        SD_DHCP_OPTION_BOOT_FILE_SIZE              = 13,
-        SD_DHCP_OPTION_DOMAIN_NAME                 = 15,
-        SD_DHCP_OPTION_ROOT_PATH                   = 17,
-        SD_DHCP_OPTION_ENABLE_IP_FORWARDING        = 19,
-        SD_DHCP_OPTION_ENABLE_IP_FORWARDING_NL     = 20,
-        SD_DHCP_OPTION_POLICY_FILTER               = 21,
-        SD_DHCP_OPTION_INTERFACE_MDR               = 22,
-        SD_DHCP_OPTION_INTERFACE_TTL               = 23,
-        SD_DHCP_OPTION_INTERFACE_MTU_AGING_TIMEOUT = 24,
-        SD_DHCP_OPTION_INTERFACE_MTU               = 26,
-        SD_DHCP_OPTION_BROADCAST                   = 28,
-       /* Windows 10 option to send when Anonymize=true */
-        SD_DHCP_OPTION_ROUTER_DISCOVER             = 31,
-        SD_DHCP_OPTION_STATIC_ROUTE                = 33,
-        SD_DHCP_OPTION_NTP_SERVER                  = 42,
-        SD_DHCP_OPTION_VENDOR_SPECIFIC             = 43,
-       /* Windows 10 option to send when Anonymize=true */
-        SD_DHCP_OPTION_NETBIOS_NAMESERVER          = 44,
-       /* Windows 10 option to send when Anonymize=true */
-        SD_DHCP_OPTION_NETBIOS_NODETYPE            = 46,
-       /* Windows 10 option to send when Anonymize=true */
-        SD_DHCP_OPTION_NETBIOS_SCOPE               = 47,
-        SD_DHCP_OPTION_REQUESTED_IP_ADDRESS        = 50,
-        SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME       = 51,
-        SD_DHCP_OPTION_OVERLOAD                    = 52,
-        SD_DHCP_OPTION_MESSAGE_TYPE                = 53,
-        SD_DHCP_OPTION_SERVER_IDENTIFIER           = 54,
-        SD_DHCP_OPTION_PARAMETER_REQUEST_LIST      = 55,
-        SD_DHCP_OPTION_ERROR_MESSAGE               = 56,
-        SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE        = 57,
-        SD_DHCP_OPTION_RENEWAL_T1_TIME             = 58,
-        SD_DHCP_OPTION_REBINDING_T2_TIME           = 59,
-        SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER     = 60,
-        SD_DHCP_OPTION_CLIENT_IDENTIFIER           = 61,
-        SD_DHCP_OPTION_SMTP_SERVER                 = 69,
-        SD_DHCP_OPTION_POP3_SERVER                 = 70,
-        SD_DHCP_OPTION_USER_CLASS                  = 77,
-        SD_DHCP_OPTION_FQDN                        = 81,
-        SD_DHCP_OPTION_RELAY_AGENT_INFORMATION     = 82,
-        SD_DHCP_OPTION_NEW_POSIX_TIMEZONE          = 100,
-        SD_DHCP_OPTION_NEW_TZDB_TIMEZONE           = 101,
-        SD_DHCP_OPTION_DOMAIN_SEARCH_LIST          = 119,
-        SD_DHCP_OPTION_SIP_SERVER                  = 120,
-        SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE      = 121,
-        SD_DHCP_OPTION_MUD_URL                     = 161,
-        SD_DHCP_OPTION_PRIVATE_BASE                = 224,
-       /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_PAD                            = 0,
+        SD_DHCP_OPTION_SUBNET_MASK                    = 1,
+        SD_DHCP_OPTION_TIME_OFFSET                    = 2,
+        SD_DHCP_OPTION_ROUTER                         = 3,
+        SD_DHCP_OPTION_DOMAIN_NAME_SERVER             = 6,
+        SD_DHCP_OPTION_LPR_SERVER                     = 9,
+        SD_DHCP_OPTION_HOST_NAME                      = 12,
+        SD_DHCP_OPTION_BOOT_FILE_SIZE                 = 13,
+        SD_DHCP_OPTION_DOMAIN_NAME                    = 15,
+        SD_DHCP_OPTION_ROOT_PATH                      = 17,
+        SD_DHCP_OPTION_ENABLE_IP_FORWARDING           = 19,
+        SD_DHCP_OPTION_ENABLE_IP_FORWARDING_NL        = 20,
+        SD_DHCP_OPTION_POLICY_FILTER                  = 21,
+        SD_DHCP_OPTION_INTERFACE_MDR                  = 22,
+        SD_DHCP_OPTION_INTERFACE_TTL                  = 23,
+        SD_DHCP_OPTION_INTERFACE_MTU_AGING_TIMEOUT    = 24,
+        SD_DHCP_OPTION_INTERFACE_MTU                  = 26,
+        SD_DHCP_OPTION_BROADCAST                      = 28,
+        /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_ROUTER_DISCOVER                = 31,
+        SD_DHCP_OPTION_STATIC_ROUTE                   = 33,
+        SD_DHCP_OPTION_NTP_SERVER                     = 42,
+        SD_DHCP_OPTION_VENDOR_SPECIFIC                = 43,
+        /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_NETBIOS_NAMESERVER             = 44,
+        /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_NETBIOS_NODETYPE               = 46,
+        /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_NETBIOS_SCOPE                  = 47,
+        SD_DHCP_OPTION_REQUESTED_IP_ADDRESS           = 50,
+        SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME          = 51,
+        SD_DHCP_OPTION_OVERLOAD                       = 52,
+        SD_DHCP_OPTION_MESSAGE_TYPE                   = 53,
+        SD_DHCP_OPTION_SERVER_IDENTIFIER              = 54,
+        SD_DHCP_OPTION_PARAMETER_REQUEST_LIST         = 55,
+        SD_DHCP_OPTION_ERROR_MESSAGE                  = 56,
+        SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE           = 57,
+        SD_DHCP_OPTION_RENEWAL_T1_TIME                = 58,
+        SD_DHCP_OPTION_REBINDING_T2_TIME              = 59,
+        SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER        = 60,
+        SD_DHCP_OPTION_CLIENT_IDENTIFIER              = 61,
+        SD_DHCP_OPTION_SMTP_SERVER                    = 69,
+        SD_DHCP_OPTION_POP3_SERVER                    = 70,
+        SD_DHCP_OPTION_USER_CLASS                     = 77,
+        SD_DHCP_OPTION_FQDN                           = 81,
+        SD_DHCP_OPTION_RELAY_AGENT_INFORMATION        = 82,
+        SD_DHCP_OPTION_NEW_POSIX_TIMEZONE             = 100,
+        SD_DHCP_OPTION_NEW_TZDB_TIMEZONE              = 101,
+        SD_DHCP_OPTION_DOMAIN_SEARCH_LIST             = 119,
+        SD_DHCP_OPTION_SIP_SERVER                     = 120,
+        SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE         = 121,
+        SD_DHCP_OPTION_MUD_URL                        = 161,
+        SD_DHCP_OPTION_PRIVATE_BASE                   = 224,
+        /* Windows 10 option to send when Anonymize=true */
         SD_DHCP_OPTION_PRIVATE_CLASSLESS_STATIC_ROUTE = 249,
-       /* Windows 10 option to send when Anonymize=true */
-        SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY = 252,
-        SD_DHCP_OPTION_PRIVATE_LAST                = 254,
-        SD_DHCP_OPTION_END                         = 255,
+        /* Windows 10 option to send when Anonymize=true */
+        SD_DHCP_OPTION_PRIVATE_PROXY_AUTODISCOVERY    = 252,
+        SD_DHCP_OPTION_PRIVATE_LAST                   = 254,
+        SD_DHCP_OPTION_END                            = 255,
 };
 
 /* Suboptions for SD_DHCP_OPTION_RELAY_AGENT_INFORMATION option */