*/
#if BUILD_HTTPS
+#define PLUGIN_NAME "https_client"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_client_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_client_done
#else
+#define PLUGIN_NAME "http_client"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_client_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done
#endif
#define ENABLE_GET GNUNET_YES
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_protocols.h"
-#include "gnunet_common.h"
-#include "gnunet_server_lib.h"
#include "gnunet_transport_plugin.h"
#include "plugin_transport_http_common.h"
#include <curl/curl.h>
/**
* A connection handle
- *
+ *
*/
struct ConnectionHandle
{
/**
- * The curl easy handle
+ * The curl easy handle
*/
CURL *easyhandle;
-
+
/**
- * The related session
+ * The related session
*/
struct Session *s;
};
/**
- * Connect a HTTP put connection
+ * Connect a HTTP put connection
*
* @param s the session to connect
* @return GNUNET_SYSERR for hard failure, GNUNET_OK for success
* @return always 0
*/
static int
-client_log (CURL *curl, curl_infotype type,
+client_log (CURL *curl, curl_infotype type,
const char *data, size_t size, void *cls)
{
struct ConnectionHandle *ch = cls;
/**
* Check if a sessions exists for an specific address
- *
+ *
* @param plugin the plugin
* @param address the address
* @return the session or NULL
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Information atsi;
char *stat_txt;
+
if (GNUNET_YES != client_exist_session(p, s))
{
GNUNET_break (0);
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->target, message,
s, (const char *) s->addr, s->addrlen);
s->next_receive =
GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
- if (GNUNET_TIME_absolute_get ().abs_value < s->next_receive.abs_value)
+ if (GNUNET_TIME_absolute_get ().abs_value_us < s->next_receive.abs_value_us)
{
-
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: peer `%s' address `%s' next read delayed for %llu ms\n",
+ "Client: peer `%s' address `%s' next read delayed for %s\n",
GNUNET_i2s (&s->target),
- http_common_plugin_address_to_string (NULL, s->plugin->protocol, s->addr, s->addrlen),
- delay);
+ http_common_plugin_address_to_string (NULL,
+ s->plugin->protocol,
+ s->addr, s->addrlen),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
}
client_reschedule_session_timeout (s);
return GNUNET_OK;
s, s->client_get,
len, GNUNET_i2s (&s->target));
now = GNUNET_TIME_absolute_get ();
- if (now.abs_value < s->next_receive.abs_value)
+ if (now.abs_value_us < s->next_receive.abs_value_us)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
struct GNUNET_TIME_Relative delta =
GNUNET_TIME_absolute_get_difference (now, s->next_receive);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %llu ms\n",
- s, s->client_get, delta.rel_value);
+ "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %s\n",
+ s, s->client_get,
+ GNUNET_STRINGS_relative_time_to_string (delta,
+ GNUNET_YES));
if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
/**
* Connect GET connection for a session
- *
+ *
* @param s the session to connect
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT, 0);
curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s);
curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS,
- (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);
+ (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL);
curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE,
2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
#if CURL_TCP_NODELAY
}
/**
- * Connect a HTTP put connection
+ * Connect a HTTP put connection
*
* @param s the session to connect
* @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0);
curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s);
curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS,
- (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);
+ (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL);
curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE,
2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
#if CURL_TCP_NODELAY
/**
* Connect both PUT and GET connection for a session
- *
+ *
* @param s the session to connect
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
}
GNUNET_asprintf (&s->url, "%s/%s;%u",
- http_common_plugin_address_to_url (NULL, s->addr, s->addrlen),
- GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
- plugin->last_tag);
+ http_common_plugin_address_to_url (NULL, s->addr, s->addrlen),
+ GNUNET_i2s_full (plugin->env->my_identity),
+ plugin->last_tag);
plugin->last_tag++;
}
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+http_client_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return ntohl (session->ats_address_network_type);
+}
+
+
/**
* Creates a new outbound session the transport service will use to send data to the
* peer
s->put_tmp_disconnected = GNUNET_NO;
client_start_session_timeout (s);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Created new session %p for `%s' address `%s''\n",
+ s,
+ http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen),
+ GNUNET_i2s (&s->target));
+
/* add new session */
GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (TIMEOUT_LOG,
- "Session %p was idle for %llu ms, disconnecting\n",
- s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value);
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+ GNUNET_YES));
/* call session destroy function */
GNUNET_assert (GNUNET_OK == client_disconnect (s));
&client_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
- "Timeout for session %p set to %llu ms\n",
- s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value);
+ "Timeout for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+ GNUNET_YES));
}
&client_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
- "Timeout rescheduled for session %p set to %llu ms\n",
- s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value);
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+ GNUNET_YES));
}
const void *addr,
size_t addrlen)
{
- return http_common_plugin_address_to_string (cls, p->protocol, addr, addrlen);
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
}
/**
api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-
+ api->get_network = &http_client_get_network;
#if BUILD_HTTPS
plugin->name = "transport-https_client";
projects / oweals / gnunet.git / blobdiff