#include "platform.h"
#include "gnunet_common.h"
#include "gnunet_transport_plugin.h"
+#include "plugin_transport_http_common.h"
struct SplittedHTTPAddress
{
- char *protocoll;
+ char *protocol;
char *host;
- char *port;
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 *protocoll_start = NULL;
+ char *protocol_start = NULL;
char *host_start = NULL;
+ char *v6_end = NULL;
char *port_start = NULL;
char *path_start = NULL;
-
- protocoll_start = src;
+ 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)
{
}
host_start[0] = '\0';
- sp->protocoll = GNUNET_strdup (protocoll_start);
+ sp->protocol = GNUNET_strdup (protocol_start);
host_start += strlen ("://");
if (strlen (host_start) == 0)
- if (NULL == host_start)
{
GNUNET_free (src);
+ GNUNET_free (sp->protocol);
GNUNET_free (sp);
return NULL;
}
- port_start = strstr (host_start, ":");
- if (NULL == port_start)
+
+ /* Find path start */
+ path_start = strchr (host_start, '/');
+ if (NULL != path_start)
{
- path_start = strstr (host_start, "/");
+ sp->path = GNUNET_strdup (path_start);
+ path_start[0] = '\0';
}
else
+ sp->path = GNUNET_strdup ("");
+
+ if (strlen(host_start) < 1)
{
- port_start[0] = '\0';
- port_start ++;
- sp->host = GNUNET_strdup (host_start);
- path_start = strstr (port_start, "/");
+ GNUNET_free (src);
+ GNUNET_free (sp->protocol);
+ GNUNET_free (sp->path);
+ GNUNET_free (sp);
+ return NULL;
}
- if (NULL == path_start)
- {
- if (NULL != port_start)
- sp->port = GNUNET_strdup (port_start);
- sp->path = NULL;
- }
- else
+ if (NULL != (port_start = strrchr (host_start, ':')))
{
- if (NULL != port_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
{
- path_start[0] = '\0';
- sp->port = GNUNET_strdup (port_start);
- path_start[0] = '/';
+ /* 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;
+ }
}
- sp->path = GNUNET_strdup(path_start);
+ }
+ 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);
- fprintf (stderr, "protocoll: `%s', host `%s' port `%s' path `%s'\n", sp->protocoll, sp->host, sp->port, sp->path);
return sp;
}
asc (asc_cls, NULL);
return;
}
- http_split_address (addr);
asc (asc_cls, saddr);
asc (asc_cls, NULL);
}
struct sockaddr *
http_common_socket_from_address (const void *addr, size_t addrlen, int *res)
{
+ struct SplittedHTTPAddress * spa;
struct sockaddr_storage *s;
- char *addrs;
- char *addrs_org;
- char *addrs_end;
(*res) = GNUNET_SYSERR;
+ char * to_conv;
if (NULL == addr)
{
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)
+ spa = http_split_address (addr);
+ if (NULL == spa)
{
- GNUNET_break (0);
- GNUNET_free (addrs_org);
- return NULL;
+ (*res) = GNUNET_SYSERR;
+ 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))
+ 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);
- GNUNET_free (addrs_org);
+ GNUNET_free (s);
(*res) = GNUNET_NO;
- return NULL;
+ s = NULL;
+ }
+ else if ((AF_INET != s->ss_family) && (AF_INET6 != s->ss_family))
+ {
+
+ GNUNET_free (s);
+ (*res) = GNUNET_SYSERR;
+ s = 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;
}
- (*res) = GNUNET_YES;
- GNUNET_free (addrs_org);
+ http_clean_splitted (spa);
+ GNUNET_free (to_conv);
return (struct sockaddr *) s;
}
* @param addrlen2 address 2 length
* @return GNUNET_YES if equal, GNUNET_NO if not, GNUNET_SYSERR on error
*/
-int
+size_t
http_common_cmp_addresses (const void *addr1, size_t addrlen1, const void *addr2, size_t addrlen2)
{
const char *a1 = (const char *) addr1;