Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/ether-wake.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/ether-wake.c (modified) (6 diffs)

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

@@ -63 +63 @@
  *   doing so only works with adapters configured for unicast+broadcast Rx
  *   filter.  That configuration consumes more power.
-*/
+ */
 
 //usage:#define ether_wake_trivial_usage
-//usage:       "[-b] [-i iface] [-p aa:bb:cc:dd[:ee:ff]] MAC"
+//usage:       "[-b] [-i IFACE] [-p aa:bb:cc:dd[:ee:ff]/a.b.c.d] MAC"
 //usage:#define ether_wake_full_usage "\n\n"
 //usage:       "Send a magic packet to wake up sleeping machines.\n"
 //usage:       "MAC must be a station address (00:11:22:33:44:55) or\n"
 //usage:       "a hostname with a known 'ethers' entry.\n"
-//usage:     "\n    -b      Send wake-up packet to the broadcast address"
-//usage:     "\n    -i iface    Interface to use (default eth0)"
-//usage:     "\n    -p pass     Append four or six byte password PW to the packet"
+//usage:     "\n    -b      Broadcast the packet"
+//usage:     "\n    -i IFACE    Interface to use (default eth0)"
+//usage:     "\n    -p PASSWORD Append four or six byte PASSWORD to the packet"
 
 #include "libbb.h"
@@ -122 +122 @@
     if (eap) {
         bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap));
-#if !defined(__UCLIBC_MAJOR__) \
- || __UCLIBC_MAJOR__ > 0 \
- || __UCLIBC_MINOR__ > 9 \
- || (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 30)
+#if !defined(__UCLIBC__) || UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 30)
     } else if (ether_hostton(hostid, eaddr) == 0) {
         bb_debug_msg("Station address for hostname %s is %s\n\n", hostid, ether_ntoa(eaddr));
@@ -134 +131 @@
 }
 
-static int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
+#define PKT_HEADER_SIZE (20 + 16*6)
+static int fill_pkt_header(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
 {
     int i;
@@ -157 +155 @@
     }
 
-    return 20 + 16*6; /* length of packet */
+    return PKT_HEADER_SIZE; /* length of packet */
 }
 
@@ -199 +197 @@
     int s;  /* Raw socket */
     int pktsize;
-    unsigned char outpack[1000];
+    unsigned char outpack[PKT_HEADER_SIZE + 6 /* max passwd size */ + 16 /* paranoia */];
 
     struct ether_addr eaddr;
@@ -221 +219 @@
 
     /* fill out the header of the packet */
-    pktsize = get_fill(outpack, &eaddr, flags /* & 1 OPT_BROADCAST */);
+    pktsize = fill_pkt_header(outpack, &eaddr, flags /* & 1 OPT_BROADCAST */);
 
     bb_debug_dump_packet(outpack, pktsize);