#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_transport_plugin.h"
+#include "plugin_transport_http_common.h"
+
+struct SplittedHTTPAddress
+{
+ char *protocol;
+ char *host;
+ char *path;
+ int port;
+};
+
+static void
+http_clean_splitted (struct SplittedHTTPAddress *spa)
+{
+ if (NULL != spa)
+ {
+ GNUNET_free_non_null (spa->protocol);
+ GNUNET_free_non_null (spa->host);
+ GNUNET_free_non_null (spa->path);
+ GNUNET_free_non_null (spa);
+ }
+}
+
+struct SplittedHTTPAddress *
+http_split_address (const char * addr)
+{
+ struct SplittedHTTPAddress *sp;
+ char *src = GNUNET_strdup (addr);
+ char *protocol_start = NULL;
+ char *host_start = NULL;
+ char *v6_end = NULL;
+ char *port_start = NULL;
+ char *path_start = NULL;
+ protocol_start = src;
+ sp = GNUNET_malloc (sizeof (struct SplittedHTTPAddress));
+
+ /* Address string consists of protocol://host[:port]path*/
+
+ host_start = strstr (src, "://");
+ if (NULL == host_start)
+ {
+ GNUNET_free (src);
+ GNUNET_free (sp);
+ return NULL;
+ }
+
+ host_start[0] = '\0';
+ sp->protocol = GNUNET_strdup (protocol_start);
+
+ host_start += strlen ("://");
+ if (strlen (host_start) == 0)
+ {
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp);
+ return NULL;
+ }
+
+ /* Find path start */
+ path_start = strchr (host_start, '/');
+ if (NULL != path_start)
+ {
+ sp->path = GNUNET_strdup (path_start);
+ path_start[0] = '\0';
+ }
+ else
+ sp->path = GNUNET_strdup ("");
+
+ if (strlen(host_start) < 1)
+ {
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
+ }
+
+ if (NULL != (port_start = strrchr (host_start, ':')))
+ {
+ /* *We COULD have a port, but also an IPv6 address! */
+ if (NULL != (v6_end = strchr(host_start, ']')))
+ {
+ if (v6_end < port_start)
+ {
+ /* IPv6 address + port */
+ port_start[0] = '\0';
+ port_start ++;
+ sp->port = atoi (port_start);
+ if ((0 == sp->port) || (65535 < sp->port))
+ {
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
+ }
+ }
+ else
+ {
+ /* IPv6 address + no port */
+ if (0 == strcmp(sp->protocol, "https"))
+ sp->port = HTTPS_DEFAULT_PORT;
+ else if (0 == strcmp(sp->protocol, "http"))
+ sp->port = HTTP_DEFAULT_PORT;
+ }
+ }
+ else
+ {
+ /* No IPv6 address */
+ port_start[0] = '\0';
+ port_start ++;
+ sp->port = atoi (port_start);
+ if ((0 == sp->port) || (65535 < sp->port))
+ {
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
+ }
+ }
+ }
+ else
+ {
+ /* No ':' as port separator, default port for protocol */
+ if (0 == strcmp(sp->protocol, "https"))
+ sp->port = HTTPS_DEFAULT_PORT;
+ else if (0 == strcmp(sp->protocol, "http"))
+ sp->port = HTTP_DEFAULT_PORT;
+ else
+ {
+ GNUNET_break (0);
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
+ }
+ }
+ if (strlen (host_start) > 0)
+ sp->host = GNUNET_strdup (host_start);
+ else
+ {
+ GNUNET_break (0);
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
+ }
+ GNUNET_free (src);
+ return sp;
+}
/**
* Convert the transports address to a nice, human-readable
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) ||
+ (0 >= addrlen) ||
+ ('\0' != saddr[addrlen-1]) )
+ {
+ asc (asc_cls, NULL);
+ return;
+ }
asc (asc_cls, saddr);
+ asc (asc_cls, NULL);
}
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;
}
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;
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 SplittedHTTPAddress * spa;
+ struct sockaddr_storage *s;
+ (*res) = GNUNET_SYSERR;
+ char * to_conv;
+
+ 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;
+ }
+
+ spa = http_split_address (addr);
+ if (NULL == spa)
+ {
+ (*res) = GNUNET_SYSERR;
+ return NULL;
+ }
+
+ s = GNUNET_malloc (sizeof (struct sockaddr_storage));
+ GNUNET_asprintf (&to_conv, "%s:%u", spa->host, spa->port);
+ if (GNUNET_SYSERR == GNUNET_STRINGS_to_address_ip (to_conv, strlen(to_conv), s))
+ {
+ /* could be a hostname */
+ GNUNET_free (s);
+ (*res) = GNUNET_NO;
+ s = NULL;
+ }
+ else if ((AF_INET != s->ss_family) && (AF_INET6 != s->ss_family))
+ {
+
+ GNUNET_free (s);
+ (*res) = GNUNET_SYSERR;
+ s = NULL;
+ }
+ else
+ {
+ (*res) = GNUNET_YES;
+ }
+ http_clean_splitted (spa);
+ GNUNET_free (to_conv);
+ return (struct sockaddr *) s;
+}
+
/**
* Get the length of an address
*
* @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
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;