diff options
Diffstat (limited to 'networking/udhcp/packet.c')
-rw-r--r-- | networking/udhcp/packet.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 84d83098c..03d5e1fc8 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #include "common.h" | 18 | #include "common.h" |
19 | #include "dhcpd.h" | 19 | #include "dhcpd.h" |
20 | #include "options.h" | ||
21 | 20 | ||
22 | void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type) | 21 | void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type) |
23 | { | 22 | { |
@@ -34,7 +33,7 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type) | |||
34 | packet->cookie = htonl(DHCP_MAGIC); | 33 | packet->cookie = htonl(DHCP_MAGIC); |
35 | if (DHCP_END != 0) | 34 | if (DHCP_END != 0) |
36 | packet->options[0] = DHCP_END; | 35 | packet->options[0] = DHCP_END; |
37 | add_simple_option(packet->options, DHCP_MESSAGE_TYPE, type); | 36 | udhcp_add_simple_option(packet->options, DHCP_MESSAGE_TYPE, type); |
38 | } | 37 | } |
39 | 38 | ||
40 | #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2 | 39 | #if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2 |
@@ -105,7 +104,7 @@ int FAST_FUNC udhcp_recv_kernel_packet(struct dhcp_packet *packet, int fd) | |||
105 | udhcp_dump_packet(packet); | 104 | udhcp_dump_packet(packet); |
106 | 105 | ||
107 | if (packet->op == BOOTREQUEST) { | 106 | if (packet->op == BOOTREQUEST) { |
108 | vendor = get_option(packet, DHCP_VENDOR); | 107 | vendor = udhcp_get_option(packet, DHCP_VENDOR); |
109 | if (vendor) { | 108 | if (vendor) { |
110 | #if 0 | 109 | #if 0 |
111 | static const char broken_vendors[][8] = { | 110 | static const char broken_vendors[][8] = { |
@@ -221,7 +220,7 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt, | |||
221 | 220 | ||
222 | /* Currently we send full-sized DHCP packets (zero padded). | 221 | /* Currently we send full-sized DHCP packets (zero padded). |
223 | * If you need to change this: last byte of the packet is | 222 | * If you need to change this: last byte of the packet is |
224 | * packet.data.options[end_option(packet.data.options)] | 223 | * packet.data.options[udhcp_end_option(packet.data.options)] |
225 | */ | 224 | */ |
226 | udhcp_dump_packet(dhcp_pkt); | 225 | udhcp_dump_packet(dhcp_pkt); |
227 | result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0, | 226 | result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0, |