1 files changed, 43 insertions, 31 deletions

diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h
index 85b177271..86b4bd0cb 100644
--- a/src/nat/nat_stun.h
+++ b/src/nat/nat_stun.h
@@ -33,12 +33,14 @@
 
 #define STUN_MAGIC_COOKIE       0x2112A442
 
-typedef struct {
+typedef struct
+{
   uint32_t id[3];
 } GNUNET_PACKED stun_trans_id;
 
 
-struct stun_header {
+struct stun_header
+{
   uint16_t msgtype;
   uint16_t msglen;
   uint32_t magic;
@@ -46,7 +48,8 @@ struct stun_header {
 } GNUNET_PACKED;
 
 
-struct stun_attr {
+struct stun_attr
+{
   uint16_t attr;
   uint16_t len;
 } GNUNET_PACKED;
@@ -55,7 +58,8 @@ struct stun_attr {
 /**
  * The format normally used for addresses carried by STUN messages.
  */
-struct stun_addr {
+struct stun_addr
+{
   uint8_t unused;
 
   /**
@@ -78,7 +82,8 @@ struct stun_addr {
 /**
  * STUN message classes
  */
-enum StunClasses {
+enum StunClasses
+{
   INVALID_CLASS = 0,
   STUN_REQUEST = 0x0000,
   STUN_INDICATION = 0x0001,
@@ -86,7 +91,8 @@ enum StunClasses {
   STUN_ERROR_RESPONSE = 0x0003
 };
 
-enum StunMethods {
+enum StunMethods
+{
   INVALID_METHOD = 0,
   STUN_BINDING = 0x0001,
   STUN_SHARED_SECRET = 0x0002,
@@ -103,7 +109,8 @@ enum StunMethods {
  * Basic attribute types in stun messages.
  * Messages can also contain custom attributes (codes above 0x7fff)
  */
-enum StunAttributes {
+enum StunAttributes
+{
   STUN_MAPPED_ADDRESS = 0x0001,
   STUN_RESPONSE_ADDRESS = 0x0002,
   STUN_CHANGE_ADDRESS = 0x0003,
@@ -133,10 +140,10 @@ enum StunAttributes {
  * @return the converted StunClass
  */
 static enum StunClasses
-decode_class(int msg)
+decode_class (int msg)
 {
   /* Sorry for the magic, but this maps the class according to rfc5245 */
-  return (enum StunClasses)((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
+  return (enum StunClasses) ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
 }
 
 
@@ -147,9 +154,11 @@ decode_class(int msg)
  * @return the converted StunMethod
  */
 static enum StunMethods
-decode_method(int msg)
+decode_method (int msg)
 {
-  return (enum StunMethods)(msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
+  return (enum StunMethods) (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg
+                                                                       & 0x3e00)
+                                                                      >> 2);
 }
 
 
@@ -161,9 +170,10 @@ decode_method(int msg)
  */
 GNUNET_UNUSED
 static const char *
-stun_msg2str(int msg)
+stun_msg2str (int msg)
 {
-  static const struct {
+  static const struct
+  {
     enum StunClasses value;
     const char *name;
   } classes[] = {
@@ -173,7 +183,8 @@ stun_msg2str(int msg)
     { STUN_ERROR_RESPONSE, "Error Response" },
     { INVALID_CLASS, NULL }
   };
-  static const struct {
+  static const struct
+  {
     enum StunMethods value;
     const char *name;
   } methods[] = {
@@ -186,25 +197,25 @@ stun_msg2str(int msg)
   enum StunClasses cvalue;
   enum StunMethods mvalue;
 
-  cvalue = decode_class(msg);
+  cvalue = decode_class (msg);
   for (unsigned int i = 0; classes[i].name; i++)
     if (classes[i].value == cvalue)
-      {
-        msg_class = classes[i].name;
-        break;
-      }
-  mvalue = decode_method(msg);
+    {
+      msg_class = classes[i].name;
+      break;
+    }
+  mvalue = decode_method (msg);
   for (unsigned int i = 0; methods[i].name; i++)
     if (methods[i].value == mvalue)
-      {
-        method = methods[i].name;
-        break;
-      }
-  GNUNET_snprintf(result,
-                  sizeof(result),
-                  "%s %s",
-                  method ? : "Unknown Method",
-                  msg_class ? : "Unknown Class Message");
+    {
+      method = methods[i].name;
+      break;
+    }
+  GNUNET_snprintf (result,
+                   sizeof(result),
+                   "%s %s",
+                   method ? : "Unknown Method",
+                   msg_class ? : "Unknown Class Message");
   return result;
 }
 
@@ -217,9 +228,10 @@ stun_msg2str(int msg)
  */
 GNUNET_UNUSED
 static const char *
-stun_attr2str(enum StunAttributes msg)
+stun_attr2str (enum StunAttributes msg)
 {
-  static const struct {
+  static const struct
+  {
     enum StunAttributes value;
     const char *name;
   } attrs[] = {