A bunch of defined(__GLIBC__) added. static-linking warning expanded

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

diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index e861b825a76ff9ef6524f3a1dfaf7ba843c243ba..25c55faab1c9d5f7a174bdac2fbd31f5a759ecef 100644 (file)
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -1,11 +1,7 @@
 /* vi: set sw=4 ts=4: */
-#include <unistd.h>
-#include <string.h>
+
 #include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <features.h>
-#if (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
+#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
 #else
@@ -13,10 +9,8 @@
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #endif
-#include <errno.h>
 
 #include "common.h"
-#include "packet.h"
 #include "dhcpd.h"
 #include "options.h"
 
@@ -70,8 +64,9 @@ int udhcp_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((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
+                       if (vendor[OPT_LEN - 2] == (uint8_t)strlen(broken_vendors[i])
+                        && !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])
+                       ) {
                                DEBUG("broken client (%s), forcing broadcast",
                                        broken_vendors[i]);
                                packet->flags |= htons(BROADCAST_FLAG);
@@ -114,15 +109,18 @@ uint16_t udhcp_checksum(void *addr, int count)
 
 
 /* Construct a ip/udp header for a packet, and specify the source and dest hardware address */
-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)
+void BUG_sizeof_struct_udp_dhcp_packet_must_be_576(void);
+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;
        int result;
        struct sockaddr_ll dest;
        struct udp_dhcp_packet packet;
 
-       if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) {
+       fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
+       if (fd < 0) {
                bb_perror_msg("socket");
                return -1;
        }
@@ -157,7 +155,11 @@ int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source
        packet.ip.ttl = IPDEFTTL;
        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 (sizeof(struct udp_dhcp_packet) != 576)
+               BUG_sizeof_struct_udp_dhcp_packet_must_be_576();
+
+       result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0,
+                       (struct sockaddr *) &dest, sizeof(dest));
        if (result <= 0) {
                bb_perror_msg("sendto");
        }
@@ -167,17 +169,18 @@ int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source
 
 
 /* Let the kernel do all the work for packet generation */
-int udhcp_kernel_packet(struct dhcpMessage *payload, uint32_t source_ip, int source_port,
-                  uint32_t dest_ip, int dest_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;
        int fd, result;
        struct sockaddr_in client;
 
-       if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+       fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+       if (fd < 0)
                return -1;
 
-       if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &n, sizeof(n)) == -1) {
+       if (setsockopt_reuseaddr(fd) == -1) {
                close(fd);
                return -1;
        }