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

6 files changed, 22 insertions, 22 deletions

diff --git a/src/nat/gnunet-nat-server.c b/src/nat/gnunet-nat-server.c
index 988e9fbc91..5e2390f352 100644
--- a/src/nat/gnunet-nat-server.c
+++ b/src/nat/gnunet-nat-server.c
@@ -83,7 +83,7 @@ struct TcpContext
    */
   struct GNUNET_NETWORK_Handle *s;
 
-  /** 
+  /**
    * Data to transmit.
    */
   uint16_t data;
@@ -122,7 +122,7 @@ tcp_send (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 /**
  * Try to send 'data' to the
  * IP 'dst_ipv4' at port 'dport' via TCP.
- * 
+ *
  * @param dst_ivp4 target IP
  * @param dport target port
  * @param data data to send
@@ -169,7 +169,7 @@ try_send_tcp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
 /**
  * Try to send 'data' to the
  * IP 'dst_ipv4' at port 'dport' via UDP.
- * 
+ *
  * @param dst_ivp4 target IP
  * @param dport target port
  * @param data data to send
@@ -208,7 +208,7 @@ try_send_udp (uint32_t dst_ipv4, uint16_t dport, uint16_t data)
 /**
  * We've received a request to probe a NAT
  * traversal. Do it.
- * 
+ *
  * @param cls unused
  * @param client handle to client (we always close)
  * @param msg message with details about what to test
diff --git a/src/nat/nat.c b/src/nat/nat.c
index a037e3b20b..891613fead 100644
--- a/src/nat/nat.c
+++ b/src/nat/nat.c
@@ -57,7 +57,7 @@
 
 /**
  * Where did the given local address originate from?
- * To be used for debugging as well as in the future 
+ * To be used for debugging as well as in the future
  * to remove all addresses from a certain source when
  * we reevaluate the source.
  */
@@ -368,7 +368,7 @@ start_gnunet_nat_server (struct GNUNET_NAT_Handle *h);
 /**
  * Remove all addresses from the list of 'local' addresses
  * that originated from the given source.
- * 
+ *
  * @param plugin the plugin
  * @param src source that identifies addresses to remove
  */
@@ -396,8 +396,8 @@ remove_from_address_list_by_source (struct GNUNET_NAT_Handle *h,
 
 /**
  * Add the given address to the list of 'local' addresses, thereby
- * making it a 'legal' address for this peer to have.  
- * 
+ * making it a 'legal' address for this peer to have.
+ *
  * @param plugin the plugin
  * @param src where did the local address originate from?
  * @param arg the address, some 'struct sockaddr'
@@ -431,7 +431,7 @@ add_to_address_list_as_is (struct GNUNET_NAT_Handle *h,
  * making it a 'legal' address for this peer to have.   Set the
  * port number in the process to the advertised port and possibly
  * also to zero (if we have the gnunet-helper-nat-server).
- * 
+ *
  * @param plugin the plugin
  * @param src where did the local address originate from?
  * @param arg the address, some 'struct sockaddr'
@@ -481,8 +481,8 @@ add_to_address_list (struct GNUNET_NAT_Handle *h, enum LocalAddressSource src,
 
 /**
  * Add the given IP address to the list of 'local' addresses, thereby
- * making it a 'legal' address for this peer to have.  
- * 
+ * making it a 'legal' address for this peer to have.
+ *
  * @param plugin the plugin
  * @param src where did the local address originate from?
  * @param arg the address, some 'struct in_addr' or 'struct in6_addr'
@@ -1040,7 +1040,7 @@ add_from_bind (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param address_callback function to call everytime the public IP address changes
  * @param reversal_callback function to call if someone wants connection reversal from us
  * @param callback_cls closure for callbacks
- * @return NULL on error, otherwise handle that can be used to unregister 
+ * @return NULL on error, otherwise handle that can be used to unregister
  */
 struct GNUNET_NAT_Handle *
 GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, int is_tcp,
diff --git a/src/nat/nat_mini.c b/src/nat/nat_mini.c
index 1f5a83d2d8..52a4e86b0c 100644
--- a/src/nat/nat_mini.c
+++ b/src/nat/nat_mini.c
@@ -361,12 +361,12 @@ process_refresh_output (void *cls, const char *line)
   }
   /*
    * we're looking for output of the form:
-   * 
+   *
    * "0 TCP  3000->192.168.2.150:3000  'libminiupnpc' ''"
    * "1 UDP  3001->192.168.2.150:3001  'libminiupnpc' ''"
-   * 
+   *
    * the pattern we look for is:
-   * 
+   *
    * "%s TCP  PORT->STRING:OURPORT *" or
    * "%s UDP  PORT->STRING:OURPORT *"
    */
@@ -439,7 +439,7 @@ process_map_output (void *cls, const char *line)
   }
   /*
    * The upnpc output we're after looks like this:
-   * 
+   *
    * "external 87.123.42.204:3000 TCP is redirected to internal 192.168.2.150:3000"
    */
   if ((NULL == (ipaddr = strstr (line, " "))) ||
@@ -475,7 +475,7 @@ process_map_output (void *cls, const char *line)
  * general-purpose 'GNUNET_NAT_register' code).  However, it can be
  * used if specifically UPnP-based NAT traversal is to be used or
  * tested.
- * 
+ *
  * @param port port to map
  * @param is_tcp GNUNET_YES to map TCP, GNUNET_NO for UDP
  * @param ac function to call with mapping result
@@ -539,7 +539,7 @@ process_unmap_output (void *cls, const char *line)
  * this function will give 'upnpc' 1s to remove tha mapping,
  * so while this function is non-blocking, a task will be
  * left with the scheduler for up to 1s past this call.
- * 
+ *
  * @param mini the handle
  */
 void
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 6a533798e0..784fc6cc74 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -45,7 +45,7 @@
 
 
 /**
- * Time to wait before stopping NAT, in seconds 
+ * Time to wait before stopping NAT, in seconds
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
@@ -87,7 +87,7 @@ struct addr_cls
 
 /**
  * Return the address of the default interface,
- * or any interface with a valid address if the default is not valid 
+ * or any interface with a valid address if the default is not valid
  *
  * @param cls the 'struct addr_cls'
  * @param name name of the interface
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 4aac3d17f0..2c6da3b574 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -22,7 +22,7 @@
  * Testcase for port redirection and public IP address retrieval.
  * This test never fails, because there need to be a NAT box set up for tha *
  * @file nat/test_nat_mini.c
- * @brief Testcase for NAT library - mini 
+ * @brief Testcase for NAT library - mini
  * @author Christian Grothoff
  *
  * TODO: actually use ARM to start resolver service to make DNS work!
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index b1e6235f9b..b8db301aa1 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -35,7 +35,7 @@
 
 
 /**
- * Time to wait before stopping NAT test, in seconds 
+ * Time to wait before stopping NAT test, in seconds
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)