run indent twice, it alternates between two 'canonical' forms, also run whitespace remover

20 files changed, 119 insertions, 120 deletions

diff --git a/src/transport/gnunet-service-transport-new.c b/src/transport/gnunet-service-transport-new.c
index 54af9cade..b605954ac 100644
--- a/src/transport/gnunet-service-transport-new.c
+++ b/src/transport/gnunet-service-transport-new.c
@@ -20,7 +20,7 @@
 
 /**
  * @file transport/gnunet-service-transport-new.c
- * @brief 
+ * @brief
  * @author Christian Grothoff
  */
 #include "platform.h"
@@ -156,8 +156,7 @@ static struct GNUNET_TIME_Relative
 plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
                              const struct GNUNET_MessageHeader *message,
                              const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                             uint32_t ats_count,
-                             struct Session *session,
+                             uint32_t ats_count, struct Session *session,
                              const char *sender_address,
                              uint16_t sender_address_len)
 {
@@ -202,7 +201,7 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
     case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT:
       (void) GST_blacklist_test_allowed (peer, NULL, &try_connect_if_allowed,
                                          NULL);
-      /* TODO: if 'session != NULL', maybe notify ATS that this is now the preferred 
+      /* TODO: if 'session != NULL', maybe notify ATS that this is now the preferred
        * way to communicate with this peer (other peer switched transport) */
       break;
     case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT:
@@ -224,21 +223,20 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
                                                   &do_forward);
       if (do_forward == GNUNET_YES)
       {
-        struct InboundMessage * im;
-        size_t size =
-            sizeof (struct InboundMessage) +
-            ntohs (message->size);
+        struct InboundMessage *im;
+        size_t size = sizeof (struct InboundMessage) + ntohs (message->size);
 
         im = GNUNET_malloc (size);
         im->header.size = htons (size);
         im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
         im->ats_count = htonl (0);
-        memcpy (&(im->peer), peer, sizeof(struct GNUNET_PeerIdentity));
+        memcpy (&(im->peer), peer, sizeof (struct GNUNET_PeerIdentity));
         memcpy (&im[1], message, ntohs (message->size));
 
-        GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im, GNUNET_YES);
+        GST_clients_broadcast ((const struct GNUNET_MessageHeader *) im,
+                               GNUNET_YES);
 
-        GNUNET_free(im);
+        GNUNET_free (im);
       }
       break;
     }
@@ -280,9 +278,9 @@ plugin_env_address_change_notification (void *cls, int add_remove,
  * use NULL wherever a session pointer is needed.  This function
  * should be called BEFORE a potential "TransmitContinuation"
  * from the "TransmitFunction".
- * 
+ *
  * @param cls closure
- * @param peer which peer was the session for 
+ * @param peer which peer was the session for
  * @param session which session is being destoyed
  */
 static void
@@ -297,7 +295,7 @@ plugin_env_session_end (void *cls, const struct GNUNET_PeerIdentity *peer,
  * Function called by ATS to notify the callee that the
  * assigned bandwidth or address for a given peer was changed.  If the
  * callback is called with address/bandwidth assignments of zero, the
- * ATS disconnect function will still be called once the disconnect 
+ * ATS disconnect function will still be called once the disconnect
  * actually happened.
  *
  * @param cls closure
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index d6b5ac23f..67dc4e962 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -439,7 +439,7 @@ struct ReadyList
 
 
 /**
- * Entry in neighbours. 
+ * Entry in neighbours.
  */
 struct NeighbourMapEntry
 {
@@ -2270,12 +2270,12 @@ try_fast_reconnect (struct TransportPlugin *p, struct NeighbourMapEntry *nl)
    * quickly (much faster than timeout) `if a connection was lost and
    * could not be re-established (i.e. other peer went down or is
    * unable / refuses to communicate);
-   * 
+   *
    * So we should consider:
    * 1) ideally: our own willingness / need to connect
    * 2) prior failures to connect to this peer (by plugin)
    * 3) ideally: reasons why other peer terminated (as far as knowable)
-   * 
+   *
    * Most importantly, it must be POSSIBLE for another peer to terminate
    * a connection for a while (without us instantly re-establishing it).
    * Similarly, if another peer is gone we should quickly notify CORE.
@@ -2284,7 +2284,7 @@ try_fast_reconnect (struct TransportPlugin *p, struct NeighbourMapEntry *nl)
    * services never even notice.
    * Furthermore, the same mechanism (or small variation) could be used
    * to switch to a better-performing plugin (ATS).
-   * 
+   *
    * Finally, this needs to be tested throughly... */
 
   /*
@@ -4002,7 +4002,7 @@ check_pending_validation (void *cls, const GNUNET_HashCode * key, void *value)
                   GNUNET_i2s (&pong->pid), a2s (ve->transport_name, &addr[slen],
                                                 alen));
       /* FIXME: since the sender of the PONG currently uses the
-       * wrong address (see FIMXE there!), we cannot run a 
+       * wrong address (see FIMXE there!), we cannot run a
        * proper check here... */
 #if FIXME_URGENT
       return GNUNET_NO;
diff --git a/src/transport/gnunet-service-transport_blacklist.c b/src/transport/gnunet-service-transport_blacklist.c
index 21ad49652..36abbf85c 100644
--- a/src/transport/gnunet-service-transport_blacklist.c
+++ b/src/transport/gnunet-service-transport_blacklist.c
@@ -648,7 +648,7 @@ GST_blacklist_handle_reply (void *cls, struct GNUNET_SERVER_Client *client,
   bl->waiting_for_reply = GNUNET_NO;
   if (NULL != bc)
   {
-    /* only run this if the blacklist check has not been 
+    /* only run this if the blacklist check has not been
      * cancelled in the meantime... */
     if (ntohl (msg->is_allowed) == GNUNET_SYSERR)
     {
@@ -683,7 +683,7 @@ GST_blacklist_handle_reply (void *cls, struct GNUNET_SERVER_Client *client,
 
 /**
  * Add the given peer to the blacklist (for the given transport).
- * 
+ *
  * @param peer peer to blacklist
  * @param transport_name transport to blacklist for this peer, NULL for all
  */
@@ -780,7 +780,7 @@ GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer,
 
 /**
  * Cancel a blacklist check.
- * 
+ *
  * @param bc check to cancel
  */
 void
diff --git a/src/transport/gnunet-service-transport_blacklist.h b/src/transport/gnunet-service-transport_blacklist.h
index 64a800664..68da7e4ce 100644
--- a/src/transport/gnunet-service-transport_blacklist.h
+++ b/src/transport/gnunet-service-transport_blacklist.h
@@ -71,7 +71,7 @@ GST_blacklist_handle_reply (void *cls, struct GNUNET_SERVER_Client *client,
 
 /**
  * Add the given peer to the blacklist (for the given transport).
- * 
+ *
  * @param peer peer to blacklist
  * @param transport_name transport to blacklist for this peer, NULL for all
  */
@@ -117,7 +117,7 @@ GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer,
 
 /**
  * Cancel a blacklist check.
- * 
+ *
  * @param bc check to cancel
  */
 void
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c
index 73d1220e4..6a29edc34 100644
--- a/src/transport/gnunet-service-transport_clients.c
+++ b/src/transport/gnunet-service-transport_clients.c
@@ -377,8 +377,7 @@ clients_handle_start (void *cls, struct GNUNET_SERVER_Client *client,
 #if DEBUG_TRANSPORT
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
                 "TransportClient %X ServerClient %X  sent multiple START messages\n",
-                tc,
-                tc->client);
+                tc, tc->client);
 #endif
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index 3c51c5df2..2793ce5eb 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -128,7 +128,7 @@ struct GeneratorContext
 
 /**
  * Add an address from the 'OwnAddressList' to the buffer.
- * 
+ *
  * @param cls the 'struct GeneratorContext'
  * @param max maximum number of bytes left
  * @param buf where to write the address
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index 76e27bf2e..d971e7cf9 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -47,7 +47,7 @@
 
 
 /**
- * Entry in neighbours. 
+ * Entry in neighbours.
  */
 struct NeighbourMapEntry;
 
@@ -105,7 +105,7 @@ struct MessageQueue
 
 
 /**
- * Entry in neighbours. 
+ * Entry in neighbours.
  */
 struct NeighbourMapEntry
 {
@@ -171,7 +171,7 @@ struct NeighbourMapEntry
 
   /**
    * ID of task scheduled to run when we should try transmitting
-   * the head of the message queue.  
+   * the head of the message queue.
    */
   GNUNET_SCHEDULER_TaskIdentifier transmission_task;
 
@@ -622,7 +622,7 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
 
 /**
  * Test if we're connected to the given peer.
- * 
+ *
  * @param target peer to test
  * @return GNUNET_YES if we are connected, GNUNET_NO if not
  */
@@ -839,7 +839,7 @@ GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour)
  * Change the incoming quota for the given peer.
  *
  * @param neighbour identity of peer to change qutoa for
- * @param quota new quota 
+ * @param quota new quota
  */
 void
 GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour,
@@ -912,7 +912,7 @@ neighbours_iterate (void *cls, const GNUNET_HashCode * key, void *value)
 /**
  * Iterate over all connected neighbours.
  *
- * @param cb function to call 
+ * @param cb function to call
  * @param cb_cls closure for cb
  */
 void
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h
index db29d66aa..d7b234889 100644
--- a/src/transport/gnunet-service-transport_neighbours.h
+++ b/src/transport/gnunet-service-transport_neighbours.h
@@ -66,7 +66,7 @@ GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target);
 
 /**
  * Test if we're connected to the given peer.
- * 
+ *
  * @param target peer to test
  * @return GNUNET_YES if we are connected, GNUNET_NO if not
  */
@@ -129,7 +129,7 @@ GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour);
  * Change the incoming quota for the given peer.
  *
  * @param neighbour identity of peer to change qutoa for
- * @param quota new quota 
+ * @param quota new quota
  */
 void
 GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour,
@@ -164,7 +164,7 @@ typedef void (*GST_NeighbourIterator) (void *cls,
 /**
  * Iterate over all connected neighbours.
  *
- * @param cb function to call 
+ * @param cb function to call
  * @param cb_cls closure for cb
  */
 void
diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c
index c32ac3acc..12ee231c4 100644
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -189,7 +189,7 @@ GST_plugins_find (const char *name)
 /**
  * Convert a given address to a human-readable format.  Note that the
  * return value will be overwritten on the next call to this function.
- * 
+ *
  * @param name plugin name
  * @param addr binary address in plugin-specific format
  * @param addrlen number of bytes in 'addr'
diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h
index 856b594cd..3a49f004f 100644
--- a/src/transport/gnunet-service-transport_plugins.h
+++ b/src/transport/gnunet-service-transport_plugins.h
@@ -68,7 +68,7 @@ GST_plugins_find (const char *name);
 /**
  * Convert a given address to a human-readable format.  Note that the
  * return value will be overwritten on the next call to this function.
- * 
+ *
  * @param name plugin name
  * @param addr binary address in plugin-specific format
  * @param addrlen number of bytes in 'addr'
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index c6ee515fe..8b652ceaa 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -409,7 +409,7 @@ add_valid_address (void *cls, const char *tname,
 
 
 /**
- * Function called for any HELLO known to PEERINFO. 
+ * Function called for any HELLO known to PEERINFO.
  *
  * @param cls unused
  * @param peer id of the peer, NULL for last call
@@ -737,7 +737,8 @@ transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid,
   hsize = ntohs (hello->size);
   tsize = sizeof (struct TransportPingMessage) + ve->addrlen + slen + hsize;
 
-  ping.header.size = htons (sizeof (struct TransportPingMessage) + ve->addrlen + slen);
+  ping.header.size =
+      htons (sizeof (struct TransportPingMessage) + ve->addrlen + slen);
   ping.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PING);
   ping.challenge = htonl (ve->challenge);
   ping.target = *pid;
diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c
index 3fca1f85f..ad6810233 100644
--- a/src/transport/gnunet-transport-wlan-helper.c
+++ b/src/transport/gnunet-transport-wlan-helper.c
@@ -611,7 +611,7 @@ stdin_send_hw (void *cls, void *client, const struct GNUNET_MessageHeader *hdr)
   rtheader.rate = header->rate;
   memcpy (write_pout->buf, &rtheader, sizeof (rtheader));
   memcpy (write_pout->buf + sizeof (rtheader), &header[1], sendsize);
-  /* payload contains MAC address, but we don't trust it, so we'll 
+  /* payload contains MAC address, but we don't trust it, so we'll
    * overwrite it with OUR MAC address again to prevent mischief */
   wlanheader = (struct ieee80211_frame *) (write_pout->buf + sizeof (rtheader));
   mac_set (wlanheader, dev);
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index d6084d9f0..452f55e1a 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -385,7 +385,7 @@ struct Plugin
 
 /**
  * Function to check if an inbound connection is acceptable.
- * Mostly used to limit the total number of open connections 
+ * Mostly used to limit the total number of open connections
  * we can have.
  *
  * @param cls the 'struct Plugin'
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 07a3df362..92fa8d2f5 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -170,7 +170,7 @@ struct PeerSession
 
 /**
  * Data structure to track defragmentation contexts based
- * on the source of the UDP traffic.  
+ * on the source of the UDP traffic.
  */
 struct ReceiveContext
 {
@@ -272,7 +272,7 @@ struct Plugin
   struct GNUNET_NETWORK_Handle *sockv6;
 
   /**
-   * expected delay for ACKs 
+   * expected delay for ACKs
    */
   struct GNUNET_TIME_Relative last_expected_delay;
 
@@ -557,7 +557,7 @@ struct SourceInformation
 
 
 /**
- * Message tokenizer has broken up an incomming message. Pass it on 
+ * Message tokenizer has broken up an incomming message. Pass it on
  * to the service.
  *
  * @param cls the 'struct Plugin'
@@ -588,7 +588,7 @@ process_inbound_tokenized_messages (void *cls, void *client,
  *
  * @param plugin plugin context
  * @param msg the message
- * @param sender_addr sender address 
+ * @param sender_addr sender address
  * @param sender_addr_len number of bytes in sender_addr
  */
 static void
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 303709136..29b465845 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -109,8 +109,8 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (send_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (send_task);
 
-  if  (cc != NULL)
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(cc);
+  if (cc != NULL)
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (cc);
 
   if (th != NULL)
     GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
@@ -229,7 +229,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, &notify_receive,
                                             &notify_connect, &notify_disconnect,
                                             NULL);
-  cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
+  cc = GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb,
+                                               NULL);
 }
 
 static int
diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 35c9e546b..075c10527 100644
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -119,11 +119,10 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  timeout_task =
-    GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
   i = 1;
-  fprintf(stderr,"%i",i);
+  fprintf (stderr, "%i", i);
   while (i <= ITERATIONS)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
@@ -142,14 +141,14 @@ run (void *cls, char *const *args, const char *cfgfile,
 
     //sleep (5);
 
-    GNUNET_TRANSPORT_TESTING_stop_peer(p1);
+    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
 
     i++;
     if (i <= ITERATIONS)
-      fprintf(stderr,"..%i",i);
+      fprintf (stderr, "..%i", i);
   }
-  fprintf(stderr,"\n");
-  end();
+  fprintf (stderr, "\n");
+  end ();
 }
 
 int
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 61c392d77..162024eb4 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -321,10 +321,11 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct PeerContext *p1,
  * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
  * @param cc a connect request handle
  */
-void
-GNUNET_TRANSPORT_TESTING_connect_peers_cancel (GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
+void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
+    (GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
 {
   struct ConnectingContext *cc = ccr;
+
   /* clean up */
   GNUNET_TRANSPORT_get_hello_cancel (cc->th_p2, &exchange_hello_last, cc);
   GNUNET_TRANSPORT_get_hello_cancel (cc->th_p1, &exchange_hello, cc);
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index fed611e49..a6d2fa0ba 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -86,7 +86,7 @@ struct GNUNET_TRANSPORT_TransmitHandle
   struct GNUNET_TIME_Absolute timeout;
 
   /**
-   * Task to trigger request timeout if the request is stalled due to 
+   * Task to trigger request timeout if the request is stalled due to
    * congestion.
    */
   GNUNET_SCHEDULER_TaskIdentifier timeout_task;
@@ -520,7 +520,7 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
       GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != n->th->timeout_task);
       GNUNET_SCHEDULER_cancel (n->th->timeout_task);
       n->th->timeout_task = GNUNET_SCHEDULER_NO_TASK;
-      /* we've been waiting for this (congestion, not quota, 
+      /* we've been waiting for this (congestion, not quota,
        * caused delayed transmission) */
       n->hn = GNUNET_CONTAINER_heap_insert (h->ready_heap, n, 0);
       schedule_transmission (h);
@@ -1082,7 +1082,7 @@ send_try_connect (void *cls, size_t size, void *buf)
 
 
 /**
- * Ask the transport service to establish a connection to 
+ * Ask the transport service to establish a connection to
  * the given peer.
  *
  * @param handle connection to transport service
diff --git a/src/transport/wlan/byteorder.h b/src/transport/wlan/byteorder.h
index 1abc631b8..1a13470e9 100644
--- a/src/transport/wlan/byteorder.h
+++ b/src/transport/wlan/byteorder.h
@@ -54,12 +54,12 @@
 
 #ifndef __int8_t_defined
 typedef uint64_t u_int64_t;
-
typedef uint32_t u_int32_t;
-
typedef uint16_t u_int16_t;
-
typedef uint8_t u_int8_t;
+typedef uint32_t u_int32_t;
+typedef uint16_t u_int16_t;
+typedef uint8_t u_int8_t;
 
 
-#endif /* 
 */
+#endif /*  */
 
 #ifndef htole16
 #if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -77,7 +77,7 @@ typedef uint64_t u_int64_t;
 #define htole64(x) (x)
 #define be64toh(x) ___my_swab64 (x)
 #define le64toh(x) (x)
-#else /* 
 */
+#else /*  */
 #define htobe16(x) (x)
 #define htole16(x) ___my_swab16 (x)
 #define be16toh(x) (x)
@@ -92,10 +92,10 @@ typedef uint64_t u_int64_t;
 #define htole64(x) ___my_swab64 (x)
 #define be64toh(x) (x)
 #define le64toh(x) ___my_swab64 (x)
-#endif /* 
 */
-#endif /* 
 */
+#endif /*  */
+#endif /*  */
 
-#endif /* 
 */
+#endif /*  */
     /*
      * Cygwin
      */
@@ -115,7 +115,7 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le32(x) (x)
 #define __cpu_to_le16(x) (x)
 #define AIRCRACK_NG_BYTE_ORDER_DEFINED
-#endif /* 
 */
+#endif /*  */
     /*
      * Windows (DDK)
      */
@@ -134,7 +134,7 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le32(x) (x)
 #define __cpu_to_le16(x) (x)
 #define AIRCRACK_NG_BYTE_ORDER_DEFINED
-#endif /* 
 */
+#endif /*  */
     /*
      * MAC (Darwin)
      */
@@ -156,7 +156,7 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le64(x) (unsigned long long) OSSwapHostToLittleInt64((uint64_t)x)
 #define __cpu_to_le32(x) (unsigned long) OSSwapHostToLittleInt32((uint32_t)x)
 #define __cpu_to_le16(x) (unsigned short) OSSwapHostToLittleInt16((uint16_t)x)
-#else /* 
 */
+#else /*  */
 #include <architecture/byte_order.h>
 #define __swab64(x)      NXSwapLongLong(x)
 #define __swab32(x)      NXSwapLong(x)
@@ -173,13 +173,13 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le64(x) NXSwapHostLongLongToLittle(x)
 #define __cpu_to_le32(x) NXSwapHostLongToLittle(x)
 #define __cpu_to_le16(x) NXSwapHostShortToLittle(x)
-#endif /* 
 */
+#endif /*  */
 #define __LITTLE_ENDIAN 1234
 #define __BIG_ENDIAN    4321
 #define __PDP_ENDIAN    3412
 #define __BYTE_ORDER    __BIG_ENDIAN
 #define AIRCRACK_NG_BYTE_ORDER_DEFINED
-#endif /* 
 */
+#endif /*  */
     /*
      * Solaris
      * -------
@@ -200,14 +200,14 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le64(x) ___my_swab64(x)
 #define __cpu_to_le32(x) ___my_swab32(x)
 #define __cpu_to_le16(x) ___my_swab16(x)
-
typedef uint64_t u_int64_t;
-
typedef uint32_t u_int32_t;
-
typedef uint16_t u_int16_t;
-
typedef uint8_t u_int8_t;
+typedef uint64_t u_int64_t;
+typedef uint32_t u_int32_t;
+typedef uint16_t u_int16_t;
+typedef uint8_t u_int8_t;
 
 
 #define AIRCRACK_NG_BYTE_ORDER_DEFINED
-#endif /* 
 */
+#endif /*  */
     /*
      * Custom stuff
      */
@@ -216,12 +216,12 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_be64(x) = OSSwapHostToBigInt64(x)
 #define __cpu_to_be32(x) = OSSwapHostToBigInt32(x)
 #define AIRCRACK_NG_BYTE_ORDER_DEFINED
-#endif /* 
 */
+#endif /*  */
 
     // FreeBSD
 #ifdef __FreeBSD__
 #include <machine/endian.h>
-#endif /* 
 */
+#endif /*  */
     // XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
 
     // XXX: Mac: Check http://www.opensource.apple.com/source/CF/CF-476.18/CFByteOrder.h
@@ -233,39 +233,39 @@ typedef uint64_t u_int64_t;
 #define AIRCRACK_NG_LITTLE_ENDIAN __LITTLE_ENDIAN
 #elif defined(_LITTLE_ENDIAN)
 #define AIRCRACK_NG_LITTLE_ENDIAN _LITTLE_ENDIAN
-#endif /* 
 */
+#endif /*  */
 #if defined(BIG_ENDIAN)
 #define AIRCRACK_NG_BIG_ENDIAN BIG_ENDIAN
 #elif defined(__BIG_ENDIAN)
 #define AIRCRACK_NG_BIG_ENDIAN __BIG_ENDIAN
 #elif defined(_BIG_ENDIAN)
 #define AIRCRACK_NG_BIG_ENDIAN _BIG_ENDIAN
-#endif /* 
 */
+#endif /*  */
 #if !defined(AIRCRACK_NG_LITTLE_ENDIAN) && !defined(AIRCRACK_NG_BIG_ENDIAN)
 #error Impossible to determine endianness (Little or Big endian), please contact the author.
-#endif /* 
 */
+#endif /*  */
 #if defined(BYTE_ORDER)
 #if (BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
 #elif (BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-#endif /* 
 */
+#endif /*  */
 #elif defined(__BYTE_ORDER)
 #if (__BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
 #elif (__BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-#endif /* 
 */
+#endif /*  */
 #elif defined(_BYTE_ORDER)
 #if (_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
 #elif (_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
 #define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-#endif /* 
 */
-#endif /* 
 */
+#endif /*  */
+#endif /*  */
 #ifndef AIRCRACK_NG_BYTE_ORDER
 #error Impossible to determine endianness (Little or Big endian), please contact the author.
-#endif /* 
 */
+#endif /*  */
 #if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
 #ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
 #define __be64_to_cpu(x) ___my_swab64(x)
@@ -280,32 +280,32 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le64(x) (x)
 #define __cpu_to_le32(x) (x)
 #define __cpu_to_le16(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef htobe16
 #define htobe16 ___my_swab16
-#endif /* 
 */
+#endif /*  */
 #ifndef htobe32
 #define htobe32 ___my_swab32
-#endif /* 
 */
+#endif /*  */
 #ifndef betoh16
 #define betoh16 ___my_swab16
-#endif /* 
 */
+#endif /*  */
 #ifndef betoh32
 #define betoh32 ___my_swab32
-#endif /* 
 */
+#endif /*  */
 #ifndef htole16
 #define htole16(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef htole32
 #define htole32(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef letoh16
 #define letoh16(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef letoh32
 #define letoh32(x) (x)
-#endif /* 
 */
-#endif /* 
 */
+#endif /*  */
+#endif /*  */
 #if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
 #ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
 #define __be64_to_cpu(x) (x)
@@ -320,32 +320,32 @@ typedef uint64_t u_int64_t;
 #define __cpu_to_le64(x) ___my_swab64(x)
 #define __cpu_to_le32(x) ___my_swab32(x)
 #define __cpu_to_le16(x) ___my_swab16(x)
-#endif /* 
 */
+#endif /*  */
 #ifndef htobe16
 #define htobe16(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef htobe32
 #define htobe32(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef betoh16
 #define betoh16(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef betoh32
 #define betoh32(x) (x)
-#endif /* 
 */
+#endif /*  */
 #ifndef htole16
 #define htole16 ___my_swab16
-#endif /* 
 */
+#endif /*  */
 #ifndef htole32
 #define htole32 ___my_swab32
-#endif /* 
 */
+#endif /*  */
 #ifndef letoh16
 #define letoh16 ___my_swab16
-#endif /* 
 */
+#endif /*  */
 #ifndef letoh32
 #define letoh32 ___my_swab32
-#endif /* 
 */
-#endif /* 
 */
+#endif /*  */
+#endif /*  */
     // Common defines
 #define cpu_to_le64 __cpu_to_le64
 #define le64_to_cpu __le64_to_cpu
@@ -361,27 +361,27 @@ typedef uint64_t u_int64_t;
 #define be16_to_cpu __be16_to_cpu
 #ifndef le16toh
 #define le16toh le16_to_cpu
-#endif /* 
 */
+#endif /*  */
 #ifndef be16toh
 #define be16toh be16_to_cpu
-#endif /* 
 */
+#endif /*  */
 #ifndef le32toh
 #define le32toh le32_to_cpu
-#endif /* 
 */
+#endif /*  */
 #ifndef be32toh
 #define be32toh be32_to_cpu
-#endif /* 
 */
+#endif /*  */
 
 #ifndef htons
 #define htons be16_to_cpu
-#endif /* 
 */
+#endif /*  */
 #ifndef htonl
 #define htonl cpu_to_be16
-#endif /* 
 */
+#endif /*  */
 #ifndef ntohs
 #define ntohs cpu_to_be16
-#endif /* 
 */
+#endif /*  */
 #ifndef ntohl
 #define ntohl cpu_to_be32
-#endif /* 
 */
-#endif /* 
 */
+#endif /*  */
+#endif /*  */
diff --git a/src/transport/wlan/ieee80211.h b/src/transport/wlan/ieee80211.h
index a952674ca..fd297f4a4 100644
--- a/src/transport/wlan/ieee80211.h
+++ b/src/transport/wlan/ieee80211.h
@@ -646,7 +646,7 @@ enum
 
 #define IEEE80211_AID(b)        ((b) &~ 0xc000)
 
-/* 
+/*
  * RTS frame length parameters.  The default is specified in
  * the 802.11 spec as 512; we treat it as implementation-dependent
  * so it's defined in ieee80211_var.h.  The max may be wrong
@@ -655,7 +655,7 @@ enum
 #define IEEE80211_RTS_MIN               1
 #define IEEE80211_RTS_MAX               2346
 
-/* 
+/*
  * TX fragmentation parameters.  As above for RTS, we treat
  * default as implementation-dependent so define it elsewhere.
  */