global reindent, now with uncrustify hook enabled

1 files changed, 114 insertions, 113 deletions

diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index f1978ce92..6a3899a46 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -61,51 +61,51 @@ static unsigned int verbosity;
  * @param record record to modify
  */
 static void
-modify_record(const struct GNUNET_DNSPARSER_Record *record)
+modify_record (const struct GNUNET_DNSPARSER_Record *record)
 {
   char buf[INET6_ADDRSTRLEN];
 
   switch (record->type)
+  {
+  case GNUNET_DNSPARSER_TYPE_A:
+    if (record->data.raw.data_len != sizeof(struct in_addr))
+      return;
+    if (NULL != n4)
+    {
+      if (verbosity > 1)
+        fprintf (stderr,
+                 "Changing A record from `%s' to `%s'\n",
+                 inet_ntop (AF_INET, record->data.raw.data, buf, sizeof(buf)),
+                 n4);
+      GNUNET_assert (1 == inet_pton (AF_INET, n4, record->data.raw.data));
+    }
+    break;
+
+  case GNUNET_DNSPARSER_TYPE_AAAA:
+    if (record->data.raw.data_len != sizeof(struct in6_addr))
+      return;
+    if (NULL != n6)
     {
-    case GNUNET_DNSPARSER_TYPE_A:
-      if (record->data.raw.data_len != sizeof(struct in_addr))
-        return;
-      if (NULL != n4)
-        {
-          if (verbosity > 1)
-            fprintf(stderr,
-                    "Changing A record from `%s' to `%s'\n",
-                    inet_ntop(AF_INET, record->data.raw.data, buf, sizeof(buf)),
-                    n4);
-          GNUNET_assert(1 == inet_pton(AF_INET, n4, record->data.raw.data));
-        }
-      break;
-
-    case GNUNET_DNSPARSER_TYPE_AAAA:
-      if (record->data.raw.data_len != sizeof(struct in6_addr))
-        return;
-      if (NULL != n6)
-        {
-          if (verbosity > 1)
-            fprintf(stderr,
-                    "Changing AAAA record from `%s' to `%s'\n",
-                    inet_ntop(AF_INET6, record->data.raw.data, buf, sizeof(buf)),
-                    n6);
-          GNUNET_assert(1 == inet_pton(AF_INET6, n6, record->data.raw.data));
-        }
-      break;
-
-    case GNUNET_DNSPARSER_TYPE_NS:
-    case GNUNET_DNSPARSER_TYPE_CNAME:
-    case GNUNET_DNSPARSER_TYPE_PTR:
-    case GNUNET_DNSPARSER_TYPE_SOA:
-    case GNUNET_DNSPARSER_TYPE_MX:
-    case GNUNET_DNSPARSER_TYPE_TXT:
-      break;
-
-    default:
-      break;
+      if (verbosity > 1)
+        fprintf (stderr,
+                 "Changing AAAA record from `%s' to `%s'\n",
+                 inet_ntop (AF_INET6, record->data.raw.data, buf, sizeof(buf)),
+                 n6);
+      GNUNET_assert (1 == inet_pton (AF_INET6, n6, record->data.raw.data));
     }
+    break;
+
+  case GNUNET_DNSPARSER_TYPE_NS:
+  case GNUNET_DNSPARSER_TYPE_CNAME:
+  case GNUNET_DNSPARSER_TYPE_PTR:
+  case GNUNET_DNSPARSER_TYPE_SOA:
+  case GNUNET_DNSPARSER_TYPE_MX:
+  case GNUNET_DNSPARSER_TYPE_TXT:
+    break;
+
+  default:
+    break;
+  }
 }
 
 
@@ -133,10 +133,10 @@ modify_record(const struct GNUNET_DNSPARSER_Record *record)
  * @param request udp payload of the DNS request
  */
 static void
-modify_request(void *cls,
-               struct GNUNET_DNS_RequestHandle *rh,
-               size_t request_length,
-               const char *request)
+modify_request (void *cls,
+                struct GNUNET_DNS_RequestHandle *rh,
+                size_t request_length,
+                const char *request)
 {
   struct GNUNET_DNSPARSER_Packet *p;
   unsigned int i;
@@ -144,35 +144,35 @@ modify_request(void *cls,
   size_t len;
   int ret;
 
-  p = GNUNET_DNSPARSER_parse(request, request_length);
+  p = GNUNET_DNSPARSER_parse (request, request_length);
   if (NULL == p)
-    {
-      fprintf(stderr, "Received malformed DNS packet, leaving it untouched\n");
-      GNUNET_DNS_request_forward(rh);
-      return;
-    }
+  {
+    fprintf (stderr, "Received malformed DNS packet, leaving it untouched\n");
+    GNUNET_DNS_request_forward (rh);
+    return;
+  }
   for (i = 0; i < p->num_answers; i++)
-    modify_record(&p->answers[i]);
+    modify_record (&p->answers[i]);
   buf = NULL;
-  ret = GNUNET_DNSPARSER_pack(p, 1024, &buf, &len);
-  GNUNET_DNSPARSER_free_packet(p);
+  ret = GNUNET_DNSPARSER_pack (p, 1024, &buf, &len);
+  GNUNET_DNSPARSER_free_packet (p);
   if (GNUNET_OK != ret)
-    {
-      if (GNUNET_NO == ret)
-        fprintf(stderr,
-                "Modified DNS response did not fit, keeping old response\n");
-      else
-        GNUNET_break(0); /* our modifications should have been sane! */
-      GNUNET_DNS_request_forward(rh);
-    }
+  {
+    if (GNUNET_NO == ret)
+      fprintf (stderr,
+               "Modified DNS response did not fit, keeping old response\n");
+    else
+      GNUNET_break (0);  /* our modifications should have been sane! */
+    GNUNET_DNS_request_forward (rh);
+  }
   else
-    {
-      if (verbosity > 0)
-        fprintf(stdout,
-                "Injecting modified DNS response\n");
-      GNUNET_DNS_request_answer(rh, len, buf);
-    }
-  GNUNET_free_non_null(buf);
+  {
+    if (verbosity > 0)
+      fprintf (stdout,
+               "Injecting modified DNS response\n");
+    GNUNET_DNS_request_answer (rh, len, buf);
+  }
+  GNUNET_free_non_null (buf);
 }
 
 
@@ -180,13 +180,13 @@ modify_request(void *cls,
  * Shutdown.
  */
 static void
-do_disconnect(void *cls)
+do_disconnect (void *cls)
 {
   if (NULL != handle)
-    {
-      GNUNET_DNS_disconnect(handle);
-      handle = NULL;
-    }
+  {
+    GNUNET_DNS_disconnect (handle);
+    handle = NULL;
+  }
 }
 
 
@@ -199,67 +199,68 @@ do_disconnect(void *cls)
  * @param cfg configuration
  */
 static void
-run(void *cls, char *const *args, const char *cfgfile,
-    const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct in_addr i4;
   struct in6_addr i6;
 
   if ((n4 != NULL) &&
-      (1 != inet_pton(AF_INET, n4, &i4)))
-    {
-      fprintf(stderr,
-              "`%s' is nto a valid IPv4 address!\n",
-              n4);
-      return;
-    }
+      (1 != inet_pton (AF_INET, n4, &i4)))
+  {
+    fprintf (stderr,
+             "`%s' is nto a valid IPv4 address!\n",
+             n4);
+    return;
+  }
   if ((n6 != NULL) &&
-      (1 != inet_pton(AF_INET6, n6, &i6)))
-    {
-      fprintf(stderr,
-              "`%s' is nto a valid IPv6 address!\n",
-              n6);
-      return;
-    }
+      (1 != inet_pton (AF_INET6, n6, &i6)))
+  {
+    fprintf (stderr,
+             "`%s' is nto a valid IPv6 address!\n",
+             n6);
+    return;
+  }
 
   handle =
-    GNUNET_DNS_connect(cfg,
-                       GNUNET_DNS_FLAG_POST_RESOLUTION,
-                       &modify_request,
-                       NULL);
-  GNUNET_SCHEDULER_add_shutdown(&do_disconnect, NULL);
+    GNUNET_DNS_connect (cfg,
+                        GNUNET_DNS_FLAG_POST_RESOLUTION,
+                        &modify_request,
+                        NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_disconnect, NULL);
 }
 
 
 int
-main(int argc, char *const *argv)
+main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_string('4',
-                                "ipv4",
-                                "IPV4",
-                                gettext_noop("set A records"),
-                                &n4),
-
-    GNUNET_GETOPT_option_string('6',
-                                "ipv4",
-                                "IPV6",
-                                gettext_noop("set AAAA records"),
-                                &n6),
-
-    GNUNET_GETOPT_option_verbose(&verbosity),
+    GNUNET_GETOPT_option_string ('4',
+                                 "ipv4",
+                                 "IPV4",
+                                 gettext_noop ("set A records"),
+                                 &n4),
+
+    GNUNET_GETOPT_option_string ('6',
+                                 "ipv4",
+                                 "IPV6",
+                                 gettext_noop ("set AAAA records"),
+                                 &n6),
+
+    GNUNET_GETOPT_option_verbose (&verbosity),
     GNUNET_GETOPT_OPTION_END
   };
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args(argc, argv, &argc, &argv))
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
 
   ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run(argc, argv, "gnunet-dns-redirector",
-                            gettext_noop
-                              ("Change DNS replies to point elsewhere."), options,
-                            &run, NULL)) ? ret : 1;
-  GNUNET_free((void*)argv);
+         GNUNET_PROGRAM_run (argc, argv, "gnunet-dns-redirector",
+                             gettext_noop
+                               ("Change DNS replies to point elsewhere."),
+                             options,
+                             &run, NULL)) ? ret : 1;
+  GNUNET_free ((void*) argv);
   return ret;
 }