mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
dhcp: make DHCP_OPTION_* enum public
libsystemd-network provides the public function sd_dhcp_client_set_request_option() to enable the request of a given DHCP option. However the enum defining such options is defined in the internal header dhcp-protocol.h. Move the enum definition to the public header sd-dhcp-client.h and properly namespace values.
This commit is contained in:
parent
f8693fc797
commit
22805d9207
@ -34,14 +34,14 @@ static int option_append(uint8_t options[], size_t size, size_t *offset,
|
||||
assert(options);
|
||||
assert(offset);
|
||||
|
||||
if (code != DHCP_OPTION_END)
|
||||
if (code != SD_DHCP_OPTION_END)
|
||||
/* always make sure there is space for an END option */
|
||||
size --;
|
||||
|
||||
switch (code) {
|
||||
|
||||
case DHCP_OPTION_PAD:
|
||||
case DHCP_OPTION_END:
|
||||
case SD_DHCP_OPTION_PAD:
|
||||
case SD_DHCP_OPTION_END:
|
||||
if (size < *offset + 1)
|
||||
return -ENOBUFS;
|
||||
|
||||
@ -91,7 +91,7 @@ int dhcp_option_append(DHCPMessage *message, size_t size, size_t *offset,
|
||||
else if (r == -ENOBUFS && (file || sname)) {
|
||||
/* did not fit, but we have more buffers to try
|
||||
close the options array and move the offset to its end */
|
||||
r = option_append(message->options, size, offset, DHCP_OPTION_END, 0, NULL);
|
||||
r = option_append(message->options, size, offset, SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -112,7 +112,7 @@ int dhcp_option_append(DHCPMessage *message, size_t size, size_t *offset,
|
||||
} else if (r == -ENOBUFS && sname) {
|
||||
/* did not fit, but we have more buffers to try
|
||||
close the file array and move the offset to its end */
|
||||
r = option_append(message->options, size, offset, DHCP_OPTION_END, 0, NULL);
|
||||
r = option_append(message->options, size, offset, SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -152,10 +152,10 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
|
||||
code = options[offset ++];
|
||||
|
||||
switch (code) {
|
||||
case DHCP_OPTION_PAD:
|
||||
case SD_DHCP_OPTION_PAD:
|
||||
continue;
|
||||
|
||||
case DHCP_OPTION_END:
|
||||
case SD_DHCP_OPTION_END:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -170,7 +170,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
|
||||
option = &options[offset];
|
||||
|
||||
switch (code) {
|
||||
case DHCP_OPTION_MESSAGE_TYPE:
|
||||
case SD_DHCP_OPTION_MESSAGE_TYPE:
|
||||
if (len != 1)
|
||||
return -EINVAL;
|
||||
|
||||
@ -179,7 +179,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
|
||||
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_ERROR_MESSAGE:
|
||||
case SD_DHCP_OPTION_ERROR_MESSAGE:
|
||||
if (len == 0)
|
||||
return -EINVAL;
|
||||
|
||||
@ -203,7 +203,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
|
||||
}
|
||||
|
||||
break;
|
||||
case DHCP_OPTION_OVERLOAD:
|
||||
case SD_DHCP_OPTION_OVERLOAD:
|
||||
if (len != 1)
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -44,7 +44,7 @@ int dhcp_message_init(DHCPMessage *message, uint8_t op, uint32_t xid,
|
||||
message->magic = htobe32(DHCP_MAGIC_COOKIE);
|
||||
|
||||
r = dhcp_option_append(message, optlen, &offset, 0,
|
||||
DHCP_OPTION_MESSAGE_TYPE, 1, &type);
|
||||
SD_DHCP_OPTION_MESSAGE_TYPE, 1, &type);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -105,48 +105,6 @@ enum {
|
||||
DHCP_OVERLOAD_SNAME = 2,
|
||||
};
|
||||
|
||||
enum {
|
||||
DHCP_OPTION_PAD = 0,
|
||||
DHCP_OPTION_SUBNET_MASK = 1,
|
||||
DHCP_OPTION_TIME_OFFSET = 2,
|
||||
DHCP_OPTION_ROUTER = 3,
|
||||
DHCP_OPTION_DOMAIN_NAME_SERVER = 6,
|
||||
DHCP_OPTION_HOST_NAME = 12,
|
||||
DHCP_OPTION_BOOT_FILE_SIZE = 13,
|
||||
DHCP_OPTION_DOMAIN_NAME = 15,
|
||||
DHCP_OPTION_ROOT_PATH = 17,
|
||||
DHCP_OPTION_ENABLE_IP_FORWARDING = 19,
|
||||
DHCP_OPTION_ENABLE_IP_FORWARDING_NL = 20,
|
||||
DHCP_OPTION_POLICY_FILTER = 21,
|
||||
DHCP_OPTION_INTERFACE_MDR = 22,
|
||||
DHCP_OPTION_INTERFACE_TTL = 23,
|
||||
DHCP_OPTION_INTERFACE_MTU_AGING_TIMEOUT = 24,
|
||||
DHCP_OPTION_INTERFACE_MTU = 26,
|
||||
DHCP_OPTION_BROADCAST = 28,
|
||||
DHCP_OPTION_STATIC_ROUTE = 33,
|
||||
DHCP_OPTION_NTP_SERVER = 42,
|
||||
DHCP_OPTION_VENDOR_SPECIFIC = 43,
|
||||
DHCP_OPTION_REQUESTED_IP_ADDRESS = 50,
|
||||
DHCP_OPTION_IP_ADDRESS_LEASE_TIME = 51,
|
||||
DHCP_OPTION_OVERLOAD = 52,
|
||||
DHCP_OPTION_MESSAGE_TYPE = 53,
|
||||
DHCP_OPTION_SERVER_IDENTIFIER = 54,
|
||||
DHCP_OPTION_PARAMETER_REQUEST_LIST = 55,
|
||||
DHCP_OPTION_ERROR_MESSAGE = 56,
|
||||
DHCP_OPTION_MAXIMUM_MESSAGE_SIZE = 57,
|
||||
DHCP_OPTION_RENEWAL_T1_TIME = 58,
|
||||
DHCP_OPTION_REBINDING_T2_TIME = 59,
|
||||
DHCP_OPTION_VENDOR_CLASS_IDENTIFIER = 60,
|
||||
DHCP_OPTION_CLIENT_IDENTIFIER = 61,
|
||||
DHCP_OPTION_FQDN = 81,
|
||||
DHCP_OPTION_NEW_POSIX_TIMEZONE = 100,
|
||||
DHCP_OPTION_NEW_TZDB_TIMEZONE = 101,
|
||||
DHCP_OPTION_CLASSLESS_STATIC_ROUTE = 121,
|
||||
DHCP_OPTION_PRIVATE_BASE = 224,
|
||||
DHCP_OPTION_PRIVATE_LAST = 254,
|
||||
DHCP_OPTION_END = 255,
|
||||
};
|
||||
|
||||
#define DHCP_MAX_FQDN_LENGTH 255
|
||||
|
||||
enum {
|
||||
|
@ -104,11 +104,11 @@ struct sd_dhcp_client {
|
||||
};
|
||||
|
||||
static const uint8_t default_req_opts[] = {
|
||||
DHCP_OPTION_SUBNET_MASK,
|
||||
DHCP_OPTION_ROUTER,
|
||||
DHCP_OPTION_HOST_NAME,
|
||||
DHCP_OPTION_DOMAIN_NAME,
|
||||
DHCP_OPTION_DOMAIN_NAME_SERVER,
|
||||
SD_DHCP_OPTION_SUBNET_MASK,
|
||||
SD_DHCP_OPTION_ROUTER,
|
||||
SD_DHCP_OPTION_HOST_NAME,
|
||||
SD_DHCP_OPTION_DOMAIN_NAME,
|
||||
SD_DHCP_OPTION_DOMAIN_NAME_SERVER,
|
||||
};
|
||||
|
||||
static int client_receive_message_raw(sd_event_source *s, int fd,
|
||||
@ -143,11 +143,11 @@ int sd_dhcp_client_set_request_option(sd_dhcp_client *client, uint8_t option) {
|
||||
DHCP_STATE_STOPPED), -EBUSY);
|
||||
|
||||
switch(option) {
|
||||
case DHCP_OPTION_PAD:
|
||||
case DHCP_OPTION_OVERLOAD:
|
||||
case DHCP_OPTION_MESSAGE_TYPE:
|
||||
case DHCP_OPTION_PARAMETER_REQUEST_LIST:
|
||||
case DHCP_OPTION_END:
|
||||
case SD_DHCP_OPTION_PAD:
|
||||
case SD_DHCP_OPTION_OVERLOAD:
|
||||
case SD_DHCP_OPTION_MESSAGE_TYPE:
|
||||
case SD_DHCP_OPTION_PARAMETER_REQUEST_LIST:
|
||||
case SD_DHCP_OPTION_END:
|
||||
return -EINVAL;
|
||||
|
||||
default:
|
||||
@ -486,7 +486,7 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret,
|
||||
Identifier option is not set */
|
||||
if (client->client_id_len) {
|
||||
r = dhcp_option_append(&packet->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_CLIENT_IDENTIFIER,
|
||||
SD_DHCP_OPTION_CLIENT_IDENTIFIER,
|
||||
client->client_id_len,
|
||||
&client->client_id);
|
||||
if (r < 0)
|
||||
@ -502,7 +502,7 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret,
|
||||
messages.
|
||||
*/
|
||||
r = dhcp_option_append(&packet->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_PARAMETER_REQUEST_LIST,
|
||||
SD_DHCP_OPTION_PARAMETER_REQUEST_LIST,
|
||||
client->req_opts_size, client->req_opts);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -531,7 +531,7 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret,
|
||||
*/
|
||||
max_size = htobe16(size);
|
||||
r = dhcp_option_append(&packet->dhcp, client->mtu, &optoffset, 0,
|
||||
DHCP_OPTION_MAXIMUM_MESSAGE_SIZE,
|
||||
SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE,
|
||||
2, &max_size);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -557,7 +557,7 @@ static int client_append_fqdn_option(DHCPMessage *message, size_t optlen, size_t
|
||||
r = dns_name_to_wire_format(fqdn, buffer + 3, sizeof(buffer) - 3, false);
|
||||
if (r > 0)
|
||||
r = dhcp_option_append(message, optlen, optoffset, 0,
|
||||
DHCP_OPTION_FQDN, 3 + r, buffer);
|
||||
SD_DHCP_OPTION_FQDN, 3 + r, buffer);
|
||||
|
||||
return r;
|
||||
}
|
||||
@ -593,7 +593,7 @@ static int client_send_discover(sd_dhcp_client *client) {
|
||||
*/
|
||||
if (client->last_addr != INADDR_ANY) {
|
||||
r = dhcp_option_append(&discover->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
SD_DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
4, &client->last_addr);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -609,7 +609,7 @@ static int client_send_discover(sd_dhcp_client *client) {
|
||||
DHCPDISCOVER but dhclient does and so we do as well
|
||||
*/
|
||||
r = dhcp_option_append(&discover->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_HOST_NAME,
|
||||
SD_DHCP_OPTION_HOST_NAME,
|
||||
strlen(client->hostname), client->hostname);
|
||||
} else
|
||||
r = client_append_fqdn_option(&discover->dhcp, optlen, &optoffset,
|
||||
@ -620,7 +620,7 @@ static int client_send_discover(sd_dhcp_client *client) {
|
||||
|
||||
if (client->vendor_class_identifier) {
|
||||
r = dhcp_option_append(&discover->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_VENDOR_CLASS_IDENTIFIER,
|
||||
SD_DHCP_OPTION_VENDOR_CLASS_IDENTIFIER,
|
||||
strlen(client->vendor_class_identifier),
|
||||
client->vendor_class_identifier);
|
||||
if (r < 0)
|
||||
@ -628,7 +628,7 @@ static int client_send_discover(sd_dhcp_client *client) {
|
||||
}
|
||||
|
||||
r = dhcp_option_append(&discover->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_END, 0, NULL);
|
||||
SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -667,13 +667,13 @@ static int client_send_request(sd_dhcp_client *client) {
|
||||
*/
|
||||
|
||||
r = dhcp_option_append(&request->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_SERVER_IDENTIFIER,
|
||||
SD_DHCP_OPTION_SERVER_IDENTIFIER,
|
||||
4, &client->lease->server_address);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&request->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
SD_DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
4, &client->lease->address);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -686,7 +686,7 @@ static int client_send_request(sd_dhcp_client *client) {
|
||||
assigned address. ’ciaddr’ MUST be zero.
|
||||
*/
|
||||
r = dhcp_option_append(&request->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
SD_DHCP_OPTION_REQUESTED_IP_ADDRESS,
|
||||
4, &client->last_addr);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -721,7 +721,7 @@ static int client_send_request(sd_dhcp_client *client) {
|
||||
if (client->hostname) {
|
||||
if (dns_name_is_single_label(client->hostname))
|
||||
r = dhcp_option_append(&request->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_HOST_NAME,
|
||||
SD_DHCP_OPTION_HOST_NAME,
|
||||
strlen(client->hostname), client->hostname);
|
||||
else
|
||||
r = client_append_fqdn_option(&request->dhcp, optlen, &optoffset,
|
||||
@ -731,7 +731,7 @@ static int client_send_request(sd_dhcp_client *client) {
|
||||
}
|
||||
|
||||
r = dhcp_option_append(&request->dhcp, optlen, &optoffset, 0,
|
||||
DHCP_OPTION_END, 0, NULL);
|
||||
SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -485,21 +485,21 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
|
||||
switch(code) {
|
||||
|
||||
case DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
|
||||
case SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
|
||||
r = lease_parse_u32(option, len, &lease->lifetime, 1);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse lease time, ignoring: %m");
|
||||
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_SERVER_IDENTIFIER:
|
||||
case SD_DHCP_OPTION_SERVER_IDENTIFIER:
|
||||
r = lease_parse_be32(option, len, &lease->server_address);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse server identifier, ignoring: %m");
|
||||
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_SUBNET_MASK:
|
||||
case SD_DHCP_OPTION_SUBNET_MASK:
|
||||
r = lease_parse_be32(option, len, &lease->subnet_mask);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse subnet mask, ignoring: %m");
|
||||
@ -507,7 +507,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
lease->have_subnet_mask = true;
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_BROADCAST:
|
||||
case SD_DHCP_OPTION_BROADCAST:
|
||||
r = lease_parse_be32(option, len, &lease->broadcast);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse broadcast address, ignoring: %m");
|
||||
@ -515,7 +515,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
lease->have_broadcast = true;
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_ROUTER:
|
||||
case SD_DHCP_OPTION_ROUTER:
|
||||
if (len >= 4) {
|
||||
r = lease_parse_be32(option, 4, &lease->router);
|
||||
if (r < 0)
|
||||
@ -523,31 +523,31 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
}
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_DOMAIN_NAME_SERVER:
|
||||
case SD_DHCP_OPTION_DOMAIN_NAME_SERVER:
|
||||
r = lease_parse_in_addrs(option, len, &lease->dns, &lease->dns_size);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse DNS server, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_NTP_SERVER:
|
||||
case SD_DHCP_OPTION_NTP_SERVER:
|
||||
r = lease_parse_in_addrs(option, len, &lease->ntp, &lease->ntp_size);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse NTP server, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_STATIC_ROUTE:
|
||||
case SD_DHCP_OPTION_STATIC_ROUTE:
|
||||
r = lease_parse_routes(option, len, &lease->static_route, &lease->static_route_size, &lease->static_route_allocated);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse static routes, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_INTERFACE_MTU:
|
||||
case SD_DHCP_OPTION_INTERFACE_MTU:
|
||||
r = lease_parse_u16(option, len, &lease->mtu, 68);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse MTU, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_DOMAIN_NAME: {
|
||||
case SD_DHCP_OPTION_DOMAIN_NAME: {
|
||||
_cleanup_free_ char *domainname = NULL, *normalized = NULL;
|
||||
|
||||
r = lease_parse_string(option, len, &domainname);
|
||||
@ -574,7 +574,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
break;
|
||||
}
|
||||
|
||||
case DHCP_OPTION_HOST_NAME: {
|
||||
case SD_DHCP_OPTION_HOST_NAME: {
|
||||
_cleanup_free_ char *hostname = NULL, *normalized = NULL;
|
||||
|
||||
r = lease_parse_string(option, len, &hostname);
|
||||
@ -601,25 +601,25 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
break;
|
||||
}
|
||||
|
||||
case DHCP_OPTION_ROOT_PATH:
|
||||
case SD_DHCP_OPTION_ROOT_PATH:
|
||||
r = lease_parse_string(option, len, &lease->root_path);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse root path, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_RENEWAL_T1_TIME:
|
||||
case SD_DHCP_OPTION_RENEWAL_T1_TIME:
|
||||
r = lease_parse_u32(option, len, &lease->t1, 1);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse T1 time, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_REBINDING_T2_TIME:
|
||||
case SD_DHCP_OPTION_REBINDING_T2_TIME:
|
||||
r = lease_parse_u32(option, len, &lease->t2, 1);
|
||||
if (r < 0)
|
||||
log_debug_errno(r, "Failed to parse T2 time, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_CLASSLESS_STATIC_ROUTE:
|
||||
case SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE:
|
||||
r = lease_parse_classless_routes(
|
||||
option, len,
|
||||
&lease->static_route,
|
||||
@ -629,7 +629,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
log_debug_errno(r, "Failed to parse classless routes, ignoring: %m");
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_NEW_TZDB_TIMEZONE: {
|
||||
case SD_DHCP_OPTION_NEW_TZDB_TIMEZONE: {
|
||||
_cleanup_free_ char *tz = NULL;
|
||||
|
||||
r = lease_parse_string(option, len, &tz);
|
||||
@ -650,7 +650,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
break;
|
||||
}
|
||||
|
||||
case DHCP_OPTION_VENDOR_SPECIFIC:
|
||||
case SD_DHCP_OPTION_VENDOR_SPECIFIC:
|
||||
|
||||
if (len <= 0)
|
||||
lease->vendor_specific = mfree(lease->vendor_specific);
|
||||
@ -668,7 +668,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
||||
lease->vendor_specific_len = len;
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_PRIVATE_BASE ... DHCP_OPTION_PRIVATE_LAST:
|
||||
case SD_DHCP_OPTION_PRIVATE_BASE ... SD_DHCP_OPTION_PRIVATE_LAST:
|
||||
r = dhcp_lease_insert_private_option(lease, code, option, len);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -897,7 +897,7 @@ int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
|
||||
*lifetime = NULL,
|
||||
*t1 = NULL,
|
||||
*t2 = NULL,
|
||||
*options[DHCP_OPTION_PRIVATE_LAST - DHCP_OPTION_PRIVATE_BASE + 1] = {};
|
||||
*options[SD_DHCP_OPTION_PRIVATE_LAST - SD_DHCP_OPTION_PRIVATE_BASE + 1] = {};
|
||||
|
||||
int r, i;
|
||||
|
||||
@ -1065,7 +1065,7 @@ int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
|
||||
log_debug_errno(r, "Failed to parse vendor specific data %s, ignoring: %m", vendor_specific_hex);
|
||||
}
|
||||
|
||||
for (i = 0; i <= DHCP_OPTION_PRIVATE_LAST - DHCP_OPTION_PRIVATE_BASE; i++) {
|
||||
for (i = 0; i <= SD_DHCP_OPTION_PRIVATE_LAST - SD_DHCP_OPTION_PRIVATE_BASE; i++) {
|
||||
_cleanup_free_ void *data = NULL;
|
||||
size_t len;
|
||||
|
||||
@ -1078,7 +1078,7 @@ int dhcp_lease_load(sd_dhcp_lease **ret, const char *lease_file) {
|
||||
continue;
|
||||
}
|
||||
|
||||
r = dhcp_lease_insert_private_option(lease, DHCP_OPTION_PRIVATE_BASE + i, data, len);
|
||||
r = dhcp_lease_insert_private_option(lease, SD_DHCP_OPTION_PRIVATE_BASE + i, data, len);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
@ -354,13 +354,13 @@ int dhcp_server_send_packet(sd_dhcp_server *server,
|
||||
assert(packet);
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &optoffset, 0,
|
||||
DHCP_OPTION_SERVER_IDENTIFIER,
|
||||
SD_DHCP_OPTION_SERVER_IDENTIFIER,
|
||||
4, &server->address);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &optoffset, 0,
|
||||
DHCP_OPTION_END, 0, NULL);
|
||||
SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -457,18 +457,18 @@ static int server_send_offer(sd_dhcp_server *server, DHCPRequest *req,
|
||||
|
||||
lease_time = htobe32(req->lifetime);
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
|
||||
SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
|
||||
&lease_time);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
|
||||
SD_DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_ROUTER, 4, &server->address);
|
||||
SD_DHCP_OPTION_ROUTER, 4, &server->address);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -494,25 +494,25 @@ static int server_send_ack(sd_dhcp_server *server, DHCPRequest *req,
|
||||
|
||||
lease_time = htobe32(req->lifetime);
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
|
||||
SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME, 4,
|
||||
&lease_time);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
|
||||
SD_DHCP_OPTION_SUBNET_MASK, 4, &server->netmask);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_ROUTER, 4, &server->address);
|
||||
SD_DHCP_OPTION_ROUTER, 4, &server->address);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (server->n_dns > 0) {
|
||||
r = dhcp_option_append(
|
||||
&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_DOMAIN_NAME_SERVER,
|
||||
SD_DHCP_OPTION_DOMAIN_NAME_SERVER,
|
||||
sizeof(struct in_addr) * server->n_dns, server->dns);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -521,7 +521,7 @@ static int server_send_ack(sd_dhcp_server *server, DHCPRequest *req,
|
||||
if (server->n_ntp > 0) {
|
||||
r = dhcp_option_append(
|
||||
&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_NTP_SERVER,
|
||||
SD_DHCP_OPTION_NTP_SERVER,
|
||||
sizeof(struct in_addr) * server->n_ntp, server->ntp);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -530,7 +530,7 @@ static int server_send_ack(sd_dhcp_server *server, DHCPRequest *req,
|
||||
if (server->timezone) {
|
||||
r = dhcp_option_append(
|
||||
&packet->dhcp, req->max_optlen, &offset, 0,
|
||||
DHCP_OPTION_NEW_TZDB_TIMEZONE,
|
||||
SD_DHCP_OPTION_NEW_TZDB_TIMEZONE,
|
||||
strlen(server->timezone), server->timezone);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@ -576,7 +576,7 @@ static int server_send_forcerenew(sd_dhcp_server *server, be32_t address,
|
||||
return r;
|
||||
|
||||
r = dhcp_option_append(&packet->dhcp, DHCP_MIN_OPTIONS_SIZE,
|
||||
&optoffset, 0, DHCP_OPTION_END, 0, NULL);
|
||||
&optoffset, 0, SD_DHCP_OPTION_END, 0, NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@ -596,22 +596,22 @@ static int parse_request(uint8_t code, uint8_t len, const void *option, void *us
|
||||
assert(req);
|
||||
|
||||
switch(code) {
|
||||
case DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
|
||||
case SD_DHCP_OPTION_IP_ADDRESS_LEASE_TIME:
|
||||
if (len == 4)
|
||||
req->lifetime = be32toh(*(be32_t*)option);
|
||||
|
||||
break;
|
||||
case DHCP_OPTION_REQUESTED_IP_ADDRESS:
|
||||
case SD_DHCP_OPTION_REQUESTED_IP_ADDRESS:
|
||||
if (len == 4)
|
||||
req->requested_ip = *(be32_t*)option;
|
||||
|
||||
break;
|
||||
case DHCP_OPTION_SERVER_IDENTIFIER:
|
||||
case SD_DHCP_OPTION_SERVER_IDENTIFIER:
|
||||
if (len == 4)
|
||||
req->server_id = *(be32_t*)option;
|
||||
|
||||
break;
|
||||
case DHCP_OPTION_CLIENT_IDENTIFIER:
|
||||
case SD_DHCP_OPTION_CLIENT_IDENTIFIER:
|
||||
if (len >= 2) {
|
||||
uint8_t *data;
|
||||
|
||||
@ -625,7 +625,7 @@ static int parse_request(uint8_t code, uint8_t len, const void *option, void *us
|
||||
}
|
||||
|
||||
break;
|
||||
case DHCP_OPTION_MAXIMUM_MESSAGE_SIZE:
|
||||
case SD_DHCP_OPTION_MAXIMUM_MESSAGE_SIZE:
|
||||
if (len == 2)
|
||||
req->max_optlen = be16toh(*(be16_t*)option) -
|
||||
- sizeof(DHCPPacket);
|
||||
|
@ -77,26 +77,26 @@ static void test_request_basic(sd_event *e) {
|
||||
assert_se(sd_dhcp_client_set_index(client, 1) == 0);
|
||||
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_SUBNET_MASK) == -EEXIST);
|
||||
SD_DHCP_OPTION_SUBNET_MASK) == -EEXIST);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_ROUTER) == -EEXIST);
|
||||
SD_DHCP_OPTION_ROUTER) == -EEXIST);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_HOST_NAME) == -EEXIST);
|
||||
SD_DHCP_OPTION_HOST_NAME) == -EEXIST);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_DOMAIN_NAME) == -EEXIST);
|
||||
SD_DHCP_OPTION_DOMAIN_NAME) == -EEXIST);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_DOMAIN_NAME_SERVER) == -EEXIST);
|
||||
SD_DHCP_OPTION_DOMAIN_NAME_SERVER) == -EEXIST);
|
||||
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_PAD) == -EINVAL);
|
||||
SD_DHCP_OPTION_PAD) == -EINVAL);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_END) == -EINVAL);
|
||||
SD_DHCP_OPTION_END) == -EINVAL);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_MESSAGE_TYPE) == -EINVAL);
|
||||
SD_DHCP_OPTION_MESSAGE_TYPE) == -EINVAL);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_OVERLOAD) == -EINVAL);
|
||||
SD_DHCP_OPTION_OVERLOAD) == -EINVAL);
|
||||
assert_se(sd_dhcp_client_set_request_option(client,
|
||||
DHCP_OPTION_PARAMETER_REQUEST_LIST)
|
||||
SD_DHCP_OPTION_PARAMETER_REQUEST_LIST)
|
||||
== -EINVAL);
|
||||
|
||||
assert_se(sd_dhcp_client_set_request_option(client, 33) == 0);
|
||||
@ -122,7 +122,7 @@ static void test_checksum(void) {
|
||||
|
||||
static int check_options(uint8_t code, uint8_t len, const void *option, void *userdata) {
|
||||
switch(code) {
|
||||
case DHCP_OPTION_CLIENT_IDENTIFIER:
|
||||
case SD_DHCP_OPTION_CLIENT_IDENTIFIER:
|
||||
{
|
||||
uint32_t iaid;
|
||||
struct duid duid;
|
||||
@ -393,7 +393,7 @@ static int test_addr_acq_recv_request(size_t size, DHCPMessage *request) {
|
||||
assert_se(res == DHCP_REQUEST);
|
||||
assert_se(xid == request->xid);
|
||||
|
||||
assert_se(msg_bytes[size - 1] == DHCP_OPTION_END);
|
||||
assert_se(msg_bytes[size - 1] == SD_DHCP_OPTION_END);
|
||||
|
||||
if (verbose)
|
||||
printf(" recv DHCP Request 0x%08x\n", be32toh(xid));
|
||||
@ -422,7 +422,7 @@ static int test_addr_acq_recv_discover(size_t size, DHCPMessage *discover) {
|
||||
res = dhcp_option_parse(discover, size, check_options, NULL, NULL);
|
||||
assert_se(res == DHCP_DISCOVER);
|
||||
|
||||
assert_se(msg_bytes[size - 1] == DHCP_OPTION_END);
|
||||
assert_se(msg_bytes[size - 1] == SD_DHCP_OPTION_END);
|
||||
|
||||
xid = discover->xid;
|
||||
|
||||
|
@ -29,7 +29,7 @@ static bool verbose = false;
|
||||
static struct option_desc option_tests[] = {
|
||||
{ {}, 0, {}, 0, { 42, 5, 65, 66, 67, 68, 69 }, 7, false, },
|
||||
{ {}, 0, {}, 0, { 42, 5, 65, 66, 67, 68, 69, 0, 0,
|
||||
DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_ACK }, 12, true, },
|
||||
SD_DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_ACK }, 12, true, },
|
||||
{ {}, 0, {}, 0, { 8, 255, 70, 71, 72 }, 5, false, },
|
||||
{ {}, 0, {}, 0, { 0x35, 0x01, 0x05, 0x36, 0x04, 0x01, 0x00, 0xa8,
|
||||
0xc0, 0x33, 0x04, 0x00, 0x01, 0x51, 0x80, 0x01,
|
||||
@ -37,17 +37,17 @@ static struct option_desc option_tests[] = {
|
||||
0xa8, 0x00, 0x01, 0x06, 0x04, 0xc0, 0xa8, 0x00,
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
|
||||
40, true, },
|
||||
{ {}, 0, {}, 0, { DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_OFFER,
|
||||
{ {}, 0, {}, 0, { SD_DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_OFFER,
|
||||
42, 3, 0, 0, 0 }, 8, true, },
|
||||
{ {}, 0, {}, 0, { 42, 2, 1, 2, 44 }, 5, false, },
|
||||
|
||||
{ {}, 0,
|
||||
{ 222, 3, 1, 2, 3, DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_NAK }, 8,
|
||||
{ DHCP_OPTION_OVERLOAD, 1, DHCP_OVERLOAD_FILE }, 3, true, },
|
||||
{ 222, 3, 1, 2, 3, SD_DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_NAK }, 8,
|
||||
{ SD_DHCP_OPTION_OVERLOAD, 1, DHCP_OVERLOAD_FILE }, 3, true, },
|
||||
|
||||
{ { 1, 4, 1, 2, 3, 4, DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_ACK }, 9,
|
||||
{ { 1, 4, 1, 2, 3, 4, SD_DHCP_OPTION_MESSAGE_TYPE, 1, DHCP_ACK }, 9,
|
||||
{ 222, 3, 1, 2, 3 }, 5,
|
||||
{ DHCP_OPTION_OVERLOAD, 1,
|
||||
{ SD_DHCP_OPTION_OVERLOAD, 1,
|
||||
DHCP_OVERLOAD_FILE|DHCP_OVERLOAD_SNAME }, 3, true, },
|
||||
};
|
||||
|
||||
@ -129,12 +129,12 @@ static void test_ignore_opts(uint8_t *descoption, int *descpos, int *desclen) {
|
||||
|
||||
while (*descpos < *desclen) {
|
||||
switch(descoption[*descpos]) {
|
||||
case DHCP_OPTION_PAD:
|
||||
case SD_DHCP_OPTION_PAD:
|
||||
*descpos += 1;
|
||||
break;
|
||||
|
||||
case DHCP_OPTION_MESSAGE_TYPE:
|
||||
case DHCP_OPTION_OVERLOAD:
|
||||
case SD_DHCP_OPTION_MESSAGE_TYPE:
|
||||
case SD_DHCP_OPTION_OVERLOAD:
|
||||
*descpos += 3;
|
||||
break;
|
||||
|
||||
@ -157,10 +157,10 @@ static int test_options_cb(uint8_t code, uint8_t len, const void *option, void *
|
||||
if (!desc)
|
||||
return -EINVAL;
|
||||
|
||||
assert_se(code != DHCP_OPTION_PAD);
|
||||
assert_se(code != DHCP_OPTION_END);
|
||||
assert_se(code != DHCP_OPTION_MESSAGE_TYPE);
|
||||
assert_se(code != DHCP_OPTION_OVERLOAD);
|
||||
assert_se(code != SD_DHCP_OPTION_PAD);
|
||||
assert_se(code != SD_DHCP_OPTION_END);
|
||||
assert_se(code != SD_DHCP_OPTION_MESSAGE_TYPE);
|
||||
assert_se(code != SD_DHCP_OPTION_OVERLOAD);
|
||||
|
||||
while (desc->pos >= 0 || desc->filepos >= 0 || desc->snamepos >= 0) {
|
||||
|
||||
@ -298,27 +298,27 @@ static void test_option_set(void) {
|
||||
result->options[2] = 'C';
|
||||
result->options[3] = 'D';
|
||||
|
||||
assert_se(dhcp_option_append(result, 0, &offset, 0, DHCP_OPTION_PAD,
|
||||
assert_se(dhcp_option_append(result, 0, &offset, 0, SD_DHCP_OPTION_PAD,
|
||||
0, NULL) == -ENOBUFS);
|
||||
assert_se(offset == 0);
|
||||
|
||||
offset = 4;
|
||||
assert_se(dhcp_option_append(result, 5, &offset, 0, DHCP_OPTION_PAD,
|
||||
assert_se(dhcp_option_append(result, 5, &offset, 0, SD_DHCP_OPTION_PAD,
|
||||
0, NULL) == -ENOBUFS);
|
||||
assert_se(offset == 4);
|
||||
assert_se(dhcp_option_append(result, 6, &offset, 0, DHCP_OPTION_PAD,
|
||||
assert_se(dhcp_option_append(result, 6, &offset, 0, SD_DHCP_OPTION_PAD,
|
||||
0, NULL) >= 0);
|
||||
assert_se(offset == 5);
|
||||
|
||||
offset = pos = 4;
|
||||
len = 11;
|
||||
while (pos < len && options[pos] != DHCP_OPTION_END) {
|
||||
while (pos < len && options[pos] != SD_DHCP_OPTION_END) {
|
||||
assert_se(dhcp_option_append(result, len, &offset, DHCP_OVERLOAD_SNAME,
|
||||
options[pos],
|
||||
options[pos + 1],
|
||||
&options[pos + 2]) >= 0);
|
||||
|
||||
if (options[pos] == DHCP_OPTION_PAD)
|
||||
if (options[pos] == SD_DHCP_OPTION_PAD)
|
||||
pos++;
|
||||
else
|
||||
pos += 2 + options[pos + 1];
|
||||
@ -336,15 +336,15 @@ static void test_option_set(void) {
|
||||
|
||||
if (verbose)
|
||||
printf("%2d: 0x%02x(0x%02x) (options)\n", 9, result->options[9],
|
||||
DHCP_OPTION_END);
|
||||
SD_DHCP_OPTION_END);
|
||||
|
||||
assert_se(result->options[9] == DHCP_OPTION_END);
|
||||
assert_se(result->options[9] == SD_DHCP_OPTION_END);
|
||||
|
||||
if (verbose)
|
||||
printf("%2d: 0x%02x(0x%02x) (options)\n", 10, result->options[10],
|
||||
DHCP_OPTION_PAD);
|
||||
SD_DHCP_OPTION_PAD);
|
||||
|
||||
assert_se(result->options[10] == DHCP_OPTION_PAD);
|
||||
assert_se(result->options[10] == SD_DHCP_OPTION_PAD);
|
||||
|
||||
for (i = 0; i < pos - 8; i++) {
|
||||
if (verbose)
|
||||
|
@ -115,10 +115,10 @@ static void test_message_handler(void) {
|
||||
.message.hlen = ETHER_ADDR_LEN,
|
||||
.message.xid = htobe32(0x12345678),
|
||||
.message.chaddr = { 'A', 'B', 'C', 'D', 'E', 'F' },
|
||||
.option_type.code = DHCP_OPTION_MESSAGE_TYPE,
|
||||
.option_type.code = SD_DHCP_OPTION_MESSAGE_TYPE,
|
||||
.option_type.length = 1,
|
||||
.option_type.type = DHCP_DISCOVER,
|
||||
.end = DHCP_OPTION_END,
|
||||
.end = SD_DHCP_OPTION_END,
|
||||
};
|
||||
struct in_addr address_lo = {
|
||||
.s_addr = htonl(INADDR_LOOPBACK),
|
||||
@ -134,14 +134,14 @@ static void test_message_handler(void) {
|
||||
test.end = 0;
|
||||
/* TODO, shouldn't this fail? */
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_OFFER);
|
||||
test.end = DHCP_OPTION_END;
|
||||
test.end = SD_DHCP_OPTION_END;
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_OFFER);
|
||||
|
||||
test.option_type.code = 0;
|
||||
test.option_type.length = 0;
|
||||
test.option_type.type = 0;
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == 0);
|
||||
test.option_type.code = DHCP_OPTION_MESSAGE_TYPE;
|
||||
test.option_type.code = SD_DHCP_OPTION_MESSAGE_TYPE;
|
||||
test.option_type.length = 1;
|
||||
test.option_type.type = DHCP_DISCOVER;
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_OFFER);
|
||||
@ -163,11 +163,11 @@ static void test_message_handler(void) {
|
||||
|
||||
test.option_type.type = DHCP_REQUEST;
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == 0);
|
||||
test.option_requested_ip.code = DHCP_OPTION_REQUESTED_IP_ADDRESS;
|
||||
test.option_requested_ip.code = SD_DHCP_OPTION_REQUESTED_IP_ADDRESS;
|
||||
test.option_requested_ip.length = 4;
|
||||
test.option_requested_ip.address = htobe32(0x12345678);
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_NAK);
|
||||
test.option_server_id.code = DHCP_OPTION_SERVER_IDENTIFIER;
|
||||
test.option_server_id.code = SD_DHCP_OPTION_SERVER_IDENTIFIER;
|
||||
test.option_server_id.length = 4;
|
||||
test.option_server_id.address = htobe32(INADDR_LOOPBACK);
|
||||
test.option_requested_ip.address = htobe32(INADDR_LOOPBACK + 3);
|
||||
@ -182,7 +182,7 @@ static void test_message_handler(void) {
|
||||
test.option_requested_ip.address = htobe32(INADDR_LOOPBACK + 3);
|
||||
assert_se(dhcp_server_handle_message(server, (DHCPMessage*)&test, sizeof(test)) == DHCP_ACK);
|
||||
|
||||
test.option_client_id.code = DHCP_OPTION_CLIENT_IDENTIFIER;
|
||||
test.option_client_id.code = SD_DHCP_OPTION_CLIENT_IDENTIFIER;
|
||||
test.option_client_id.length = 7;
|
||||
test.option_client_id.id[0] = 0x01;
|
||||
test.option_client_id.id[1] = 'A';
|
||||
|
@ -573,28 +573,28 @@ int dhcp4_configure(Link *link) {
|
||||
|
||||
if (link->network->dhcp_mtu) {
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client,
|
||||
DHCP_OPTION_INTERFACE_MTU);
|
||||
SD_DHCP_OPTION_INTERFACE_MTU);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
if (link->network->dhcp_routes) {
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client,
|
||||
DHCP_OPTION_STATIC_ROUTE);
|
||||
SD_DHCP_OPTION_STATIC_ROUTE);
|
||||
if (r < 0)
|
||||
return r;
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client,
|
||||
DHCP_OPTION_CLASSLESS_STATIC_ROUTE);
|
||||
SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE);
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
/* Always acquire the timezone and NTP*/
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_NTP_SERVER);
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NTP_SERVER);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client, DHCP_OPTION_NEW_TZDB_TIMEZONE);
|
||||
r = sd_dhcp_client_set_request_option(link->dhcp_client, SD_DHCP_OPTION_NEW_TZDB_TIMEZONE);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
@ -42,6 +42,48 @@ enum {
|
||||
SD_DHCP_CLIENT_EVENT_RENEW = 4,
|
||||
};
|
||||
|
||||
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_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,
|
||||
SD_DHCP_OPTION_STATIC_ROUTE = 33,
|
||||
SD_DHCP_OPTION_NTP_SERVER = 42,
|
||||
SD_DHCP_OPTION_VENDOR_SPECIFIC = 43,
|
||||
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_FQDN = 81,
|
||||
SD_DHCP_OPTION_NEW_POSIX_TIMEZONE = 100,
|
||||
SD_DHCP_OPTION_NEW_TZDB_TIMEZONE = 101,
|
||||
SD_DHCP_OPTION_CLASSLESS_STATIC_ROUTE = 121,
|
||||
SD_DHCP_OPTION_PRIVATE_BASE = 224,
|
||||
SD_DHCP_OPTION_PRIVATE_LAST = 254,
|
||||
SD_DHCP_OPTION_END = 255,
|
||||
};
|
||||
|
||||
typedef struct sd_dhcp_client sd_dhcp_client;
|
||||
|
||||
typedef void (*sd_dhcp_client_cb_t)(sd_dhcp_client *client, int event,
|
||||
|
Loading…
Reference in New Issue
Block a user