diff options
| author | Rob Landley | 2006-05-28 01:06:36 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-05-28 01:06:36 +0000 |
| commit | 3f78561d63290c53ca8bb3cd6314ca7357a617ee (patch) | |
| tree | 03b3973eeaee9635c77c21028133374d66f2aa18 /networking/udhcp/packet.c | |
| parent | 8fba99f35e46d234b47d652225bb80846cae369c (diff) | |
| download | busybox-3f78561d63290c53ca8bb3cd6314ca7357a617ee.zip busybox-3f78561d63290c53ca8bb3cd6314ca7357a617ee.tar.gz | |
My first bout of untangling udhcp. Make lots of gratuitous #defines go
away, substitutie BB_VER for an external VERSION, use busybox CONFIG symbols
rather than checking for them then defining others, etc. Lots more cleanup
to do...
Diffstat (limited to 'networking/udhcp/packet.c')
| -rw-r--r-- | networking/udhcp/packet.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index ae06d53..8cf9fe2 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c @@ -20,7 +20,7 @@ #include "options.h" -void init_header(struct dhcpMessage *packet, char type) +void udhcp_init_header(struct dhcpMessage *packet, char type) { memset(packet, 0, sizeof(struct dhcpMessage)); switch (type) { @@ -44,7 +44,7 @@ void init_header(struct dhcpMessage *packet, char type) /* read a packet from socket fd, return -1 on read error, -2 on packet error */ -int get_packet(struct dhcpMessage *packet, int fd) +int udhcp_get_packet(struct dhcpMessage *packet, int fd) { static const char broken_vendors[][8] = { "MSFT 98", @@ -82,7 +82,7 @@ int get_packet(struct dhcpMessage *packet, int fd) } -uint16_t checksum(void *addr, int count) +uint16_t udhcp_checksum(void *addr, int count) { /* Compute Internet Checksum for "count" bytes * beginning at location "addr". @@ -113,7 +113,7 @@ uint16_t checksum(void *addr, int count) /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */ -int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, +int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex) { int fd; @@ -148,13 +148,13 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, packet.udp.len = htons(sizeof(packet.udp) + sizeof(struct dhcpMessage)); /* cheat on the psuedo-header */ packet.ip.tot_len = packet.udp.len; memcpy(&(packet.data), payload, sizeof(struct dhcpMessage)); - packet.udp.check = checksum(&packet, sizeof(struct udp_dhcp_packet)); + packet.udp.check = udhcp_checksum(&packet, sizeof(struct udp_dhcp_packet)); packet.ip.tot_len = htons(sizeof(struct udp_dhcp_packet)); packet.ip.ihl = sizeof(packet.ip) >> 2; packet.ip.version = IPVERSION; packet.ip.ttl = IPDEFTTL; - packet.ip.check = checksum(&(packet.ip), sizeof(packet.ip)); + packet.ip.check = udhcp_checksum(&(packet.ip), sizeof(packet.ip)); result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest)); if (result <= 0) { @@ -166,7 +166,7 @@ int raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, /* Let the kernel do all the work for packet generation */ -int kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, +int udhcp_kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port, uint32_t dest_ip, int dest_port) { int n = 1; |