even nicer indentation, thanks to LRN's indent patch

9 files changed, 72 insertions, 56 deletions

diff --git a/src/vpn/gnunet-daemon-vpn-dns.h b/src/vpn/gnunet-daemon-vpn-dns.h
index 2882969e5..0cd0d8b26 100644
--- a/src/vpn/gnunet-daemon-vpn-dns.h
+++ b/src/vpn/gnunet-daemon-vpn-dns.h
@@ -40,19 +40,22 @@ extern struct query_packet_list *tail;
  * Callback called by notify_transmit_ready; sends dns-queries or rehijack-messages
  * to the service-dns
  */
-size_t send_query (void *cls, size_t size, void *buf);
+size_t
+send_query (void *cls, size_t size, void *buf);
 
 /**
  * Connect to the service-dns
  */
-void connect_to_service_dns (void *cls,
-                             const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+connect_to_service_dns (void *cls,
+                        const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 /**
  * This receives packets from the service-dns and schedules process_answer to
  * handle it
  */
-void dns_answer_handler (void *cls, const struct GNUNET_MessageHeader *msg);
+void
+dns_answer_handler (void *cls, const struct GNUNET_MessageHeader *msg);
 
 /**
  * The connection to the service-dns
diff --git a/src/vpn/gnunet-daemon-vpn-helper.c b/src/vpn/gnunet-daemon-vpn-helper.c
index 71fdefc0a..ef2833f87 100644
--- a/src/vpn/gnunet-daemon-vpn-helper.c
+++ b/src/vpn/gnunet-daemon-vpn-helper.c
@@ -497,9 +497,9 @@ message_token (void *cls __attribute__ ((unused)), void *client
 
             }
             else if (0x06 == pkt->ip_hdr.proto &&
-                     (me->desc.
-                      service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP)) &&
-                     (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt)))
+                     (me->
+                      desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP))
+                     && (port_in_ports (me->desc.ports, pkt_tcp->tcp_hdr.dpt)))
             {
               hdr->type = ntohs (GNUNET_MESSAGE_TYPE_VPN_SERVICE_TCP);
 
diff --git a/src/vpn/gnunet-daemon-vpn-helper.h b/src/vpn/gnunet-daemon-vpn-helper.h
index 8e0ee5a0f..7329e45ff 100644
--- a/src/vpn/gnunet-daemon-vpn-helper.h
+++ b/src/vpn/gnunet-daemon-vpn-helper.h
@@ -38,35 +38,39 @@ extern GNUNET_SCHEDULER_TaskIdentifier shs_task;
 /**
  * Start the helper-process
  */
-void start_helper_and_schedule (void *cls,
-                                const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+start_helper_and_schedule (void *cls,
+                           const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 /**
  * Restart the helper-process
  */
-void restart_helper (void *cls,
-                     const struct GNUNET_SCHEDULER_TaskContext *tskctx);
+void
+restart_helper (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx);
 
 /**
  * Read from the helper-process
  */
-void helper_read (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tsdkctx);
+void
+helper_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tsdkctx);
 
 /**
  * Send an dns-answer-packet to the helper
  */
-void helper_write (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tsdkctx);
+void
+helper_write (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tsdkctx);
 
 /**
  * Receive packets from the helper-process
  */
-void message_token (void *cls, void *client,
-                    const struct GNUNET_MessageHeader *message);
+void
+message_token (void *cls, void *client,
+               const struct GNUNET_MessageHeader *message);
 
-void write_to_helper (void *buf, size_t len);
+void
+write_to_helper (void *buf, size_t len);
 
-void schedule_helper_write (struct GNUNET_TIME_Relative, void *cls);
+void
+schedule_helper_write (struct GNUNET_TIME_Relative, void *cls);
 
 #endif /* end of include guard: GNUNET-DAEMON-VPN-HELPER_H */
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c
index 301ba90be..06cade482 100644
--- a/src/vpn/gnunet-daemon-vpn.c
+++ b/src/vpn/gnunet-daemon-vpn.c
@@ -931,8 +931,8 @@ receive_udp_back (void *cls
     GNUNET_assert (me != NULL);
     if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK)
     {
-      GNUNET_assert (me->
-                     desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP));
+      GNUNET_assert (me->desc.
+                     service_type & htonl (GNUNET_DNS_SERVICE_TYPE_UDP));
       if (!port_in_ports (me->desc.ports, pkt6->udp_hdr.spt) &&
           !testBit (me->additional_ports, ntohs (pkt6->udp_hdr.spt)))
       {
@@ -1109,8 +1109,8 @@ receive_tcp_back (void *cls
 
     GNUNET_assert (me != NULL);
     if (ntohs (message->type) == GNUNET_MESSAGE_TYPE_VPN_SERVICE_UDP_BACK)
-      GNUNET_assert (me->
-                     desc.service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP));
+      GNUNET_assert (me->desc.
+                     service_type & htonl (GNUNET_DNS_SERVICE_TYPE_TCP));
 
     pkt6->tcp_hdr.crc = 0;
     uint32_t sum = 0;
diff --git a/src/vpn/gnunet-daemon-vpn.h b/src/vpn/gnunet-daemon-vpn.h
index 4f4cf5a0f..701a88d63 100644
--- a/src/vpn/gnunet-daemon-vpn.h
+++ b/src/vpn/gnunet-daemon-vpn.h
@@ -35,23 +35,28 @@
  * At the moment this means "inventing" and IPv6-Address for .gnunet-services and
  * doing nothing for "real" services.
  */
-void process_answer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+process_answer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
-void send_icmp6_response (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc);
-void send_icmp4_response (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+send_icmp6_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+void
+send_icmp4_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
-size_t                       send_udp_service (void *cls, size_t size,
-                                               void *buf);
+size_t
+send_udp_service (void *cls, size_t size, void *buf);
 
-GNUNET_HashCode *address6_mapping_exists (unsigned char addr[]);
-GNUNET_HashCode *address4_mapping_exists (uint32_t addr);
+GNUNET_HashCode *
+address6_mapping_exists (unsigned char addr[]);
+GNUNET_HashCode *
+address4_mapping_exists (uint32_t addr);
 
-unsigned int port_in_ports (uint64_t ports, uint16_t port);
+unsigned int
+port_in_ports (uint64_t ports, uint16_t port);
 
-void send_pkt_to_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_TRANSPORT_ATS_Information *atsi);
+void
+send_pkt_to_peer (void *cls, const struct GNUNET_PeerIdentity *peer,
+                  const struct GNUNET_TRANSPORT_ATS_Information *atsi);
 
 /**
  * The configuration to use
@@ -94,7 +99,8 @@ struct map_entry
  * @param bitArray memory area to set the bit in
  * @param bitIdx which bit to set
  */
-void setBit (char *bitArray, unsigned int bitIdx);
+void
+setBit (char *bitArray, unsigned int bitIdx);
 
 /**
  * Clears a bit from bitArray.
@@ -102,7 +108,8 @@ void setBit (char *bitArray, unsigned int bitIdx);
  * @param bitArray memory area to set the bit in
  * @param bitIdx which bit to unset
  */
-void clearBit (char *bitArray, unsigned int bitIdx);
+void
+clearBit (char *bitArray, unsigned int bitIdx);
 
 /**
  * Checks if a bit is active in the bitArray
@@ -111,7 +118,8 @@ void clearBit (char *bitArray, unsigned int bitIdx);
  * @param bitIdx which bit to test
  * @return GNUNET_YES if the bit is set, GNUNET_NO if not.
  */
-int testBit (char *bitArray, unsigned int bitIdx);
+int
+testBit (char *bitArray, unsigned int bitIdx);
 
 struct remote_addr
 {
diff --git a/src/vpn/gnunet-dns-parser.h b/src/vpn/gnunet-dns-parser.h
index cf9d55e8a..70a1e4b9e 100644
--- a/src/vpn/gnunet-dns-parser.h
+++ b/src/vpn/gnunet-dns-parser.h
@@ -4,8 +4,10 @@
 #include "platform.h"
 #include "gnunet-vpn-packet.h"
 
-struct dns_pkt_parsed *parse_dns_packet (struct dns_pkt *pkt);
+struct dns_pkt_parsed *
+parse_dns_packet (struct dns_pkt *pkt);
 
-void free_parsed_dns_packet (struct dns_pkt_parsed *ppkt);
+void
+free_parsed_dns_packet (struct dns_pkt_parsed *ppkt);
 
 #endif
diff --git a/src/vpn/gnunet-helper-vpn-api.h b/src/vpn/gnunet-helper-vpn-api.h
index 4e8f76611..964beb23c 100644
--- a/src/vpn/gnunet-helper-vpn-api.h
+++ b/src/vpn/gnunet-helper-vpn-api.h
@@ -95,20 +95,16 @@ struct GNUNET_VPN_HELPER_Handle
  *
  * @return A pointer to the new Handle, NULL on error
  */
-struct GNUNET_VPN_HELPER_Handle *start_helper (const char *ifname,
-                                               const char *ipv6addr,
-                                               const char *ipv6prefix,
-                                               const char *ipv4addr,
-                                               const char *ipv4mask,
-                                               const char *process_name,
-                                               GNUNET_SCHEDULER_Task
-                                               restart_task,
-                                               GNUNET_SERVER_MessageTokenizerCallback
-                                               cb, void *cb_cls);
+struct GNUNET_VPN_HELPER_Handle *
+start_helper (const char *ifname, const char *ipv6addr, const char *ipv6prefix,
+              const char *ipv4addr, const char *ipv4mask,
+              const char *process_name, GNUNET_SCHEDULER_Task restart_task,
+              GNUNET_SERVER_MessageTokenizerCallback cb, void *cb_cls);
 
 /**
  * @brief Kills the helper, closes the pipe and free()s the handle
  */
-void cleanup_helper (struct GNUNET_VPN_HELPER_Handle *);
+void
+cleanup_helper (struct GNUNET_VPN_HELPER_Handle *);
 
 #endif /* end of include guard: GNUNET_HELPER_VPN_API_H */
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index a267cab0d..ba7fa65d7 100644
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -927,8 +927,8 @@ out:
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
-static void read_response (void *cls,
-                           const struct GNUNET_SCHEDULER_TaskContext *tc);
+static void
+read_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 
 static int
 open_port ()
diff --git a/src/vpn/gnunet-vpn-checksum.h b/src/vpn/gnunet-vpn-checksum.h
index 82f4954ca..b6af8c56e 100644
--- a/src/vpn/gnunet-vpn-checksum.h
+++ b/src/vpn/gnunet-vpn-checksum.h
@@ -4,13 +4,16 @@
 
 #include <platform.h>
 
-uint32_t calculate_checksum_update (uint32_t sum, uint16_t * hdr, short len);
+uint32_t
+calculate_checksum_update (uint32_t sum, uint16_t * hdr, short len);
 
-uint16_t calculate_checksum_end (uint32_t sum);
+uint16_t
+calculate_checksum_end (uint32_t sum);
 
 /**
  * Calculate the checksum of an IPv4-Header
  */
-uint16_t calculate_ip_checksum (uint16_t * hdr, short len);
+uint16_t
+calculate_ip_checksum (uint16_t * hdr, short len);
 
 #endif /* end of include guard: GNUNET-VPN-CHECKSUM_H */