OSDN Git Service
(root)
/
android-x86
/
external-wireless-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
v24
[android-x86/external-wireless-tools.git]
/
wireless_tools
/
macaddr.c
diff --git
a/wireless_tools/macaddr.c
b/wireless_tools/macaddr.c
index
8c5a93a
..
5950fd9
100644
(file)
--- a/
wireless_tools/macaddr.c
+++ b/
wireless_tools/macaddr.c
@@
-11,43
+11,43
@@
* This is released unther the GPL license.
*/
* This is released unther the GPL license.
*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include <linux/in.h>
-#include <linux/socket.h>
-#include <linux/if.h>
-int main(int argc, char** argv) {
+#include "iwlib.h"
+
+int main(int argc, char** argv)
+{
int devsock;
struct ifreq ifbuffer;
int devsock;
struct ifreq ifbuffer;
- int i;
- if (
argc != 2
) {
+ if (
(argc != 2) || (argv[1][0] == '-')
) {
printf("Usage: macaddr interface\n");
exit(1);
}
printf("Usage: macaddr interface\n");
exit(1);
}
- devsock = socket(AF_INET, SOCK_STREAM,
IPPROTO_TCP
);
+ devsock = socket(AF_INET, SOCK_STREAM,
0
);
if (devsock == -1) {
if (devsock == -1) {
- p
rintf("Failed opening socket\n
");
+ p
error("Failed opening socket
");
exit (1);
}
memset(&ifbuffer, 0, sizeof(ifbuffer));
exit (1);
}
memset(&ifbuffer, 0, sizeof(ifbuffer));
- str
cpy(ifbuffer.ifr_name, argv[1]
);
+ str
ncpy(ifbuffer.ifr_name, argv[1], sizeof(ifbuffer.ifr_name)
);
if (ioctl(devsock, SIOCGIFHWADDR, &ifbuffer) == -1) {
if (ioctl(devsock, SIOCGIFHWADDR, &ifbuffer) == -1) {
-
printf(
"There is no MACADDR for %s\n", argv[1]);
+
fprintf(stderr,
"There is no MACADDR for %s\n", argv[1]);
exit(1);
}
exit(1);
}
- close
(devsock);
+ close(devsock);
- for (i = 0; i < IFHWADDRLEN; i++)
- printf("%02X", (unsigned char) ifbuffer.ifr_ifru.ifru_hwaddr.sa_data[i]);
- printf("\n");
+ puts(iw_ether_ntoa((struct ether_addr *) ifbuffer.ifr_ifru.ifru_hwaddr.sa_data));
exit(0);
exit(0);
-
}
}