/*
This file is part of GNUnet
- (C) 2002-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
#include "gnunet_protocols.h"
#include "gnunet_transport_plugin.h"
#include "plugin_transport_http_common.h"
+#if HAVE_CURL_CURL_H
#include <curl/curl.h>
+#elif HAVE_GNURL_CURL_H
+#include <gnurl/curl.h>
+#endif
#define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__)
unsigned int msgs_in_queue;
/**
- * ATS network type in NBO
+ * ATS network type.
*/
- uint32_t ats_address_network_type;
+ enum GNUNET_ATS_Network_Type scope;
};
client_delete_session (s);
/* Re-schedule since handles have changed */
- if (plugin->client_perform_task != NULL)
+ if (NULL != plugin->client_perform_task)
{
GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
plugin->client_perform_task = NULL;
struct Session *s = cls;
struct HTTP_Client_Plugin *plugin;
struct GNUNET_TIME_Relative delay;
- struct GNUNET_ATS_Information atsi;
char *stat_txt;
plugin = s->plugin;
- atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- atsi.value = s->ats_address_network_type;
- GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
-
delay = s->plugin->env->receive (plugin->env->cls,
s->address,
s,
message);
- plugin->env->update_address_metrics (plugin->env->cls,
- s->address,
- s,
- &atsi, 1);
-
GNUNET_asprintf (&stat_txt,
"# bytes received via %s_client",
plugin->protocol);
return GNUNET_SYSERR;
}
- GNUNET_asprintf(&s->url,
- "%s/%s;%u",
- http_common_plugin_address_to_url(NULL,
- s->address->address,
- s->address->address_length),
- GNUNET_i2s_full (plugin->env->my_identity),
- plugin->last_tag);
+ GNUNET_asprintf (&s->url,
+ "%s/%s;%u",
+ http_common_plugin_address_to_url (NULL,
+ s->address->address,
+ s->address->address_length),
+ GNUNET_i2s_full (plugin->env->my_identity),
+ plugin->last_tag);
plugin->last_tag++;
LOG (GNUNET_ERROR_TYPE_DEBUG,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p: connected with GET %p and PUT %p\n",
- s, s->get.easyhandle, s->put.easyhandle);
+ s, s->get.easyhandle,
+ s->put.easyhandle);
/* Perform connect */
GNUNET_STATISTICS_set (plugin->env->stats,
HTTP_STAT_STR_CONNECTIONS,
plugin->cur_requests,
GNUNET_NO);
/* Re-schedule since handles have changed */
- if (plugin->client_perform_task != NULL)
+ if (NULL != plugin->client_perform_task)
{
GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
plugin->client_perform_task = NULL;
}
/* Schedule task to run immediately */
- plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, plugin);
+ plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run,
+ plugin);
return res;
}
http_client_plugin_get_network (void *cls,
struct Session *session)
{
- return ntohl (session->ats_address_network_type);
+ return session->scope;
}
struct HTTP_Client_Plugin *plugin = cls;
struct Session *s;
struct sockaddr *sa;
- struct GNUNET_ATS_Information ats;
+ enum GNUNET_ATS_Network_Type net_type;
size_t salen = 0;
int res;
}
/* Determine network location */
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+ net_type = GNUNET_ATS_NET_UNSPECIFIED;
sa = http_common_socket_from_address (address->address,
address->address_length,
&res);
{
salen = sizeof (struct sockaddr_in6);
}
- ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+ net_type = plugin->env->get_address_type (plugin->env->cls, sa, salen);
GNUNET_free (sa);
}
else if (GNUNET_NO == res)
{
/* Cannot convert to sockaddr -> is external hostname */
- ats.value = htonl (GNUNET_ATS_NET_WAN);
+ net_type = GNUNET_ATS_NET_WAN;
}
- if (GNUNET_ATS_NET_UNSPECIFIED == ntohl (ats.value))
+ if (GNUNET_ATS_NET_UNSPECIFIED == net_type)
{
GNUNET_break (0);
return NULL;
s = GNUNET_new (struct Session);
s->plugin = plugin;
s->address = GNUNET_HELLO_address_copy (address);
- s->ats_address_network_type = ats.value;
+ s->scope = net_type;
s->put.state = H_NOT_CONNECTED;
s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT);