1 files changed, 81 insertions, 63 deletions

diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 941f394aa..0af9a1d3e 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -78,7 +78,8 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Header from Linux TUN interface.
  */
-struct GNUNET_TUN_Layer2PacketHeader {
+struct GNUNET_TUN_Layer2PacketHeader
+{
   /**
    * Some flags (unused).
    */
@@ -94,7 +95,8 @@ struct GNUNET_TUN_Layer2PacketHeader {
 /**
  * Standard IPv4 header.
  */
-struct GNUNET_TUN_IPv4Header {
+struct GNUNET_TUN_IPv4Header
+{
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   unsigned int header_length : 4 GNUNET_PACKED;
   unsigned int version : 4 GNUNET_PACKED;
@@ -150,7 +152,8 @@ struct GNUNET_TUN_IPv4Header {
 /**
  * Standard IPv6 header.
  */
-struct GNUNET_TUN_IPv6Header {
+struct GNUNET_TUN_IPv6Header
+{
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   unsigned int traffic_class_h : 4 GNUNET_PACKED;
   unsigned int version : 4 GNUNET_PACKED;
@@ -205,7 +208,8 @@ struct GNUNET_TUN_IPv6Header {
 /**
  * TCP packet header.
  */
-struct GNUNET_TUN_TcpHeader {
+struct GNUNET_TUN_TcpHeader
+{
   /**
    * Source port (in NBO).
    */
@@ -272,7 +276,8 @@ struct GNUNET_TUN_TcpHeader {
 /**
  * UDP packet header.
  */
-struct GNUNET_TUN_UdpHeader {
+struct GNUNET_TUN_UdpHeader
+{
   /**
    * Source port (in NBO).
    */
@@ -331,7 +336,8 @@ struct GNUNET_TUN_UdpHeader {
 /**
  * DNS flags (largely RFC 1035 / RFC 2136).
  */
-struct GNUNET_TUN_DnsFlags {
+struct GNUNET_TUN_DnsFlags
+{
 #if __BYTE_ORDER == __LITTLE_ENDIAN
   /**
    * Set to 1 if recursion is desired (client -> server)
@@ -442,7 +448,8 @@ struct GNUNET_TUN_DnsFlags {
 /**
  * DNS header.
  */
-struct GNUNET_TUN_DnsHeader {
+struct GNUNET_TUN_DnsHeader
+{
   /**
    * Unique identifier for the request/response.
    */
@@ -478,7 +485,8 @@ struct GNUNET_TUN_DnsHeader {
 /**
  * Payload of DNS SOA record (header).
  */
-struct GNUNET_TUN_DnsSoaRecord {
+struct GNUNET_TUN_DnsSoaRecord
+{
   /**
    * The version number of the original copy of the zone.   (NBO)
    */
@@ -512,7 +520,8 @@ struct GNUNET_TUN_DnsSoaRecord {
 /**
  * Payload of DNS SRV record (header).
  */
-struct GNUNET_TUN_DnsSrvRecord {
+struct GNUNET_TUN_DnsSrvRecord
+{
   /**
    * Preference for this entry (lower value is higher preference).  Clients
    * will contact hosts from the lowest-priority group first and fall back
@@ -539,7 +548,8 @@ struct GNUNET_TUN_DnsSrvRecord {
 /**
  * Payload of DNS CERT record.
  */
-struct GNUNET_TUN_DnsCertRecord {
+struct GNUNET_TUN_DnsCertRecord
+{
   /**
    * Certificate type
    */
@@ -563,7 +573,8 @@ struct GNUNET_TUN_DnsCertRecord {
  * Payload of DNSSEC TLSA record.
  * http://datatracker.ietf.org/doc/draft-ietf-dane-protocol/
  */
-struct GNUNET_TUN_DnsTlsaRecord {
+struct GNUNET_TUN_DnsTlsaRecord
+{
   /**
    * Certificate usage
    * 0: CA cert
@@ -607,7 +618,8 @@ struct GNUNET_TUN_DnsTlsaRecord {
 /**
  * Payload of GNS VPN record
  */
-struct GNUNET_TUN_GnsVpnRecord {
+struct GNUNET_TUN_GnsVpnRecord
+{
   /**
    * The peer to contact
    */
@@ -625,7 +637,8 @@ struct GNUNET_TUN_GnsVpnRecord {
 /**
  * DNS query prefix.
  */
-struct GNUNET_TUN_DnsQueryLine {
+struct GNUNET_TUN_DnsQueryLine
+{
   /**
    * Desired type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
    */
@@ -641,7 +654,8 @@ struct GNUNET_TUN_DnsQueryLine {
 /**
  * General DNS record prefix.
  */
-struct GNUNET_TUN_DnsRecordLine {
+struct GNUNET_TUN_DnsRecordLine
+{
   /**
    * Record type (GNUNET_DNSPARSER_TYPE_XXX). (NBO)
    */
@@ -684,16 +698,19 @@ struct GNUNET_TUN_DnsRecordLine {
 /**
  * ICMP header.
  */
-struct GNUNET_TUN_IcmpHeader {
+struct GNUNET_TUN_IcmpHeader
+{
   uint8_t type;
   uint8_t code;
   uint16_t crc GNUNET_PACKED;
 
-  union {
+  union
+  {
     /**
      * ICMP Echo (request/reply)
      */
-    struct {
+    struct
+    {
       uint16_t identifier GNUNET_PACKED;
       uint16_t sequence_number GNUNET_PACKED;
     } echo;
@@ -701,7 +718,8 @@ struct GNUNET_TUN_IcmpHeader {
     /**
      * ICMP Destination Unreachable (RFC 1191)
      */
-    struct ih_pmtu {
+    struct ih_pmtu
+    {
       uint16_t empty GNUNET_PACKED;
       uint16_t next_hop_mtu GNUNET_PACKED;
       /* followed by original IP header + first 8 bytes of original IP datagram
@@ -735,11 +753,11 @@ GNUNET_NETWORK_STRUCT_END
  * @param dst destination IP address to use
  */
 void
-GNUNET_TUN_initialize_ipv4_header(struct GNUNET_TUN_IPv4Header *ip,
-                                  uint8_t protocol,
-                                  uint16_t payload_length,
-                                  const struct in_addr *src,
-                                  const struct in_addr *dst);
+GNUNET_TUN_initialize_ipv4_header (struct GNUNET_TUN_IPv4Header *ip,
+                                   uint8_t protocol,
+                                   uint16_t payload_length,
+                                   const struct in_addr *src,
+                                   const struct in_addr *dst);
 
 
 /**
@@ -753,11 +771,11 @@ GNUNET_TUN_initialize_ipv4_header(struct GNUNET_TUN_IPv4Header *ip,
  * @param dst destination IP address to use
  */
 void
-GNUNET_TUN_initialize_ipv6_header(struct GNUNET_TUN_IPv6Header *ip,
-                                  uint8_t protocol,
-                                  uint16_t payload_length,
-                                  const struct in6_addr *src,
-                                  const struct in6_addr *dst);
+GNUNET_TUN_initialize_ipv6_header (struct GNUNET_TUN_IPv6Header *ip,
+                                   uint8_t protocol,
+                                   uint16_t payload_length,
+                                   const struct in6_addr *src,
+                                   const struct in6_addr *dst);
 
 /**
  * Calculate IPv4 TCP checksum.
@@ -768,10 +786,10 @@ GNUNET_TUN_initialize_ipv6_header(struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of TCP @a payload
  */
 void
-GNUNET_TUN_calculate_tcp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
-                                   struct GNUNET_TUN_TcpHeader *tcp,
-                                   const void *payload,
-                                   uint16_t payload_length);
+GNUNET_TUN_calculate_tcp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
+                                    struct GNUNET_TUN_TcpHeader *tcp,
+                                    const void *payload,
+                                    uint16_t payload_length);
 
 /**
  * Calculate IPv6 TCP checksum.
@@ -782,10 +800,10 @@ GNUNET_TUN_calculate_tcp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
  * @param payload_length number of bytes of TCP payload
  */
 void
-GNUNET_TUN_calculate_tcp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
-                                   struct GNUNET_TUN_TcpHeader *tcp,
-                                   const void *payload,
-                                   uint16_t payload_length);
+GNUNET_TUN_calculate_tcp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
+                                    struct GNUNET_TUN_TcpHeader *tcp,
+                                    const void *payload,
+                                    uint16_t payload_length);
 
 /**
  * Calculate IPv4 UDP checksum.
@@ -796,10 +814,10 @@ GNUNET_TUN_calculate_tcp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of UDP @a payload
  */
 void
-GNUNET_TUN_calculate_udp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
-                                   struct GNUNET_TUN_UdpHeader *udp,
-                                   const void *payload,
-                                   uint16_t payload_length);
+GNUNET_TUN_calculate_udp4_checksum (const struct GNUNET_TUN_IPv4Header *ip,
+                                    struct GNUNET_TUN_UdpHeader *udp,
+                                    const void *payload,
+                                    uint16_t payload_length);
 
 
 /**
@@ -811,10 +829,10 @@ GNUNET_TUN_calculate_udp4_checksum(const struct GNUNET_TUN_IPv4Header *ip,
  * @param payload_length number of bytes of @a payload
  */
 void
-GNUNET_TUN_calculate_udp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
-                                   struct GNUNET_TUN_UdpHeader *udp,
-                                   const void *payload,
-                                   uint16_t payload_length);
+GNUNET_TUN_calculate_udp6_checksum (const struct GNUNET_TUN_IPv6Header *ip,
+                                    struct GNUNET_TUN_UdpHeader *udp,
+                                    const void *payload,
+                                    uint16_t payload_length);
 
 
 /**
@@ -825,9 +843,9 @@ GNUNET_TUN_calculate_udp6_checksum(const struct GNUNET_TUN_IPv6Header *ip,
  * @param payload_length number of bytes of @a payload
  */
 void
-GNUNET_TUN_calculate_icmp_checksum(struct GNUNET_TUN_IcmpHeader *icmp,
-                                   const void *payload,
-                                   uint16_t payload_length);
+GNUNET_TUN_calculate_icmp_checksum (struct GNUNET_TUN_IcmpHeader *icmp,
+                                    const void *payload,
+                                    uint16_t payload_length);
 
 
 /**
@@ -839,9 +857,9 @@ GNUNET_TUN_calculate_icmp_checksum(struct GNUNET_TUN_IcmpHeader *icmp,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv4toregexsearch(const struct in_addr *ip,
-                             uint16_t port,
-                             char *rxstr);
+GNUNET_TUN_ipv4toregexsearch (const struct in_addr *ip,
+                              uint16_t port,
+                              char *rxstr);
 
 
 /**
@@ -853,9 +871,9 @@ GNUNET_TUN_ipv4toregexsearch(const struct in_addr *ip,
  *              bytes long.
  */
 void
-GNUNET_TUN_ipv6toregexsearch(const struct in6_addr *ipv6,
-                             uint16_t port,
-                             char *rxstr);
+GNUNET_TUN_ipv6toregexsearch (const struct in6_addr *ipv6,
+                              uint16_t port,
+                              char *rxstr);
 
 
 /**
@@ -868,7 +886,7 @@ GNUNET_TUN_ipv6toregexsearch(const struct in6_addr *ipv6,
  * @return regular expression, NULL on error
  */
 char *
-GNUNET_TUN_ipv6policy2regex(const char *policy);
+GNUNET_TUN_ipv6policy2regex (const char *policy);
 
 
 /**
@@ -881,7 +899,7 @@ GNUNET_TUN_ipv6policy2regex(const char *policy);
  * @return regular expression, NULL on error
  */
 char *
-GNUNET_TUN_ipv4policy2regex(const char *policy);
+GNUNET_TUN_ipv4policy2regex (const char *policy);
 
 
 /**
@@ -893,8 +911,8 @@ GNUNET_TUN_ipv4policy2regex(const char *policy);
  * @param[out] hc corresponding hash
  */
 void
-GNUNET_TUN_service_name_to_hash(const char *service_name,
-                                struct GNUNET_HashCode *hc);
+GNUNET_TUN_service_name_to_hash (const char *service_name,
+                                 struct GNUNET_HashCode *hc);
 
 
 /**
@@ -906,9 +924,9 @@ GNUNET_TUN_service_name_to_hash(const char *service_name,
  * @return #GNUNET_YES if they are equal
  */
 int
-GNUNET_TUN_sockaddr_cmp(const struct sockaddr *sa,
-                        const struct sockaddr *sb,
-                        int include_port);
+GNUNET_TUN_sockaddr_cmp (const struct sockaddr *sa,
+                         const struct sockaddr *sb,
+                         int include_port);
 
 
 /**
@@ -921,9 +939,9 @@ GNUNET_TUN_sockaddr_cmp(const struct sockaddr *sa,
  * @param[out] cadet_port CADET port to use
  */
 void
-GNUNET_TUN_compute_service_cadet_port(const struct GNUNET_HashCode *desc,
-                                      uint16_t ip_port,
-                                      struct GNUNET_HashCode *cadet_port);
+GNUNET_TUN_compute_service_cadet_port (const struct GNUNET_HashCode *desc,
+                                       uint16_t ip_port,
+                                       struct GNUNET_HashCode *cadet_port);
 
 #endif