[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17995 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17995 - gnunet/src/transport |
Date: |
Fri, 4 Nov 2011 14:50:14 +0100 |
Author: grothoff
Date: 2011-11-04 14:50:14 +0100 (Fri, 04 Nov 2011)
New Revision: 17995
Modified:
gnunet/src/transport/gnunet_wlan_sender.c
Log:
parse earlier, check sscanf return value
Modified: gnunet/src/transport/gnunet_wlan_sender.c
===================================================================
--- gnunet/src/transport/gnunet_wlan_sender.c 2011-11-04 13:47:14 UTC (rev
17994)
+++ gnunet/src/transport/gnunet_wlan_sender.c 2011-11-04 13:50:14 UTC (rev
17995)
@@ -143,8 +143,28 @@
fprintf(stderr, "Usage: interface-name mac-target mac-source\n"
"e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
return 1;
}
+ if (6 !=
+ sscanf(argv[3], "%x-%x-%x-%x-%x-%x",
&temp[0],&temp[1],&temp[2],&temp[3],&temp[4],&temp[5]))
+ {
+ fprintf(stderr, "Usage: interface-name mac-target mac-source\n"
"e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
+ return 1;
+ }
+ if (6 !=
+ sscanf(argv[2], "%x-%x-%x-%x-%x-%x",
&temp[0],&temp[1],&temp[2],&temp[3],&temp[4],&temp[5]))
+ {
+ fprintf(stderr, "Usage: interface-name mac-target mac-source\n"
"e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
+ return 1;
+ }
+ for (i = 0; i < 6; i++)
+ {
+ inmac[i] = temp[i];
+ }
+ for (i = 0; i < 6; i++)
+ {
+ outmac[i] = temp[i];
+ }
+
-
pid_t pid;
int commpipe[2]; /* This holds the fd for the input &
output of the pipe */
@@ -165,14 +185,6 @@
close(commpipe[0]); /* Close unused side of pipe
(in side) */
setvbuf(stdout,(char*)NULL,_IONBF,0); /* Set non-buffered
output on stdout */
- sscanf(argv[3], "%x-%x-%x-%x-%x-%x",
&temp[0],&temp[1],&temp[2],&temp[3],&temp[4],&temp[5]);
- for (i = 0; i < 6; i++){
- inmac[i] = temp[i];
- }
- sscanf(argv[2], "%x-%x-%x-%x-%x-%x",
&temp[0],&temp[1],&temp[2],&temp[3],&temp[4],&temp[5]);
- for (i = 0; i < 6; i++){
- outmac[i] = temp[i];
- }
msg = (struct GNUNET_MessageHeader*) msg_buf;
msg->type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17995 - gnunet/src/transport,
gnunet <=