emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcp: merge options.h into common.h, script.c into dhcpc.c

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-03-22 14:29:13 +01:00
parent 8d1144565f
commit dde8bdcc5b
11 changed files with 490 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
networking/udhcp/packet.c
View File

@ -17,7 +17,6 @@
#include "common.h"
#include "dhcpd.h"
#include "options.h"
void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
{
@ -34,7 +33,7 @@ void FAST_FUNC udhcp_init_header(struct dhcp_packet *packet, char type)
packet->cookie = htonl(DHCP_MAGIC);
if (DHCP_END != 0)
packet->options[0] = DHCP_END;
add_simple_option(packet->options, DHCP_MESSAGE_TYPE, type);
udhcp_add_simple_option(packet->options, DHCP_MESSAGE_TYPE, type);
}
#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)
udhcp_dump_packet(packet);
if (packet->op == BOOTREQUEST) {
vendor = get_option(packet, DHCP_VENDOR);
vendor = udhcp_get_option(packet, DHCP_VENDOR);
if (vendor) {
#if 0
static const char broken_vendors[][8] = {
@ -221,7 +220,7 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
/* Currently we send full-sized DHCP packets (zero padded).
* If you need to change this: last byte of the packet is
* packet.data.options[end_option(packet.data.options)]
* packet.data.options[udhcp_end_option(packet.data.options)]
*/
udhcp_dump_packet(dhcp_pkt);
result = sendto(fd, &packet, IP_UPD_DHCP_SIZE, 0,