13 files changed, 101 insertions, 82 deletions

diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index d17eab1d6..31dad4117 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -325,7 +325,7 @@ struct GNUNET_CADET_RequestDropCadetMessage
    * Type: #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE
    */
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * Type of the message this handler covers, in host byte order.
    */
@@ -337,7 +337,7 @@ struct GNUNET_CADET_RequestDropCadetMessage
   struct GNUNET_CADET_ClientChannelNumber ccn;
 
 };
-  
+
 /**
  * Message to inform the client about channels in the service.
  */
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 67f6571c5..45cc508a6 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1001,8 +1001,8 @@ GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
   p->window_changes = window_changes;
   p->disconnects = disconnects;
   p->handlers = (NULL == pd->agpl_url)
-    ? GNUNET_MQ_copy_handlers (handlers)
-    : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
+                ? GNUNET_MQ_copy_handlers (handlers)
+                : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
 
   GNUNET_assert (GNUNET_OK == open_port_cb (h, &p->id, p));
   return p;
diff --git a/src/cadet/cadet_api_drop_message.c b/src/cadet/cadet_api_drop_message.c
index d9f7e003e..2b031b5c0 100644
--- a/src/cadet/cadet_api_drop_message.c
+++ b/src/cadet/cadet_api_drop_message.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -35,8 +35,8 @@
  */
 void
 GNUNET_CADET_drop_message (struct GNUNET_MQ_Handle *mq,
-                           struct GNUNET_CADET_ClientChannelNumber ccn,
-                           uint16_t type)
+                           struct GNUNET_CADET_ClientChannelNumber ccn,
+                           uint16_t type)
 {
   struct GNUNET_CADET_RequestDropCadetMessage *message;
   struct GNUNET_MQ_Envelope *env;
@@ -45,15 +45,15 @@ GNUNET_CADET_drop_message (struct GNUNET_MQ_Handle *mq,
 
   message->ccn = ccn;
   message->type = type;
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Dropping message for channel of type %s (%d)\n", type == GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY ? "GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY" : "UNKNOWN", type);
+              "Dropping message for channel of type %s (%d)\n", type ==
+              GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY ?
+              "GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY" : "UNKNOWN", type);
 
   GNUNET_MQ_send (mq, env);
-  
-}
-
 
+}
 
 
 /* end of cadet_api_drop_message.c */
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h
index 08298e224..117a7922e 100644
--- a/src/cadet/cadet_protocol.h
+++ b/src/cadet/cadet_protocol.h
@@ -85,11 +85,11 @@ struct GNUNET_CADET_ConnectionCreateMessage
   uint32_t options GNUNET_PACKED;
 
   /**
-   * This flag indicates the peer sending the connection create 
+   * This flag indicates the peer sending the connection create
    * meassage likes to trigger a KX handshake.
    */
   int has_monotime;
-  
+
   /**
    *  This monotonic time is set, if a peer likes to trigger a KX, but is not
    *  the peer that should start the KX. (xrs,t3ss)
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index f3767fb01..2d3b548dd 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -1010,6 +1010,7 @@ handle_info_tunnels (void *cls,
   GNUNET_SERVICE_client_continue (c->client);
 }
 
+
 /**
  * Handler for client's #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE request.
  *
@@ -1026,11 +1027,12 @@ handle_drop_message (void *cls,
   ch = lookup_channel (c,
                        message->ccn);
 
-  GCCH_assign_type_to_drop(ch, message);
-  
+  GCCH_assign_type_to_drop (ch, message);
+
   GNUNET_SERVICE_client_continue (c->client);
 }
 
+
 /**
  * Callback called when a client connects to the service.
  *
@@ -1327,52 +1329,52 @@ run (void *cls,
  * Define "main" method using service macro.
  */
 GNUNET_SERVICE_MAIN
-("cadet",
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &client_connect_cb,
- &client_disconnect_cb,
- NULL,
- GNUNET_MQ_hd_fixed_size (port_open,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN,
-                          struct GNUNET_CADET_PortMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (port_close,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE,
-                          struct GNUNET_CADET_PortMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (channel_create,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
-                          struct GNUNET_CADET_LocalChannelCreateMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (channel_destroy,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
-                          struct GNUNET_CADET_LocalChannelDestroyMessage,
-                          NULL),
- GNUNET_MQ_hd_var_size (local_data,
-                        GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
-                        struct GNUNET_CADET_LocalData,
-                        NULL),
- GNUNET_MQ_hd_fixed_size (local_ack,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK,
-                          struct GNUNET_CADET_LocalAck,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (get_peers,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS,
-                          struct GNUNET_MessageHeader,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (show_path,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH,
-                          struct GNUNET_CADET_RequestPathInfoMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (info_tunnels,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS,
-                          struct GNUNET_MessageHeader,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (drop_message,
-                          GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE,
-                          struct GNUNET_CADET_RequestDropCadetMessage,
-                          NULL),
- GNUNET_MQ_handler_end ());
+  ("cadet",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &client_connect_cb,
+  &client_disconnect_cb,
+  NULL,
+  GNUNET_MQ_hd_fixed_size (port_open,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN,
+                           struct GNUNET_CADET_PortMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (port_close,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE,
+                           struct GNUNET_CADET_PortMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (channel_create,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
+                           struct GNUNET_CADET_LocalChannelCreateMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (channel_destroy,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
+                           struct GNUNET_CADET_LocalChannelDestroyMessage,
+                           NULL),
+  GNUNET_MQ_hd_var_size (local_data,
+                         GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
+                         struct GNUNET_CADET_LocalData,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (local_ack,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK,
+                           struct GNUNET_CADET_LocalAck,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (get_peers,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (show_path,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH,
+                           struct GNUNET_CADET_RequestPathInfoMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (info_tunnels,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (drop_message,
+                           GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE,
+                           struct GNUNET_CADET_RequestDropCadetMessage,
+                           NULL),
+  GNUNET_MQ_handler_end ());
 
 /* end of gnunet-service-cadet-new.c */
diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h
index ff216f8c3..6da0950f1 100644
--- a/src/cadet/gnunet-service-cadet.h
+++ b/src/cadet/gnunet-service-cadet.h
@@ -325,5 +325,4 @@ const char *
 GSC_2s (struct CadetClient *c);
 
 
-
 #endif
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index e6fce562f..dab53b8c4 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -385,29 +385,32 @@ struct CadetChannel
    * Type of message to be droped. See GCT_send.
    */
   uint16_t type GNUNET_PACKED;
-  
+
 };
 
 /**
  * Assign type of message to drop.
- * @param ch CadetChannel to assign type to drop. 
+ * @param ch CadetChannel to assign type to drop.
  * @param message GNUNET_CADET_RequestDropCadetMessage to get the type from.
  */
 void
-GCCH_assign_type_to_drop(struct CadetChannel *ch, const struct GNUNET_CADET_RequestDropCadetMessage *message)
+GCCH_assign_type_to_drop (struct CadetChannel *ch, const struct
+                          GNUNET_CADET_RequestDropCadetMessage *message)
 {
 
   ch->type = message->type;
-  
+
 }
 
+
 /**
  * Check if type of message is the one to drop.
- * @param ch CadetChannel to check for message type to drop. 
+ * @param ch CadetChannel to check for message type to drop.
  * @param message GNUNET_MessageHeader to compare the type with.
  */
 int
-GCCH_is_type_to_drop(struct CadetChannel *ch, const struct GNUNET_MessageHeader *message)
+GCCH_is_type_to_drop (struct CadetChannel *ch, const struct
+                      GNUNET_MessageHeader *message)
 {
 
   if (ch->type == message->type)
@@ -419,6 +422,7 @@ GCCH_is_type_to_drop(struct CadetChannel *ch, const struct GNUNET_MessageHeader
     return GNUNET_NO;
 }
 
+
 /**
  * Get the static string for identification of the channel.
  *
@@ -854,7 +858,8 @@ send_channel_data_ack (struct CadetChannel *ch)
        GCCH_2s (ch));
   if (NULL != ch->last_control_qe)
     GCT_send_cancel (ch->last_control_qe);
-  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch, &msg.ctn);
+  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch,
+                                  &msg.ctn);
 }
 
 
@@ -881,7 +886,8 @@ send_open_ack (void *cls)
   msg.port = ch->port;
   if (NULL != ch->last_control_qe)
     GCT_send_cancel (ch->last_control_qe);
-  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch, &msg.ctn);
+  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch,
+                                  &msg.ctn);
 }
 
 
@@ -1513,7 +1519,8 @@ retry_transmission (void *cls)
        "Retrying transmission on %s of message %u\n",
        GCCH_2s (ch),
        (unsigned int) ntohl (crm->data_message->mid.mid));
-  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm, &crm->data_message->ctn);
+  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm,
+                      &crm->data_message->ctn);
   GNUNET_assert (NULL == ch->retry_data_task);
 }
 
@@ -1901,7 +1908,8 @@ GCCH_handle_local_data (struct CadetChannel *ch,
     GNUNET_SCHEDULER_cancel (ch->retry_data_task);
     ch->retry_data_task = NULL;
   }
-  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm, &crm->data_message->ctn);
+  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm,
+                      &crm->data_message->ctn);
   GNUNET_assert (NULL == ch->retry_data_task);
   return GNUNET_OK;
 }
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index a7c1d9fb0..3e1f779ad 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -614,6 +614,7 @@ set_monotime_sig (struct GNUNET_CADET_ConnectionCreateMessage *msg)
 
 }
 
+
 /**
  * Send a #GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE message to the
  * first hop.
@@ -641,7 +642,7 @@ send_create (void *cls)
 
   // check for tunnel state and set signed monotime (xrs,t3ss)
   t = GCP_get_tunnel (cc->destination, GNUNET_YES);
-  if ((NULL != t)&& (GCT_get_estate (t) == CADET_TUNNEL_KEY_UNINITIALIZED) &&
+  if ((NULL != t) && (GCT_get_estate (t) == CADET_TUNNEL_KEY_UNINITIALIZED) &&
       (GCT_alice_or_betty (GCP_get_id (cc->destination)) == GNUNET_NO))
   {
     create_msg->has_monotime = GNUNET_YES;
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c
index db47c8a90..9a83fa31d 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -826,9 +826,9 @@ handle_connection_create (
 
     // Check for CADET state in case the other side has lost the tunnel (xrs,t3ss)
     if ((GNUNET_YES == msg->has_monotime) &&
-        (GNUNET_YES == GCP_check_and_update_monotime(origin, msg->monotime)) &&
-        ( GNUNET_OK == GCP_check_monotime_sig(origin, msg)) &&
-         (CADET_TUNNEL_KEY_OK == GCT_get_estate(t)))
+        (GNUNET_YES == GCP_check_and_update_monotime (origin, msg->monotime)) &&
+        (GNUNET_OK == GCP_check_monotime_sig (origin, msg)) &&
+        (CADET_TUNNEL_KEY_OK == GCT_get_estate (t)))
     {
       GCT_change_estate (t, CADET_TUNNEL_KEY_UNINITIALIZED);
     }
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index e5885278b..a2068b31b 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -1552,6 +1552,7 @@ GCP_send_ooo (struct CadetPeer *cp,
                   env);
 }
 
+
 /**
  * Checking if a monotime value is newer than the last monotime value received from a peer. If the time value is newer it will be stored at the peer.
  *
@@ -1574,6 +1575,7 @@ GCP_check_and_update_monotime (struct CadetPeer *peer,
   return GNUNET_NO;
 }
 
+
 /**
  * Checking the signature for a monotime of a GNUNET_CADET_ConnectionCreateMessage.
  *
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index 66e7d5b1e..2ca46b5aa 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -3476,7 +3476,7 @@ GCT_send (struct CadetTunnel *t,
   {
     ch = lookup_channel (t,
                          *ctn);
-    if ((NULL != ch)&& GCCH_is_type_to_drop (ch, message))
+    if ((NULL != ch) && GCCH_is_type_to_drop (ch, message))
     {
       GNUNET_break (0);
       return NULL;
diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h
index 147f2e56f..075cd03f8 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.h
+++ b/src/cadet/gnunet-service-cadet_tunnels.h
@@ -235,7 +235,7 @@ GCT_send (struct CadetTunnel *t,
           const struct GNUNET_MessageHeader *message,
           GCT_SendContinuation cont,
           void *cont_cls,
-          struct GNUNET_CADET_ChannelTunnelNumber *ctn);
+          struct GNUNET_CADET_ChannelTunnelNumber *ctn);
 
 
 /**
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 779d3bc9f..23f2ccbe3 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -550,6 +550,7 @@ get_from_p_ids ()
   }
 }
 
+
 static struct GNUNET_CADET_Handle *
 get_from_cadets ()
 {
@@ -568,6 +569,7 @@ get_from_cadets ()
 
 }
 
+
 static unsigned int
 get_peer_nr (int outgoing)
 {
@@ -581,6 +583,7 @@ get_peer_nr (int outgoing)
   }
 }
 
+
 /**
  * Task to reconnect to other peer.
  *
@@ -626,6 +629,7 @@ reconnect_op (void *cls)
   send_test_message (outgoing_ch);
 }
 
+
 void
 reopen_channel ()
 {
@@ -659,6 +663,7 @@ reopen_channel ()
   send_test_message (outgoing_ch);
 }
 
+
 static void
 peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple);
 
@@ -676,6 +681,7 @@ get_peers (void *cls)
 
 }
 
+
 /**
  * Method called to retrieve information about all peers in CADET, called
  * once per peer.
@@ -712,7 +718,7 @@ peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple)
               "p_id %s\n",
               GNUNET_i2s_full (p_id));
 
-  if ((0 == GNUNET_memcmp (&ple->peer, p_id))&& ple->have_tunnel)
+  if ((0 == GNUNET_memcmp (&ple->peer, p_id)) && ple->have_tunnel)
   {
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -733,6 +739,7 @@ peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple)
   }
 }
 
+
 /**
  * Function called whenever an MQ-channel is destroyed, unless the destruction
  * was requested by #GNUNET_CADET_channel_destroy.
@@ -1169,7 +1176,7 @@ connect_handler (void *cls,
 
   if (peer == get_peer_nr (GNUNET_NO))
   {
-    if ((DESTROY != test)&&(NULL != incoming_ch))
+    if ((DESTROY != test) && (NULL != incoming_ch))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Duplicate incoming channel for client %lu\n",