diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-01-26 21:32:42 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-01-26 21:32:42 +0000 |
commit | b1970ab977139ccc00cdc05c6df3f20b676e56ea (patch) | |
tree | 57d287149432f908c9c73c56dd31cfd425cc5384 /src/transport/gnunet-helper-transport-wlan-dummy.c | |
parent | 47be1a48f383fc4b84a1b9369a62468dabb4bfba (diff) | |
download | gnunet-b1970ab977139ccc00cdc05c6df3f20b676e56ea.tar.gz gnunet-b1970ab977139ccc00cdc05c6df3f20b676e56ea.zip |
-do not send any messages until we have our own MAC from the helper
Diffstat (limited to 'src/transport/gnunet-helper-transport-wlan-dummy.c')
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan-dummy.c | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c index 162774b5d..6e4e15d40 100644 --- a/src/transport/gnunet-helper-transport-wlan-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c | |||
@@ -103,10 +103,14 @@ send_mac_to_plugin (char *buffer, struct GNUNET_TRANSPORT_WLAN_MacAddress *mac) | |||
103 | 103 | ||
104 | struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg; | 104 | struct GNUNET_TRANSPORT_WLAN_HelperControlMessage macmsg; |
105 | 105 | ||
106 | memcpy (&macmsg.mac, (char *) mac, sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)); | 106 | memcpy (&macmsg.mac, |
107 | (char *) mac, | ||
108 | sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)); | ||
107 | macmsg.hdr.size = htons (sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage)); | 109 | macmsg.hdr.size = htons (sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage)); |
108 | macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL); | 110 | macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL); |
109 | memcpy (buffer, &macmsg, sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage)); | 111 | memcpy (buffer, |
112 | &macmsg, | ||
113 | sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage)); | ||
110 | return sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage); | 114 | return sizeof (struct GNUNET_TRANSPORT_WLAN_HelperControlMessage); |
111 | } | 115 | } |
112 | 116 | ||
@@ -228,7 +232,9 @@ main (int argc, char *argv[]) | |||
228 | if ( (GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE1)) || | 232 | if ( (GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE1)) || |
229 | (GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE2)) ) | 233 | (GNUNET_OK != GNUNET_DISK_directory_create_for_file (FIFO_FILE2)) ) |
230 | { | 234 | { |
231 | FPRINTF (stderr, "Failed to create directory for file `%s'\n", FIFO_FILE1); | 235 | FPRINTF (stderr, |
236 | "Failed to create directory for file `%s'\n", | ||
237 | FIFO_FILE1); | ||
232 | return 1; | 238 | return 1; |
233 | } | 239 | } |
234 | if (0 == strcmp (argv[1], "1") ) | 240 | if (0 == strcmp (argv[1], "1") ) |
@@ -247,7 +253,9 @@ main (int argc, char *argv[]) | |||
247 | { | 253 | { |
248 | GNUNET_break (0 == (erg = mkfifo (FIFO_FILE2, 0666))); | 254 | GNUNET_break (0 == (erg = mkfifo (FIFO_FILE2, 0666))); |
249 | if ( (0 != erg) && (EEXIST != errno) ) | 255 | if ( (0 != erg) && (EEXIST != errno) ) |
250 | FPRINTF (stderr, "Error in mkfifo(%s): %s\n", FIFO_FILE2, | 256 | FPRINTF (stderr, |
257 | "Error in mkfifo(%s): %s\n", | ||
258 | FIFO_FILE2, | ||
251 | strerror (errno)); | 259 | strerror (errno)); |
252 | } | 260 | } |
253 | } | 261 | } |
@@ -258,7 +266,9 @@ main (int argc, char *argv[]) | |||
258 | fpin = fopen (FIFO_FILE1, "r"); | 266 | fpin = fopen (FIFO_FILE1, "r"); |
259 | if (NULL == fpin) | 267 | if (NULL == fpin) |
260 | { | 268 | { |
261 | FPRINTF (stderr, "fopen of read FIFO_FILE1 failed: %s\n", STRERROR (errno)); | 269 | FPRINTF (stderr, |
270 | "fopen of read FIFO_FILE1 failed: %s\n", | ||
271 | STRERROR (errno)); | ||
262 | goto end; | 272 | goto end; |
263 | } | 273 | } |
264 | if (NULL == (fpout = fopen (FIFO_FILE2, "w"))) | 274 | if (NULL == (fpout = fopen (FIFO_FILE2, "w"))) |
@@ -268,7 +278,9 @@ main (int argc, char *argv[]) | |||
268 | } | 278 | } |
269 | if (NULL == fpout) | 279 | if (NULL == fpout) |
270 | { | 280 | { |
271 | FPRINTF (stderr, "fopen of write FIFO_FILE2 failed: %s\n", STRERROR (errno)); | 281 | FPRINTF (stderr, |
282 | "fopen of write FIFO_FILE2 failed: %s\n", | ||
283 | STRERROR (errno)); | ||
272 | goto end; | 284 | goto end; |
273 | } | 285 | } |
274 | } | 286 | } |
@@ -282,13 +294,17 @@ main (int argc, char *argv[]) | |||
282 | } | 294 | } |
283 | if (NULL == fpout) | 295 | if (NULL == fpout) |
284 | { | 296 | { |
285 | FPRINTF (stderr, "fopen of write FIFO_FILE1 failed: %s\n", STRERROR (errno)); | 297 | FPRINTF (stderr, |
298 | "fopen of write FIFO_FILE1 failed: %s\n", | ||
299 | STRERROR (errno)); | ||
286 | goto end; | 300 | goto end; |
287 | } | 301 | } |
288 | fpin = fopen (FIFO_FILE2, "r"); | 302 | fpin = fopen (FIFO_FILE2, "r"); |
289 | if (NULL == fpin) | 303 | if (NULL == fpin) |
290 | { | 304 | { |
291 | FPRINTF (stderr, "fopen of read FIFO_FILE2 failed: %s\n", STRERROR (errno)); | 305 | FPRINTF (stderr, |
306 | "fopen of read FIFO_FILE2 failed: %s\n", | ||
307 | STRERROR (errno)); | ||
292 | goto end; | 308 | goto end; |
293 | } | 309 | } |
294 | } | 310 | } |
@@ -297,7 +313,9 @@ main (int argc, char *argv[]) | |||
297 | GNUNET_assert (fpin >= 0); | 313 | GNUNET_assert (fpin >= 0); |
298 | if (fdpin >= FD_SETSIZE) | 314 | if (fdpin >= FD_SETSIZE) |
299 | { | 315 | { |
300 | FPRINTF (stderr, "File fdpin number too large (%d > %u)\n", fdpin, | 316 | FPRINTF (stderr, |
317 | "File fdpin number too large (%d > %u)\n", | ||
318 | fdpin, | ||
301 | (unsigned int) FD_SETSIZE); | 319 | (unsigned int) FD_SETSIZE); |
302 | goto end; | 320 | goto end; |
303 | } | 321 | } |
@@ -307,7 +325,9 @@ main (int argc, char *argv[]) | |||
307 | 325 | ||
308 | if (fdpout >= FD_SETSIZE) | 326 | if (fdpout >= FD_SETSIZE) |
309 | { | 327 | { |
310 | FPRINTF (stderr, "File fdpout number too large (%d > %u)\n", fdpout, | 328 | FPRINTF (stderr, |
329 | "File fdpout number too large (%d > %u)\n", | ||
330 | fdpout, | ||
311 | (unsigned int) FD_SETSIZE); | 331 | (unsigned int) FD_SETSIZE); |
312 | goto end; | 332 | goto end; |
313 | } | 333 | } |