- spelling

[oweals/busybox.git] / networking / udhcp / packet.c

diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 1c6bb0ca404c34e5fe5fce71434a31b7c579fea8..8cf9fe2838d27cf01032d074adb7363762e2f4c8 100644 (file)
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -4,7 +4,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <features.h>
-#if __GLIBC__ >=2 && __GLIBC_MINOR >= 1
+#if (__GLIBC__ >= 2 && __GLIBC_MINOR >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
@@ -14,13 +14,13 @@
 #endif
 #include <errno.h>
 
+#include "common.h"
 #include "packet.h"
 #include "dhcpd.h"
 #include "options.h"
-#include "common.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,14 +44,14 @@ 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)
 {
-       int bytes;
-       int i;
-       const char broken_vendors[][8] = {
+       static const char broken_vendors[][8] = {
                "MSFT 98",
                ""
        };
+       int bytes;
+       int i;
        char unsigned *vendor;
 
        memset(packet, 0, sizeof(struct dhcpMessage));
@@ -70,20 +70,19 @@ int get_packet(struct dhcpMessage *packet, int fd)
        if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) {
                for (i = 0; broken_vendors[i][0]; i++) {
                        if (vendor[OPT_LEN - 2] == (uint8_t) strlen(broken_vendors[i]) &&
-                           !strncmp(vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
-                               DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
-                                       broken_vendors[i]);
-                               packet->flags |= htons(BROADCAST_FLAG);
+                           !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
+                               DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
+                                       broken_vendors[i]);
+                               packet->flags |= htons(BROADCAST_FLAG);
                        }
                }
        }
-                       
 
        return bytes;
 }
 
 
-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".
@@ -114,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;
@@ -149,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) {
@@ -167,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;
@@ -177,24 +176,30 @@ int kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_po
        if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
                return -1;
 
-       if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1)
+       if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) {
+               close(fd);
                return -1;
+       }
 
        memset(&client, 0, sizeof(client));
        client.sin_family = AF_INET;
        client.sin_port = htons(source_port);
        client.sin_addr.s_addr = source_ip;
 
-       if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1)
+       if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) {
+               close(fd);
                return -1;
+       }
 
        memset(&client, 0, sizeof(client));
        client.sin_family = AF_INET;
        client.sin_port = htons(dest_port);
        client.sin_addr.s_addr = dest_ip;
 
-       if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1)
+       if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) {
+               close(fd);
                return -1;
+       }
 
        result = write(fd, payload, sizeof(struct dhcpMessage));
        close(fd);