/*
This file is part of GNUnet
- (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2002-2013 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
#if BUILD_HTTPS
#define PLUGIN_NAME "https_client"
+#define HTTP_STAT_STR_CONNECTIONS "# HTTPS client connections"
#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 HTTP_STAT_STR_CONNECTIONS "# HTTP client connections"
#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>
*/
struct Session;
+
/**
* A connection handle
- *
+ *
*/
struct ConnectionHandle
{
/**
- * The curl easy handle
+ * The curl easy handle
*/
CURL *easyhandle;
-
+
/**
- * The related session
+ * The related session
*/
struct Session *s;
};
-
/**
* Session handle for connections.
*/
/**
* Address
*/
- struct HttpAddress *addr;
-
- /**
- * Address length
- */
- size_t addrlen;
+ struct GNUNET_HELLO_Address *address;
/**
* ATS network type in NBO
};
-/**
- * Encapsulation of all of the state of the plugin.
- */
-struct HTTP_Client_Plugin *p;
-
-
-/**
- * Start session timeout for a session
- * @param s the session
- */
-static void
-client_start_session_timeout (struct Session *s);
-
-
/**
* Increment session timeout due to activity for a session
* @param s the session
client_reschedule_session_timeout (struct Session *s);
-/**
- * Cancel timeout for a session
- * @param s the session
- */
-static void
-client_stop_session_timeout (struct Session *s);
-
-
/**
* Function setting up file descriptors and scheduling task to run
*
/**
- * 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 #GNUNET_SYSERR for hard failure, #GNUNET_OK for success
*/
static int
client_connect_put (struct Session *s);
*
* @param plugin the plugin
* @param s desired session
- * @return GNUNET_YES or GNUNET_NO
+ * @return #GNUNET_YES or #GNUNET_NO
*/
static int
-client_exist_session (struct HTTP_Client_Plugin *plugin, struct Session *s)
+client_exist_session (struct HTTP_Client_Plugin *plugin,
+ struct Session *s)
{
struct Session * head;
- GNUNET_assert (NULL != plugin);
- GNUNET_assert (NULL != s);
-
for (head = plugin->head; head != NULL; head = head->next)
- {
if (head == s)
return GNUNET_YES;
- }
return GNUNET_NO;
}
* @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;
struct HTTP_Message *msg;
char *stat_txt;
- GNUNET_assert (plugin != NULL);
- GNUNET_assert (s != NULL);
-
/* lookup if session is really existing */
if (GNUNET_YES != client_exist_session (plugin, s))
{
memcpy (msg->buf, msgbuf, msgbuf_size);
GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
- GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol);
+ GNUNET_asprintf (&stat_txt,
+ "# bytes currently in %s_client buffers",
+ plugin->protocol);
GNUNET_STATISTICS_update (plugin->env->stats,
stat_txt, msgbuf_size, GNUNET_NO);
-
GNUNET_free (stat_txt);
if (GNUNET_YES == s->put_tmp_disconnecting)
"Session %p/connection %p: unpausing connection\n",
s, s->client_put);
s->put_paused = GNUNET_NO;
- curl_easy_pause (s->client_put, CURLPAUSE_CONT);
+ if (NULL != s->client_put)
+ curl_easy_pause (s->client_put, CURLPAUSE_CONT);
}
else if (GNUNET_YES == s->put_tmp_disconnected)
{
}
client_schedule (s->plugin, GNUNET_YES);
- client_reschedule_session_timeout (s);
return msgbuf_size;
}
struct HTTP_Message *pos;
struct HTTP_Message *next;
- client_stop_session_timeout (s);
-
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (GNUNET_SCHEDULER_NO_TASK != s->put_disconnect_task)
{
GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
GNUNET_SERVER_mst_destroy (s->msg_tk);
s->msg_tk = NULL;
}
- GNUNET_free (s->addr);
+ GNUNET_HELLO_address_free (s->address);
GNUNET_free (s->url);
GNUNET_free (s);
}
-
/**
* Disconnect a session
*
+ * @param cls the `struct HTTP_Client_Plugin`
* @param s session
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
static int
-client_disconnect (struct Session *s)
+http_client_session_disconnect (void *cls,
+ struct Session *s)
{
- struct HTTP_Client_Plugin *plugin = s->plugin;
+ struct HTTP_Client_Plugin *plugin = cls;
struct HTTP_Message *msg;
struct HTTP_Message *t;
int res = GNUNET_OK;
return GNUNET_SYSERR;
}
- if (s->client_put != NULL)
+ if (NULL != s->client_put)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Session %p/connection %p: disconnecting PUT connection to peer `%s'\n",
s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (s->client_get != NULL)
+ if (NULL != s->client_get)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p/connection %p: disconnecting GET connection to peer `%s'\n",
- s, s->client_get, GNUNET_i2s (&s->target));
-
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p/connection %p: disconnecting GET connection to peer `%s'\n",
+ s, s->client_get,
+ GNUNET_i2s (&s->target));
/* remove curl handle from multi handle */
mret = curl_multi_remove_handle (plugin->curl_multi_handle, s->client_get);
if (mret != CURLM_OK)
}
msg = s->msg_head;
- while (msg != NULL)
+ while (NULL != msg)
{
t = msg->next;
if (NULL != msg->transmit_cont)
GNUNET_assert (plugin->cur_connections >= 2);
plugin->cur_connections -= 2;
GNUNET_STATISTICS_set (plugin->env->stats,
- "# HTTP client sessions",
- plugin->cur_connections,
- GNUNET_NO);
-
+ HTTP_STAT_STR_CONNECTIONS,
+ plugin->cur_connections,
+ GNUNET_NO);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Session %p: notifying transport about ending session\n",s);
- plugin->env->session_end (plugin->env->cls, &s->target, s);
+ plugin->env->session_end (plugin->env->cls, s->address, s);
client_delete_session (s);
/* Re-schedule since handles have changed */
}
+/**
+ * Function that is called to get the keepalive factor.
+ * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
+ * calculate the interval between keepalive packets.
+ *
+ * @param cls closure with the `struct Plugin`
+ * @return keepalive factor
+ */
+static unsigned int
+http_client_query_keepalive_factor (void *cls)
+{
+ return 3;
+}
+
+
/**
* Function that can be used to force the plugin to disconnect
* from the given peer and cancel all previous transmissions
* @param target peer from which to disconnect
*/
static void
-http_client_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
+http_client_peer_disconnect (void *cls,
+ const struct GNUNET_PeerIdentity *target)
{
struct HTTP_Client_Plugin *plugin = cls;
struct Session *next = NULL;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Disconnecting session %p to `%pos'\n",
pos, GNUNET_i2s (target));
- GNUNET_assert (GNUNET_OK == client_disconnect (pos));
+ GNUNET_assert (GNUNET_OK == http_client_session_disconnect (plugin,
+ pos));
}
}
-
}
+
/**
* Check if a sessions exists for an specific address
- *
+ *
* @param plugin the plugin
* @param address the address
* @return the session or NULL
struct Session *pos;
for (pos = plugin->head; NULL != pos; pos = pos->next)
+ {
if ((0 == memcmp (&address->peer, &pos->target, sizeof (struct GNUNET_PeerIdentity))) &&
- (address->address_length == pos->addrlen) &&
- (0 == memcmp (address->address, pos->addr, pos->addrlen)))
+ (0 == GNUNET_HELLO_address_cmp(address, pos->address)))
return pos;
+ }
return NULL;
}
+
static void
-client_put_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+client_put_disconnect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Session *s = cls;
+
s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
"Session %p/connection %p: will be disconnected due to no activity\n",
s, s->client_put);
s->put_paused = GNUNET_NO;
s->put_tmp_disconnecting = GNUNET_YES;
- curl_easy_pause (s->client_put, CURLPAUSE_CONT);
+ if (NULL != s->client_put)
+ curl_easy_pause (s->client_put, CURLPAUSE_CONT);
client_schedule (s->plugin, GNUNET_YES);
}
-
/**
* Callback method used with libcurl
* Method is called when libcurl needs to read data during sending
* @param stream pointer where to write data
* @param size size of an individual element
* @param nmemb count of elements that can be written to the buffer
- * @param cls source pointer, passed to the libcurl handle
+ * @param cls our `struct Session`
* @return bytes written to stream, returning 0 will terminate connection!
*/
static size_t
GNUNET_STATISTICS_update (plugin->env->stats,
stat_txt, len, GNUNET_NO);
GNUNET_free (stat_txt);
-
- client_reschedule_session_timeout (s);
return len;
}
* @param tc task context
*/
static void
-client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+client_wake_up (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Session *s = cls;
+ struct HTTP_Client_Plugin *p = s->plugin;
- if (GNUNET_YES != client_exist_session(p, s))
+ if (GNUNET_YES != client_exist_session (p, s))
{
GNUNET_break (0);
return;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Session %p/connection %p: Waking up GET handle\n", s, s->client_get);
- if (s->client_get != NULL)
+ "Session %p/connection %p: Waking up GET handle\n",
+ s,
+ s->client_get);
+ s->put_paused = GNUNET_NO;
+ if (NULL != s->client_get)
curl_easy_pause (s->client_get, CURLPAUSE_CONT);
+
}
* @param cls the session
* @param client not used
* @param message the message received
- * @return always GNUNET_OK
+ * @return always #GNUNET_OK
*/
static int
client_receive_mst_cb (void *cls, void *client,
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Information atsi;
char *stat_txt;
- if (GNUNET_YES != client_exist_session(p, s))
+
+ plugin = s->plugin;
+ if (GNUNET_YES != client_exist_session (plugin, s))
{
GNUNET_break (0);
return GNUNET_OK;
}
- 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->target, message,
- s, (const char *) s->addr, s->addrlen);
+ delay = s->plugin->env->receive (plugin->env->cls, s->address, s, message);
plugin->env->update_address_metrics (plugin->env->cls,
- &s->target,
- s->addr,
- s->addrlen,
- s,
+ s->address, s,
&atsi, 1);
- GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol);
+ GNUNET_asprintf (&stat_txt,
+ "# bytes received via %s_client",
+ plugin->protocol);
GNUNET_STATISTICS_update (plugin->env->stats,
stat_txt, ntohs(message->size), GNUNET_NO);
GNUNET_free (stat_txt);
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->address->address,
+ s->address->address_length),
+ 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);
*
* @param plugin the plugin as closure
* @param now schedule task in 1ms, regardless of what curl may say
- * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
+ * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok
*/
static int
client_schedule (struct HTTP_Client_Plugin *plugin, int now)
/* Disconnect other transmission direction and tell transport */
s->get.easyhandle = NULL;
s->get.s = NULL;
- client_disconnect (s);
+ http_client_session_disconnect (plugin, s);
}
}
}
/**
* Connect GET connection for a session
- *
+ *
* @param s the session to connect
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
static int
client_connect_get (struct Session *s)
{
-
CURLMcode mret;
+
/* create get connection */
s->client_get = curl_easy_init ();
s->get.s = s;
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
- if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
- (ntohl (s->addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
- {
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 1L);
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 2L);
- }
- else
- {
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
- }
+ {
+ struct HttpAddress *ha;
+ ha = (struct HttpAddress *) s->address->address;
+
+ if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
+ (ntohl (ha->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ {
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 1L);
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 2L);
+ }
+ else
+ {
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ }
curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
#else
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
mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
if (mret != CURLM_OK)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Session %p : Failed to add GET handle to multihandle: `%s'\n",
- s, curl_multi_strerror (mret));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ "Session %p : Failed to add GET handle to multihandle: `%s'\n",
+ s,
+ curl_multi_strerror (mret));
curl_easy_cleanup (s->client_get);
s->client_get = NULL;
s->get.s = NULL;
return GNUNET_OK;
}
+
/**
- * 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
+ * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok
*/
static int
client_connect_put (struct Session *s)
{
CURLMcode mret;
+
/* create put connection */
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Session %p : Init PUT handle \n", s);
+ "Session %p : Init PUT handle\n", s);
s->client_put = curl_easy_init ();
s->put.s = s;
s->put.easyhandle = s->client_put;
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
- if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
- (ntohl (s->addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
- {
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 1L);
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 2L);
- }
- else
- {
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
- }
+ {
+ struct HttpAddress *ha;
+ ha = (struct HttpAddress *) s->address->address;
+
+ if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
+ (ntohl (ha->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ {
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 1L);
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 2L);
+ }
+ else
+ {
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ }
curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
#else
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
mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_put);
if (mret != CURLM_OK)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Session %p : Failed to add PUT handle to multihandle: `%s'\n",
- s, curl_multi_strerror (mret));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ "Session %p : Failed to add PUT handle to multihandle: `%s'\n",
+ s,
+ curl_multi_strerror (mret));
curl_easy_cleanup (s->client_put);
s->client_put = NULL;
s->put.easyhandle = NULL;
/**
* Connect both PUT and GET connection for a session
- *
+ *
* @param s the session to connect
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
static int
client_connect (struct Session *s)
int res = GNUNET_OK;
/* create url */
- if (NULL == http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen))
+ if (NULL == http_common_plugin_address_to_string (NULL,
+ plugin->protocol, s->address->address, s->address->address_length))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
"Invalid address peer `%s'\n",
GNUNET_i2s (&s->target));
return GNUNET_SYSERR;
}
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->address->address,
+ s->address->address_length),
+ GNUNET_i2s_full (plugin->env->my_identity),
+ plugin->last_tag);
plugin->last_tag++;
if ((GNUNET_SYSERR == client_connect_get (s)) ||
(GNUNET_SYSERR == client_connect_put (s)))
{
- GNUNET_break (0);
- return GNUNET_SYSERR;
+ plugin->env->session_end (plugin->env->cls, s->address, s);
+ client_delete_session (s);
+ return GNUNET_SYSERR;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p: connected with connections GET %p and PUT %p\n",
- s, s->client_get, s->client_put);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
+ "Session %p: connected with connections GET %p and PUT %p\n",
+ s, s->client_get, s->client_put);
/* Perform connect */
plugin->cur_connections += 2;
GNUNET_STATISTICS_set (plugin->env->stats,
- "# HTTP client connections",
- plugin->cur_connections,
- GNUNET_NO);
+ HTTP_STAT_STR_CONNECTIONS,
+ plugin->cur_connections,
+ GNUNET_NO);
/* Re-schedule since handles have changed */
if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
return res;
}
+
/**
* Function obtain the network type for a session
*
- * @param cls closure ('struct Plugin*')
+ * @param cls closure (`struct Plugin*`)
* @param session the session
- * @return the network type in HBO or GNUNET_SYSERR
+ * @return the network type
*/
static enum GNUNET_ATS_Network_Type
-http_client_get_network (void *cls, void *session)
+http_client_get_network (void *cls,
+ struct Session *session)
{
- struct Session *s = (struct Session *) session;
- GNUNET_assert (NULL != s);
- return ntohl(s->ats_address_network_type);
+ return ntohl (session->ats_address_network_type);
}
/**
- * Creates a new outbound session the transport service will use to send data to the
- * peer
+ * Session was idle, so disconnect it
+ *
+ * @param cls the `struct Session` of the idle session
+ * @param tc scheduler context
+ */
+static void
+client_session_timeout (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Session *s = cls;
+
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (TIMEOUT_LOG,
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (HTTP_CLIENT_SESSION_TIMEOUT,
+ GNUNET_YES));
+
+ /* call session destroy function */
+ GNUNET_assert (GNUNET_OK == http_client_session_disconnect (s->plugin,
+ s));
+}
+
+
+/**
+ * Creates a new outbound session the transport service will use to
+ * send data to the peer
*
* @param cls the plugin
* @param address the address
*/
static struct Session *
http_client_plugin_get_session (void *cls,
- const struct GNUNET_HELLO_Address *address)
+ const struct GNUNET_HELLO_Address *address)
{
struct HTTP_Client_Plugin *plugin = cls;
struct Session * s = NULL;
size_t salen = 0;
int res;
- GNUNET_assert (plugin != NULL);
- GNUNET_assert (address != NULL);
GNUNET_assert (address->address != NULL);
/* find existing session */
sa = http_common_socket_from_address (address->address, address->address_length, &res);
if (GNUNET_SYSERR == res)
{
- return NULL;
+ return NULL;
}
else if (GNUNET_YES == res)
{
- GNUNET_assert (NULL != sa);
- if (AF_INET == sa->sa_family)
- {
- salen = sizeof (struct sockaddr_in);
- }
- else if (AF_INET6 == sa->sa_family)
- {
- salen = sizeof (struct sockaddr_in6);
- }
- ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
- //fprintf (stderr, "Address %s is in %s\n", GNUNET_a2s (sa,salen), GNUNET_ATS_print_network_type(ntohl(ats.value)));
- GNUNET_free (sa);
+ GNUNET_assert (NULL != sa);
+ if (AF_INET == sa->sa_family)
+ {
+ salen = sizeof (struct sockaddr_in);
+ }
+ else if (AF_INET6 == sa->sa_family)
+ {
+ salen = sizeof (struct sockaddr_in6);
+ }
+ ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+ //fprintf (stderr, "Address %s is in %s\n", GNUNET_a2s (sa,salen), GNUNET_ATS_print_network_type(ntohl(ats.value)));
+ GNUNET_free (sa);
}
-
else if (GNUNET_NO == res)
{
- /* Cannot convert to sockaddr -> is external hostname */
- ats.value = htonl (GNUNET_ATS_NET_WAN);
+ /* Cannot convert to sockaddr -> is external hostname */
+ ats.value = htonl (GNUNET_ATS_NET_WAN);
}
-
- if (GNUNET_ATS_NET_UNSPECIFIED == ntohl(ats.value))
+ if (GNUNET_ATS_NET_UNSPECIFIED == ntohl (ats.value))
{
- GNUNET_break (0);
- return NULL;
+ GNUNET_break (0);
+ return NULL;
}
- s = GNUNET_malloc (sizeof (struct Session));
- memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
+ s = GNUNET_new (struct Session);
+ s->target = address->peer;
s->plugin = plugin;
- s->addr = GNUNET_malloc (address->address_length);
- memcpy (s->addr, address->address, address->address_length);
- s->addrlen = address->address_length;
+ s->address = GNUNET_HELLO_address_copy (address);
s->ats_address_network_type = ats.value;
s->put_paused = GNUNET_NO;
s->put_tmp_disconnecting = GNUNET_NO;
s->put_tmp_disconnected = GNUNET_NO;
- client_start_session_timeout (s);
-
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_CLIENT_SESSION_TIMEOUT,
+ &client_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),
+ s, http_common_plugin_address_to_string (NULL,
+ plugin->protocol, s->address->address,
+ s->address->address_length),
GNUNET_i2s (&s->target));
/* add new session */
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
"Cannot connect to peer `%s' address `%s''\n",
- http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen),
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol, s->address->address,
+ s->address->address_length),
GNUNET_i2s (&s->target));
client_delete_session (s);
return NULL;
* Setup http_client plugin
*
* @param plugin the plugin handle
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
static int
client_start (struct HTTP_Client_Plugin *plugin)
return GNUNET_OK;
}
-/**
- * Session was idle, so disconnect it
- */
-static void
-client_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_assert (NULL != cls);
- struct Session *s = cls;
-
- 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);
-
- /* call session destroy function */
- GNUNET_assert (GNUNET_OK == client_disconnect (s));
-}
-
-
-/**
- * Start session timeout for session s
- *
- * @param s the session
- */
-static void
-client_start_session_timeout (struct Session *s)
-{
-
- GNUNET_assert (NULL != s);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_add_delayed (CLIENT_SESSION_TIMEOUT,
- &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);
-}
-
/**
* Increment session timeout due to activity for session s
static void
client_reschedule_session_timeout (struct Session *s)
{
-
- GNUNET_assert (NULL != s);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
-
- GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_add_delayed (CLIENT_SESSION_TIMEOUT,
- &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);
-}
-
-
-/**
- * Cancel timeout due to activity for session s
- *
- * param s the session
- */
-static void
-client_stop_session_timeout (struct Session *s)
-{
- GNUNET_assert (NULL != s);
-
- if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (TIMEOUT_LOG, "Timeout stopped for session %p\n", s);
- }
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_CLIENT_SESSION_TIMEOUT,
+ &client_session_timeout,
+ s);
+ GNUNET_log (TIMEOUT_LOG,
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (HTTP_CLIENT_SESSION_TIMEOUT,
+ GNUNET_YES));
}
* address. If so, consider adding it to the list
* of addresses.
*
- * @param cls closure
+ * @param cls closure with the `struct Plugin`
* @param addr pointer to the address
- * @param addrlen length of addr
- * @return GNUNET_OK if this is a plausible address for this peer
- * and transport
+ * @param addrlen length of @a addr
+ * @return #GNUNET_OK if this is a plausible address for this peer
+ * and transport; always returns #GNUNET_NO (this is the client!)
*/
static int
-http_client_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
+http_client_plugin_address_suggested (void *cls,
+ const void *addr,
+ size_t addrlen)
{
/* struct Plugin *plugin = cls; */
next = plugin->head;
while (NULL != (pos = next))
{
- next = pos->next;
- client_disconnect (pos);
+ next = pos->next;
+ http_client_session_disconnect (plugin, pos);
}
if (GNUNET_SCHEDULER_NO_TASK != plugin->client_perform_task)
{
- GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
- plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
+ plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
}
* Configure plugin
*
* @param plugin the plugin handle
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
static int
client_configure_plugin (struct HTTP_Client_Plugin *plugin)
return GNUNET_OK;
}
-const char *http_plugin_address_to_string (void *cls,
- const void *addr,
- size_t addrlen)
+
+static const char *
+http_plugin_address_to_string (void *cls,
+ 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);
+}
+
+
+static void
+http_client_plugin_update_session_timeout (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session *session)
+{
+ struct HTTP_Client_Plugin *plugin = cls;
+
+ /* lookup if session is really existing */
+ if (GNUNET_YES != client_exist_session (plugin, session))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ client_reschedule_session_timeout (session);
}
/**
{
/* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
initialze the plugin or the API */
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = NULL;
api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
return api;
}
- plugin = GNUNET_malloc (sizeof (struct HTTP_Client_Plugin));
- p = plugin;
+ plugin = GNUNET_new (struct HTTP_Client_Plugin);
plugin->env = env;
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = plugin;
api->send = &http_client_plugin_send;
- api->disconnect = &http_client_plugin_disconnect;
+ api->disconnect_session = &http_client_session_disconnect;
+ api->query_keepalive_factor = &http_client_query_keepalive_factor;
+ api->disconnect_peer = &http_client_peer_disconnect;
api->check_address = &http_client_plugin_address_suggested;
api->get_session = &http_client_plugin_get_session;
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;
+ api->update_session_timeout = &http_client_plugin_update_session_timeout;
#if BUILD_HTTPS
plugin->name = "transport-https_client";
if (GNUNET_SYSERR == client_configure_plugin (plugin))
{
- LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
- return NULL;
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
}
/* Start client */
if (GNUNET_SYSERR == client_start (plugin))
{
- LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
- return NULL;
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
}
return api;
}