/**
* @file transport/plugin_transport_http_client.c
- * @brief http transport service plugin
+ * @brief HTTP/S client transport plugin
* @author Matthias Wachs
*/
-#include "plugin_transport_http.h"
+#if BUILD_HTTPS
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_client_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_client_done
+#else
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_client_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done
+#endif
+
+
+#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+
+#include "platform.h"
+#include "gnunet_protocols.h"
+#include "gnunet_connection_lib.h"
+#include "gnunet_server_lib.h"
+#include "gnunet_service_lib.h"
+#include "gnunet_statistics_service.h"
+#include "gnunet_transport_service.h"
+#include "gnunet_transport_plugin.h"
+#include "plugin_transport_http_common.h"
+#include <curl/curl.h>
-static struct Plugin * p;
-#if VERBOSE_CURL
/**
- * Function to log curl debug messages with GNUNET_log
- * @param curl handle
- * @param type curl_infotype
- * @param data data
- * @param size size
- * @param cls closure
- * @return 0
+ * Encapsulation of all of the state of the plugin.
*/
-static int
-client_log (CURL * curl, curl_infotype type, char *data, size_t size, void *cls)
+struct HTTP_Client_Plugin;
+
+
+/**
+ * Message to send using http
+ */
+struct HTTP_Message
{
- if (type == CURLINFO_TEXT)
- {
- char text[size + 2];
+ /**
+ * next pointer for double linked list
+ */
+ struct HTTP_Message *next;
+
+ /**
+ * previous pointer for double linked list
+ */
+ struct HTTP_Message *prev;
+
+ /**
+ * buffer containing data to send
+ */
+ char *buf;
+
+ /**
+ * amount of data already sent
+ */
+ size_t pos;
+
+ /**
+ * buffer length
+ */
+ size_t size;
+
+ /**
+ * Continuation function to call once the transmission buffer
+ * has again space available. NULL if there is no
+ * continuation to call.
+ */
+ GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
+
+ /**
+ * Closure for transmit_cont.
+ */
+ void *transmit_cont_cls;
+};
- memcpy (text, data, size);
- if (text[size - 1] == '\n')
- text[size] = '\0';
- else
- {
- text[size] = '\n';
- text[size + 1] = '\0';
- }
-#if BUILD_HTTPS
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-https",
- "Client: %X - %s", cls, text);
-#else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-http",
- "Client: %X - %s", cls, text);
-#endif
- }
- return 0;
-}
-#endif
/**
- * Task performing curl operations
- * @param cls plugin as closure
- * @param tc gnunet scheduler task context
+ * Session handle for connections.
*/
-static void
-client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+struct Session
+{
+ /**
+ * To whom are we talking to (set to our identity
+ * if we are still waiting for the welcome message)
+ */
+ struct GNUNET_PeerIdentity target;
+
+ /**
+ * Stored in a linked list.
+ */
+ struct Session *next;
+
+ /**
+ * Stored in a linked list.
+ */
+ struct Session *prev;
+
+ /**
+ * Address
+ */
+ void *addr;
+
+ /**
+ * Address length
+ */
+ size_t addrlen;
+
+ /**
+ * ATS network type in NBO
+ */
+ uint32_t ats_address_network_type;
+
+ /**
+ * Pointer to the global plugin struct.
+ */
+ struct HTTP_Client_Plugin *plugin;
+
+ /**
+ * Is client send handle paused since there are no data to send?
+ * GNUNET_YES/NO
+ */
+ int client_put_paused;
+
+
+ /**
+ * Client send handle
+ */
+ void *client_put;
+
+ /**
+ * Client receive handle
+ */
+ void *client_get;
+
+ /**
+ * next pointer for double linked list
+ */
+ struct HTTP_Message *msg_head;
+
+ /**
+ * previous pointer for double linked list
+ */
+ struct HTTP_Message *msg_tail;
+
+ /**
+ * Message stream tokenizer for incoming data
+ */
+ struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
+
+ /**
+ * Session timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * Task to wake up client receive handle when receiving is allowed again
+ */
+ GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task;
+
+ /**
+ * Absolute time when to receive data again
+ * Used for receive throttling
+ */
+ struct GNUNET_TIME_Absolute next_receive;
+};
/**
- * Function setting up file descriptors and scheduling task to run
- *
- * @param plugin 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
+ * Encapsulation of all of the state of the plugin.
*/
-static int
-client_schedule (struct Plugin *plugin, int now)
+struct HTTP_Client_Plugin
{
- fd_set rs;
- fd_set ws;
- fd_set es;
- int max;
- struct GNUNET_NETWORK_FDSet *grs;
- struct GNUNET_NETWORK_FDSet *gws;
- long to;
- CURLMcode mret;
- struct GNUNET_TIME_Relative timeout;
+ /**
+ * Our environment.
+ */
+ struct GNUNET_TRANSPORT_PluginEnvironment *env;
+
+ /**
+ * Linked list head of open sessions.
+ */
+ struct Session *head;
+
+ /**
+ * Linked list tail of open sessions.
+ */
+ struct Session *tail;
+
+ /**
+ * Plugin name
+ */
+ char *name;
+
+ /**
+ * Protocol
+ */
+ char *protocol;
+
+ /**
+ * Maximum number of sockets the plugin can use
+ * Each http inbound /outbound connections are two connections
+ */
+ unsigned int max_connections;
+
+ /**
+ * Current number of sockets the plugin can use
+ * Each http inbound /outbound connections are two connections
+ */
+ unsigned int cur_connections;
+
+ /**
+ * Last used unique HTTP connection tag
+ */
+ uint32_t last_tag;
+
+ /**
+ * use IPv6
+ */
+ uint16_t use_ipv6;
+
+ /**
+ * use IPv4
+ */
+ uint16_t use_ipv4;
+
+ /**
+ * cURL Multihandle
+ */
+ CURLM *curl_multi_handle;
+
+ /**
+ * curl perform task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier client_perform_task;
+};
- /* Cancel previous scheduled task */
- if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
- plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
- }
+/**
+ * Encapsulation of all of the state of the plugin.
+ */
+struct HTTP_Client_Plugin *p;
- max = -1;
- FD_ZERO (&rs);
- FD_ZERO (&ws);
- FD_ZERO (&es);
- mret = curl_multi_fdset (plugin->client_mh, &rs, &ws, &es, &max);
- if (mret != CURLM_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_fdset", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return GNUNET_SYSERR;
- }
- mret = curl_multi_timeout (plugin->client_mh, &to);
- if (to == -1)
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1);
- else
- timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, to);
- if (now == GNUNET_YES)
- timeout = GNUNET_TIME_UNIT_MILLISECONDS;
+/**
+ * Start session timeout
+ */
+static void
+client_start_session_timeout (struct Session *s);
- if (mret != CURLM_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("%s failed at %s:%d: `%s'\n"),
- "curl_multi_timeout", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return GNUNET_SYSERR;
- }
+/**
+ * Increment session timeout due to activity
+ */
+static void
+client_reschedule_session_timeout (struct Session *s);
- grs = GNUNET_NETWORK_fdset_create ();
- gws = GNUNET_NETWORK_fdset_create ();
- GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
- GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
-
- plugin->client_perform_task =
- GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- timeout, grs, gws,
- &client_run, plugin);
- GNUNET_NETWORK_fdset_destroy (gws);
- GNUNET_NETWORK_fdset_destroy (grs);
- return GNUNET_OK;
-}
+/**
+ * Cancel timeout
+ */
+static void
+client_stop_session_timeout (struct Session *s);
-int
-client_send (struct Session *s, struct HTTP_Message *msg)
+/**
+ * Function that can be used by the transport service to transmit
+ * a message using the plugin. Note that in the case of a
+ * peer disconnecting, the continuation MUST be called
+ * prior to the disconnect notification itself. This function
+ * will be called with this peer's HELLO message to initiate
+ * a fresh connection to another peer.
+ *
+ * @param cls closure
+ * @param session which session must be used
+ * @param msgbuf the message to transmit
+ * @param msgbuf_size number of bytes in 'msgbuf'
+ * @param priority how important is the message (most plugins will
+ * ignore message priority and just FIFO)
+ * @param to how long to wait at most for the transmission (does not
+ * require plugins to discard the message after the timeout,
+ * just advisory for the desired delay; most plugins will ignore
+ * this as well)
+ * @param cont continuation to call once the message has
+ * been transmitted (or if the transport is ready
+ * for the next transmission call; or if the
+ * peer disconnected...); can be NULL
+ * @param cont_cls closure for cont
+ * @return number of bytes used (on the physical network, with overheads);
+ * -1 on hard errors (i.e. address invalid); 0 is a legal value
+ * and does NOT mean that the message was not transmitted (DV)
+ */
+static ssize_t
+http_client_plugin_send (void *cls,
+ struct Session *session,
+ const char *msgbuf, size_t msgbuf_size,
+ unsigned int priority,
+ struct GNUNET_TIME_Relative to,
+ GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
- GNUNET_assert (s != NULL);
- GNUNET_CONTAINER_DLL_insert (s->msg_head, s->msg_tail, msg);
+ struct HTTP_Client_Plugin *plugin = cls;
+ int bytes_sent = 0;
- if (GNUNET_YES != exist_session(p, s))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- if (s->client_put_paused == GNUNET_YES)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Client: %X was suspended, unpausing\n", s->client_put);
- s->client_put_paused = GNUNET_NO;
- curl_easy_pause (s->client_put, CURLPAUSE_CONT);
- }
+ GNUNET_assert (plugin != NULL);
+ GNUNET_assert (session != NULL);
- client_schedule (s->plugin, GNUNET_YES);
+ GNUNET_break (0);
- return GNUNET_OK;
+ /* struct Plugin *plugin = cls; */
+ return bytes_sent;
}
/**
- * Task performing curl operations
- * @param cls plugin as closure
- * @param tc gnunet scheduler task context
+ * Function that can be used to force the plugin to disconnect
+ * from the given peer and cancel all previous transmissions
+ * (and their continuationc).
+ *
+ * @param cls closure
+ * @param target peer from which to disconnect
*/
static void
-client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+http_client_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
{
- struct Plugin *plugin = cls;
- int running;
- CURLMcode mret;
-
- GNUNET_assert (cls != NULL);
-
- plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
- do
- {
- running = 0;
- mret = curl_multi_perform (plugin->client_mh, &running);
-
- CURLMsg *msg;
- int msgs_left;
-
- while ((msg = curl_multi_info_read (plugin->client_mh, &msgs_left)))
- {
- CURL *easy_h = msg->easy_handle;
- struct Session *s = NULL;
- char *d = (char *) s;
-
-
- //GNUNET_assert (easy_h != NULL);
- if (easy_h == NULL)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: connection to ended with reason %i: `%s', %i handles running\n",
- msg->data.result,
- curl_easy_strerror (msg->data.result), running);
- continue;
- }
-
- GNUNET_assert (CURLE_OK ==
- curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d));
- s = (struct Session *) d;
+ // struct Plugin *plugin = cls;
+ // FIXME
+ GNUNET_break (0);
+}
- if (GNUNET_YES != exist_session(plugin, s))
- {
- GNUNET_break (0);
- return;
- }
+static struct Session *
+client_lookup_session (struct HTTP_Client_Plugin *plugin,
+ const struct GNUNET_HELLO_Address *address)
+{
+ 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)))
+ return pos;
+ return NULL;
+}
- GNUNET_assert (s != NULL);
+static int
+client_exist_session (struct HTTP_Client_Plugin *plugin, struct Session *s)
+{
+ struct Session * head;
- if (msg->msg == CURLMSG_DONE)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X connection to '%s' %s ended with reason %i: `%s'\n",
- msg->easy_handle, GNUNET_i2s (&s->target),
- http_plugin_address_to_string (NULL, s->addr,
- s->addrlen),
- msg->data.result,
- curl_easy_strerror (msg->data.result));
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != s);
- client_disconnect (s);
- //GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,"Notifying about ended session to peer `%s' `%s'\n", GNUNET_i2s (&s->target), http_plugin_address_to_string (plugin, s->addr, s->addrlen));
- notify_session_end (plugin, &s->target, s);
- }
- }
+ for (head = plugin->head; head != NULL; head = head->next)
+ {
+ if (head == s)
+ return GNUNET_YES;
}
- while (mret == CURLM_CALL_MULTI_PERFORM);
- client_schedule (plugin, GNUNET_NO);
+ return GNUNET_NO;
}
-int
-client_disconnect (struct Session *s)
+/**
+ * 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
+ * @return bytes written to stream, returning 0 will terminate connection!
+ */
+static size_t
+client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
{
- int res = GNUNET_OK;
- CURLMcode mret;
- struct Plugin *plugin = s->plugin;
- struct HTTP_Message *msg;
- struct HTTP_Message *t;
+ struct Session *s = cls;
+ struct HTTP_Client_Plugin *plugin = s->plugin;
+ struct HTTP_Message *msg = s->msg_head;
+ size_t len;
- if (GNUNET_YES != exist_session(plugin, s))
+ if (GNUNET_YES != client_exist_session (plugin, s))
{
GNUNET_break (0);
- return GNUNET_SYSERR;
+ return 0;
}
-
- if (s->client_put != NULL)
+ if (NULL == msg)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X Deleting outbound PUT session to peer `%s'\n",
- s->client_put, GNUNET_i2s (&s->target));
-
- mret = curl_multi_remove_handle (plugin->client_mh, s->client_put);
- if (mret != CURLM_OK)
- {
- curl_easy_cleanup (s->client_put);
- res = GNUNET_SYSERR;
- GNUNET_break (0);
- }
- curl_easy_cleanup (s->client_put);
- s->client_put = NULL;
- }
-
-
- if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
- s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+ "Nothing to for session %p send! Suspending PUT handle!\n", s);
+ s->client_put_paused = GNUNET_YES;
+ return CURL_READFUNC_PAUSE;
}
-
- if (s->client_get != NULL)
+ /* data to send */
+ GNUNET_assert (msg->pos < msg->size);
+ /* calculate how much fits in buffer */
+ len = GNUNET_MIN (msg->size - msg->pos,
+ size * nmemb);
+ memcpy (stream, &msg->buf[msg->pos], len);
+ msg->pos += len;
+ if (msg->pos == msg->size)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X Deleting outbound GET session to peer `%s'\n",
- s->client_get, GNUNET_i2s (&s->target));
-
- mret = curl_multi_remove_handle (plugin->client_mh, s->client_get);
- if (mret != CURLM_OK)
- {
- curl_easy_cleanup (s->client_get);
- res = GNUNET_SYSERR;
- GNUNET_break (0);
- }
- curl_easy_cleanup (s->client_get);
- s->client_get = NULL;
- }
-
- msg = s->msg_head;
- while (msg != NULL)
- {
- t = msg->next;
- if (NULL != msg->transmit_cont)
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ "Session %p message with %u bytes sent, removing message from queue\n",
+ s, msg->size, msg->pos);
+ /* Calling transmit continuation */
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
+ if (NULL != msg->transmit_cont)
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
GNUNET_free (msg);
- msg = t;
}
+ client_reschedule_session_timeout (s);
+ return len;
+}
- plugin->cur_connections -= 2;
- GNUNET_assert (plugin->outbound_sessions > 0);
- plugin->outbound_sessions --;
- GNUNET_STATISTICS_set (plugin->env->stats,
- "# HTTP outbound sessions",
- plugin->outbound_sessions,
- GNUNET_NO);
+static void
+client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Session *s = cls;
- /* Re-schedule since handles have changed */
- if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_YES != client_exist_session(p, s))
{
- GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
- plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_break (0);
+ return;
}
+ s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Client: %p Waking up receive handle\n", s->client_get);
+ if (s->client_get != NULL)
+ curl_easy_pause (s->client_get, CURLPAUSE_CONT);
+}
- client_schedule (plugin, GNUNET_YES);
- return res;
-}
static int
client_receive_mst_cb (void *cls, void *client,
const struct GNUNET_MessageHeader *message)
{
struct Session *s = cls;
+ struct HTTP_Client_Plugin *plugin;
struct GNUNET_TIME_Relative delay;
+ struct GNUNET_ATS_Information atsi[2];
- if (GNUNET_YES != exist_session(p, s))
+ if (GNUNET_YES != client_exist_session(p, s))
{
GNUNET_break (0);
return GNUNET_OK;
}
+ plugin = s->plugin;
- delay = http_plugin_receive (s, &s->target, message, s, s->addr, s->addrlen);
+
+ atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+ atsi[0].value = htonl (1);
+ atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ atsi[1].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,
+ (const struct GNUNET_ATS_Information *) &atsi, 2,
+ s, 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)
{
- struct Plugin *plugin = s->plugin;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Client: peer `%s' address `%s' next read delayed for %llu ms\n",
GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen),
delay);
}
+ client_reschedule_session_timeout (s);
return GNUNET_OK;
}
-static void
-client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct Session *s = cls;
-
- if (GNUNET_YES != exist_session(p, s))
- {
- GNUNET_break (0);
- return;
- }
-
- s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
-
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
-
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Client: %X Waking up receive handle\n", s->client_get);
-
- if (s->client_get != NULL)
- curl_easy_pause (s->client_get, CURLPAUSE_CONT);
-}
/**
-* Callback method used with libcurl
-* Method is called when libcurl needs to write 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 destination pointer, passed to the libcurl handle
-* @return bytes read from stream
-*/
+ * Callback method used with libcurl
+ * Method is called when libcurl needs to write 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 destination pointer, passed to the libcurl handle
+ * @return bytes read from stream
+ */
static size_t
client_receive (void *stream, size_t size, size_t nmemb, void *cls)
{
+ return 0;
+
struct Session *s = cls;
struct GNUNET_TIME_Absolute now;
size_t len = size * nmemb;
- struct Plugin *plugin = s->plugin;
+ struct HTTP_Client_Plugin *plugin = s->plugin;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: Received %Zu bytes from peer `%s'\n", len,
+ "Received %u bytes from peer `%s'\n", len,
GNUNET_i2s (&s->target));
now = GNUNET_TIME_absolute_get ();
if (now.abs_value < s->next_receive.abs_value)
struct GNUNET_TIME_Relative delta =
GNUNET_TIME_absolute_get_difference (now, s->next_receive);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X No inbound bandwidth available! Next read was delayed for %llu ms\n",
- s->client_get, delta.rel_value);
+ "No inbound bandwidth for session %p available! Next read was delayed for %llu ms\n",
+ s, delta.rel_value);
if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s);
return CURLPAUSE_ALL;
}
-
-
- if (s->msg_tk == NULL)
+ if (NULL == s->msg_tk)
s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);
-
GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
-
return len;
+
}
/**
- * 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
- * @return bytes written to stream, returning 0 will terminate connection!
+ * Task performing curl operations
+ *
+ * @param cls plugin as closure
+ * @param tc gnunet scheduler task context
*/
-static size_t
-client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
+static void
+client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct Session *s = cls;
- struct Plugin *plugin = s->plugin;
- size_t bytes_sent = 0;
- size_t len;
+ GNUNET_break (0);
+#if 0
+ struct HTTP_Client_Plugin *plugin = cls;
+ int running;
+ CURLMcode mret;
+
+ GNUNET_assert (cls != NULL);
+
+ plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+ return;
+
+ do
+ {
+ running = 0;
+ mret = curl_multi_perform (plugin->client_mh, &running);
+
+ CURLMsg *msg;
+ int msgs_left;
+
+ while ((msg = curl_multi_info_read (plugin->client_mh, &msgs_left)))
+ {
+ CURL *easy_h = msg->easy_handle;
+ struct Session *s = NULL;
+ char *d = (char *) s;
+
+ if (easy_h == NULL)
+ {
+ GNUNET_break (0);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Client: connection to ended with reason %i: `%s', %i handles running\n",
+ msg->data.result,
+ curl_easy_strerror (msg->data.result), running);
+ continue;
+ }
- if (GNUNET_YES != exist_session(plugin, s))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
+ GNUNET_assert (CURLE_OK ==
+ curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d));
+ s = (struct Session *) d;
- struct HTTP_Message *msg = s->msg_head;
+ if (GNUNET_YES != exist_session(plugin, s))
+ {
+ GNUNET_break (0);
+ return;
+ }
- if (msg == NULL)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X Nothing to send! Suspending PUT handle!\n",
- s->client_put);
- s->client_put_paused = GNUNET_YES;
- return CURL_READFUNC_PAUSE;
- }
+ GNUNET_assert (s != NULL);
+ if (msg->msg == CURLMSG_DONE)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Client: %p connection to '%s' %s ended with reason %i: `%s'\n",
+ msg->easy_handle, GNUNET_i2s (&s->target),
+ http_plugin_address_to_string (NULL, s->addr,
+ s->addrlen),
+ msg->data.result,
+ curl_easy_strerror (msg->data.result));
- GNUNET_assert (msg != NULL);
- /* data to send */
- if (msg->pos < msg->size)
- {
- /* data fit in buffer */
- if ((msg->size - msg->pos) <= (size * nmemb))
- {
- len = (msg->size - msg->pos);
- memcpy (stream, &msg->buf[msg->pos], len);
- msg->pos += len;
- bytes_sent = len;
- }
- else
- {
- len = size * nmemb;
- memcpy (stream, &msg->buf[msg->pos], len);
- msg->pos += len;
- bytes_sent = len;
+ /* Disconnect other transmission direction and tell transport */
+ client_disconnect (s);
+ }
}
}
- /* no data to send */
- else
- {
- GNUNET_assert (0);
- bytes_sent = 0;
- }
-
- if (msg->pos == msg->size)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Client: %X Message with %u bytes sent, removing message from queue\n",
- s->client_put, msg->size, msg->pos);
- /* Calling transmit continuation */
- if (NULL != msg->transmit_cont)
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
- GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
- GNUNET_free (msg);
- }
- return bytes_sent;
+ while (mret == CURLM_CALL_MULTI_PERFORM);
+ client_schedule (plugin, GNUNET_NO);
+#endif
}
-int
+
+static int
client_connect (struct Session *s)
{
- struct Plugin *plugin = s->plugin;
+
+ struct HTTP_Client_Plugin *plugin = s->plugin;
int res = GNUNET_OK;
char *url;
CURLMcode mret;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Initiating outbound session peer `%s'\n",
- GNUNET_i2s (&s->target));
- s->inbound = GNUNET_NO;
- plugin->last_tag++;
/* create url */
+ if (NULL == http_common_plugin_address_to_string (NULL, s->addr, s->addrlen))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid address peer `%s'\n",
+ GNUNET_i2s (&s->target));
+ return GNUNET_SYSERR;
+ }
+
GNUNET_asprintf (&url, "%s%s;%u",
- http_plugin_address_to_string (plugin, s->addr, s->addrlen),
+ http_common_plugin_address_to_string (plugin, s->addr, s->addrlen),
GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
plugin->last_tag);
-#if 0
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, "URL `%s'\n", url);
-#endif
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Initiating outbound session peer `%s' using address `%s'\n",
+ GNUNET_i2s (&s->target), url);
+
/* create get connection */
s->client_get = curl_easy_init ();
#if VERBOSE_CURL
#if CURL_TCP_NODELAY
curl_easy_setopt (s->client_put, CURLOPT_TCP_NODELAY, 1);
#endif
-
GNUNET_free (url);
- mret = curl_multi_add_handle (plugin->client_mh, s->client_get);
+ mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_get);
if (mret != CURLM_OK)
{
curl_easy_cleanup (s->client_get);
- res = GNUNET_SYSERR;
GNUNET_break (0);
+ return GNUNET_SYSERR;
}
- mret = curl_multi_add_handle (plugin->client_mh, s->client_put);
+ mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_put);
if (mret != CURLM_OK)
{
- curl_multi_remove_handle (plugin->client_mh, s->client_get);
+ curl_multi_remove_handle (plugin->curl_multi_handle, s->client_get);
curl_easy_cleanup (s->client_get);
curl_easy_cleanup (s->client_put);
- res = GNUNET_SYSERR;
GNUNET_break (0);
+ return GNUNET_SYSERR;
}
/* Perform connect */
plugin->cur_connections += 2;
-
- plugin->outbound_sessions ++;
GNUNET_STATISTICS_set (plugin->env->stats,
- "# HTTP outbound sessions",
- plugin->outbound_sessions,
+ "# HTTP client connections",
+ plugin->cur_connections,
GNUNET_NO);
/* Re-schedule since handles have changed */
plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
}
plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, plugin);
-
return res;
}
-int
-client_start (struct Plugin *plugin)
+void
+client_delete_session (struct Session *s)
{
- int res = GNUNET_OK;
- p = plugin;
+ struct HTTP_Client_Plugin *plugin = s->plugin;
+ struct HTTP_Message *pos = s->msg_head;
+ struct HTTP_Message *next = NULL;
+
+ client_stop_session_timeout (s);
+
+ GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
+
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, pos);
+ if (pos->transmit_cont != NULL)
+ pos->transmit_cont (pos->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ GNUNET_free (pos);
+ }
+
+ if (s->msg_tk != NULL)
+ {
+ GNUNET_SERVER_mst_destroy (s->msg_tk);
+ s->msg_tk = NULL;
+ }
+ GNUNET_free (s->addr);
+ GNUNET_free (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
+ * @return the session or NULL of max connections exceeded
+ */
+static struct Session *
+http_client_plugin_get_session (void *cls,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct HTTP_Client_Plugin *plugin = cls;
+ struct Session * s = NULL;
+
+ GNUNET_assert (plugin != NULL);
+ GNUNET_assert (address != NULL);
+ GNUNET_assert (address->address != NULL);
+
+
+ /* find existing session */
+ s = client_lookup_session (plugin, address);
+ if (s != NULL)
+ return s;
+
+ if (plugin->max_connections <= plugin->cur_connections)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
+ "Maximum number of connections (%u) reached: "
+ "cannot connect to peer `%s'\n",
+ plugin->max_connections,
+ GNUNET_i2s (&address->peer));
+ return NULL;
+ }
+
+ s = GNUNET_malloc (sizeof (struct Session));
+ memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
+ s->plugin = plugin;
+ s->addr = GNUNET_malloc (address->address_length);
+ memcpy (s->addr, address->address, address->address_length);
+ s->addrlen = address->address_length;
+ //s->ats_address_network_type = ats.value;
+ GNUNET_break (0);
+
+ client_start_session_timeout (s);
+
+ /* add new session */
+ GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
+
+ /* initiate new connection */
+ if (GNUNET_SYSERR == client_connect (s))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Cannot connect to peer `%s' address `%s''\n",
+ http_common_plugin_address_to_string (NULL, s->addr, s->addrlen),
+ GNUNET_i2s (&s->target));
+ client_delete_session (s);
+ return NULL;
+ }
+ return s;
+}
+static int
+client_start (struct HTTP_Client_Plugin *plugin)
+{
curl_global_init (CURL_GLOBAL_ALL);
- plugin->client_mh = curl_multi_init ();
+ plugin->curl_multi_handle = curl_multi_init ();
- if (NULL == plugin->client_mh)
+ if (NULL == plugin->curl_multi_handle)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- _
- ("Could not initialize curl multi handle, failed to start %s plugin!\n"),
- plugin->name);
- res = GNUNET_SYSERR;
+ _("Could not initialize curl multi handle, failed to start %s plugin!\n"),
+ plugin->name);
+ return GNUNET_SYSERR;
}
- return res;
+ return GNUNET_OK;
}
-void
-client_stop (struct Plugin *plugin)
+static int
+client_disconnect (struct Session *s)
{
- p = NULL;
+#if 0
+ int res = GNUNET_OK;
+ CURLMcode mret;
+ struct Plugin *plugin = s->plugin;
+ struct HTTP_Message *msg;
+ struct HTTP_Message *t;
+
+ if (GNUNET_YES != exist_session(plugin, s))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
+ if (s->client_put != NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Client: %p / %p Deleting outbound PUT session to peer `%s'\n",
+ s, s->client_put, GNUNET_i2s (&s->target));
+
+ /* remove curl handle from multi handle */
+ mret = curl_multi_remove_handle (plugin->client_mh, s->client_put);
+ if (mret != CURLM_OK)
+ {
+ /* clean up easy handle, handle is now invalid and free'd */
+ res = GNUNET_SYSERR;
+ GNUNET_break (0);
+ }
+ curl_easy_cleanup (s->client_put);
+ s->client_put = NULL;
+ }
+
+
+ if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
+ s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (s->client_get != NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Client: %p / %p Deleting outbound GET session to peer `%s'\n",
+ s,
+ s->client_get, GNUNET_i2s (&s->target));
+
+ /* remove curl handle from multi handle */
+ mret = curl_multi_remove_handle (plugin->client_mh, s->client_get);
+ if (mret != CURLM_OK)
+ {
+ /* clean up easy handle, handle is now invalid and free'd */
+ res = GNUNET_SYSERR;
+ GNUNET_break (0);
+ }
+ curl_easy_cleanup (s->client_get);
+ s->client_get = NULL;
+ }
+
+ msg = s->msg_head;
+ while (msg != NULL)
+ {
+ t = msg->next;
+ if (NULL != msg->transmit_cont)
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
+ GNUNET_free (msg);
+ msg = t;
+ }
+
+ plugin->cur_connections -= 2;
+
+ notify_session_end (plugin, &s->target, s);
+
+ GNUNET_assert (plugin->outbound_sessions > 0);
+ plugin->outbound_sessions --;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# HTTP outbound sessions",
+ plugin->outbound_sessions,
+ GNUNET_NO);
+
+ /* Re-schedule since handles have changed */
if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
}
+ client_schedule (plugin, GNUNET_YES);
- curl_multi_cleanup (plugin->client_mh);
+ return res;
+#endif
+ GNUNET_break (0);
+ return 0;
+}
+
+/**
+ * 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) TIMEOUT.rel_value);
+
+ /* call session destroy function */
+ GNUNET_assert (GNUNET_OK == client_disconnect (s));
+}
+
+/**
+* Start session timeout
+*/
+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 (TIMEOUT,
+ &client_session_timeout,
+ s);
+ GNUNET_log (TIMEOUT_LOG,
+ "Timeout for session %p set to %llu ms\n",
+ s, (unsigned long long) TIMEOUT.rel_value);
+ GNUNET_break (0);
+}
+
+/**
+* Increment session timeout due to activity
+*/
+static void
+client_reschedule_session_timeout (struct Session *s)
+{
+#if 0
+ 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 (TIMEOUT,
+ &server_session_timeout,
+ s);
+ GNUNET_log (TIMEOUT_LOG,
+ "Timeout rescheduled for session %p set to %llu ms\n",
+ s, (unsigned long long) TIMEOUT.rel_value);
+#endif
+ GNUNET_break (0);
+}
+
+/**
+* Cancel timeout
+*/
+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);
+ }
+}
+
+
+/**
+ * Another peer has suggested an address for this
+ * peer and transport plugin. Check that this could be a valid
+ * address. If so, consider adding it to the list
+ * of addresses.
+ *
+ * @param cls closure
+ * @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
+ */
+static int
+http_client_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
+{
+ /* struct Plugin *plugin = cls; */
+
+ /* A HTTP/S client does not have any valid address so:*/
+ return GNUNET_NO;
+}
+
+/**
+ * Exit point from the plugin.
+ */
+void *
+LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
+{
+ struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
+ struct HTTP_Client_Plugin *plugin = api->cls;
+
+ if (NULL != plugin->curl_multi_handle)
+ {
+ curl_multi_cleanup (plugin->curl_multi_handle);
+ plugin->curl_multi_handle = NULL;
+ }
curl_global_cleanup ();
+
+ GNUNET_free (plugin);
+ GNUNET_free (api);
+ return NULL;
}
+/**
+ * Entry point for the plugin.
+ */
+void *
+LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
+{
+ struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
+ struct GNUNET_TRANSPORT_PluginFunctions *api;
+ struct HTTP_Client_Plugin *plugin;
+
+ plugin = GNUNET_malloc (sizeof (struct HTTP_Client_Plugin));
+ p = plugin;
+ plugin->env = env;
+ api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api->cls = plugin;
+ api->send = &http_client_plugin_send;
+ api->disconnect = &http_client_plugin_disconnect;
+ api->check_address = &http_client_plugin_address_suggested;
+ api->get_session = &http_client_plugin_get_session;
+
+ api->address_to_string = &http_common_plugin_address_to_string;
+ api->string_to_address = &http_common_plugin_string_to_address;
+ api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
+
+#if BUILD_HTTPS
+ plugin->name = "transport-https_client";
+ plugin->protocol = "https";
+#else
+ plugin->name = "transport-http_client";
+ plugin->protocol = "http";
+#endif
+
+ /* Start client */
+ if (GNUNET_SYSERR == client_start (plugin))
+ {
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
+ }
+ return api;
+}
/* end of plugin_transport_http_client.c */
projects / oweals / gnunet.git / blobdiff