diff options
Diffstat (limited to 'networking/udhcp/dhcpd.c')
-rw-r--r-- | networking/udhcp/dhcpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index a8cd3f03b..0c55fa5e4 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -378,7 +378,7 @@ struct config_keyword { | |||
378 | #define OFS(field) offsetof(struct server_config_t, field) | 378 | #define OFS(field) offsetof(struct server_config_t, field) |
379 | 379 | ||
380 | static const struct config_keyword keywords[] = { | 380 | static const struct config_keyword keywords[] = { |
381 | /* keyword handler variable address default */ | 381 | /* keyword handler variable address default */ |
382 | {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, | 382 | {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, |
383 | {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, | 383 | {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, |
384 | {"interface" , read_str , OFS(interface ), "eth0"}, | 384 | {"interface" , read_str , OFS(interface ), "eth0"}, |
@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet) | |||
640 | static uint32_t select_lease_time(struct dhcp_packet *packet) | 640 | static uint32_t select_lease_time(struct dhcp_packet *packet) |
641 | { | 641 | { |
642 | uint32_t lease_time_sec = server_config.max_lease_sec; | 642 | uint32_t lease_time_sec = server_config.max_lease_sec; |
643 | uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME); | 643 | uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME); |
644 | if (lease_time_opt) { | 644 | if (lease_time_opt) { |
645 | move_from_unaligned32(lease_time_sec, lease_time_opt); | 645 | move_from_unaligned32(lease_time_sec, lease_time_opt); |
646 | lease_time_sec = ntohl(lease_time_sec); | 646 | lease_time_sec = ntohl(lease_time_sec); |
@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
987 | } | 987 | } |
988 | 988 | ||
989 | /* Get SERVER_ID if present */ | 989 | /* Get SERVER_ID if present */ |
990 | server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID); | 990 | server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID); |
991 | if (server_id_opt) { | 991 | if (server_id_opt) { |
992 | uint32_t server_id_network_order; | 992 | uint32_t server_id_network_order; |
993 | move_from_unaligned32(server_id_network_order, server_id_opt); | 993 | move_from_unaligned32(server_id_network_order, server_id_opt); |
@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) | |||
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | /* Get REQUESTED_IP if present */ | 1013 | /* Get REQUESTED_IP if present */ |
1014 | requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP); | 1014 | requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP); |
1015 | if (requested_ip_opt) { | 1015 | if (requested_ip_opt) { |
1016 | move_from_unaligned32(requested_nip, requested_ip_opt); | 1016 | move_from_unaligned32(requested_nip, requested_ip_opt); |
1017 | } | 1017 | } |