-remove trailing whitespace

6 files changed, 275 insertions, 275 deletions

diff --git a/src/vpn/gnunet-helper-vpn-windows.c b/src/vpn/gnunet-helper-vpn-windows.c
index 15dc5a667..3f4920a6f 100644
--- a/src/vpn/gnunet-helper-vpn-windows.c
+++ b/src/vpn/gnunet-helper-vpn-windows.c
@@ -19,8 +19,8 @@
  */
 /**
  * @file vpn/gnunet-helper-vpn-windows.c
- * @brief the helper for the VPN service in win32 builds. 
- * Opens a virtual network-interface, sends data received on the if to stdout, 
+ * @brief the helper for the VPN service in win32 builds.
+ * Opens a virtual network-interface, sends data received on the if to stdout,
  * sends data received on stdin to the interface
  * @author Christian M. Fuchs
  *
@@ -68,7 +68,7 @@
 #endif
 
 /**
- * Will this binary be run in permissions testing mode? 
+ * Will this binary be run in permissions testing mode?
  */
 static boolean privilege_testing = FALSE;
 
@@ -90,7 +90,7 @@ static boolean privilege_testing = FALSE;
 #define INF_FILE64 "share/gnunet/openvpn-tap32/tapw64/OemWin2k.inf"
 
 /**
- * Hardware ID used in the inf-file. 
+ * Hardware ID used in the inf-file.
  * This might change over time, as openvpn advances their driver
  */
 #define HARDWARE_ID "tap0901"
@@ -101,7 +101,7 @@ static boolean privilege_testing = FALSE;
 #define TAP_WIN_MIN_MAJOR 9
 
 /**
- * Minimum minor-id of the driver version we can work with. 
+ * Minimum minor-id of the driver version we can work with.
  * v <= 7 has buggy IPv6.
  * v == 8 is broken for small IPv4 Packets
  */
@@ -109,7 +109,7 @@ static boolean privilege_testing = FALSE;
 
 /**
  * Time in seconds to wait for our virtual device to go up after telling it to do so.
- * 
+ *
  * openvpn doesn't specify a value, 4 seems sane for testing, even for openwrt
  * (in fact, 4 was chosen by a fair dice roll...)
  */
@@ -121,7 +121,7 @@ static boolean privilege_testing = FALSE;
 #define INTERFACE_REGISTRY_LOCATION "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
 
 /**
- * Our local process' PID. Used for creating a sufficiently unique additional 
+ * Our local process' PID. Used for creating a sufficiently unique additional
  * hardware ID for our device.
  */
 static char secondary_hwid[LINE_LEN / 2];
@@ -132,13 +132,13 @@ static char secondary_hwid[LINE_LEN / 2];
  */
 static char device_visible_name[256];
 
-/** 
+/**
  * This is our own local instance of a virtual network interface
  * It is (somewhat) equivalent to using tun/tap in unixoid systems
- * 
+ *
  * Upon initialization, we create such an device node.
  * Upon termination, we remove it again.
- * 
+ *
  * If we crash this device might stay around.
  */
 static HDEVINFO DeviceInfo = INVALID_HANDLE_VALUE;
@@ -149,7 +149,7 @@ static HDEVINFO DeviceInfo = INVALID_HANDLE_VALUE;
 static SP_DEVINFO_DATA DeviceNode;
 
 /**
- * GUID of our virtual device in the form of 
+ * GUID of our virtual device in the form of
  * {12345678-1234-1234-1234-123456789abc} - in hex
  */
 static char device_guid[256];
@@ -161,36 +161,36 @@ static char device_guid[256];
 enum IO_State
 {
 
-  /** 
-   * overlapped I/O is ready for work 
+  /**
+   * overlapped I/O is ready for work
    */
   IOSTATE_READY = 0,
 
-  /** 
-   * overlapped I/O has been queued 
+  /**
+   * overlapped I/O has been queued
    */
   IOSTATE_QUEUED,
 
-  /** 
-   * overlapped I/O has finished, but is waiting for it's write-partner 
+  /**
+   * overlapped I/O has finished, but is waiting for it's write-partner
    */
-  IOSTATE_WAITING, 
-  
-  /** 
+  IOSTATE_WAITING,
+
+  /**
    * there is a full buffer waiting
    */
   IOSTATE_RESUME,
 
-  /** 
+  /**
    * Operlapped IO states for facility objects
-   * overlapped I/O has failed, stop processing 
+   * overlapped I/O has failed, stop processing
    */
-  IOSTATE_FAILED 
+  IOSTATE_FAILED
 
 };
 
 
-/** 
+/**
  * A IO Object + read/writebuffer + buffer-size for windows asynchronous IO handling
  */
 struct io_facility
@@ -229,7 +229,7 @@ struct io_facility
    * Amount of data actually written or read by readfile/writefile.
    */
   DWORD buffer_size_processed;
-  
+
   /**
    * How much of this buffer we have writte in total
    */
@@ -248,32 +248,32 @@ typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL);
 
 /**
  * Determines if the host OS is win32 or win64
- * 
- * @return true if 
+ *
+ * @return true if
  */
 BOOL
 is_win64 ()
 {
 #if defined(_WIN64)
-  //this is a win64 binary, 
-  return TRUE; 
+  //this is a win64 binary,
+  return TRUE;
 #elif defined(_WIN32)
   //this is a 32bit binary, and we need to check if we are running in WOW64
   BOOL success = FALSE;
   BOOL on_wow64 = FALSE;
   LPFN_ISWOW64PROCESS IsWow64Process = (LPFN_ISWOW64PROCESS) GetProcAddress (GetModuleHandle ("kernel32"), "IsWow64Process");
-  
+
   if (NULL != IsWow64Process)
       success = IsWow64Process (GetCurrentProcess (), &on_wow64);
-  
+
   return success && on_wow64;
 #endif
 }
 /**
  * Wrapper for executing a shellcommand in windows.
- * 
+ *
  * @param command - the command + parameters to execute
- * @return * exitcode of the program executed, 
+ * @return * exitcode of the program executed,
  *         * EINVAL (cmd/file not found)
  *         * EPIPE (could not read STDOUT)
  */
@@ -365,7 +365,7 @@ remove_address6 (const char *address)
 
   /* Did it work?*/
   if (0 != ret)
-    fprintf (stderr, 
+    fprintf (stderr,
              "FATAL: removing IPv6 address failed: %s\n",
              strerror (ret));
 }
@@ -410,8 +410,8 @@ set_address4 (const char *address, const char *mask)
 
   /* Did it work?*/
   if (0 != ret)
-    fprintf (stderr, 
-             "FATAL: Setting IPv4 address failed: %s\n", 
+    fprintf (stderr,
+             "FATAL: Setting IPv4 address failed: %s\n",
              strerror (ret));
   return ret;
 }
@@ -448,8 +448,8 @@ remove_address4 (const char *address)
 
 
 /**
- * Setup a new virtual interface to use for tunneling. 
- * 
+ * Setup a new virtual interface to use for tunneling.
+ *
  * @return: TRUE if setup was successful, else FALSE
  */
 static BOOL
@@ -457,7 +457,7 @@ setup_interface ()
 {
   /*
    * where to find our inf-file. (+ the "full" path, after windows found")
-   * 
+   *
    * We do not directly input all the props here, because openvpn will update
    * these details over time.
    */
@@ -468,22 +468,22 @@ setup_interface ()
   GUID class_guid;
   int str_length = 0;
 
-  /** 
+  /**
    * Set the device's hardware ID and add it to a list.
-   * This information will later on identify this device in registry. 
+   * This information will later on identify this device in registry.
    */
   strncpy (hwidlist, HARDWARE_ID, LINE_LEN);
   /**
-   * this is kind of over-complicated, but allows keeps things independent of 
-   * how the openvpn-hwid is actually stored. 
-   * 
+   * this is kind of over-complicated, but allows keeps things independent of
+   * how the openvpn-hwid is actually stored.
+   *
    * A HWID list is double-\0 terminated and \0 separated
    */
   str_length = strlen (hwidlist) + 1;
   strncpy (&hwidlist[str_length], secondary_hwid, LINE_LEN);
   str_length += strlen (&hwidlist[str_length]) + 1;
-  
-  /** 
+
+  /**
    * Locate the inf-file, we need to store it somewhere where the system can
    * find it. We need to pick the correct driver for win32/win64.
    */
@@ -493,7 +493,7 @@ setup_interface ()
     GetFullPathNameA (INF_FILE, MAX_PATH, inf_file_path, &temp_inf_filename);
 
   fprintf (stderr, "INFO: Located our driver's .inf file at %s\n", inf_file_path);
-  /** 
+  /**
    * Bootstrap our device info using the drivers inf-file
    */
   if ( ! SetupDiGetINFClassA (inf_file_path,
@@ -502,9 +502,9 @@ setup_interface ()
                             NULL))
     return FALSE;
 
-  /** 
-   * Collect all the other needed information... 
-   * let the system fill our this form 
+  /**
+   * Collect all the other needed information...
+   * let the system fill our this form
    */
   DeviceInfo = SetupDiCreateDeviceInfoList (&class_guid, NULL);
   if (DeviceInfo == INVALID_HANDLE_VALUE)
@@ -549,9 +549,9 @@ setup_interface ()
 
 
 /**
- * Remove our new virtual interface to use for tunneling. 
+ * Remove our new virtual interface to use for tunneling.
  * This function must be called AFTER setup_interface!
- * 
+ *
  * @return: TRUE if destruction was successful, else FALSE
  */
 static BOOL
@@ -567,7 +567,7 @@ remove_interface ()
   remove.Scope = DI_REMOVEDEVICE_GLOBAL;
   remove.ClassInstallHeader.InstallFunction = DIF_REMOVE;
   /*
-   * 1. Prepare our existing device information set, and place the 
+   * 1. Prepare our existing device information set, and place the
    *    uninstall related information into the structure
    */
   if ( ! SetupDiSetClassInstallParamsA (DeviceInfo,
@@ -584,7 +584,7 @@ remove_interface ()
     return FALSE;
 
   SetupDiDestroyDeviceInfoList (DeviceInfo);
-  
+
   fprintf (stderr, "DEBUG: removed interface successfully\n");
 
   return TRUE;
@@ -593,8 +593,8 @@ remove_interface ()
 
 /**
  * Do all the lookup necessary to retrieve the inteface's actual name
- * off the registry. 
- * 
+ * off the registry.
+ *
  * @return: TRUE if we were able to lookup the interface's name, else FALSE
  */
 static BOOL
@@ -618,7 +618,7 @@ resolve_interface_name ()
                                           0, //must be 0
                                           NULL)) //hMachine, we are local
     return FALSE;
-  
+
   fprintf (stderr, "DEBUG: Resolving interface name for network device %s\n",pnp_instance_id);
 
   /* Registry is incredibly slow, retry for up to 30 seconds to allow registry to refresh */
@@ -636,7 +636,7 @@ resolve_interface_name ()
                                           &adapter_key_handle))
         return FALSE;
 
-      /* Of course there is a multitude of entries here, with arbitrary names, 
+      /* Of course there is a multitude of entries here, with arbitrary names,
        * thus we need to iterate through there.
        */
       while (!retval)
@@ -661,7 +661,7 @@ resolve_interface_name ()
                                   NULL,
                                   NULL);
 
-          /* this may fail due to one of two reasons: 
+          /* this may fail due to one of two reasons:
            * we are at the end of the list*/
           if (ERROR_NO_MORE_ITEMS == status)
             break;
@@ -712,8 +712,8 @@ resolve_interface_name ()
           if (status != ERROR_SUCCESS || data_type != REG_SZ)
             goto cleanup;
 
-          /* 
-           * we have successfully found OUR instance, 
+          /*
+           * we have successfully found OUR instance,
            * save the device GUID before exiting
            */
 
@@ -735,7 +735,7 @@ cleanup:
 
 /**
  * Determines the version of the installed TAP32 driver and checks if it's sufficiently new for GNUNET
- * 
+ *
  * @param handle the handle to our tap device
  * @return TRUE if the version is sufficient, else FALSE
  */
@@ -761,7 +761,7 @@ check_tapw32_version (HANDLE handle)
                TAP_WIN_MIN_MINOR);
       return FALSE;
     }
-      
+
   return TRUE;
 }
 
@@ -827,8 +827,8 @@ init_tun ()
 
 /**
  * Brings a TAP device up and sets it to connected state.
- * 
- * @param handle the handle to our TAP device 
+ *
+ * @param handle the handle to our TAP device
  * @return True if the operation succeeded, else false
  */
 static BOOL
@@ -854,25 +854,25 @@ tun_up (HANDLE handle)
 
 /**
  * Attempts to read off an input facility (tap or named pipe) in overlapped mode.
- * 
- * 1. 
+ *
+ * 1.
  * If the input facility is in IOSTATE_READY, it will issue a new read operation to the
- * input handle. Then it goes into IOSTATE_QUEUED state. 
+ * input handle. Then it goes into IOSTATE_QUEUED state.
  * In case the read succeeded instantly the input facility enters 3.
- * 
- * 2. 
+ *
+ * 2.
  * If the input facility is in IOSTATE_QUEUED state, it will check if the queued read has finished already.
  * If it has finished, go to state 3.
  * If it has failed, set IOSTATE_FAILED
- * 
+ *
  * 3.
  * If the output facility is in state IOSTATE_READY, the read-buffer is copied to the output buffer.
  *   The input facility enters state IOSTATE_READY
  *   The output facility enters state IOSTATE_READY
  * If the output facility is in state IOSTATE_QUEUED, the input facility enters IOSTATE_WAITING
- * 
+ *
  * IOSTATE_WAITING is reset by the output facility, once it has completed.
- * 
+ *
  * @param input_facility input named pipe or file to work with.
  * @param output_facility output pipe or file to hand over data to.
  * @return false if an event reset was impossible (OS error), else true
@@ -883,11 +883,11 @@ attempt_read_tap (struct io_facility * input_facility,
 {
   struct GNUNET_MessageHeader * hdr;
   unsigned short size;
-  
+
   switch (input_facility->facility_state)
     {
     case IOSTATE_READY:
-      { 
+      {
         if (! ResetEvent (input_facility->overlapped.hEvent))
           {
             return FALSE;
@@ -906,9 +906,9 @@ attempt_read_tap (struct io_facility * input_facility,
             /* reset event manually*/
             if (! SetEvent (input_facility->overlapped.hEvent))
               return FALSE;
-            
+
             fprintf (stderr, "DEBUG: tap read succeeded immediately\n");
-            
+
             /* we successfully read something from the TAP and now need to
              * send it our via STDOUT. Is that possible at the moment? */
             if ((IOSTATE_READY == output_facility->facility_state ||
@@ -917,7 +917,7 @@ attempt_read_tap (struct io_facility * input_facility,
               { /* hand over this buffers content and apply message header for gnunet */
                 hdr = (struct GNUNET_MessageHeader *) output_facility->buffer;
                 size = input_facility->buffer_size + sizeof (struct GNUNET_MessageHeader);
-                
+
                 memcpy (output_facility->buffer + sizeof (struct GNUNET_MessageHeader),
                         input_facility->buffer,
                         input_facility->buffer_size);
@@ -964,7 +964,7 @@ attempt_read_tap (struct io_facility * input_facility,
               return FALSE;
 
             fprintf (stderr, "DEBUG: tap read succeeded delayed\n");
-            
+
             /* we successfully read something from the TAP and now need to
              * send it our via STDOUT. Is that possible at the moment? */
             if ((IOSTATE_READY == output_facility->facility_state ||
@@ -973,7 +973,7 @@ attempt_read_tap (struct io_facility * input_facility,
               { /* hand over this buffers content and apply message header for gnunet */
                 hdr = (struct GNUNET_MessageHeader *) output_facility->buffer;
                 size = input_facility->buffer_size + sizeof (struct GNUNET_MessageHeader);
-                
+
                 memcpy (output_facility->buffer + sizeof (struct GNUNET_MessageHeader),
                         input_facility->buffer,
                         input_facility->buffer_size);
@@ -1026,26 +1026,26 @@ attempt_read_tap (struct io_facility * input_facility,
 
 /**
  * Attempts to read off an input facility (tap or named pipe) in overlapped mode.
- * 
- * 1. 
+ *
+ * 1.
  * If the input facility is in IOSTATE_READY, it will issue a new read operation to the
- * input handle. Then it goes into IOSTATE_QUEUED state. 
+ * input handle. Then it goes into IOSTATE_QUEUED state.
  * In case the read succeeded instantly the input facility enters 3.
- * 
- * 2. 
+ *
+ * 2.
  * If the input facility is in IOSTATE_QUEUED state, it will check if the queued read has finished already.
  * If it has finished, go to state 3.
  * If it has failed, set IOSTATE_FAILED
- * 
+ *
  * 3.
  * If the facility is finished with ready
  *   The read-buffer is copied to the output buffer, except for the GNUNET_MessageHeader.
  *   The input facility enters state IOSTATE_READY
  *   The output facility enters state IOSTATE_READY
  * If the output facility is in state IOSTATE_QUEUED, the input facility enters IOSTATE_WAITING
- * 
+ *
  * IOSTATE_WAITING is reset by the output facility, once it has completed.
- * 
+ *
  * @param input_facility input named pipe or file to work with.
  * @param output_facility output pipe or file to hand over data to.
  * @return false if an event reset was impossible (OS error), else true
@@ -1055,17 +1055,17 @@ attempt_read_stdin (struct io_facility * input_facility,
                     struct io_facility * output_facility)
 {
   struct GNUNET_MessageHeader * hdr;
-  
+
   switch (input_facility->facility_state)
     {
     case IOSTATE_READY:
       {
         input_facility->buffer_size = 0;
-        
+
 partial_read_iostate_ready:
         if (! ResetEvent (input_facility->overlapped.hEvent))
           return FALSE;
-       
+
         /* Check how the task is handled */
         if (ReadFile (input_facility->handle,
                            input_facility->buffer + input_facility->buffer_size,
@@ -1113,7 +1113,7 @@ partial_read_iostate_ready:
               input_facility->facility_state = IOSTATE_WAITING;
             else /* we read nothing */
               input_facility->facility_state = IOSTATE_READY;
-          } 
+          }
         else /* operation was either queued or failed*/
           {
             int err = GetLastError ();
@@ -1141,13 +1141,13 @@ partial_read_iostate_ready:
                                  FALSE))
           {/* successful return for a queued operation */
             hdr = (struct GNUNET_MessageHeader *) input_facility->buffer;
-            
+
             if (! ResetEvent (input_facility->overlapped.hEvent))
               return FALSE;
-            
+
             fprintf (stderr, "DEBUG: stdin read succeeded delayed\n");
             input_facility->buffer_size += input_facility->buffer_size_processed;
-            
+
             if ((ntohs (hdr->type) != GNUNET_MESSAGE_TYPE_VPN_HELPER) ||
                 (ntohs (hdr->size) > sizeof (input_facility->buffer)))
               {
@@ -1209,7 +1209,7 @@ partial_read_iostate_ready:
  * Attempts to write to an output facility (tap or named pipe) in overlapped mode.
  *
  * TODO: high level description
- * 
+ *
  * @param output_facility output pipe or file to hand over data to.
  * @param input_facility input named pipe or file to work with.
  * @return false if an event reset was impossible (OS error), else true
@@ -1222,7 +1222,7 @@ attempt_write (struct io_facility * output_facility,
     {
     case IOSTATE_READY:
       output_facility->buffer_size_written = 0;
-      
+
 continue_partial_write:
       if (! ResetEvent (output_facility->overlapped.hEvent))
         return FALSE;
@@ -1237,7 +1237,7 @@ continue_partial_write:
 
           fprintf (stderr, "DEBUG: write succeeded immediately\n");
           output_facility->buffer_size_written += output_facility->buffer_size_processed;
-          
+
           /* reset event manually*/
           if (! SetEvent (output_facility->overlapped.hEvent))
             return FALSE;
@@ -1245,7 +1245,7 @@ continue_partial_write:
           /* partial write */
           if (output_facility->buffer_size_written < output_facility->buffer_size)
             goto continue_partial_write;
-          
+
           /* we are now waiting for our buffer to be filled*/
           output_facility->facility_state = IOSTATE_WAITING;
 
@@ -1272,7 +1272,7 @@ continue_partial_write:
       return TRUE;
     case IOSTATE_QUEUED:
       // there was an operation going on already, check if that has completed now.
-      
+
       if (GetOverlappedResult (output_facility->handle,
                                     &output_facility->overlapped,
                                     &output_facility->buffer_size_processed,
@@ -1280,17 +1280,17 @@ continue_partial_write:
         {/* successful return for a queued operation */
           if (! ResetEvent (output_facility->overlapped.hEvent))
             return FALSE;
-          
+
           fprintf (stderr, "DEBUG: write succeeded delayed\n");
           output_facility->buffer_size_written += output_facility->buffer_size_processed;
-          
+
           /* partial write */
           if (output_facility->buffer_size_written < output_facility->buffer_size)
             goto continue_partial_write;
-          
+
           /* we are now waiting for our buffer to be filled*/
           output_facility->facility_state = IOSTATE_WAITING;
-          
+
           /* we successfully wrote something and now need to reset our reader */
           if (IOSTATE_WAITING == input_facility->facility_state)
             input_facility->facility_state = IOSTATE_RESUME;
@@ -1307,7 +1307,7 @@ continue_partial_write:
               fprintf (stderr, "FATAL: Write to handle failed, exiting\n");
             }
         }
-    default: 
+    default:
       return TRUE;
     }
 }
@@ -1315,7 +1315,7 @@ continue_partial_write:
 
 /**
  * Initialize a overlapped structure
- * 
+ *
  * @param elem the element to initilize
  * @param initial_state the initial state for this instance
  * @param signaled if the hEvent created should default to signaled or not
@@ -1361,7 +1361,7 @@ run (HANDLE tap_handle)
   /* tun up: */
   /* we do this HERE and not beforehand (in init_tun()), in contrast to openvpn
    * to remove the need to flush the arp cache, handle DHCP and wrong IPs.
-   *  
+   *
    * DHCP and such are all features we will never use in gnunet afaik.
    * But for openvpn those are essential.
    */
@@ -1383,12 +1383,12 @@ run (HANDLE tap_handle)
   /* Debug output to console STDIN/STDOUT*/
   std_in.handle = parent_std_in_handle;
   std_out.handle = parent_std_out_handle;
-  
+
 #else
   fprintf (stderr, "DEBUG: reopening stdin/out for overlapped IO\n");
-  /* 
-   * Find out the types of our handles. 
-   * This part is a problem, because in windows we need to handle files, 
+  /*
+   * Find out the types of our handles.
+   * This part is a problem, because in windows we need to handle files,
    * pipes and the console differently.
    */
   if ((FILE_TYPE_PIPE != GetFileType (parent_std_in_handle)) ||
@@ -1472,16 +1472,16 @@ main (int argc, char **argv)
   int global_ret = 0;
   BOOL have_ip4 = FALSE;
   BOOL have_ip6 = FALSE;
-  
+
   if (argc > 1 && 0 != strcmp (argv[1], "-d")){
       privilege_testing = TRUE;
-      fprintf (stderr, 
+      fprintf (stderr,
                "%s",
                "DEBUG: Running binary in privilege testing mode.");
       argv++;
       argc--;
     }
-  
+
   if (6 != argc)
     {
       fprintf (stderr,
@@ -1493,9 +1493,9 @@ main (int argc, char **argv)
   strncpy (hwid, argv[1], LINE_LEN);
   hwid[LINE_LEN - 1] = '\0';
 
-  /* 
-   * We use our PID for finding/resolving the control-panel name of our virtual 
-   * device. PIDs are (of course) unique at runtime, thus we can safely use it 
+  /*
+   * We use our PID for finding/resolving the control-panel name of our virtual
+   * device. PIDs are (of course) unique at runtime, thus we can safely use it
    * as additional hardware-id for our device.
    */
   snprintf (secondary_hwid, LINE_LEN / 2, "%s-%d",
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index c8f4530eb..57e5008e0 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -585,7 +585,7 @@ main (int argc, char **argv)
 
     set_address4 (dev, address, mask);
   }
-  
+
   uid_t uid = getuid ();
 #ifdef HAVE_SETRESUID
   if (0 != setresuid (uid, uid, uid))
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 13cbf5021..4ecd0dfc1 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -22,7 +22,7 @@
  * @file vpn/gnunet-service-vpn.c
  * @brief service that opens a virtual interface and allows its clients
  *        to allocate IPs on the virtual interface and to then redirect
- *        IP traffic received on those IPs via the GNUnet mesh 
+ *        IP traffic received on those IPs via the GNUnet mesh
  * @author Philipp Toelke
  * @author Christian Grothoff
  *
@@ -150,14 +150,14 @@ struct DestinationEntry
 
     } service_destination;
 
-    struct 
+    struct
     {
-  
+
       /**
        * Address family used (AF_INET or AF_INET6).
        */
       int af;
-      
+
       /**
        * IP address of the ultimate destination (only used for exit tunnels).
        */
@@ -177,7 +177,7 @@ struct DestinationEntry
     } exit_destination;
 
   } details;
-    
+
 };
 
 
@@ -195,7 +195,7 @@ struct TunnelMessageQueueEntry
    * This is a doubly-linked list.
    */
   struct TunnelMessageQueueEntry *prev;
-  
+
   /**
    * Number of bytes in 'msg'.
    */
@@ -244,7 +244,7 @@ struct TunnelState
   /**
    * Tail of list of messages scheduled for transmission.
    */
-  struct TunnelMessageQueueEntry *tmq_tail;  
+  struct TunnelMessageQueueEntry *tmq_tail;
 
   /**
    * Destination entry that has a pointer to this tunnel state;
@@ -284,7 +284,7 @@ struct TunnelState
      * Address if af is AF_INET.
      */
     struct in_addr v4;
-    
+
     /**
      * Address if af is AF_INET6.
      */
@@ -302,7 +302,7 @@ struct TunnelState
      * Address if af is AF_INET.
      */
     struct in_addr v4;
-    
+
     /**
      * Address if af is AF_INET6.
      */
@@ -506,7 +506,7 @@ send_client_reply (struct GNUNET_SERVER_Client *client,
   switch (result_af)
   {
   case AF_INET:
-    rlen = sizeof (struct in_addr);    
+    rlen = sizeof (struct in_addr);
     break;
   case AF_INET6:
     rlen = sizeof (struct in6_addr);
@@ -632,8 +632,8 @@ send_to_peer_notify_callback (void *cls, size_t size, void *buf)
   ret = tnq->len;
   GNUNET_free (tnq);
   if (NULL != (tnq = ts->tmq_head))
-    ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel, 
-                                                GNUNET_NO /* cork */, 
+    ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
+                                                GNUNET_NO /* cork */,
                                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                                 tnq->len,
                                                 &send_to_peer_notify_callback,
@@ -678,12 +678,12 @@ send_to_tunnel (struct TunnelMessageQueueEntry *tnq,
     ts->th = NULL;
     GNUNET_STATISTICS_update (stats,
                               gettext_noop ("# Bytes dropped in mesh queue (overflow)"),
-                              dq->len, 
+                              dq->len,
                               GNUNET_NO);
     GNUNET_free (dq);
   }
   if (NULL == ts->th)
-    ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel, 
+    ts->th = GNUNET_MESH_notify_transmit_ready (ts->tunnel,
                                                 GNUNET_NO /* cork */,
                                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                                 tnq->len,
@@ -803,7 +803,7 @@ create_tunnel_to_destination (struct DestinationTunnel *dt,
       char address[GNUNET_TUN_IPV4_REGEXLEN];
 
       GNUNET_TUN_ipv4toregexsearch (&dt->destination->details.exit_destination.ip.v4,
-                                    "255.255.255.255", 
+                                    "255.255.255.255",
                                     address);
       GNUNET_asprintf (&policy, "%s%s%s:%u",
                        GNUNET_APPLICATION_TYPE_EXIT_REGEX_PREFIX,
@@ -815,7 +815,7 @@ create_tunnel_to_destination (struct DestinationTunnel *dt,
     case AF_INET6:
     {
       char address[GNUNET_TUN_IPV6_REGEXLEN];
-      
+
       GNUNET_TUN_ipv6toregexsearch (&dt->destination->details.exit_destination.ip.v6,
                                     128, address);
       GNUNET_asprintf (&policy, "%s%s%s:%u",
@@ -862,7 +862,7 @@ expire_tunnel (struct TunnelState *except)
 
 
 /**
- * Route a packet via mesh to the given destination.  
+ * Route a packet via mesh to the given destination.
  *
  * @param destination description of the destination
  * @param af address family on this end (AF_INET or AF_INET6)
@@ -930,7 +930,7 @@ route_packet (struct DestinationEntry *destination,
         /* blame kernel? */
         GNUNET_break (0);
         return;
-      }      
+      }
       udp = NULL; /* make compiler happy */
       icmp = NULL;  /* make compiler happy */
       tcp = payload;
@@ -950,8 +950,8 @@ route_packet (struct DestinationEntry *destination,
                                &key);
     }
     break;
-  case IPPROTO_ICMP:  
-  case IPPROTO_ICMPV6:  
+  case IPPROTO_ICMP:
+  case IPPROTO_ICMPV6:
     {
       if ( (AF_INET == af) ^ (protocol == IPPROTO_ICMP) )
       {
@@ -986,7 +986,7 @@ route_packet (struct DestinationEntry *destination,
   }
   alen = 0;
   if (! destination->is_service)
-  {  
+  {
     switch (destination->details.exit_destination.af)
     {
     case AF_INET:
@@ -1003,7 +1003,7 @@ route_packet (struct DestinationEntry *destination,
       char sbuf[INET6_ADDRSTRLEN];
       char dbuf[INET6_ADDRSTRLEN];
       char xbuf[INET6_ADDRSTRLEN];
-      
+
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Routing %s packet from %s:%u -> %s:%u to destination %s:%u\n",
                   (protocol == IPPROTO_TCP) ? "TCP" : "UDP",
@@ -1025,7 +1025,7 @@ route_packet (struct DestinationEntry *destination,
     {
       char sbuf[INET6_ADDRSTRLEN];
       char dbuf[INET6_ADDRSTRLEN];
-      
+
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Routing %s packet from %s:%u -> %s:%u to service %s at peer %s\n",
                   (protocol == IPPROTO_TCP) ? "TCP" : "UDP",
@@ -1066,7 +1066,7 @@ route_packet (struct DestinationEntry *destination,
     ts->destination_container = NULL; /* no longer 'contained' */
     /* now bind existing "unbound" tunnel to our IP/port tuple */
     ts->protocol = protocol;
-    ts->af = af; 
+    ts->af = af;
     if (AF_INET == af)
     {
       ts->source_ip.v4 = * (const struct in_addr *) source_ip;
@@ -1086,7 +1086,7 @@ route_packet (struct DestinationEntry *destination,
                    GNUNET_CONTAINER_multihashmap_put (tunnel_map,
                                                       &key,
                                                       ts,
-                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); 
+                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
     GNUNET_STATISTICS_update (stats,
                               gettext_noop ("# Active tunnels"),
                               1, GNUNET_NO);
@@ -1096,12 +1096,12 @@ route_packet (struct DestinationEntry *destination,
   else
   {
     is_new = GNUNET_NO;
-    GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
+    GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
                                        ts->heap_node,
                                        GNUNET_TIME_absolute_get ().abs_value_us);
   }
   GNUNET_assert (NULL != ts->tunnel);
-  
+
   /* send via tunnel */
   switch (protocol)
   {
@@ -1110,7 +1110,7 @@ route_packet (struct DestinationEntry *destination,
     {
       struct GNUNET_EXIT_UdpServiceMessage *usm;
 
-      mlen = sizeof (struct GNUNET_EXIT_UdpServiceMessage) + 
+      mlen = sizeof (struct GNUNET_EXIT_UdpServiceMessage) +
         payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
@@ -1139,7 +1139,7 @@ route_packet (struct DestinationEntry *destination,
       struct in6_addr *ip6dst;
       void *payload;
 
-      mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) + 
+      mlen = sizeof (struct GNUNET_EXIT_UdpInternetMessage) +
         alen + payload_length - sizeof (struct GNUNET_TUN_UdpHeader);
       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
@@ -1151,7 +1151,7 @@ route_packet (struct DestinationEntry *destination,
       tnq->msg = &tnq[1];
       uim = (struct GNUNET_EXIT_UdpInternetMessage *) &tnq[1];
       uim->header.size = htons ((uint16_t) mlen);
-      uim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET); 
+      uim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_INTERNET);
       uim->af = htonl (destination->details.exit_destination.af);
       uim->source_port = (ntohs (udp->source_port) < 32000) ? udp->source_port : 0;
       uim->destination_port = udp->destination_port;
@@ -1182,7 +1182,7 @@ route_packet (struct DestinationEntry *destination,
       {
         struct GNUNET_EXIT_TcpServiceStartMessage *tsm;
 
-        mlen = sizeof (struct GNUNET_EXIT_TcpServiceStartMessage) + 
+        mlen = sizeof (struct GNUNET_EXIT_TcpServiceStartMessage) +
           payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
         if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
         {
@@ -1209,7 +1209,7 @@ route_packet (struct DestinationEntry *destination,
         struct in6_addr *ip6dst;
         void *payload;
 
-        mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) + 
+        mlen = sizeof (struct GNUNET_EXIT_TcpInternetStartMessage) +
           alen + payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
         if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
         {
@@ -1248,7 +1248,7 @@ route_packet (struct DestinationEntry *destination,
     {
       struct GNUNET_EXIT_TcpDataMessage *tdm;
 
-      mlen = sizeof (struct GNUNET_EXIT_TcpDataMessage) + 
+      mlen = sizeof (struct GNUNET_EXIT_TcpDataMessage) +
         payload_length - sizeof (struct GNUNET_TUN_TcpHeader);
       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
@@ -1274,7 +1274,7 @@ route_packet (struct DestinationEntry *destination,
     {
       struct GNUNET_EXIT_IcmpServiceMessage *ism;
 
-      mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) + 
+      mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
         payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
@@ -1303,7 +1303,7 @@ route_packet (struct DestinationEntry *destination,
         case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
         case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:
           /* throw away ICMP payload, won't be useful for the other side anyway */
-          payload_length = sizeof (struct GNUNET_TUN_IcmpHeader); 
+          payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
           break;
         default:
           GNUNET_STATISTICS_update (stats,
@@ -1321,7 +1321,7 @@ route_packet (struct DestinationEntry *destination,
         case GNUNET_TUN_ICMPTYPE6_TIME_EXCEEDED:
         case GNUNET_TUN_ICMPTYPE6_PARAMETER_PROBLEM:
           /* throw away ICMP payload, won't be useful for the other side anyway */
-          payload_length = sizeof (struct GNUNET_TUN_IcmpHeader); 
+          payload_length = sizeof (struct GNUNET_TUN_IcmpHeader);
           break;
         case GNUNET_TUN_ICMPTYPE6_ECHO_REQUEST:
         case GNUNET_TUN_ICMPTYPE6_ECHO_REPLY:
@@ -1340,8 +1340,8 @@ route_packet (struct DestinationEntry *destination,
       }
 
       /* update length calculations, as payload_length may have changed */
-      mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) + 
-        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);      
+      mlen = sizeof (struct GNUNET_EXIT_IcmpServiceMessage) +
+        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
       tnq->len = mlen;
       ism->header.size = htons ((uint16_t) mlen);
       /* finally, copy payload (if there is any left...) */
@@ -1356,7 +1356,7 @@ route_packet (struct DestinationEntry *destination,
       struct in6_addr *ip6dst;
       void *payload;
 
-      mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) + 
+      mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
         alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
       if (mlen >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
       {
@@ -1366,7 +1366,7 @@ route_packet (struct DestinationEntry *destination,
       tnq = GNUNET_malloc (sizeof (struct TunnelMessageQueueEntry) + mlen);
       tnq->msg = &tnq[1];
       iim = (struct GNUNET_EXIT_IcmpInternetMessage *) &tnq[1];
-      iim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_INTERNET); 
+      iim->header.type = htons (GNUNET_MESSAGE_TYPE_VPN_ICMP_TO_INTERNET);
       iim->icmp_header = *icmp;
       /* Perform ICMP protocol-translation (depending on destination AF and source AF)
          and throw away ICMP payload depending on ICMP message type */
@@ -1375,11 +1375,11 @@ route_packet (struct DestinationEntry *destination,
       case AF_INET:
         switch (icmp->type)
         {
-        case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:      
+        case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:    
           if (destination->details.exit_destination.af == AF_INET6)
             iim->icmp_header.type = GNUNET_TUN_ICMPTYPE6_ECHO_REPLY;
           break;
-        case GNUNET_TUN_ICMPTYPE_ECHO_REQUEST:    
+        case GNUNET_TUN_ICMPTYPE_ECHO_REQUEST:  
           if (destination->details.exit_destination.af == AF_INET6)
             iim->icmp_header.type = GNUNET_TUN_ICMPTYPE6_ECHO_REQUEST;
           break;
@@ -1411,7 +1411,7 @@ route_packet (struct DestinationEntry *destination,
           GNUNET_STATISTICS_update (stats,
                                     gettext_noop ("# ICMPv4 packets dropped (type not allowed)"),
                                     1, GNUNET_NO);
-          GNUNET_free (tnq);        
+          GNUNET_free (tnq);    
           return;
         }
         /* end of AF_INET */
@@ -1467,17 +1467,17 @@ route_packet (struct DestinationEntry *destination,
             GNUNET_STATISTICS_update (stats,
                                       gettext_noop ("# ICMPv6 packets dropped (type not allowed)"),
                                       1, GNUNET_NO);
-            GNUNET_free (tnq);      
+            GNUNET_free (tnq);  
             return;
           }
         /* end of AF_INET6 */
         break;
       default:
         GNUNET_assert (0);
-      } 
+      }
       /* update length calculations, as payload_length may have changed */
-      mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) + 
-        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);      
+      mlen = sizeof (struct GNUNET_EXIT_IcmpInternetMessage) +
+        alen + payload_length - sizeof (struct GNUNET_TUN_IcmpHeader);
       tnq->len = mlen;
       iim->header.size = htons ((uint16_t) mlen);
 
@@ -1549,7 +1549,7 @@ message_token (void *cls,
   case ETH_P_IPV6:
     {
       const struct GNUNET_TUN_IPv6Header *pkt6;
-      
+
       if (mlen < sizeof (struct GNUNET_TUN_IPv6Header))
       {
         /* blame kernel */
@@ -1576,8 +1576,8 @@ message_token (void *cls,
       route_packet (de,
                     AF_INET6,
                     pkt6->next_header,
-                    &pkt6->source_address,                  
-                    &pkt6->destination_address,             
+                    &pkt6->source_address,              
+                    &pkt6->destination_address,         
                     &pkt6[1],
                     mlen - sizeof (struct GNUNET_TUN_IPv6Header));
     }
@@ -1612,14 +1612,14 @@ message_token (void *cls,
       if (pkt4->header_length * 4 != sizeof (struct GNUNET_TUN_IPv4Header))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                    _("Received IPv4 packet with options (dropping it)\n"));                
+                    _("Received IPv4 packet with options (dropping it)\n"));            
         return GNUNET_OK;
       }
       route_packet (de,
                     AF_INET,
                     pkt4->protocol,
-                    &pkt4->source_address,                  
-                    &pkt4->destination_address,             
+                    &pkt4->source_address,              
+                    &pkt4->destination_address,         
                     &pkt4[1],
                     mlen - sizeof (struct GNUNET_TUN_IPv4Header));
     }
@@ -1696,7 +1696,7 @@ make_up_icmpv6_payload (struct TunnelState *ts,
  * @param message the actual message
  * @return #GNUNET_OK to keep the connection open,
  *         #GNUNET_SYSERR to close it (signal serious error)
- */ 
+ */
 static int
 receive_icmp_back (void *cls,
                    struct GNUNET_MESH_Tunnel *tunnel,
@@ -1731,7 +1731,7 @@ receive_icmp_back (void *cls,
   {
     char sbuf[INET6_ADDRSTRLEN];
     char dbuf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received ICMP packet from mesh, sending %u bytes from %s -> %s via TUN\n",
                 (unsigned int) mlen,
@@ -1742,8 +1742,8 @@ receive_icmp_back (void *cls,
   {
   case AF_INET:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv4Header) 
-        + sizeof (struct GNUNET_TUN_IcmpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+        + sizeof (struct GNUNET_TUN_IcmpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -1767,12 +1767,12 @@ receive_icmp_back (void *cls,
         memcpy (&icmp[1],
                 &i2v[1],
                 mlen);
-        /* For some ICMP types, we need to adjust (make up) the payload here. 
-           Also, depending on the AF used on the other side, we have to 
+        /* For some ICMP types, we need to adjust (make up) the payload here.
+           Also, depending on the AF used on the other side, we have to
            do ICMP PT (translate ICMP types) */
         switch (ntohl (i2v->af))
         {
-        case AF_INET:     
+        case AF_INET:   
           switch (icmp->type)
           {
           case GNUNET_TUN_ICMPTYPE_ECHO_REPLY:
@@ -1780,11 +1780,11 @@ receive_icmp_back (void *cls,
             break;
           case GNUNET_TUN_ICMPTYPE_DESTINATION_UNREACHABLE:
           case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
-          case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:         
+          case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:       
             {
               struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -1814,7 +1814,7 @@ receive_icmp_back (void *cls,
             {
               struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -1831,7 +1831,7 @@ receive_icmp_back (void *cls,
             {
               struct GNUNET_TUN_IPv4Header *ipp = (struct GNUNET_TUN_IPv4Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -1881,8 +1881,8 @@ receive_icmp_back (void *cls,
     break;
   case AF_INET6:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv6Header) 
-        + sizeof (struct GNUNET_TUN_IcmpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+        + sizeof (struct GNUNET_TUN_IcmpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -1905,12 +1905,12 @@ receive_icmp_back (void *cls,
                 &i2v[1],
                 mlen);
 
-        /* For some ICMP types, we need to adjust (make up) the payload here. 
-           Also, depending on the AF used on the other side, we have to 
+        /* For some ICMP types, we need to adjust (make up) the payload here.
+           Also, depending on the AF used on the other side, we have to
            do ICMP PT (translate ICMP types) */
         switch (ntohl (i2v->af))
         {
-        case AF_INET:     
+        case AF_INET:   
           /* ICMP PT 4-to-6 and possibly making up payloads */
           switch (icmp->type)
           {
@@ -1925,7 +1925,7 @@ receive_icmp_back (void *cls,
             {
               struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -1937,12 +1937,12 @@ receive_icmp_back (void *cls,
               make_up_icmpv6_payload (ts, ipp, udp);
             }
             break;
-          case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:         
+          case GNUNET_TUN_ICMPTYPE_TIME_EXCEEDED:       
             icmp->type = GNUNET_TUN_ICMPTYPE6_TIME_EXCEEDED;
             {
               struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -1957,7 +1957,7 @@ receive_icmp_back (void *cls,
           case GNUNET_TUN_ICMPTYPE_SOURCE_QUENCH:
             GNUNET_STATISTICS_update (stats,
                                       gettext_noop ("# ICMPv4 packets dropped (impossible PT to v6)"),
-                                      1, GNUNET_NO);        
+                                      1, GNUNET_NO);    
             return GNUNET_OK;
           default:
             GNUNET_break_op (0);
@@ -1978,7 +1978,7 @@ receive_icmp_back (void *cls,
             {
               struct GNUNET_TUN_IPv6Header *ipp = (struct GNUNET_TUN_IPv6Header *) &icmp[1];
               struct GNUNET_TUN_UdpHeader *udp = (struct GNUNET_TUN_UdpHeader *) &ipp[1];
-              
+        
               if (mlen != 0)
                 {
                   /* sender did not strip ICMP payload? */
@@ -2018,7 +2018,7 @@ receive_icmp_back (void *cls,
   default:
     GNUNET_assert (0);
   }
-  GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
+  GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
                                      ts->heap_node,
                                      GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
@@ -2035,7 +2035,7 @@ receive_icmp_back (void *cls,
  * @param message the actual message
  * @return #GNUNET_OK to keep the connection open,
  *         #GNUNET_SYSERR to close it (signal serious error)
- */ 
+ */
 static int
 receive_udp_back (void *cls,
                   struct GNUNET_MESH_Tunnel *tunnel,
@@ -2070,7 +2070,7 @@ receive_udp_back (void *cls,
   {
     char sbuf[INET6_ADDRSTRLEN];
     char dbuf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received UDP reply from mesh, sending %u bytes from %s:%u -> %s:%u via TUN\n",
                 (unsigned int) mlen,
@@ -2083,8 +2083,8 @@ receive_udp_back (void *cls,
   {
   case AF_INET:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv4Header) 
-        + sizeof (struct GNUNET_TUN_UdpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+        + sizeof (struct GNUNET_TUN_UdpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -2128,8 +2128,8 @@ receive_udp_back (void *cls,
     break;
   case AF_INET6:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv6Header) 
-        + sizeof (struct GNUNET_TUN_UdpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+        + sizeof (struct GNUNET_TUN_UdpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -2173,7 +2173,7 @@ receive_udp_back (void *cls,
   default:
     GNUNET_assert (0);
   }
-  GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
+  GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
                                      ts->heap_node,
                                      GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
@@ -2190,7 +2190,7 @@ receive_udp_back (void *cls,
  * @param message the actual message
  * @return #GNUNET_OK to keep the connection open,
  *         #GNUNET_SYSERR to close it (signal serious error)
- */ 
+ */
 static int
 receive_tcp_back (void *cls,
                   struct GNUNET_MESH_Tunnel *tunnel,
@@ -2220,7 +2220,7 @@ receive_tcp_back (void *cls,
   {
     char sbuf[INET6_ADDRSTRLEN];
     char dbuf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received TCP reply from mesh, sending %u bytes from %s:%u -> %s:%u via TUN\n",
                 (unsigned int) mlen,
@@ -2238,8 +2238,8 @@ receive_tcp_back (void *cls,
   {
   case AF_INET:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv4Header) 
-        + sizeof (struct GNUNET_TUN_TcpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv4Header)
+        + sizeof (struct GNUNET_TUN_TcpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -2277,8 +2277,8 @@ receive_tcp_back (void *cls,
     break;
   case AF_INET6:
     {
-      size_t size = sizeof (struct GNUNET_TUN_IPv6Header) 
-        + sizeof (struct GNUNET_TUN_TcpHeader) 
+      size_t size = sizeof (struct GNUNET_TUN_IPv6Header)
+        + sizeof (struct GNUNET_TUN_TcpHeader)
         + sizeof (struct GNUNET_MessageHeader) +
         sizeof (struct GNUNET_TUN_Layer2PacketHeader) +
         mlen;
@@ -2315,7 +2315,7 @@ receive_tcp_back (void *cls,
     }
     break;
   }
-  GNUNET_CONTAINER_heap_update_cost (tunnel_heap, 
+  GNUNET_CONTAINER_heap_update_cost (tunnel_heap,
                                      ts->heap_node,
                                      GNUNET_TIME_absolute_get ().abs_value_us);
   return GNUNET_OK;
@@ -2342,10 +2342,10 @@ allocate_v4_address (struct in_addr *v4)
   unsigned int tries;
 
   GNUNET_assert (1 == inet_pton (AF_INET, ipv4addr, &addr));
-  GNUNET_assert (1 == inet_pton (AF_INET, ipv4mask, &mask));           
-  /* Given 192.168.0.1/255.255.0.0, we want a mask 
+  GNUNET_assert (1 == inet_pton (AF_INET, ipv4mask, &mask));
+  /* Given 192.168.0.1/255.255.0.0, we want a mask
      of '192.168.255.255', thus:  */
-  mask.s_addr = addr.s_addr | ~mask.s_addr;  
+  mask.s_addr = addr.s_addr | ~mask.s_addr;
   tries = 0;
   do
     {
@@ -2357,9 +2357,9 @@ allocate_v4_address (struct in_addr *v4)
         return GNUNET_SYSERR;
       }
       /* Pick random IPv4 address within the subnet, except 'addr' or 'mask' itself */
-      rnd.s_addr = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 
+      rnd.s_addr = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
                                              UINT32_MAX);       
-      v4->s_addr = (addr.s_addr | rnd.s_addr) & mask.s_addr;          
+      v4->s_addr = (addr.s_addr | rnd.s_addr) & mask.s_addr;
       get_destination_key_from_ip (AF_INET,
                                    v4,
                                    &key);
@@ -2399,7 +2399,7 @@ allocate_v6_address (struct in6_addr *v6)
   mask = addr;
   for (i=127;i>=ipv6prefix;i--)
     mask.s6_addr[i / 8] |= (1 << (i % 8));
-  
+
   /* Pick random IPv6 address within the subnet, except 'addr' or 'mask' itself */
   tries = 0;
   do
@@ -2414,7 +2414,7 @@ allocate_v6_address (struct in6_addr *v6)
         }
       for (i=0;i<16;i++)
         {
-          rnd.s6_addr[i] = (unsigned char) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 
+          rnd.s6_addr[i] = (unsigned char) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
                                                                      256);
           v6->s6_addr[i]
             = (addr.s6_addr[i] | rnd.s6_addr[i]) & mask.s6_addr[i];
@@ -2466,7 +2466,7 @@ free_destination_entry (struct DestinationEntry *de)
   if (NULL != de->heap_node)
   {
     GNUNET_CONTAINER_heap_remove_node (de->heap_node);
-    de->heap_node = NULL;  
+    de->heap_node = NULL;
     GNUNET_assert (GNUNET_YES ==
                    GNUNET_CONTAINER_multihashmap_remove (destination_map,
                                                          &de->key,
@@ -2481,7 +2481,7 @@ free_destination_entry (struct DestinationEntry *de)
  *
  * @param except destination that must NOT be cleaned up, even if it is the oldest
  */
-static void 
+static void
 expire_destination (struct DestinationEntry *except)
 {
   struct DestinationEntry *de;
@@ -2495,13 +2495,13 @@ expire_destination (struct DestinationEntry *except)
 
 
 /**
- * Allocate an IP address for the response.  
+ * Allocate an IP address for the response.
  *
  * @param result_af desired address family; set to the actual
  *        address family; can initially be AF_UNSPEC if there
  *        is no preference; will be set to AF_UNSPEC if the
  *        allocation failed
- * @param addr set to either v4 or v6 depending on which 
+ * @param addr set to either v4 or v6 depending on which
  *         storage location was used; set to NULL if allocation failed
  * @param v4 storage space for an IPv4 address
  * @param v6 storage space for an IPv6 address
@@ -2550,7 +2550,7 @@ allocate_response_ip (int *result_af,
     return GNUNET_SYSERR;
   }
   return GNUNET_OK;
-}                     
+}               
 
 
 /**
@@ -2577,7 +2577,7 @@ service_redirect_to_ip (void *cls,
   void *addr;
   struct DestinationEntry *de;
   struct GNUNET_HashCode key;
-  
+
   /* validate and parse request */
   mlen = ntohs (message->size);
   if (mlen < sizeof (struct RedirectToIpRequestMessage))
@@ -2596,7 +2596,7 @@ service_redirect_to_ip (void *cls,
     {
       GNUNET_break (0);
       GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;      
+      return;
     }
     break;
   case AF_INET6:
@@ -2604,13 +2604,13 @@ service_redirect_to_ip (void *cls,
     {
       GNUNET_break (0);
       GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;      
+      return;
     }
     break;
   default:
     GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;      
+    return;
   }
 
   /* allocate response IP */
@@ -2620,13 +2620,13 @@ service_redirect_to_ip (void *cls,
                                          &v4, &v6))
   {
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;      
+    return;
   }
   /* send reply with our IP address */
   send_client_reply (client,
                      msg->request_id,
                      result_af,
-                     addr);  
+                     addr);
   if (result_af == AF_UNSPEC)
   {
     /* failure, we're done */
@@ -2637,14 +2637,14 @@ service_redirect_to_ip (void *cls,
   {
     char sbuf[INET6_ADDRSTRLEN];
     char dbuf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Allocated address %s for redirection via exit to %s\n",
                 inet_ntop (result_af, addr, sbuf, sizeof (sbuf)),
                 inet_ntop (addr_af,
                            &msg[1], dbuf, sizeof (dbuf)));
   }
-  
+
   /* setup destination record */
   de = GNUNET_new (struct DestinationEntry);
   de->is_service = GNUNET_NO;
@@ -2683,7 +2683,7 @@ service_redirect_to_ip (void *cls,
  * @param message redirection request (a `struct RedirectToPeerRequestMessage`)
  */
 static void
-service_redirect_to_service (void *cls, 
+service_redirect_to_service (void *cls,
                              struct GNUNET_SERVER_Client *client,
                              const struct GNUNET_MessageHeader *message)
 {
@@ -2696,7 +2696,7 @@ service_redirect_to_service (void *cls,
   struct GNUNET_HashCode key;
   struct TunnelState *ts;
   struct DestinationTunnel *dt;
-  
+
   /*  parse request */
   msg = (const struct RedirectToServiceRequestMessage *) message;
 
@@ -2707,12 +2707,12 @@ service_redirect_to_service (void *cls,
                                          &v4, &v6))
   {
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    return;      
+    return;
   }
   send_client_reply (client,
                      msg->request_id,
                      result_af,
-                     addr);  
+                     addr);
   if (result_af == AF_UNSPEC)
   {
     /* failure, we're done */
@@ -2724,14 +2724,14 @@ service_redirect_to_service (void *cls,
 
   {
     char sbuf[INET6_ADDRSTRLEN];
-    
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Allocated address %s for redirection to service %s on peer %s\n",
                 inet_ntop (result_af, addr, sbuf, sizeof (sbuf)),
                 GNUNET_h2s (&msg->service_descriptor),
                 GNUNET_i2s (&msg->target));
   }
-  
+
   /* setup destination record */
   de = GNUNET_new (struct DestinationEntry);
   de->is_service = GNUNET_YES;
@@ -2778,15 +2778,15 @@ service_redirect_to_service (void *cls,
 /**
  * Function called whenever a tunnel is destroyed.  Should clean up
  * any associated state.
- * 
+ *
  * @param cls closure (set from #GNUNET_MESH_connect)
  * @param tunnel connection to the other end (henceforth invalid)
  * @param tunnel_ctx place where local state associated
  *                   with the tunnel is stored (our `struct TunnelState`)
- */ 
+ */
 static void
-tunnel_cleaner (void *cls, 
-                const struct GNUNET_MESH_Tunnel *tunnel, 
+tunnel_cleaner (void *cls,
+                const struct GNUNET_MESH_Tunnel *tunnel,
                 void *tunnel_ctx)
 {
   struct TunnelState *ts = tunnel_ctx;
@@ -2851,7 +2851,7 @@ cleanup (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "VPN is shutting down\n");
   if (NULL != destination_map)
-  {  
+  {
     GNUNET_CONTAINER_multihashmap_iterate (destination_map,
                                            &cleanup_destination,
                                            NULL);
@@ -2864,7 +2864,7 @@ cleanup (void *cls,
     destination_heap = NULL;
   }
   if (NULL != tunnel_map)
-  {  
+  {
     GNUNET_CONTAINER_multihashmap_iterate (tunnel_map,
                                            &cleanup_tunnel,
                                            NULL);
@@ -2916,8 +2916,8 @@ run (void *cls,
   static const struct GNUNET_SERVER_MessageHandler service_handlers[] = {
     /* callback, cls, type, size */
     { &service_redirect_to_ip, NULL, GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP, 0},
-    { &service_redirect_to_service, NULL, 
-     GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE, 
+    { &service_redirect_to_service, NULL,
+     GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE,
      sizeof (struct RedirectToServiceRequestMessage) },
     {NULL, NULL, 0, 0}
   };
@@ -2982,7 +2982,7 @@ run (void *cls,
                                                  &ipv6addr) ||
           (1 != inet_pton (AF_INET6, ipv6addr, &v6))) )
     {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR", 
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6ADDR",
                                  _("Must specify valid IPv6 address"));
       GNUNET_SCHEDULER_shutdown ();
       return;
@@ -3023,7 +3023,7 @@ run (void *cls,
                                                  &ipv4addr) ||
           (1 != inet_pton (AF_INET, ipv4addr, &v4))) )
     {
-      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR", 
+      GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV4ADDR",
                                  _("Must specify valid IPv4 address"));
       GNUNET_SCHEDULER_shutdown ();
       return;
@@ -3051,9 +3051,9 @@ run (void *cls,
   vpn_argv[6] = NULL;
 
   mesh_handle =
-    GNUNET_MESH_connect (cfg_, NULL, 
-                         NULL, 
-                         &tunnel_cleaner, 
+    GNUNET_MESH_connect (cfg_, NULL,
+                         NULL,
+                         &tunnel_cleaner,
                          mesh_handlers,
                          NULL);
   helper_handle = GNUNET_HELPER_start (GNUNET_NO,
@@ -3076,7 +3076,7 @@ int
 main (int argc, char *const *argv)
 {
   return (GNUNET_OK ==
-          GNUNET_SERVICE_run (argc, argv, "vpn", 
+          GNUNET_SERVICE_run (argc, argv, "vpn",
                               GNUNET_SERVICE_OPTION_NONE,
                               &run, NULL)) ? global_ret : 1;
 }
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index b4d6824d9..5a35a0df5 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -122,7 +122,7 @@ do_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  *                will match 'result_af' from the request
  * @param address IP address (struct in_addr or struct in_addr6, depending on 'af')
  *                that the VPN allocated for the redirection;
- *                traffic to this IP will now be redirected to the 
+ *                traffic to this IP will now be redirected to the
  *                specified target peer; NULL on error
  */
 static void
@@ -167,7 +167,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 {
   int dst_af;
   int req_af;
-  struct GNUNET_PeerIdentity peer; 
+  struct GNUNET_PeerIdentity peer;
   struct GNUNET_HashCode sd;
   const void *addr;
   struct in_addr v4;
@@ -194,7 +194,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
   if (ipv6)
     req_af = AF_INET6;
-  
+
   if (NULL == target_ip)
   {
     if (NULL == service_name)
@@ -233,7 +233,7 @@ run (void *cls, char *const *args, const char *cfgfile,
       FPRINTF (stderr, _("`%s' is not a valid peer identifier.\n"),
                peer_id);
       goto error;
-    }    
+    }
     GNUNET_CRYPTO_hash (service_name,
                         strlen (service_name),
                         &sd);
@@ -265,7 +265,7 @@ run (void *cls, char *const *args, const char *cfgfile,
     {
       dst_af = AF_INET6;
       addr = &v6;
-    }    
+    }
     request = GNUNET_VPN_redirect_to_ip (handle,
                                          req_af,
                                          dst_af,
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h
index b74b5b766..a487d8113 100644
--- a/src/vpn/vpn.h
+++ b/src/vpn/vpn.h
@@ -46,7 +46,7 @@ struct RedirectToIpRequestMessage
    * Always zero.
    */
   uint32_t reserved GNUNET_PACKED;
-  
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -69,7 +69,7 @@ struct RedirectToIpRequestMessage
   uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
 
@@ -89,7 +89,7 @@ struct RedirectToServiceRequestMessage
    * Always zero.
    */
   uint32_t reserved GNUNET_PACKED;
-  
+
   /**
    * How long should the redirection be maintained at most?
    */
@@ -99,7 +99,7 @@ struct RedirectToServiceRequestMessage
    * Desired protocol (IPPROTO_UDP or IPPROTO_TCP)
    */
   int32_t protocol GNUNET_PACKED;
-  
+
   /**
    * Address family desired for the result (AF_INET or AF_INET6 or AF_UNSPEC, in nbo)
    */
@@ -130,7 +130,7 @@ struct RedirectToServiceRequestMessage
  */
 struct RedirectToIpResponseMessage
 {
-  
+
   /**
    * Type is #GNUNET_MESSAGE_TYPE_VPN_CLIENT_USE_IP
    */
@@ -148,7 +148,7 @@ struct RedirectToIpResponseMessage
   uint64_t request_id GNUNET_PACKED;
 
   /* followed by destination address ('struct in_addr' or 'struct in6_addr') */
-  
+
 };
 
 GNUNET_NETWORK_STRUCT_END
diff --git a/src/vpn/vpn_api.c b/src/vpn/vpn_api.c
index 8539a6a37..cf493cc52 100644
--- a/src/vpn/vpn_api.c
+++ b/src/vpn/vpn_api.c
@@ -106,7 +106,7 @@ struct GNUNET_VPN_RedirectionRequest
    * Function to call with the designated IP address.
    */
   GNUNET_VPN_AllocationCallback cb;
-  
+
   /**
    * Closure for 'cb'.
    */
@@ -120,7 +120,7 @@ struct GNUNET_VPN_RedirectionRequest
   /**
    * For service redirection, service descriptor.
    */
-  struct GNUNET_HashCode serv;               
+  struct GNUNET_HashCode serv;          
 
   /**
    * At what time should the created service mapping expire?
@@ -141,7 +141,7 @@ struct GNUNET_VPN_RedirectionRequest
    * Address family of 'addr'.  AF_INET or AF_INET6.
    */
   int addr_af;
-  
+
   /**
    * For service redirection, IPPROT_UDP or IPPROTO_TCP.
    */
@@ -165,7 +165,7 @@ reconnect (struct GNUNET_VPN_Handle *vh);
  * @param cls the 'struct GNUNET_VPN_Handle'
  * @param msg message received, NULL on timeout or fatal error
  */
-static void 
+static void
 receive_response (void *cls,
                   const struct GNUNET_MessageHeader* msg)
 {
@@ -176,7 +176,7 @@ receive_response (void *cls,
   size_t alen;
   int af;
 
-  if (NULL == msg) 
+  if (NULL == msg)
   {
     reconnect (vh);
     return;
@@ -212,10 +212,10 @@ receive_response (void *cls,
     GNUNET_break (0);
     reconnect (vh);
     return;
-  }  
+  }
   GNUNET_CLIENT_receive (vh->client,
                          &receive_response, vh,
-                         GNUNET_TIME_UNIT_FOREVER_REL);      
+                         GNUNET_TIME_UNIT_FOREVER_REL);
   for (rr = vh->rr_head; NULL != rr; rr = rr->next)
   {
     if (rr->request_id == rm->request_id)
@@ -260,9 +260,9 @@ transmit_request (void *cls,
   while ( (NULL != rr) &&
           (0 != rr->request_id) )
     rr = rr->next;
-  if (NULL == rr) 
+  if (NULL == rr)
     return 0;
-  if (0 == size) 
+  if (0 == size)
   {
     reconnect (vh);
     return 0;
@@ -272,7 +272,7 @@ transmit_request (void *cls,
   if (0 == vh->request_id_gen)
     GNUNET_CLIENT_receive (vh->client,
                            &receive_response, vh,
-                           GNUNET_TIME_UNIT_FOREVER_REL); 
+                           GNUNET_TIME_UNIT_FOREVER_REL);
   if (NULL == rr->addr)
   {
     ret = sizeof (struct RedirectToServiceRequestMessage);
@@ -285,7 +285,7 @@ transmit_request (void *cls,
     rs.result_af = htonl (rr->result_af);
     rs.target = rr->peer;
     rs.service_descriptor = rr->serv;
-    rs.request_id = rr->request_id = ++vh->request_id_gen;    
+    rs.request_id = rr->request_id = ++vh->request_id_gen;
     memcpy (buf, &rs, sizeof (struct RedirectToServiceRequestMessage));
   }
   else
@@ -332,7 +332,7 @@ transmit_request (void *cls,
 
 /**
  * Add a request to our request queue and transmit it.
- * 
+ *
  * @param rr request to queue and transmit.
  */
 static void
@@ -366,12 +366,12 @@ connect_task (void *cls,
               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_VPN_Handle *vh = cls;
-  
+
   vh->rt = GNUNET_SCHEDULER_NO_TASK;
   vh->client = GNUNET_CLIENT_connect ("vpn", vh->cfg);
   GNUNET_assert (NULL != vh->client);
   GNUNET_assert (NULL == vh->th);
-  if (NULL != vh->rr_head) 
+  if (NULL != vh->rr_head)
     vh->th = GNUNET_CLIENT_notify_transmit_ready (vh->client,
                                                   sizeof (struct RedirectToServiceRequestMessage),
                                                   GNUNET_TIME_UNIT_FOREVER_REL,
@@ -395,7 +395,7 @@ reconnect (struct GNUNET_VPN_Handle *vh)
   {
     GNUNET_CLIENT_notify_transmit_ready_cancel (vh->th);
     vh->th = NULL;
-  }  
+  }
   GNUNET_CLIENT_disconnect (vh->client);
   vh->client = NULL;
   vh->request_id_gen = 0;
@@ -405,7 +405,7 @@ reconnect (struct GNUNET_VPN_Handle *vh)
                                           GNUNET_TIME_relative_min (GNUNET_TIME_relative_multiply (vh->backoff, 2),
                                                                     GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)));
   vh->rt = GNUNET_SCHEDULER_add_delayed (vh->backoff,
-                                         &connect_task, 
+                                         &connect_task,
                                          vh);
 }
 
@@ -540,7 +540,7 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh,
  * Connect to the VPN service
  *
  * @param cfg configuration to use
- * @return VPN handle 
+ * @return VPN handle
  */
 struct GNUNET_VPN_Handle *
 GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)