changes

[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 b1bf7b0deb7e005949c0f953ebae3be9ebf0511a..f138845074f841e5ac5b99a37740d7d37984ca08 100644 (file)
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -50,8 +50,25 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
                                         GNUNET_TRANSPORT_AddressStringCallback
                                         asc, void *asc_cls)
 {
-  GNUNET_break (0);
-  asc (asc_cls, NULL);
+  const char *saddr = (const char *) addr;
+  if (NULL == saddr)
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
+  if (0 >= addrlen)
+  if (NULL == saddr)
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
+  if (saddr[addrlen-1] != '\0')
+  if (NULL == saddr)
+  {
+      asc (asc_cls, NULL);
+      return;
+  }
+  asc (asc_cls, saddr);
 }
 
 
@@ -69,8 +86,14 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
 const char *
 http_common_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
 {
-  GNUNET_break (0);
-  return NULL;
+  const char *saddr = (const char *) addr;
+  if (NULL == saddr)
+      return NULL;
+  if (0 >= addrlen)
+    return NULL;
+  if (saddr[addrlen-1] != '\0')
+    return NULL;
+  return saddr;
 }
 
 /**
@@ -92,8 +115,83 @@ http_common_plugin_string_to_address (void *cls,
                         void **buf,
                         size_t *added)
 {
-  GNUNET_break (0);
-  return GNUNET_SYSERR;
+  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;
+  return GNUNET_OK;
+}
+
+/**
+ * Create a HTTP address from a socketaddr
+ *
+ * @param protocol protocol
+ * @param addr sockaddr * address
+ * @param addrlen length of the address
+ * @return the string
+ */
+char *
+http_common_address_from_socket (const char *protocol, const struct sockaddr *addr, socklen_t addrlen)
+{
+  char *res;
+  GNUNET_asprintf(&res, "%s://%s", protocol, GNUNET_a2s (addr, addrlen));
+  return res;
+}
+
+/**
+ * Get the length of an address
+ *
+ * @param addr address
+ * @return the size
+ */
+size_t
+http_common_address_get_size (const void *addr)
+{
+ return strlen (addr) + 1;
 }
 
+/**
+ * Compare addr1 to addr2
+ *
+ * @param addr1 address1
+ * @param addrlen1 address 1 length
+ * @param addr2 address2
+ * @param addrlen2 address 2 length
+ * @return GNUNET_YES if equal, GNUNET_NO if not, GNUNET_SYSERR on error
+ */
+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;
+}
+
+
+
 /* end of plugin_transport_http_common.c */