applying fix for:

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

diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index d9f715971dcda0e1f2dc35251d2a5d3094f0099a..1c6bb0ca404c34e5fe5fce71434a31b7c579fea8 100644 (file)
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -15,9 +15,9 @@
 #include <errno.h>
 
 #include "packet.h"
-#include "debug.h"
 #include "dhcpd.h"
 #include "options.h"
+#include "common.h"
 
 
 void init_header(struct dhcpMessage *packet, char type)
@@ -66,10 +66,10 @@ int get_packet(struct dhcpMessage *packet, int fd)
                return -2;
        }
        DEBUG(LOG_INFO, "Received a packet");
-       
+
        if (packet->op == BOOTREQUEST && (vendor = get_option(packet, DHCP_VENDOR))) {
                for (i = 0; broken_vendors[i][0]; i++) {
-                       if (vendor[OPT_LEN - 2] == (unsigned char) strlen(broken_vendors[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]);
@@ -77,19 +77,19 @@ int get_packet(struct dhcpMessage *packet, int fd)
                        }
                }
        }
-                               
+                       
 
        return bytes;
 }
 
 
-u_int16_t checksum(void *addr, int count)
+uint16_t checksum(void *addr, int count)
 {
        /* Compute Internet Checksum for "count" bytes
         *         beginning at location "addr".
         */
        register int32_t sum = 0;
-       u_int16_t *source = (u_int16_t *) addr;
+       uint16_t *source = (uint16_t *) addr;
 
        while (count > 1)  {
                /*  This is the inner loop */
@@ -101,8 +101,8 @@ u_int16_t checksum(void *addr, int count)
        if (count > 0) {
                /* Make sure that the left-over byte is added correctly both
                 * with little and big endian hosts */
-               u_int16_t tmp = 0;
-               *(unsigned char *) (&tmp) = * (unsigned char *) source;
+               uint16_t tmp = 0;
+               *(uint8_t *) (&tmp) = * (uint8_t *) source;
                sum += tmp;
        }
        /*  Fold 32-bit sum to 16 bits */
@@ -113,9 +113,9 @@ u_int16_t checksum(void *addr, int count)
 }
 
 
-/* Constuct a ip/udp header for a packet, and specify the source and dest hardware address */
-int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port,
-                  u_int32_t dest_ip, int dest_port, unsigned char *dest_arp, int ifindex)
+/* 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,
+                  uint32_t dest_ip, int dest_port, uint8_t *dest_arp, int ifindex)
 {
        int fd;
        int result;
@@ -123,20 +123,20 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
        struct udp_dhcp_packet packet;
 
        if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
-               DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno));
+               DEBUG(LOG_ERR, "socket call failed: %m");
                return -1;
        }
-       
+
        memset(&dest, 0, sizeof(dest));
        memset(&packet, 0, sizeof(packet));
-       
+
        dest.sll_family = AF_PACKET;
        dest.sll_protocol = htons(ETH_P_IP);
        dest.sll_ifindex = ifindex;
        dest.sll_halen = 6;
        memcpy(dest.sll_addr, dest_arp, 6);
        if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) {
-               DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno));
+               DEBUG(LOG_ERR, "bind call failed: %m");
                close(fd);
                return -1;
        }
@@ -150,7 +150,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
        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.ip.tot_len = htons(sizeof(struct udp_dhcp_packet));
        packet.ip.ihl = sizeof(packet.ip) >> 2;
        packet.ip.version = IPVERSION;
@@ -159,7 +159,7 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
 
        result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest));
        if (result <= 0) {
-               DEBUG(LOG_ERR, "write on socket failed: %s", strerror(errno));
+               DEBUG(LOG_ERR, "write on socket failed: %m");
        }
        close(fd);
        return result;
@@ -167,16 +167,16 @@ int raw_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port
 
 
 /* Let the kernel do all the work for packet generation */
-int kernel_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_port,
-                  u_int32_t dest_ip, int dest_port)
+int kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
+                  uint32_t dest_ip, int dest_port)
 {
        int n = 1;
        int fd, result;
        struct sockaddr_in client;
-       
+
        if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
                return -1;
-       
+
        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1)
                return -1;
 
@@ -191,7 +191,7 @@ int kernel_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_p
        memset(&client, 0, sizeof(client));
        client.sin_family = AF_INET;
        client.sin_port = htons(dest_port);
-       client.sin_addr.s_addr = dest_ip; 
+       client.sin_addr.s_addr = dest_ip;
 
        if (connect(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1)
                return -1;
@@ -199,5 +199,4 @@ int kernel_packet(struct dhcpMessage *payload, u_int32_t source_ip, int source_p
        result = write(fd, payload, sizeof(struct dhcpMessage));
        close(fd);
        return result;
-}      
-
+}