[GNUnet-SVN] r25016 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2012-11-16 17:39:32 +0100 (Fri, 16 Nov 2012)
New Revision: 25016

Modified:
   gnunet/src/transport/gnunet-helper-transport-wlan.c
Log:
-cleaner error reporting

Modified: gnunet/src/transport/gnunet-helper-transport-wlan.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-wlan.c 2012-11-16 16:37:40 UTC 
(rev 25015)
+++ gnunet/src/transport/gnunet-helper-transport-wlan.c 2012-11-16 16:39:32 UTC 
(rev 25016)
@@ -1651,6 +1651,15 @@
              IFNAMSIZ, dev->iface, strerror (errno));
     return 1;
   }
+  if (((ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211) &&
+       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) &&
+       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)) )
+  {
+    fprintf (stderr, "Error: interface `%.*s' is not using a supported 
hardware address family (got %d)\n",
+             IFNAMSIZ, dev->iface,
+            ifr.ifr_hwaddr.sa_family);
+    return 1;
+  }
 
   /* lookup iw mode */
   memset (&wrq, 0, sizeof (struct iwreq));
@@ -1662,12 +1671,8 @@
     wrq.u.mode = IW_MODE_MONITOR;
   }
 
-  if (((ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211) &&
-       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM) &&
-       (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)) ||
-      ( (wrq.u.mode != IW_MODE_MONITOR) &&
-       (wrq.u.mode != IW_MODE_ADHOC) ))
-       
+  if ( (wrq.u.mode != IW_MODE_MONITOR) &&
+       (wrq.u.mode != IW_MODE_ADHOC) ) 
   {
     fprintf (stderr, "Error: interface `%.*s' is not in monitor or ad-hoc mode 
(got %d)\n",
              IFNAMSIZ, dev->iface,