X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fether-wake.c;h=c38547dda422b412eba7866bebfaa888bfec3c05;hb=2db782bc7be70c34a756e2bc6d4a53e8f47bab20;hp=882429d1a967a59a4577480a73ceb895c702bc2c;hpb=360d9661b6a33b0358104623058f1c3629a469ea;p=oweals%2Fbusybox.git

diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index 882429d1a..c38547dda 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -2,7 +2,7 @@
 /*
  * ether-wake.c - Send a magic packet to wake up sleeping machines.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Author:      Donald Becker, http://www.scyld.com/"; http://www.scyld.com/wakeonlan.html
  * Busybox port: Christian Volkmann <haveaniceday@online.de>
@@ -49,9 +49,9 @@
  *	Copyright 1999-2003 Donald Becker and Scyld Computing Corporation.
  *
  *	The author may be reached as becker@scyld, or C/O
- *	 Scyld Computing Corporation
- *	 914 Bay Ridge Road, Suite 220
- *	 Annapolis MD 21403
+ *	Scyld Computing Corporation
+ *	914 Bay Ridge Road, Suite 220
+ *	Annapolis MD 21403
  *
  *   Notes:
  *   On some systems dropping root capability allows the process to be
@@ -62,16 +62,23 @@
  *   An alternative to needing 'root' is using a UDP broadcast socket, however
  *   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]/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		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"
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "libbb.h"
-
 /* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
  * work as non-root, but we need SOCK_PACKET to specify the Ethernet
  * destination address.
@@ -106,24 +113,25 @@ void bb_debug_dump_packet(unsigned char *outpack, int pktsize)
  *    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);
+	eap = ether_aton_r(hostid, eaddr);
 	if (eap) {
-		*eaddr = *eap;
-		bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eaddr));
-#if !defined(__UCLIBC__)
+		bb_debug_msg("The target station address is %s\n\n", ether_ntoa(eap));
+#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));
 #endif
-	} else
+	} else {
 		bb_show_usage();
+	}
 }
 
-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;
 	unsigned char *station_addr = eaddr->ether_addr_octet;
@@ -146,7 +154,7 @@ static int get_fill(unsigned char *pkt, struct ether_addr *eaddr, int broadcast)
 		memcpy(pkt, station_addr, 6); /* 20,26,32,... */
 	}
 
-	return 20 + 16*6; /* length of packet */
+	return PKT_HEADER_SIZE; /* length of packet */
 }
 
 static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
@@ -164,7 +172,7 @@ static int get_wol_pw(const char *ethoptarg, unsigned char *wol_passwd)
 		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");
+		bb_error_msg("can't read Wake-On-LAN pass");
 		return 0;
 	}
 // TODO: check invalid numbers >255??
@@ -186,12 +194,12 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
 	unsigned flags;
 	unsigned char wol_passwd[6];
 	int wol_passwd_sz = 0;
-	int s;						/* Raw socket */
+	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;
-	struct whereto_t whereto;	/* who to wake up */
+	struct whereto_t whereto;  /* who to wake up */
 
 	/* handle misc user options */
 	opt_complementary = "=1";
@@ -210,7 +218,7 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
 	get_dest_addr(argv[optind], &eaddr);
 
 	/* 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);
 
@@ -228,9 +236,9 @@ int ether_wake_main(int argc UNUSED_PARAM, char **argv)
 		{
 			unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
 			printf("The hardware address (SIOCGIFHWADDR) of %s is type %d  "
-				   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname,
-				   if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
-				   hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+				"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n\n", ifname,
+				if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
+				hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
 		}
 # endif
 	}