Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/clientpacket.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/clientpacket.c (modified) (15 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/clientpacket.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* clientpacket.c
  *
@@ -8 +9 @@
  */
 
-#include <string.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>
@@ -19 +18 @@
 #include <linux/if_ether.h>
 #endif
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-
-
+
+#include "common.h"
 #include "dhcpd.h"
-#include "clientpacket.h"
+#include "dhcpc.h"
 #include "options.h"
-#include "dhcpc.h"
-#include "common.h"
 
 
 /* Create a random xid */
-unsigned long random_xid(void)
-{
-    static int initialized;
+uint32_t random_xid(void)
+{
+    static smallint initialized;
+
     if (!initialized) {
-        int fd;
-        unsigned long seed;
-
-        fd = open("/dev/urandom", 0);
-        if (fd < 0 || read(fd, &seed, sizeof(seed)) < 0) {
-            LOG(LOG_WARNING, "Could not load seed from /dev/urandom: %m");
-            seed = time(0);
-        }
-        if (fd >= 0) close(fd);
-        srand(seed);
-        initialized++;
+        srand(monotonic_us());
+        initialized = 1;
     }
     return rand();
@@ -61 +44 @@
     memcpy(packet->chaddr, client_config.arp, 6);
     if (client_config.clientid)
-        add_option_string(packet->options, client_config.clientid);
-    if (client_config.hostname) add_option_string(packet->options, client_config.hostname);
-    if (client_config.fqdn) add_option_string(packet->options, client_config.fqdn);
+        add_option_string(packet->options, client_config.clientid);
+    if (client_config.hostname)
+        add_option_string(packet->options, client_config.hostname);
+    if (client_config.fqdn)
+        add_option_string(packet->options, client_config.fqdn);
     add_option_string(packet->options, client_config.vendorclass);
 }
@@ -87 +72 @@
 
 /* Broadcast a DHCP discover packet to the network, with an optionally requested IP */
-int send_discover(unsigned long xid, unsigned long requested)
+int send_discover(uint32_t xid, uint32_t requested)
 {
     struct dhcpMessage packet;
@@ -97 +82 @@
 
     add_requests(&packet);
-    LOG(LOG_DEBUG, "Sending discover...");
+    bb_info_msg("Sending discover...");
+    return udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
+            SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
+}
+
+
+/* Broadcasts a DHCP request message */
+int send_selecting(uint32_t xid, uint32_t server, uint32_t requested)
+{
+    struct dhcpMessage packet;
+    struct in_addr addr;
+
+    init_packet(&packet, DHCPREQUEST);
+    packet.xid = xid;
+
+    add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
+    add_simple_option(packet.options, DHCP_SERVER_ID, server);
+
+    add_requests(&packet);
+    addr.s_addr = requested;
+    bb_info_msg("Sending select for %s...", inet_ntoa(addr));
     return udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
                 SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
@@ -103 +108 @@
 
 
-/* Broadcasts a DHCP request message */
-int send_selecting(unsigned long xid, unsigned long server, unsigned long requested)
-{
-    struct dhcpMessage packet;
-    struct in_addr addr;
-
-    init_packet(&packet, DHCPREQUEST);
-    packet.xid = xid;
-
-    add_simple_option(packet.options, DHCP_REQUESTED_IP, requested);
-    add_simple_option(packet.options, DHCP_SERVER_ID, server);
-
-    add_requests(&packet);
-    addr.s_addr = requested;
-    LOG(LOG_DEBUG, "Sending select for %s...", inet_ntoa(addr));
-    return udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
-                SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
-}
-
-
 /* Unicasts or broadcasts a DHCP renew message */
-int send_renew(unsigned long xid, unsigned long server, unsigned long ciaddr)
-{
-    struct dhcpMessage packet;
-    int ret = 0;
+int send_renew(uint32_t xid, uint32_t server, uint32_t ciaddr)
+{
+    struct dhcpMessage packet;
 
     init_packet(&packet, DHCPREQUEST);
@@ -134 +118 @@
 
     add_requests(&packet);
-    LOG(LOG_DEBUG, "Sending renew...");
+    bb_info_msg("Sending renew...");
     if (server)
-        ret = udhcp_kernel_packet(&packet, ciaddr, CLIENT_PORT, server, SERVER_PORT);
-    else ret = udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
+        return udhcp_kernel_packet(&packet, ciaddr, CLIENT_PORT, server, SERVER_PORT);
+
+    return udhcp_raw_packet(&packet, INADDR_ANY, CLIENT_PORT, INADDR_BROADCAST,
                 SERVER_PORT, MAC_BCAST_ADDR, client_config.ifindex);
-    return ret;
 }
 
 
 /* Unicasts a DHCP release message */
-int send_release(unsigned long server, unsigned long ciaddr)
+int send_release(uint32_t server, uint32_t ciaddr)
 {
     struct dhcpMessage packet;
@@ -155 +139 @@
     add_simple_option(packet.options, DHCP_SERVER_ID, server);
 
-    LOG(LOG_DEBUG, "Sending release...");
+    bb_info_msg("Sending release...");
     return udhcp_kernel_packet(&packet, ciaddr, CLIENT_PORT, server, SERVER_PORT);
 }
@@ -171 +155 @@
     bytes = read(fd, &packet, sizeof(struct udp_dhcp_packet));
     if (bytes < 0) {
-        DEBUG(LOG_INFO, "couldn't read on raw listening socket -- ignoring");
+        DEBUG("Cannot read on raw listening socket - ignoring");
         usleep(500000); /* possible down interface, looping condition */
         return -1;
@@ -177 +161 @@
 
     if (bytes < (int) (sizeof(struct iphdr) + sizeof(struct udphdr))) {
-        DEBUG(LOG_INFO, "message too short, ignoring");
+        DEBUG("Message too short, ignoring");
         return -2;
     }
 
     if (bytes < ntohs(packet.ip.tot_len)) {
-        DEBUG(LOG_INFO, "Truncated packet");
+        DEBUG("Truncated packet");
         return -2;
     }
@@ -190 +174 @@
 
     /* Make sure its the right packet for us, and that it passes sanity checks */
-    if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION ||
-        packet.ip.ihl != sizeof(packet.ip) >> 2 || packet.udp.dest != htons(CLIENT_PORT) ||
-        bytes > (int) sizeof(struct udp_dhcp_packet) ||
-        ntohs(packet.udp.len) != (uint16_t) (bytes - sizeof(packet.ip))) {
-        DEBUG(LOG_INFO, "unrelated/bogus packet");
+    if (packet.ip.protocol != IPPROTO_UDP || packet.ip.version != IPVERSION
+     || packet.ip.ihl != sizeof(packet.ip) >> 2
+     || packet.udp.dest != htons(CLIENT_PORT)
+     || bytes > (int) sizeof(struct udp_dhcp_packet)
+     || ntohs(packet.udp.len) != (uint16_t)(bytes - sizeof(packet.ip))
+    ) {
+        DEBUG("Unrelated/bogus packet");
         return -2;
     }
@@ -202 +188 @@
     packet.ip.check = 0;
     if (check != udhcp_checksum(&(packet.ip), sizeof(packet.ip))) {
-        DEBUG(LOG_INFO, "bad IP header checksum, ignoring");
+        DEBUG("bad IP header checksum, ignoring");
         return -1;
     }
@@ -218 +204 @@
     packet.ip.tot_len = packet.udp.len; /* cheat on the psuedo-header */
     if (check && check != udhcp_checksum(&packet, bytes)) {
-        DEBUG(LOG_ERR, "packet with bad UDP checksum received, ignoring");
+        bb_error_msg("packet with bad UDP checksum received, ignoring");
         return -2;
     }
@@ -225 +211 @@
 
     if (ntohl(payload->cookie) != DHCP_MAGIC) {
-        LOG(LOG_ERR, "received bogus message (bad magic) -- ignoring");
-        return -2;
-    }
-    DEBUG(LOG_INFO, "oooooh!!! got some!");
+        bb_error_msg("received bogus message (bad magic) - ignoring");
+        return -2;
+    }
+    DEBUG("oooooh!!! got some!");
     return bytes - (sizeof(packet.ip) + sizeof(packet.udp));
-
-}
+}