1 files changed, 123 insertions, 121 deletions

diff --git a/src/util/test_socks.c b/src/util/test_socks.c
index dc5847d14..b813937c2 100644
--- a/src/util/test_socks.c
+++ b/src/util/test_socks.c
@@ -37,24 +37,25 @@ static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 #define MY_TYPE 130
 
-struct CopyContext {
+struct CopyContext
+{
   struct GNUNET_SERVER_Client *client;
   struct GNUNET_MessageHeader *cpy;
 };
 
 static size_t
-copy_msg(void *cls, size_t size, void *buf)
+copy_msg (void *cls, size_t size, void *buf)
 {
   struct CopyContext *ctx = cls;
   struct GNUNET_MessageHeader *cpy = ctx->cpy;
 
-  GNUNET_assert(sizeof(struct GNUNET_MessageHeader) == ntohs(cpy->size));
-  GNUNET_assert(size >= ntohs(cpy->size));
-  GNUNET_memcpy(buf, cpy, ntohs(cpy->size));
-  GNUNET_SERVER_receive_done(ctx->client, GNUNET_OK);
-  GNUNET_free(cpy);
-  GNUNET_free(ctx);
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Message bounced back to client\n");
+  GNUNET_assert (sizeof(struct GNUNET_MessageHeader) == ntohs (cpy->size));
+  GNUNET_assert (size >= ntohs (cpy->size));
+  GNUNET_memcpy (buf, cpy, ntohs (cpy->size));
+  GNUNET_SERVER_receive_done (ctx->client, GNUNET_OK);
+  GNUNET_free (cpy);
+  GNUNET_free (ctx);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bounced back to client\n");
   return sizeof(struct GNUNET_MessageHeader);
 }
 
@@ -63,25 +64,25 @@ copy_msg(void *cls, size_t size, void *buf)
  * Callback that just bounces the message back to the sender.
  */
 static void
-echo_cb(void *cls, struct GNUNET_SERVER_Client *client,
-        const struct GNUNET_MessageHeader *message)
+echo_cb (void *cls, struct GNUNET_SERVER_Client *client,
+         const struct GNUNET_MessageHeader *message)
 {
   struct CopyContext *cc;
   struct GNUNET_MessageHeader *cpy;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Receiving message from client, bouncing back\n");
-  GNUNET_assert(sizeof(struct GNUNET_MessageHeader) == ntohs(message->size));
-  cc = GNUNET_new(struct CopyContext);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Receiving message from client, bouncing back\n");
+  GNUNET_assert (sizeof(struct GNUNET_MessageHeader) == ntohs (message->size));
+  cc = GNUNET_new (struct CopyContext);
   cc->client = client;
-  cpy = GNUNET_malloc(ntohs(message->size));
-  GNUNET_memcpy(cpy, message, ntohs(message->size));
+  cpy = GNUNET_malloc (ntohs (message->size));
+  GNUNET_memcpy (cpy, message, ntohs (message->size));
   cc->cpy = cpy;
-  GNUNET_assert(NULL !=
-                GNUNET_SERVER_notify_transmit_ready(client,
-                                                    ntohs(message->size),
-                                                    GNUNET_TIME_UNIT_SECONDS,
-                                                    &copy_msg, cc));
+  GNUNET_assert (NULL !=
+                 GNUNET_SERVER_notify_transmit_ready (client,
+                                                      ntohs (message->size),
+                                                      GNUNET_TIME_UNIT_SECONDS,
+                                                      &copy_msg, cc));
 }
 
 
@@ -92,17 +93,17 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = {
 
 
 static void
-handle_bounce(void *cls,
-              const struct GNUNET_MessageHeader *got)
+handle_bounce (void *cls,
+               const struct GNUNET_MessageHeader *got)
 {
   int *ok = cls;
 
-  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-             "Receiving bounce, checking content\n");
-  GNUNET_assert(NULL != got);
-  GNUNET_MQ_destroy(mq);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Receiving bounce, checking content\n");
+  GNUNET_assert (NULL != got);
+  GNUNET_MQ_destroy (mq);
   mq = NULL;
-  GNUNET_SERVER_destroy(server);
+  GNUNET_SERVER_destroy (server);
   server = NULL;
   *ok = 0;
 }
@@ -117,15 +118,15 @@ handle_bounce(void *cls,
  * @param error error code
  */
 static void
-mq_error_handler(void *cls,
-                 enum GNUNET_MQ_Error error)
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
-  GNUNET_assert(0);  /* should never happen */
+  GNUNET_assert (0);  /* should never happen */
 }
 
 
 static void
-task(void *cls)
+task (void *cls)
 {
   struct sockaddr_in sa;
   struct sockaddr *sap[2];
@@ -133,121 +134,122 @@ task(void *cls)
   struct GNUNET_MQ_Envelope *env;
   struct GNUNET_MessageHeader *msg;
   struct GNUNET_MQ_MessageHandler chandlers[] = {
-    GNUNET_MQ_hd_fixed_size(bounce,
-                            MY_TYPE,
-                            struct GNUNET_MessageHeader,
-                            cls),
-    GNUNET_MQ_handler_end()
+    GNUNET_MQ_hd_fixed_size (bounce,
+                             MY_TYPE,
+                             struct GNUNET_MessageHeader,
+                             cls),
+    GNUNET_MQ_handler_end ()
   };
 
   /* test IPC between client and server */
-  sap[0] = (struct sockaddr *)&sa;
+  sap[0] = (struct sockaddr *) &sa;
   slens[0] = sizeof(sa);
   sap[1] = NULL;
   slens[1] = 0;
-  memset(&sa, 0, sizeof(sa));
+  memset (&sa, 0, sizeof(sa));
 #if HAVE_SOCKADDR_IN_SIN_LEN
   sa.sin_len = sizeof(sa);
 #endif
   sa.sin_family = AF_INET;
-  sa.sin_port = htons(PORT);
+  sa.sin_port = htons (PORT);
   server =
-    GNUNET_SERVER_create(NULL, NULL, sap, slens,
-                         GNUNET_TIME_relative_multiply
-                           (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO);
-  GNUNET_assert(server != NULL);
+    GNUNET_SERVER_create (NULL, NULL, sap, slens,
+                          GNUNET_TIME_relative_multiply
+                            (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO);
+  GNUNET_assert (server != NULL);
   handlers[0].callback_cls = cls;
   handlers[1].callback_cls = cls;
-  GNUNET_SERVER_add_handlers(server, handlers);
-  mq = GNUNET_CLIENT_connect(cfg,
-                             MYNAME,
-                             chandlers,
-                             &mq_error_handler,
-                             NULL);
-  GNUNET_assert(NULL != mq);
-  env = GNUNET_MQ_msg(msg,
-                      MY_TYPE);
-  GNUNET_MQ_send(mq,
-                 env);
+  GNUNET_SERVER_add_handlers (server, handlers);
+  mq = GNUNET_CLIENT_connect (cfg,
+                              MYNAME,
+                              chandlers,
+                              &mq_error_handler,
+                              NULL);
+  GNUNET_assert (NULL != mq);
+  env = GNUNET_MQ_msg (msg,
+                       MY_TYPE);
+  GNUNET_MQ_send (mq,
+                  env);
 }
 
 
 int
-main(int argc, char *argv[])
+main (int argc, char *argv[])
 {
   int ok;
   int status;
   const char *socksport = "1081";
 
-  GNUNET_log_setup("test_client",
-                   "WARNING",
-                   NULL);
+  GNUNET_log_setup ("test_client",
+                    "WARNING",
+                    NULL);
 
-  pid_t pid = fork();
-  GNUNET_assert(pid >= 0);
+  pid_t pid = fork ();
+  GNUNET_assert (pid >= 0);
   if (pid == 0)
-    {
-      execlp("ssh",
-             "ssh", "-D", socksport,
-             "-o", "BatchMode yes",
-             "-o", "UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
-             "-o", "StrictHostKeyChecking no",
-             "127.0.0.1", "-N", (char*)NULL);
-      perror("execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
-      printf(""
-             "Please ensure you have ssh installed and have sshd installed and running :\n"
-             "\tsudo apt-get install openssh-client openssh-server\n"
-             "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
-             "to localhost.  Please either run  make check  from an unproxied user, or else\n"
-             "add these lines to the beginning of your ~/.ssh/config file :"
-             "\tHost 127.0.0.1 localhost\n"
-             "\t  CheckHostIP no\n"
-             "\t  Protocol 2\n"
-             "\t  ProxyCommand nc 127.0.0.1 22\n");
-      kill(getppid(), SIGALRM);
-      return 1;
-    }
-  if (0 != sleep(1))
-    {
-      /* sleep interrupted, likely SIGALRM, failure to
-         launch child, terminate */
-      printf(""
-             "Please ensure you have ssh installed and have sshd installed and running :\n"
-             "\tsudo apt-get install openssh-client openssh-server\n"
-             "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
-             "to localhost.  Please either run  make check  from an unproxied user, or else\n"
-             "add these lines to the beginning of your ~/.ssh/config file :"
-             "\tHost 127.0.0.1 localhost\n"
-             "\t  CheckHostIP no\n"
-             "\t  Protocol 2\n"
-             "\t  ProxyCommand nc 127.0.0.1 22\n");
-      return 77;
-    }
+  {
+    execlp ("ssh",
+            "ssh", "-D", socksport,
+            "-o", "BatchMode yes",
+            "-o", "UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
+            "-o", "StrictHostKeyChecking no",
+            "127.0.0.1", "-N", (char*) NULL);
+    perror (
+      "execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
+    printf (""
+            "Please ensure you have ssh installed and have sshd installed and running :\n"
+            "\tsudo apt-get install openssh-client openssh-server\n"
+            "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
+            "to localhost.  Please either run  make check  from an unproxied user, or else\n"
+            "add these lines to the beginning of your ~/.ssh/config file :"
+            "\tHost 127.0.0.1 localhost\n"
+            "\t  CheckHostIP no\n"
+            "\t  Protocol 2\n"
+            "\t  ProxyCommand nc 127.0.0.1 22\n");
+    kill (getppid (), SIGALRM);
+    return 1;
+  }
+  if (0 != sleep (1))
+  {
+    /* sleep interrupted, likely SIGALRM, failure to
+       launch child, terminate */
+    printf (""
+            "Please ensure you have ssh installed and have sshd installed and running :\n"
+            "\tsudo apt-get install openssh-client openssh-server\n"
+            "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
+            "to localhost.  Please either run  make check  from an unproxied user, or else\n"
+            "add these lines to the beginning of your ~/.ssh/config file :"
+            "\tHost 127.0.0.1 localhost\n"
+            "\t  CheckHostIP no\n"
+            "\t  Protocol 2\n"
+            "\t  ProxyCommand nc 127.0.0.1 22\n");
+    return 77;
+  }
   /* check if child exec()ed but died */
-  if (0 != waitpid(pid, &status, WNOHANG))
-    {
-      printf(""
-             "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
-             "to localhost.  Please either run  make check  from an unproxied user, or else\n"
-             "add these lines to the beginning of your ~/.ssh/config file :"
-             "\tHost 127.0.0.1 localhost\n"
-             "\t  CheckHostIP no\n"
-             "\t  Protocol 2\n"
-             "\t  ProxyCommand nc 127.0.0.1 22\n");
-      return 77;
-    }
-
-  cfg = GNUNET_CONFIGURATION_create();
-  GNUNET_CONFIGURATION_set_value_string(cfg, MYNAME, "SOCKSHOST", "127.0.0.1");
-  GNUNET_CONFIGURATION_set_value_string(cfg, MYNAME, "SOCKSPORT", socksport);
-  GNUNET_CONFIGURATION_set_value_number(cfg, MYNAME, "PORT", PORT);
-  GNUNET_CONFIGURATION_set_value_string(cfg, MYNAME, "HOSTNAME", "127.0.0.1");
+  if (0 != waitpid (pid, &status, WNOHANG))
+  {
+    printf (""
+            "If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
+            "to localhost.  Please either run  make check  from an unproxied user, or else\n"
+            "add these lines to the beginning of your ~/.ssh/config file :"
+            "\tHost 127.0.0.1 localhost\n"
+            "\t  CheckHostIP no\n"
+            "\t  Protocol 2\n"
+            "\t  ProxyCommand nc 127.0.0.1 22\n");
+    return 77;
+  }
+
+  cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "SOCKSHOST", "127.0.0.1");
+  GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "SOCKSPORT", socksport);
+  GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
+  GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "127.0.0.1");
   ok = 1;
-  GNUNET_SCHEDULER_run(&task, &ok);
-  GNUNET_CONFIGURATION_destroy(cfg);
+  GNUNET_SCHEDULER_run (&task, &ok);
+  GNUNET_CONFIGURATION_destroy (cfg);
 
-  GNUNET_break(0 == kill(pid, SIGTERM));
-  GNUNET_break(pid == waitpid(pid, &status, 0));
+  GNUNET_break (0 == kill (pid, SIGTERM));
+  GNUNET_break (pid == waitpid (pid, &status, 0));
   return ok;
 }