rt_names: stop allocating 5k in rwdata

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

diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 1bdade7e50f9c9a8fa3a0f3b4bf88794e38f8392..25c55faab1c9d5f7a174bdac2fbd31f5a759ecef 100644 (file)
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -1,10 +1,7 @@
-#include <unistd.h>
-#include <string.h>
+/* vi: set sw=4 ts=4: */
+
 #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
@@ -12,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"
 
@@ -57,21 +52,22 @@ int udhcp_get_packet(struct dhcpMessage *packet, int fd)
        memset(packet, 0, sizeof(struct dhcpMessage));
        bytes = read(fd, packet, sizeof(struct dhcpMessage));
        if (bytes < 0) {
-               DEBUG(LOG_INFO, "couldn't read on listening socket, ignoring");
+               DEBUG("cannot read on listening socket, ignoring");
                return -1;
        }
 
        if (ntohl(packet->cookie) != DHCP_MAGIC) {
-               LOG(LOG_ERR, "received bogus message, ignoring");
+               bb_error_msg("received bogus message, ignoring");
                return -2;
        }
-       DEBUG(LOG_INFO, "Received a packet");
+       DEBUG("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] == (uint8_t) strlen(broken_vendors[i]) &&
-                           !strncmp((char*)vendor, broken_vendors[i], vendor[OPT_LEN - 2])) {
-                               DEBUG(LOG_INFO, "broken client (%s), forcing broadcast",
+                       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);
                        }
@@ -113,16 +109,19 @@ 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) {
-               DEBUG(LOG_ERR, "socket call failed: %m");
+       fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
+       if (fd < 0) {
+               bb_perror_msg("socket");
                return -1;
        }
 
@@ -135,7 +134,7 @@ int udhcp_raw_packet(struct dhcpMessage *payload, uint32_t source_ip, int source
        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: %m");
+               bb_perror_msg("bind");
                close(fd);
                return -1;
        }
@@ -156,9 +155,13 @@ 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) {
-               DEBUG(LOG_ERR, "write on socket failed: %m");
+               bb_perror_msg("sendto");
        }
        close(fd);
        return result;
@@ -166,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;
        }