[GNUnet-SVN] r35822 - in gnunet/src: exit pt vpn

[gnunet]

Author: grothoff
Date: 2015-05-26 17:23:33 +0200 (Tue, 26 May 2015)
New Revision: 35822

Modified:
   gnunet/src/exit/gnunet-helper-exit.c
   gnunet/src/pt/test_gnunet_vpn.c
   gnunet/src/vpn/gnunet-helper-vpn.c
Log:
-indentation

Modified: gnunet/src/exit/gnunet-helper-exit.c
===================================================================
--- gnunet/src/exit/gnunet-helper-exit.c        2015-05-26 15:06:13 UTC (rev 
35821)
+++ gnunet/src/exit/gnunet-helper-exit.c        2015-05-26 15:23:33 UTC (rev 
35822)
@@ -503,7 +503,9 @@
                   MAX_SIZE - sizeof (struct GNUNET_MessageHeader));
         if (-1 == buftun_size)
         {
-          fprintf (stderr, "read-error: %s\n", strerror (errno));
+          fprintf (stderr,
+                   "read-error: %s\n",
+                   strerror (errno));
           shutdown (fd_tun, SHUT_RD);
           shutdown (1, SHUT_WR);
           read_open = 0;
@@ -538,7 +540,9 @@
 #if !DEBUG
          if (errno != EPIPE)
 #endif
-           fprintf (stderr, "write-error to stdout: %s\n", strerror (errno));
+           fprintf (stderr,
+                     "write-error to stdout: %s\n",
+                     strerror (errno));
           shutdown (fd_tun, SHUT_RD);
           shutdown (1, SHUT_WR);
           read_open = 0;

Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2015-05-26 15:06:13 UTC (rev 35821)
+++ gnunet/src/pt/test_gnunet_vpn.c     2015-05-26 15:23:33 UTC (rev 35822)
@@ -270,9 +270,16 @@
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  GNUNET_asprintf (&url, "http://%s:%u/hello_world";,
-                   inet_ntop (af, address, ips, sizeof (ips)),
-                   (unsigned int) PORT);
+  if (AF_INET6 == af)
+    GNUNET_asprintf (&url,
+                     "http://[%s]:%u/hello_world";,
+                     inet_ntop (af, address, ips, sizeof (ips)),
+                     (unsigned int) PORT);
+  else
+    GNUNET_asprintf (&url,
+                     "http://%s:%u/hello_world";,
+                     inet_ntop (af, address, ips, sizeof (ips)),
+                     (unsigned int) PORT);
   curl = curl_easy_init ();
   curl_easy_setopt (curl, CURLOPT_URL, url);
   curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, &copy_buffer);
@@ -281,11 +288,13 @@
   curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
   curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
   curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
+  curl_easy_setopt (curl, CURLOPT_VERBOSE, 1);
 
   multi = curl_multi_init ();
   GNUNET_assert (multi != NULL);
   GNUNET_assert (CURLM_OK == curl_multi_add_handle (multi, curl));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Beginning HTTP download from `%s'\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Beginning HTTP download from `%s'\n",
               url);
   curl_main ();
 }

Modified: gnunet/src/vpn/gnunet-helper-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-helper-vpn.c  2015-05-26 15:06:13 UTC (rev 35821)
+++ gnunet/src/vpn/gnunet-helper-vpn.c  2015-05-26 15:23:33 UTC (rev 35822)
@@ -360,7 +360,7 @@
   /* write refers to reading from stdin, writing to fd_tun */
   int write_open = 1;
 
-  while ((1 == read_open) && (1 == write_open))
+  while ((1 == read_open) || (1 == write_open))
   {
     FD_ZERO (&fds_w);
     FD_ZERO (&fds_r);
@@ -412,7 +412,9 @@
                   MAX_SIZE - sizeof (struct GNUNET_MessageHeader));
         if (-1 == buftun_size)
         {
-          fprintf (stderr, "read-error: %s\n", strerror (errno));
+          fprintf (stderr,
+                   "read-error: %s\n",
+                   strerror (errno));
           shutdown (fd_tun, SHUT_RD);
           shutdown (1, SHUT_WR);
           read_open = 0;
@@ -445,7 +447,9 @@
 #if !DEBUG
          if (errno != EPIPE)
 #endif
-           fprintf (stderr, "write-error to stdout: %s\n", strerror (errno));
+           fprintf (stderr,
+                     "write-error to stdout: %s\n",
+                     strerror (errno));
           shutdown (fd_tun, SHUT_RD);
           shutdown (1, SHUT_WR);
           read_open = 0;
@@ -468,7 +472,9 @@
         bufin_size = read (0, bufin + bufin_rpos, MAX_SIZE - bufin_rpos);
         if (-1 == bufin_size)
         {
-          fprintf (stderr, "read-error: %s\n", strerror (errno));
+          fprintf (stderr,
+                   "read-error: %s\n",
+                   strerror (errno));
           shutdown (0, SHUT_RD);
           shutdown (fd_tun, SHUT_WR);
           write_open = 0;