Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/ether-wake.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/ether-wake.c (modified) (10 diffs)

branches/2.2.5/mindi-busybox/networking/ether-wake.c

@@ -66 +66 @@
 
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <features.h>
 #include <netpacket/packet.h>
 #include <net/ethernet.h>
-#include <netdb.h>
 #include <netinet/ether.h>
-
-#ifdef __linux__
 #include <linux/if.h>
-#endif
-
-#include "busybox.h"
+
+#include "libbb.h"
 
 /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
@@ -94 +79 @@
 #ifdef PF_PACKET
 # define whereto_t sockaddr_ll
-# define make_socket() bb_xsocket(PF_PACKET, SOCK_RAW, 0)
+# define make_socket() xsocket(PF_PACKET, SOCK_RAW, 0)
 #else
 # define whereto_t sockaddr
-# define make_socket() bb_xsocket(AF_INET, SOCK_PACKET, SOCK_PACKET)
+# define make_socket() xsocket(AF_INET, SOCK_PACKET, SOCK_PACKET)
 #endif
 
@@ -108 +93 @@
     for (i = 0; i < pktsize; ++i) {
         printf("%2.2x ", outpack[i]);
-        if (i % 20 == 19) printf("\n");
+        if (i % 20 == 19) puts("");
     }
     printf("\n\n");
 }
 #else
-# define bb_debug_msg(fmt, args...)
-# define bb_debug_dump_packet(outpack, pktsize)
-#endif
-
-static inline void get_dest_addr(const char *arg, struct ether_addr *eaddr);
-static inline int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast);
-static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd);
-
-int etherwake_main(int argc, char *argv[])
-{
-    char *ifname = "eth0", *pass = NULL;
-    unsigned long flags;
+# define bb_debug_msg(fmt, args...)             ((void)0)
+# define bb_debug_dump_packet(outpack, pktsize) ((void)0)
+#endif
+
+/* Convert the host ID string to a MAC address.
+ * The string may be a:
+ *    Host name
+ *    IP address string
+ *    MAC address string
+*/
+static void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
+{
+    struct ether_addr *eap;
+
+    eap = ether_aton(hostid);
+    if (eap) {
+        *eaddr = *eap;
+        bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eaddr));
+#if !defined(__UCLIBC__)
+    } else if (ether_hostton(hostid, eaddr) == 0) {
+        bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
+#endif
+    } else
+        bb_show_usage();
+}
+
+static int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
+{
+    int i;
+    unsigned char *station_addr = eaddr->ether_addr_octet;
+
+    memset(pkt, 0xff, 6);
+    if (!broadcast)
+        memcpy(pkt, station_addr, 6);
+    pkt += 6;
+
+    memcpy(pkt, station_addr, 6); /* 6 */
+    pkt += 6;
+
+    *pkt++ = 0x08; /* 12 */ /* Or 0x0806 for ARP, 0x8035 for RARP */
+    *pkt++ = 0x42; /* 13 */
+
+    memset(pkt, 0xff, 6); /* 14 */
+
+    for (i = 0; i < 16; ++i) {
+        pkt += 6;
+        memcpy(pkt, station_addr, 6); /* 20,26,32,... */
+    }
+
+    return 20 + 16*6; /* length of packet */
+}
+
+static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
+{
+    unsigned passwd[6];
+    int byte_cnt, i;
+
+    /* handle MAC format */
+    byte_cnt = sscanf(ethoptarg, "%2x:%2x:%2x:%2x:%2x:%2x",
+                      &passwd[0], &passwd[1], &passwd[2],
+                      &passwd[3], &passwd[4], &passwd[5]);
+    /* handle IP format */
+// FIXME: why < 4?? should it be < 6?
+    if (byte_cnt < 4)
+        byte_cnt = sscanf(ethoptarg, "%u.%u.%u.%u",
+                          &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
+    if (byte_cnt < 4) {
+        bb_error_msg("cannot read Wake-On-LAN pass");
+        return 0;
+    }
+// TODO: check invalid numbers >255??
+    for (i = 0; i < byte_cnt; ++i)
+        wol_passwd[i] = passwd[i];
+
+    bb_debug_msg("password: %2.2x %2.2x %2.2x %2.2x (%d)\n\n",
+                 wol_passwd[0], wol_passwd[1], wol_passwd[2], wol_passwd[3],
+                 byte_cnt);
+
+    return byte_cnt;
+}
+
+int ether_wake_main(int argc, char **argv);
+int ether_wake_main(int argc, char **argv)
+{
+    const char *ifname = "eth0";
+    char *pass;
+    unsigned flags;
     unsigned char wol_passwd[6];
     int wol_passwd_sz = 0;
-
     int s;                      /* Raw socket */
     int pktsize;
@@ -136 +195 @@
 
     /* handle misc user options */
-    flags = bb_getopt_ulflags(argc, argv, "bi:p:", &ifname, &pass);
-    if (optind == argc)
-        bb_show_usage();
-    if (pass)
+    opt_complementary = "=1";
+    flags = getopt32(argv, "bi:p:", &ifname, &pass);
+    if (flags & 4) /* -p */
         wol_passwd_sz = get_wol_pw(pass, wol_passwd);
+    flags &= 1; /* we further interested only in -b [bcast] flag */
 
     /* create the raw socket */
@@ -146 +205 @@
 
     /* now that we have a raw socket we can drop root */
-    xsetuid(getuid());
+    /* xsetuid(getuid()); - but save on code size... */
 
     /* look up the dest mac address */
@@ -152 +211 @@
 
     /* fill out the header of the packet */
-    pktsize = get_fill(outpack, &eaddr, flags /*& 1 [OPT_BROADCAST]*/);
+    pktsize = get_fill(outpack, &eaddr, flags /* & 1 OPT_BROADCAST */);
 
     bb_debug_dump_packet(outpack, pktsize);
@@ -161 +220 @@
         struct ifreq if_hwaddr;
 
-        strcpy(if_hwaddr.ifr_name, ifname);
-        if (ioctl(s, SIOCGIFHWADDR, &if_hwaddr) < 0)
-            bb_perror_msg_and_die("SIOCGIFHWADDR on %s failed", ifname);
+        strncpy(if_hwaddr.ifr_name, ifname, sizeof(if_hwaddr.ifr_name));
+        ioctl_or_perror_and_die(s, SIOCGIFHWADDR, &if_hwaddr, "SIOCGIFHWADDR on %s failed", ifname);
 
         memcpy(outpack+6, if_hwaddr.ifr_hwaddr.sa_data, 6);
@@ -190 +248 @@
 
     /* This is necessary for broadcasts to work */
-    if (flags /*& 1 [OPT_BROADCAST]*/) {
-        int one = 1;
-        if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, (void *)&one, sizeof(one)) < 0)
+    if (flags /* & 1 OPT_BROADCAST */) {
+        if (setsockopt_broadcast(s) != 0)
             bb_perror_msg("SO_BROADCAST");
     }
@@ -200 +257 @@
         struct ifreq ifr;
         strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-        if (ioctl(s, SIOCGIFINDEX, &ifr) == -1)
-            bb_perror_msg_and_die("SIOCGIFINDEX");
+        xioctl(s, SIOCGIFINDEX, &ifr);
         memset(&whereto, 0, sizeof(whereto));
         whereto.sll_family = AF_PACKET;
@@ -214 +270 @@
     strcpy(whereto.sa_data, ifname);
 #endif
-
-    if (sendto(s, outpack, pktsize, 0, (struct sockaddr *)&whereto, sizeof(whereto)) < 0)
-        bb_perror_msg(bb_msg_write_error);
-
-    close(s);
-
+    xsendto(s, outpack, pktsize, (struct sockaddr *)&whereto, sizeof(whereto));
+    if (ENABLE_FEATURE_CLEAN_UP)
+        close(s);
     return EXIT_SUCCESS;
 }
-
-/* Convert the host ID string to a MAC address.
- * The string may be a:
- *    Host name
- *    IP address string
- *    MAC address string
-*/
-static inline void get_dest_addr(const char *hostid, struct ether_addr *eaddr)
-{
-    struct ether_addr *eap;
-
-    eap = ether_aton(hostid);
-    if (eap) {
-        *eaddr = *eap;
-        bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eaddr));
-#if !defined(__UCLIBC__)
-    } else if (ether_hostton(hostid, eaddr) == 0) {
-        bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
-#else
-# warning Need to implement ether_hostton() for uClibc
-#endif
-    } else
-        bb_show_usage();
-}
-
-static inline int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
-{
-    int offset, i;
-    unsigned char *station_addr = eaddr->ether_addr_octet;
-
-    if (broadcast)
-        memset(pkt+0, 0xff, 6);
-    else
-        memcpy(pkt, station_addr, 6);
-    memcpy(pkt+6, station_addr, 6);
-    pkt[12] = 0x08;             /* Or 0x0806 for ARP, 0x8035 for RARP */
-    pkt[13] = 0x42;
-    offset = 14;
-
-    memset(pkt+offset, 0xff, 6);
-    offset += 6;
-
-    for (i = 0; i < 16; ++i) {
-        memcpy(pkt+offset, station_addr, 6);
-        offset += 6;
-    }
-
-    return offset;
-}
-
-static inline int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
-{
-    int passwd[6];
-    int byte_cnt, i;
-
-    /* handle MAC format */
-    byte_cnt = sscanf(ethoptarg, "%2x:%2x:%2x:%2x:%2x:%2x",
-                      &passwd[0], &passwd[1], &passwd[2],
-                      &passwd[3], &passwd[4], &passwd[5]);
-    /* handle IP format */
-    if (byte_cnt < 4)
-        byte_cnt = sscanf(ethoptarg, "%d.%d.%d.%d",
-                          &passwd[0], &passwd[1], &passwd[2], &passwd[3]);
-    if (byte_cnt < 4) {
-        bb_error_msg("Unable to read the Wake-On-LAN pass");
-        return 0;
-    }
-
-    for (i = 0; i < byte_cnt; ++i)
-        wol_passwd[i] = passwd[i];
-
-    bb_debug_msg("password: %2.2x %2.2x %2.2x %2.2x (%d)\n\n",
-                 wol_passwd[0], wol_passwd[1], wol_passwd[2], wol_passwd[3],
-                 byte_cnt);
-
-    return byte_cnt;
-}