[GNUnet-SVN] r33798 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2014-06-23 21:24:14 +0200 (Mon, 23 Jun 2014)
New Revision: 33798

Modified:
   gnunet/src/transport/plugin_transport_http_common.c
   gnunet/src/transport/plugin_transport_http_common.h
   gnunet/src/transport/test_http_common.c
Log:
-minor code cleanup, indentation, doxygen

Modified: gnunet/src/transport/plugin_transport_http_common.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.c 2014-06-23 19:13:45 UTC 
(rev 33797)
+++ gnunet/src/transport/plugin_transport_http_common.c 2014-06-23 19:24:14 UTC 
(rev 33798)
@@ -29,15 +29,6 @@
 #include "plugin_transport_http_common.h"
 
 
-struct SplittedHTTPAddress
-{
-  char *protocol;
-  char *host;
-  char *path;
-  int port;
-};
-
-
 static void
 http_clean_splitted (struct SplittedHTTPAddress *spa)
 {
@@ -474,8 +465,8 @@
   spa = http_split_address ((const char *) &ha[1]);
   if (NULL == spa)
   {
-      (*res) = GNUNET_SYSERR;
-      return NULL;
+    (*res) = GNUNET_SYSERR;
+    return NULL;
   }
 
   s = GNUNET_new (struct sockaddr_storage);

Modified: gnunet/src/transport/plugin_transport_http_common.h
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.h 2014-06-23 19:13:45 UTC 
(rev 33797)
+++ gnunet/src/transport/plugin_transport_http_common.h 2014-06-23 19:24:14 UTC 
(rev 33798)
@@ -17,13 +17,11 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file transport/plugin_transport_http_common.c
  * @brief functionality shared by http client and server transport service 
plugin
  * @author Matthias Wachs
  */
-
 #include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_transport_plugin.h"
@@ -86,8 +84,22 @@
 
 GNUNET_NETWORK_STRUCT_END
 
-struct SplittedHTTPAddress;
+/**
+ * Representation of HTTP URL split into its components.
+ */
+struct SplittedHTTPAddress
+{
+  char *protocol;
+  char *host;
+  char *path;
+  int port;
+};
 
+
+/**
+ * Split an HTTP address into protocol, hostname, port
+ * and path components.
+ */
 struct SplittedHTTPAddress *
 http_split_address (const char *addr);
 
@@ -125,7 +137,7 @@
  *
  * @param plugin name of the plugin
  * @param addr binary address
- * @param addrlen length of the address
+ * @param addrlen length of @a addr
  * @return string representing the same address
  */
 const char *
@@ -205,9 +217,9 @@
  * Compare addr1 to addr2
  *
  * @param addr1 address1
- * @param addrlen1 address 1 length
+ * @param addrlen1 length of @a address1
  * @param addr2 address2
- * @param addrlen2 address 2 length
+ * @param addrlen2 length of @a address2
  * @return #GNUNET_YES if equal, #GNUNET_NO else
  */
 size_t

Modified: gnunet/src/transport/test_http_common.c
===================================================================
--- gnunet/src/transport/test_http_common.c     2014-06-23 19:13:45 UTC (rev 
33797)
+++ gnunet/src/transport/test_http_common.c     2014-06-23 19:24:14 UTC (rev 
33798)
@@ -26,135 +26,125 @@
 #include "transport-testing.h"
 #include "plugin_transport_http_common.h"
 
-struct SplittedHTTPAddress
-{
-       char *protocol;
-       char *host;
-       char *path;
-       int port;
-};
 
-void
+static void
 clean (struct SplittedHTTPAddress *addr)
 {
-       if (NULL != addr)
-       {
-               GNUNET_free_non_null (addr->host);
-               GNUNET_free_non_null (addr->path);
-               GNUNET_free_non_null (addr->protocol);
-               GNUNET_free_non_null (addr);
-       }
+  if (NULL == addr)
+    return;
+  GNUNET_free_non_null (addr->host);
+  GNUNET_free_non_null (addr->path);
+  GNUNET_free_non_null (addr->protocol);
+  GNUNET_free (addr);
 }
 
 
-int
+static int
 check (struct SplittedHTTPAddress *addr,
-                        char * protocol,
-                        char * host,
-                        int port,
-                        char * path)
+       char * protocol,
+       char * host,
+       int port,
+       char * path)
 {
+  if (NULL == addr)
+    return GNUNET_NO;
+  if (((NULL == addr->protocol) && (NULL != protocol)) ||
+      ((NULL != addr->protocol) && (NULL == protocol)))
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  else if ((NULL != addr->protocol) && (NULL != protocol))
+  {
+    if (0 != strcmp(addr->protocol, protocol))
+    {
+      GNUNET_break (0);
+      return GNUNET_NO;
+    }
+  }
 
-       if (NULL == addr)
-               return GNUNET_NO;
-       if (((NULL == addr->protocol) && (NULL != protocol)) ||
-                       ((NULL != addr->protocol) && (NULL == protocol)))
-       {
-               GNUNET_break (0);
-               return GNUNET_NO;
-       }
-       else if ((NULL != addr->protocol) && (NULL != protocol))
-       {
-               if (0 != strcmp(addr->protocol, protocol))
-               {
-                       GNUNET_break (0);
-                       return GNUNET_NO;
-               }
-       }
+  if (((NULL == addr->host) && (NULL != host)) ||
+      ((NULL != addr->host) && (NULL == host)))
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  else if ((NULL != addr->host) && (NULL != host))
+  {
+    if (0 != strcmp(addr->host, host))
+    {
+      GNUNET_break (0);
+      return GNUNET_NO;
+    }
+  }
 
-       if (((NULL == addr->host) && (NULL != host)) ||
-                       ((NULL != addr->host) && (NULL == host)))
-       {
-               GNUNET_break (0);
-               return GNUNET_NO;
-       }
-       else if ((NULL != addr->host) && (NULL != host))
-       {
-               if (0 != strcmp(addr->host, host))
-               {
-                       GNUNET_break (0);
-                       return GNUNET_NO;
-               }
-       }
+  if (((NULL == addr->path) && (NULL != path)) ||
+      ((NULL != addr->path) && (NULL == path)))
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  else if ((NULL != addr->path) && (NULL != path))
+  {
+    if (0 != strcmp(addr->path, path))
+    {
+      GNUNET_break (0);
+      return GNUNET_NO;
+    }
+  }
 
+  if ((addr->port != port))
+  {
+    GNUNET_break (0);
+    return GNUNET_NO;
+  }
+  return GNUNET_OK;
+}
 
-       if (((NULL == addr->path) && (NULL != path)) ||
-                       ((NULL != addr->path) && (NULL == path)))
-       {
-               GNUNET_break (0);
-               return GNUNET_NO;
-       }
-       else if ((NULL != addr->path) && (NULL != path))
-       {
-               if (0 != strcmp(addr->path, path))
-               {
-                       GNUNET_break (0);
-                       return GNUNET_NO;
-               }
-       }
 
-       if ((addr->port != port))
-       {
-               GNUNET_break (0);
-               return GNUNET_NO;
-       }
+static int
+check_pass (const char *src,
+            const char *protocol,
+            const char *host,
+            int port,
+            const char *path)
+{
+  struct SplittedHTTPAddress *spa;
 
-       return GNUNET_OK;
-}
-
-int
-check_pass (char *src,
-                                               char * protocol,
-                                               char * host,
-                                               int port,
-                                               char * path)
-{
-       struct SplittedHTTPAddress * spa;
   spa = http_split_address (src);
   if (NULL == spa)
   {
-       GNUNET_break (0);
-       return GNUNET_SYSERR;
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
-  else
+  if (GNUNET_OK != check(spa, protocol, host, port, path))
   {
-               if (GNUNET_OK != check(spa, protocol, host, port, path))
-               {
-                               clean (spa);
-                               GNUNET_break (0);
-                       return GNUNET_SYSERR;
-               }
-               clean (spa);
+    clean (spa);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
   }
+  clean (spa);
   return GNUNET_OK;
 }
 
-int
-check_fail (char *src)
+
+static int
+check_fail (const char *src)
 {
-       struct SplittedHTTPAddress * spa;
+  struct SplittedHTTPAddress * spa;
+
   spa = http_split_address (src);
   if (NULL != spa)
   {
-       GNUNET_break (0);
-       clean (spa);
-       return GNUNET_SYSERR;
+    GNUNET_break (0);
+    clean (spa);
+    return GNUNET_SYSERR;
   }
   return GNUNET_OK;
 }
 
 
-void
+static void
 test_pass_hostname ()
 {
   check_pass("http://test.local";, "http", "test.local", HTTP_DEFAULT_PORT, "");
@@ -171,7 +161,7 @@
 }
 
 
-void
+static void
 test_pass_ipv4 ()
 {
   check_pass("http://127.0.0.1";, "http", "127.0.0.1", HTTP_DEFAULT_PORT, "");
@@ -185,7 +175,8 @@
   check_pass("http://127.0.0.1:81/path/more";, "http", "127.0.0.1", 81, 
"/path/more");
 }
 
-void
+
+static void
 test_fail_ipv6 ()
 {
   check_pass("http://[::1]";, "http", "[::1]", HTTP_DEFAULT_PORT, "");
@@ -200,57 +191,58 @@
 }
 
 
-void
+static void
 test_fail ()
 {
-       if (GNUNET_SYSERR == check_fail (""))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("http"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("://"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("http://";))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("//localhost"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("//:80"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("//:80/"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("//:80:"))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("http://localhost:a/";))
-               GNUNET_break (0);
-       if (GNUNET_SYSERR == check_fail ("http://127.0.0.1:a/";))
-               GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail (""))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("http"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("://"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("http://";))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("//localhost"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("//:80"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("//:80/"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("//:80:"))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("http://localhost:a/";))
+    GNUNET_break (0);
+  if (GNUNET_SYSERR == check_fail ("http://127.0.0.1:a/";))
+    GNUNET_break (0);
 }
 
+
 int
 main (int argc, char *argv[])
 {
   int ret = 0;
   struct SplittedHTTPAddress * spa;
+
   GNUNET_log_setup ("test", "DEBUG", NULL);
-
   spa = http_split_address ("");
   if (NULL != spa)
   {
-       clean (spa);
-       GNUNET_break (0);
+    clean (spa);
+    GNUNET_break (0);
   }
 
   http_split_address ("http://";);
   if (NULL != spa)
   {
-               clean (spa);
-       GNUNET_break (0);
+    clean (spa);
+    GNUNET_break (0);
   }
 
   http_split_address ("://");
   if (NULL != spa)
   {
-               clean (spa);
-       GNUNET_break (0);
+    clean (spa);
+    GNUNET_break (0);
   }
 
   test_pass_hostname ();