new operation queue for limiting overlay connects

[oweals/gnunet.git] / src / transport / plugin_transport_http_common.c

diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index a7a39baeccb537a007c253337c78f5162086b4e7..fc4c4a211aa50d7292c39350bd2750457556ebe2 100644 (file)
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -51,9 +51,22 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
                                         asc, void *asc_cls)
 {
   const char *saddr = (const char *) addr;
-  GNUNET_assert (NULL != saddr);
-  GNUNET_assert (0 < addrlen);
-  GNUNET_assert (saddr[addrlen-1] == '\0');
+  if (NULL == saddr)
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
+  if (0 >= addrlen)
+  if (NULL == saddr)
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
+  if (saddr[addrlen-1] != '\0')
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
   asc (asc_cls, saddr);
 }
 
@@ -73,9 +86,12 @@ const char *
 http_common_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
 {
   const char *saddr = (const char *) addr;
-  GNUNET_assert (NULL != saddr);
-  GNUNET_assert (0 < addrlen);
-  GNUNET_assert (saddr[addrlen-1] == '\0');
+  if (NULL == saddr)
+      return NULL;
+  if (0 >= addrlen)
+    return NULL;
+  if (saddr[addrlen-1] != '\0')
+    return NULL;
   return saddr;
 }
 
@@ -98,9 +114,12 @@ http_common_plugin_string_to_address (void *cls,
                         void **buf,
                         size_t *added)
 {
-  GNUNET_assert (NULL != addr);
-  GNUNET_assert (0 < addrlen);
-  GNUNET_assert (addr[addrlen-1] == '\0');
+  if (NULL == addr)
+      return GNUNET_SYSERR;
+  if (0 >= addrlen)
+    return GNUNET_SYSERR;
+  if (addr[addrlen-1] != '\0')
+    return GNUNET_SYSERR;
 
   (*buf) = strdup (addr);
   (*added) = strlen (addr) + 1;
@@ -123,6 +142,89 @@ http_common_address_from_socket (const char *protocol, const struct sockaddr *ad
   return res;
 }
 
+/**
+ * Create a socketaddr from a HTTP address
+ *
+ * @param addr sockaddr * address
+ * @param addrlen length of the address
+ * @param res the result:
+ * GNUNET_SYSERR, invalid input,
+ * GNUNET_YES: could convert to ip,
+ * GNUNET_NO: valid input but could not convert to ip (hostname?)
+ * @return the string
+ */
+struct sockaddr *
+http_common_socket_from_address (const void *addr, size_t addrlen, int *res)
+{
+  struct sockaddr_storage *s;
+  char *addrs;
+  char *addrs_org;
+  char *addrs_end;
+  (*res) = GNUNET_SYSERR;
+
+  if (NULL == addr)
+    {
+      GNUNET_break (0);
+      return NULL;
+    }
+  if (0 >= addrlen)
+    {
+      GNUNET_break (0);
+      return NULL;
+    }
+  if (((char *) addr)[addrlen-1] != '\0')
+    {
+      GNUNET_break (0);
+      return NULL;
+    }
+
+  addrs_org = strdup ((char *) addr);
+  addrs = strstr (addrs_org , "://");
+  if (NULL == addrs)
+  {
+    GNUNET_break (0);
+    GNUNET_free (addrs_org);
+    return NULL;
+  }
+
+  if (strlen (addrs) < 3)
+  {
+    GNUNET_break (0);
+    GNUNET_free (addrs_org);
+    return NULL;
+  }
+
+  addrs += 3;
+
+  addrs_end = strchr (addrs, '/');
+  if (NULL != addrs_end)
+    addrs[strlen (addrs) - strlen(addrs_end)] = '\0';
+
+  s = GNUNET_malloc (sizeof (struct sockaddr_storage));
+  if (GNUNET_SYSERR == GNUNET_STRINGS_to_address_ip (addrs, strlen(addrs), s))
+  {
+    /* could be a hostname */
+    GNUNET_free (s);
+    GNUNET_free (addrs_org);
+    (*res) = GNUNET_NO;
+    return NULL;
+  }
+  else
+  {
+    if ((AF_INET != s->ss_family) && (AF_INET6 != s->ss_family))
+    {
+      GNUNET_break (0);
+      GNUNET_free (s);
+      GNUNET_free (addrs_org);
+      (*res) = GNUNET_SYSERR;
+      return NULL;
+    }
+  }
+  (*res) = GNUNET_YES;
+  GNUNET_free (addrs_org);
+  return (struct sockaddr *) s;
+}
+
 /**
  * Get the length of an address
  *
@@ -142,11 +244,31 @@ http_common_address_get_size (const void *addr)
  * @param addrlen1 address 1 length
  * @param addr2 address2
  * @param addrlen2 address 2 length
- * @return GNUNET_YES if equal, GNUNET_NO else
+ * @return GNUNET_YES if equal, GNUNET_NO if not, GNUNET_SYSERR on error
  */
-size_t
+int
 http_common_cmp_addresses (const void *addr1, size_t addrlen1, const void *addr2, size_t addrlen2)
 {
+  const char *a1 = (const char *) addr1;
+  const char *a2 = (const char *) addr2;
+
+  if (NULL == a1)
+      return GNUNET_SYSERR;
+  if (0 >= addrlen1)
+    return GNUNET_SYSERR;
+  if (a1[addrlen1-1] != '\0')
+    return GNUNET_SYSERR;
+
+  if (NULL == a2)
+      return GNUNET_SYSERR;
+  if (0 >= addrlen2)
+    return GNUNET_SYSERR;
+  if (a2[addrlen2-1] != '\0')
+    return GNUNET_SYSERR;
+
+  if (addrlen1 != addrlen2)
+    return GNUNET_NO;
+
   if (0 == strcmp (addr1, addr2))
     return GNUNET_YES;
   return GNUNET_NO;