X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http_client.c;h=ceed94af8b2d700e7ddd7bdcde231364bd593e57;hb=abdec5e11ff11bb10d32c013e11344a54786f80f;hp=bd4487614370477ff9e7a2fab7cce8a7cb2a588a;hpb=1257490cb630ade315a196a724d0233e662afb2c;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index bd4487614..ceed94af8 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2002-2013 Christian Grothoff (and other contributing authors) + Copyright (C) 2002-2014 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,14 +14,15 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** * @file transport/plugin_transport_http_client.c * @brief HTTP/S client transport plugin * @author Matthias Wachs + * @author Christian Grothoff */ #if BUILD_HTTPS @@ -36,7 +37,7 @@ #define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done #endif -#define VERBOSE_CURL GNUNET_YES +#define VERBOSE_CURL GNUNET_NO #define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) @@ -48,15 +49,60 @@ #include "gnunet_protocols.h" #include "gnunet_transport_plugin.h" #include "plugin_transport_http_common.h" +#if HAVE_CURL_CURL_H #include +#elif HAVE_GNURL_CURL_H +#include +#endif +#define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__) /** * Encapsulation of all of the state of the plugin. */ struct HTTP_Client_Plugin; +/** + * State of a HTTP PUT request + */ +enum HTTP_PUT_REQUEST_STATE +{ + /** + * Just created, not yet connected + */ + H_NOT_CONNECTED, + + /** + * Connected + */ + H_CONNECTED, + + /** + * Paused, nothing to send + */ + H_PAUSED, + + /** + * Temporary disconnect in progress due to inactivity + */ + H_TMP_DISCONNECTING, + + /** + * Send request while temporary disconnect, reconnect + */ + H_TMP_RECONNECT_REQUIRED, + + /** + * Temporarily disconnected + */ + H_TMP_DISCONNECTED, + + /** + * Disconnected + */ + H_DISCONNECTED +}; /** * Message to send using http @@ -79,41 +125,47 @@ struct HTTP_Message char *buf; /** - * amount of data already sent + * Continuation function to call once the transmission buffer + * has again space available. NULL if there is no + * continuation to call. */ - size_t pos; + GNUNET_TRANSPORT_TransmitContinuation transmit_cont; /** - * buffer length + * Closure for @e transmit_cont. */ - size_t size; + void *transmit_cont_cls; /** - * Continuation function to call once the transmission buffer - * has again space available. NULL if there is no - * continuation to call. + * amount of data already sent */ - GNUNET_TRANSPORT_TransmitContinuation transmit_cont; + size_t pos; /** - * Closure for transmit_cont. + * buffer length */ - void *transmit_cont_cls; + size_t size; + }; /** - * Session handle for connections. + * Session handle for HTTP(S) connections. */ -struct Session; +struct GNUNET_ATS_Session; /** - * A connection handle + * A request handle * */ -struct ConnectionHandle +struct RequestHandle { + /** + * Current state of this request + */ + enum HTTP_PUT_REQUEST_STATE state; + /** * The curl easy handle */ @@ -122,31 +174,15 @@ struct ConnectionHandle /** * The related session */ - struct Session *s; + struct GNUNET_ATS_Session *s; }; /** * Session handle for connections. */ -struct Session +struct GNUNET_ATS_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; - /** * The URL to connect to */ @@ -157,90 +193,82 @@ struct Session */ struct GNUNET_HELLO_Address *address; - /** - * ATS network type in NBO - */ - uint32_t ats_address_network_type; - /** * Pointer to the global plugin struct. */ struct HTTP_Client_Plugin *plugin; /** - * Client send handle + * Handle for the HTTP PUT request. */ - void *client_put; - - struct ConnectionHandle put; - struct ConnectionHandle get; + struct RequestHandle put; /** - * Is the client PUT handle currently paused + * Handle for the HTTP GET request. */ - int put_paused; + struct RequestHandle get; /** - * Is the client PUT handle disconnect in progress? + * next pointer for double linked list */ - int put_tmp_disconnecting; + struct HTTP_Message *msg_head; /** - * Is the client PUT handle temporarily disconnected? + * previous pointer for double linked list */ - int put_tmp_disconnected; + struct HTTP_Message *msg_tail; /** - * We received data to send while disconnecting, reconnect immediately + * Message stream tokenizer for incoming data */ - int put_reconnect_required; + struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk; /** - * Client receive handle + * Session timeout task */ - void *client_get; + struct GNUNET_SCHEDULER_Task *put_disconnect_task; /** - * Outbound overhead due to HTTP connection - * Add to next message of this session when calling callback + * Session timeout task */ - size_t overhead; + struct GNUNET_SCHEDULER_Task *timeout_task; /** - * next pointer for double linked list + * Task to wake up client receive handle when receiving is allowed again */ - struct HTTP_Message *msg_head; + struct GNUNET_SCHEDULER_Task *recv_wakeup_task; /** - * previous pointer for double linked list + * Absolute time when to receive data again. + * Used for receive throttling. */ - struct HTTP_Message *msg_tail; + struct GNUNET_TIME_Absolute next_receive; /** - * Message stream tokenizer for incoming data + * When does this session time out. */ - struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk; + struct GNUNET_TIME_Absolute timeout; /** - * Session timeout task + * Number of bytes waiting for transmission to this peer. */ - GNUNET_SCHEDULER_TaskIdentifier put_disconnect_task; + unsigned long long bytes_in_queue; /** - * Session timeout task + * Outbound overhead due to HTTP connection + * Add to next message of this session when calling callback */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + size_t overhead; /** - * Task to wake up client receive handle when receiving is allowed again + * Number of messages waiting for transmission to this peer. */ - GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task; + unsigned int msgs_in_queue; /** - * Absolute time when to receive data again - * Used for receive throttling - */ - struct GNUNET_TIME_Absolute next_receive; + * ATS network type. + */ + enum GNUNET_ATS_Network_Type scope; }; @@ -255,14 +283,19 @@ struct HTTP_Client_Plugin struct GNUNET_TRANSPORT_PluginEnvironment *env; /** - * Linked list head of open sessions. + * Open sessions. */ - struct Session *head; + struct GNUNET_CONTAINER_MultiPeerMap *sessions; /** - * Linked list tail of open sessions. + * Function to call about session status changes. */ - struct Session *tail; + GNUNET_TRANSPORT_SessionInfoCallback sic; + + /** + * Closure for @e sic. + */ + void *sic_cls; /** * Plugin name @@ -274,6 +307,49 @@ struct HTTP_Client_Plugin */ char *protocol; + /** + * Proxy configuration: hostname or ip of the proxy server + */ + char *proxy_hostname; + + /** + * Username for the proxy server + */ + char *proxy_username; + + /** + * Password for the proxy server + */ + char *proxy_password; + + /** + * cURL Multihandle + */ + CURLM *curl_multi_handle; + + /** + * curl perform task + */ + struct GNUNET_SCHEDULER_Task * client_perform_task; + + /** + * Type of proxy server: + * + * Valid values as supported by curl: + * CURLPROXY_HTTP, CURLPROXY_HTTP_1_0 CURLPROXY_SOCKS4, CURLPROXY_SOCKS5, + * CURLPROXY_SOCKS4A, CURLPROXY_SOCKS5_HOSTNAME + */ + curl_proxytype proxytype; + + /** + * Use proxy tunneling: + * Tunnel all operations through a given HTTP instead of have the proxy + * evaluate the HTTP request + * + * Default: #GNUNET_NO, #GNUNET_YES experimental + */ + int proxy_use_httpproxytunnel; + /** * My options to be included in the address */ @@ -281,15 +357,15 @@ struct HTTP_Client_Plugin /** * Maximum number of sockets the plugin can use - * Each http inbound /outbound connections are two connections + * Each http connections are two requests */ - unsigned int max_connections; + unsigned int max_requests; /** * Current number of sockets the plugin can use - * Each http inbound /outbound connections are two connections + * Each http connections are two requests */ - unsigned int cur_connections; + unsigned int cur_requests; /** * Last used unique HTTP connection tag @@ -307,66 +383,259 @@ struct HTTP_Client_Plugin uint16_t use_ipv4; /** - * cURL Multihandle - */ - CURLM *curl_multi_handle; - - /** - * curl perform task + * Should we emulate an XHR client for testing? */ - GNUNET_SCHEDULER_TaskIdentifier client_perform_task; + int emulate_xhr; }; /** - * Increment session timeout due to activity for a session - * @param s the session + * Disconnect a session + * + * @param cls the `struct HTTP_Client_Plugin *` + * @param s session + * @return #GNUNET_OK on success, #GNUNET_SYSERR on error + */ +static int +http_client_plugin_session_disconnect (void *cls, struct GNUNET_ATS_Session *s); + + +/** + * If a session monitor is attached, notify it about the new + * session state. + * + * @param plugin our plugin + * @param session session that changed state + * @param state new state of the session */ static void -client_reschedule_session_timeout (struct Session *s); +notify_session_monitor (struct HTTP_Client_Plugin *plugin, + struct GNUNET_ATS_Session *session, + enum GNUNET_TRANSPORT_SessionState state) +{ + struct GNUNET_TRANSPORT_SessionInfo info; + + if (NULL == plugin->sic) + return; + memset (&info, 0, sizeof (info)); + info.state = state; + info.is_inbound = GNUNET_NO; + info.num_msg_pending = session->msgs_in_queue; + info.num_bytes_pending = session->bytes_in_queue; + info.receive_delay = session->next_receive; + info.session_timeout = session->timeout; + info.address = session->address; + plugin->sic (plugin->sic_cls, + session, + &info); +} /** - * Function setting up file descriptors and scheduling task to run + * Delete session @a s. * - * @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 + * @param s the session to delete */ -static int -client_schedule (struct HTTP_Client_Plugin *plugin, int now); +static void +client_delete_session (struct GNUNET_ATS_Session *s) +{ + struct HTTP_Client_Plugin *plugin = s->plugin; + struct HTTP_Message *pos; + struct HTTP_Message *next; + CURLMcode mret; + + if (NULL != s->timeout_task) + { + GNUNET_SCHEDULER_cancel (s->timeout_task); + s->timeout_task = NULL; + s->timeout = GNUNET_TIME_UNIT_ZERO_ABS; + } + if (NULL != s->put_disconnect_task) + { + GNUNET_SCHEDULER_cancel (s->put_disconnect_task); + s->put_disconnect_task = NULL; + } + if (NULL != s->recv_wakeup_task) + { + GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); + s->recv_wakeup_task = NULL; + } + GNUNET_assert (GNUNET_OK == + GNUNET_CONTAINER_multipeermap_remove (plugin->sessions, + &s->address->peer, + s)); + if (NULL != s->put.easyhandle) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: disconnecting PUT request to peer `%s'\n", + s, + s->put.easyhandle, + GNUNET_i2s (&s->address->peer)); + + /* remove curl handle from multi handle */ + mret = curl_multi_remove_handle (plugin->curl_multi_handle, + s->put.easyhandle); + GNUNET_break (CURLM_OK == mret); + curl_easy_cleanup (s->put.easyhandle); + GNUNET_assert (plugin->cur_requests > 0); + plugin->cur_requests--; + s->put.easyhandle = NULL; + } + if (NULL != s->get.easyhandle) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: disconnecting GET request to peer `%s'\n", + s, s->get.easyhandle, + GNUNET_i2s (&s->address->peer)); + /* remove curl handle from multi handle */ + mret = curl_multi_remove_handle (plugin->curl_multi_handle, + s->get.easyhandle); + GNUNET_break (CURLM_OK == mret); + curl_easy_cleanup (s->get.easyhandle); + GNUNET_assert (plugin->cur_requests > 0); + plugin->cur_requests--; + s->get.easyhandle = NULL; + } + + GNUNET_STATISTICS_set (plugin->env->stats, + HTTP_STAT_STR_CONNECTIONS, + plugin->cur_requests, + GNUNET_NO); + next = s->msg_head; + while (NULL != (pos = next)) + { + next = pos->next; + GNUNET_CONTAINER_DLL_remove (s->msg_head, + s->msg_tail, + pos); + GNUNET_assert (0 < s->msgs_in_queue); + s->msgs_in_queue--; + GNUNET_assert (pos->size <= s->bytes_in_queue); + s->bytes_in_queue -= pos->size; + if (NULL != pos->transmit_cont) + pos->transmit_cont (pos->transmit_cont_cls, + &s->address->peer, + GNUNET_SYSERR, + pos->size, + pos->pos + s->overhead); + s->overhead = 0; + GNUNET_free (pos); + } + GNUNET_assert (0 == s->msgs_in_queue); + GNUNET_assert (0 == s->bytes_in_queue); + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_DONE); + if (NULL != s->msg_tk) + { + GNUNET_SERVER_mst_destroy (s->msg_tk); + s->msg_tk = NULL; + } + GNUNET_HELLO_address_free (s->address); + GNUNET_free (s->url); + GNUNET_free (s); +} /** - * Connect a HTTP put connection + * Increment session timeout due to activity for session @a s. * - * @param s the session to connect - * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for success + * @param s the session */ -static int -client_connect_put (struct Session *s); +static void +client_reschedule_session_timeout (struct GNUNET_ATS_Session *s) +{ + GNUNET_assert (NULL != s->timeout_task); + s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); +} + + +/** + * Task performing curl operations + * + * @param cls plugin as closure + * @param tc gnunet scheduler task context + */ +static void +client_run (void *cls); /** - * Does a session s exists? + * Function setting up file descriptors and scheduling task to run * - * @param plugin the plugin - * @param s desired session - * @return #GNUNET_YES or #GNUNET_NO + * @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 */ static int -client_exist_session (struct HTTP_Client_Plugin *plugin, - struct Session *s) +client_schedule (struct HTTP_Client_Plugin *plugin, + int now) { - struct Session * head; + 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; - for (head = plugin->head; head != NULL; head = head->next) - if (head == s) - return GNUNET_YES; - return GNUNET_NO; + /* Cancel previous scheduled task */ + if (plugin->client_perform_task != NULL) + { + GNUNET_SCHEDULER_cancel (plugin->client_perform_task); + plugin->client_perform_task = NULL; + } + max = -1; + FD_ZERO (&rs); + FD_ZERO (&ws); + FD_ZERO (&es); + mret = curl_multi_fdset (plugin->curl_multi_handle, &rs, &ws, &es, &max); + if (mret != CURLM_OK) + { + 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->curl_multi_handle, &to); + if (-1 == to) + 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; + + if (CURLM_OK != mret) + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("%s failed at %s:%d: `%s'\n"), + "curl_multi_timeout", __FILE__, __LINE__, + curl_multi_strerror (mret)); + return GNUNET_SYSERR; + } + + 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); + + /* Schedule task to run when select is ready to read or write */ + 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; } +#if VERBOSE_CURL /** * Loggging function * @@ -378,55 +647,77 @@ client_exist_session (struct HTTP_Client_Plugin *plugin, * @return always 0 */ static int -client_log (CURL *curl, curl_infotype type, - const char *data, size_t size, void *cls) +client_log (CURL *curl, + curl_infotype type, + const char *data, + size_t size, + void *cls) { - struct ConnectionHandle *ch = cls; + struct RequestHandle *ch = cls; const char *ttype = "UNSPECIFIED"; + char text[size + 2]; - if ((type == CURLINFO_TEXT) || (type == CURLINFO_HEADER_IN) || (type == CURLINFO_HEADER_OUT)) + if (! ((CURLINFO_TEXT == type) || + (CURLINFO_HEADER_IN == type) || + (CURLINFO_HEADER_OUT == type))) + return 0; + switch (type) { - char text[size + 2]; - - switch (type) { - case CURLINFO_TEXT: - ttype = "TEXT"; - break; - case CURLINFO_HEADER_IN: - ttype = "HEADER_IN"; - break; - case CURLINFO_HEADER_OUT: - ttype = "HEADER_OUT"; - /* Overhead*/ - - GNUNET_assert (NULL != ch); - GNUNET_assert (NULL != ch->easyhandle); - GNUNET_assert (NULL != ch->s); - ch->s->overhead += size; - break; - default: - ttype = "UNSPECIFIED"; - break; - } - - 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", - "Connection %p %s: %s", ch->easyhandle, ttype, text); -#else - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-http_client", - "Connection %p %s: %s", ch->easyhandle, ttype, text); -#endif + case CURLINFO_TEXT: + ttype = "TEXT"; + break; + case CURLINFO_HEADER_IN: + ttype = "HEADER_IN"; + break; + case CURLINFO_HEADER_OUT: + ttype = "HEADER_OUT"; + /* Overhead*/ + GNUNET_assert (NULL != ch); + GNUNET_assert (NULL != ch->easyhandle); + GNUNET_assert (NULL != ch->s); + ch->s->overhead += size; + break; + default: + ttype = "UNSPECIFIED"; + break; + } + GNUNET_memcpy (text, data, size); + if (text[size - 1] == '\n') + { + text[size] = '\0'; } + else + { + text[size] = '\n'; + text[size + 1] = '\0'; + } + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Request %p %s: %s", + ch->easyhandle, + ttype, + text); return 0; } +#endif + +/** + * Connect GET request + * + * @param s the session to connect + * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise + */ +static int +client_connect_get (struct GNUNET_ATS_Session *s); + + +/** + * Connect a HTTP put request + * + * @param s the session to connect + * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for success + */ +static int +client_connect_put (struct GNUNET_ATS_Session *s); /** @@ -440,7 +731,7 @@ client_log (CURL *curl, curl_infotype type, * @param cls closure * @param s which session must be used * @param msgbuf the message to transmit - * @param msgbuf_size number of bytes in 'msgbuf' + * @param msgbuf_size number of bytes in @a 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 @@ -451,15 +742,16 @@ client_log (CURL *curl, curl_infotype type, * 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 + * @param cont_cls closure for @a 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 *s, - const char *msgbuf, size_t msgbuf_size, + struct GNUNET_ATS_Session *s, + const char *msgbuf, + size_t msgbuf_size, unsigned int priority, struct GNUNET_TIME_Relative to, GNUNET_TRANSPORT_TransmitContinuation cont, @@ -469,28 +761,27 @@ http_client_plugin_send (void *cls, struct HTTP_Message *msg; char *stat_txt; - /* lookup if session is really existing */ - if (GNUNET_YES != client_exist_session (plugin, s)) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p/connection %p: Sending message with %u to peer `%s' \n", - s, s->client_put, - msgbuf_size, GNUNET_i2s (&s->target)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: Sending message with %u to peer `%s' \n", + s, + s->put.easyhandle, + msgbuf_size, + GNUNET_i2s (&s->address->peer)); /* create new message and schedule */ msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size); - msg->next = NULL; msg->size = msgbuf_size; - msg->pos = 0; msg->buf = (char *) &msg[1]; msg->transmit_cont = cont; msg->transmit_cont_cls = cont_cls; - memcpy (msg->buf, msgbuf, msgbuf_size); - GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg); + GNUNET_memcpy (msg->buf, + msgbuf, + msgbuf_size); + GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, + s->msg_tail, + msg); + s->msgs_in_queue++; + s->bytes_in_queue += msg->size; GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", @@ -498,202 +789,85 @@ http_client_plugin_send (void *cls, GNUNET_STATISTICS_update (plugin->env->stats, stat_txt, msgbuf_size, GNUNET_NO); GNUNET_free (stat_txt); - - if (GNUNET_YES == s->put_tmp_disconnecting) + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + if (H_TMP_DISCONNECTING == s->put.state) { - /* PUT connection is currently getting disconnected */ - s->put_reconnect_required = GNUNET_YES; - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p/connection %jp: currently disconnecting, reconnecting immediately\n", - s, s->client_put); + /* PUT request is currently getting disconnected */ + s->put.state = H_TMP_RECONNECT_REQUIRED; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: currently disconnecting, reconnecting immediately\n", + s, + s->put.easyhandle); return msgbuf_size; } - else if (GNUNET_YES == s->put_paused) + if (H_PAUSED == s->put.state) { - /* PUT connection was paused, unpause */ - GNUNET_assert (s->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK); + /* PUT request was paused, unpause */ + GNUNET_assert (s->put_disconnect_task != NULL); GNUNET_SCHEDULER_cancel (s->put_disconnect_task); - s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p/connection %p: unpausing connection\n", - s, s->client_put); - s->put_paused = GNUNET_NO; - if (NULL != s->client_put) - curl_easy_pause (s->client_put, CURLPAUSE_CONT); + s->put_disconnect_task = NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: unpausing request\n", + s, s->put.easyhandle); + s->put.state = H_CONNECTED; + if (NULL != s->put.easyhandle) + curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT); } - else if (GNUNET_YES == s->put_tmp_disconnected) + else if (H_TMP_DISCONNECTED == s->put.state) { - /* PUT connection was disconnected, reconnect */ - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p: Reconnecting PUT connection\n", - s); - s->put_tmp_disconnected = GNUNET_NO; - GNUNET_break (s->client_put == NULL); + /* PUT request was disconnected, reconnect */ + LOG (GNUNET_ERROR_TYPE_DEBUG, "Session %p: Reconnecting PUT request\n", s); + GNUNET_break (NULL == s->put.easyhandle); if (GNUNET_SYSERR == client_connect_put (s)) { + /* Could not reconnect */ + http_client_plugin_session_disconnect (plugin, s); return GNUNET_SYSERR; } } - client_schedule (s->plugin, GNUNET_YES); return msgbuf_size; } -/** - * Delete session s - * - * @param s the session to delete - */ -static void -client_delete_session (struct Session *s) -{ - struct HTTP_Client_Plugin *plugin = s->plugin; - struct HTTP_Message *pos; - struct HTTP_Message *next; - - 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); - s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK; - } - - GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s); - - next = s->msg_head; - 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, - pos->size, pos->pos + s->overhead); - s->overhead = 0; - GNUNET_free (pos); - } - - if (s->msg_tk != NULL) - { - GNUNET_SERVER_mst_destroy (s->msg_tk); - s->msg_tk = NULL; - } - GNUNET_HELLO_address_free (s->address); - GNUNET_free (s->url); - GNUNET_free (s); -} - - /** * Disconnect a session * - * @param cls the `struct HTTP_Client_Plugin` + * @param cls the `struct HTTP_Client_Plugin *` * @param s session * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ static int -http_client_session_disconnect (void *cls, - struct Session *s) +http_client_plugin_session_disconnect (void *cls, + struct GNUNET_ATS_Session *s) { struct HTTP_Client_Plugin *plugin = cls; - struct HTTP_Message *msg; - struct HTTP_Message *t; - int res = GNUNET_OK; - CURLMcode mret; - - if (GNUNET_YES != client_exist_session (plugin, s)) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } - - 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, s->client_put, GNUNET_i2s (&s->target)); - - /* remove curl handle from multi handle */ - mret = curl_multi_remove_handle (plugin->curl_multi_handle, 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 (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)); - /* remove curl handle from multi handle */ - mret = curl_multi_remove_handle (plugin->curl_multi_handle, 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 (NULL != msg) - { - t = msg->next; - if (NULL != msg->transmit_cont) - msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR, - msg->size, msg->pos + s->overhead); - s->overhead = 0; - GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg); - GNUNET_free (msg); - msg = t; - } - - GNUNET_assert (plugin->cur_connections >= 2); - plugin->cur_connections -= 2; - GNUNET_STATISTICS_set (plugin->env->stats, - 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); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p: notifying transport about ending session\n", + s); + plugin->env->session_end (plugin->env->cls, + s->address, + s); client_delete_session (s); /* Re-schedule since handles have changed */ - if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK) + if (NULL != plugin->client_perform_task) { GNUNET_SCHEDULER_cancel (plugin->client_perform_task); - plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK; + plugin->client_perform_task = NULL; } client_schedule (plugin, GNUNET_YES); - return res; + return GNUNET_OK; } /** * Function that is called to get the keepalive factor. - * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to + * #GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to * calculate the interval between keepalive packets. * * @param cls closure with the `struct Plugin` @@ -706,6 +880,27 @@ http_client_query_keepalive_factor (void *cls) } +/** + * Callback to destroys all sessions on exit. + * + * @param cls the `struct HTTP_Client_Plugin *` + * @param peer identity of the peer + * @param value the `struct GNUNET_ATS_Session *` + * @return #GNUNET_OK (continue iterating) + */ +static int +destroy_session_cb (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *value) +{ + struct HTTP_Client_Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = value; + + http_client_plugin_session_disconnect (plugin, session); + return GNUNET_OK; +} + + /** * Function that can be used to force the plugin to disconnect * from the given peer and cancel all previous transmissions @@ -715,30 +910,61 @@ http_client_query_keepalive_factor (void *cls) * @param target peer from which to disconnect */ static void -http_client_peer_disconnect (void *cls, - const struct GNUNET_PeerIdentity *target) +http_client_plugin_peer_disconnect (void *cls, + const struct GNUNET_PeerIdentity *target) { struct HTTP_Client_Plugin *plugin = cls; - struct Session *next = NULL; - struct Session *pos = NULL; - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Transport tells me to disconnect `%s'\n", - GNUNET_i2s (target)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Transport tells me to disconnect `%s'\n", + GNUNET_i2s (target)); + GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions, + target, + &destroy_session_cb, + plugin); +} - next = plugin->head; - while (NULL != (pos = next)) + +/** + * Closure for #session_lookup_client_by_address(). + */ +struct GNUNET_ATS_SessionClientCtx +{ + /** + * Address we are looking for. + */ + const struct GNUNET_HELLO_Address *address; + + /** + * Session that was found. + */ + struct GNUNET_ATS_Session *ret; +}; + + +/** + * Locate the seession object for a given address. + * + * @param cls the `struct GNUNET_ATS_SessionClientCtx *` + * @param key peer identity + * @param value the `struct GNUNET_ATS_Session` to check + * @return #GNUNET_NO if found, #GNUNET_OK if not + */ +static int +session_lookup_client_by_address (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct GNUNET_ATS_SessionClientCtx *sc_ctx = cls; + struct GNUNET_ATS_Session *s = value; + + if (0 == GNUNET_HELLO_address_cmp (sc_ctx->address, + s->address)) { - next = pos->next; - if (0 == memcmp (target, &pos->target, sizeof (struct GNUNET_PeerIdentity))) - { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Disconnecting session %p to `%pos'\n", - pos, GNUNET_i2s (target)); - GNUNET_assert (GNUNET_OK == http_client_session_disconnect (plugin, - pos)); - } + sc_ctx->ret = s; + return GNUNET_NO; } + return GNUNET_YES; } @@ -749,36 +975,41 @@ http_client_peer_disconnect (void *cls, * @param address the address * @return the session or NULL */ -static struct Session * +static struct GNUNET_ATS_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))) && - (0 == GNUNET_HELLO_address_cmp(address, pos->address))) - return pos; - } - return NULL; + struct GNUNET_ATS_SessionClientCtx sc_ctx; + + sc_ctx.address = address; + sc_ctx.ret = NULL; + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, + &session_lookup_client_by_address, + &sc_ctx); + return sc_ctx.ret; } +/** + * When we have nothing to transmit, we pause the HTTP PUT + * after a while (so that gnurl stops asking). This task + * is the delayed task that actually disconnects the PUT. + * + * @param cls the `struct GNUNET_ATS_Session *` with the put + */ static void -client_put_disconnect (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +client_put_disconnect (void *cls) { - 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; - if (NULL != s->client_put) - curl_easy_pause (s->client_put, CURLPAUSE_CONT); + struct GNUNET_ATS_Session *s = cls; + + s->put_disconnect_task = NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: will be disconnected due to no activity\n", + s, s->put.easyhandle); + s->put.state = H_TMP_DISCONNECTING; + if (NULL != s->put.easyhandle) + curl_easy_pause (s->put.easyhandle, + CURLPAUSE_CONT); client_schedule (s->plugin, GNUNET_YES); } @@ -790,39 +1021,51 @@ client_put_disconnect (void *cls, * @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 our `struct Session` - * @return bytes written to stream, returning 0 will terminate connection! + * @param cls our `struct GNUNET_ATS_Session` + * @return bytes written to stream, returning 0 will terminate request! */ static size_t -client_send_cb (void *stream, size_t size, size_t nmemb, void *cls) +client_send_cb (void *stream, + size_t size, + size_t nmemb, + void *cls) { - struct Session *s = cls; + struct GNUNET_ATS_Session *s = cls; struct HTTP_Client_Plugin *plugin = s->plugin; struct HTTP_Message *msg = s->msg_head; size_t len; char *stat_txt; - if (GNUNET_YES != client_exist_session (plugin, s)) + if (H_TMP_DISCONNECTING == s->put.state) { - GNUNET_break (0); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: disconnect due to inactivity\n", + s, s->put.easyhandle); return 0; } - if (GNUNET_YES == s->put_tmp_disconnecting) - { - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p/connection %p: disconnect due to inactivity\n", - s, s->client_put); - return 0; - } if (NULL == msg) { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: nothing to send, suspending\n", - s, s->client_put); - s->put_disconnect_task = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT, &client_put_disconnect, s); - s->put_paused = GNUNET_YES; + if (GNUNET_YES == plugin->emulate_xhr) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: PUT request finished\n", + s, + s->put.easyhandle); + s->put.state = H_TMP_DISCONNECTING; + return 0; + } + + /* We have nothing to send, so pause PUT request */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: nothing to send, suspending\n", + s, + s->put.easyhandle); + s->put_disconnect_task + = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT, + &client_put_disconnect, + s); + s->put.state = H_PAUSED; return CURL_READFUNC_PAUSE; } /* data to send */ @@ -830,30 +1073,53 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls) /* calculate how much fits in buffer */ len = GNUNET_MIN (msg->size - msg->pos, size * nmemb); - memcpy (stream, &msg->buf[msg->pos], len); + GNUNET_memcpy (stream, + &msg->buf[msg->pos], + len); msg->pos += len; if (msg->pos == msg->size) { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: sent message with %u bytes sent, removing message from queue\n", - s, s->client_put, msg->size, msg->pos); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: sent message with %u bytes sent, removing message from queue\n", + s, + s->put.easyhandle, + msg->size, + msg->pos); /* Calling transmit continuation */ - GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg); + GNUNET_CONTAINER_DLL_remove (s->msg_head, + s->msg_tail, + msg); + GNUNET_assert (0 < s->msgs_in_queue); + s->msgs_in_queue--; + GNUNET_assert (msg->size <= s->bytes_in_queue); + s->bytes_in_queue -= msg->size; if (NULL != msg->transmit_cont) - msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK, - msg->size, msg->size + s->overhead); + msg->transmit_cont (msg->transmit_cont_cls, + &s->address->peer, + GNUNET_OK, + msg->size, + msg->size + s->overhead); s->overhead = 0; GNUNET_free (msg); } - - GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol); + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + GNUNET_asprintf (&stat_txt, + "# bytes currently in %s_client buffers", + plugin->protocol); GNUNET_STATISTICS_update (plugin->env->stats, - stat_txt, -len, GNUNET_NO); + stat_txt, + - len, + GNUNET_NO); GNUNET_free (stat_txt); - - GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_client", plugin->protocol); + GNUNET_asprintf (&stat_txt, + "# bytes transmitted via %s_client", + plugin->protocol); GNUNET_STATISTICS_update (plugin->env->stats, - stat_txt, len, GNUNET_NO); + stat_txt, + len, + GNUNET_NO); GNUNET_free (stat_txt); return len; } @@ -863,31 +1129,28 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls) * Wake up a curl handle which was suspended * * @param cls the session - * @param tc task context */ static void -client_wake_up (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +client_wake_up (void *cls) { - struct Session *s = cls; - struct HTTP_Client_Plugin *p = s->plugin; + struct GNUNET_ATS_Session *s = cls; - if (GNUNET_YES != client_exist_session (p, s)) + s->recv_wakeup_task = NULL; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: Waking up GET handle\n", + s, s->get.easyhandle); + if (H_PAUSED == s->put.state) { - GNUNET_break (0); - return; + /* PUT request was paused, unpause */ + GNUNET_assert (s->put_disconnect_task != NULL); + GNUNET_SCHEDULER_cancel (s->put_disconnect_task); + s->put_disconnect_task = NULL; + s->put.state = H_CONNECTED; + if (NULL != s->put.easyhandle) + curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT); } - 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, - "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); - + if (NULL != s->get.easyhandle) + curl_easy_pause (s->get.easyhandle, CURLPAUSE_CONT); } @@ -900,198 +1163,126 @@ client_wake_up (void *cls, * @return always #GNUNET_OK */ static int -client_receive_mst_cb (void *cls, void *client, +client_receive_mst_cb (void *cls, + void *client, const struct GNUNET_MessageHeader *message) { - struct Session *s = cls; + struct GNUNET_ATS_Session *s = cls; struct HTTP_Client_Plugin *plugin; struct GNUNET_TIME_Relative delay; - struct GNUNET_ATS_Information atsi; char *stat_txt; plugin = s->plugin; - if (GNUNET_YES != client_exist_session (plugin, s)) - { - GNUNET_break (0); - return GNUNET_OK; - } - - 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); - + delay = s->plugin->env->receive (plugin->env->cls, + s->address, + s, + message); 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_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 %s\n", - GNUNET_i2s (&s->target), - 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; -} - - -/** - * Callback method used with libcurl when data for a PUT connection are - * received. We do not expect data here, so we just dismiss it - * - * @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_put (void *stream, size_t size, size_t nmemb, void *cls) -{ - return size * nmemb; -} - - -/** - * Callback method used with libcurl when data for a GET connection are - * received. Forward to MST - * - * @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) -{ - struct Session *s = cls; - struct GNUNET_TIME_Absolute now; - size_t len = size * nmemb; - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p / connection %p: Received %u bytes from peer `%s'\n", - s, s->client_get, - len, GNUNET_i2s (&s->target)); - now = GNUNET_TIME_absolute_get (); - 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 %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); - s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK; - } - s->recv_wakeup_task = - GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s); - return CURL_WRITEFUNC_PAUSE; - } - 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; -} - - -/** - * Task performing curl operations - * - * @param cls plugin as closure - * @param tc gnunet scheduler task context - */ -static void -client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); - - -/** - * Function setting up file descriptors and scheduling task to run - * - * @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 - */ -static int -client_schedule (struct HTTP_Client_Plugin *plugin, int now) -{ - 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; - - /* 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; - } - max = -1; - FD_ZERO (&rs); - FD_ZERO (&ws); - FD_ZERO (&es); - mret = curl_multi_fdset (plugin->curl_multi_handle, &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->curl_multi_handle, &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; + "# bytes received via %s_client", + plugin->protocol); + GNUNET_STATISTICS_update (plugin->env->stats, + stat_txt, + ntohs (message->size), + GNUNET_NO); + GNUNET_free (stat_txt); - if (mret != CURLM_OK) + s->next_receive = GNUNET_TIME_relative_to_absolute (delay); + if (GNUNET_TIME_absolute_get ().abs_value_us < s->next_receive.abs_value_us) { - 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; + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Client: peer `%s' address `%s' next read delayed for %s\n", + GNUNET_i2s (&s->address->peer), + http_common_plugin_address_to_string (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; +} - 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; +/** + * Callback method used with libcurl when data for a PUT request are + * received. We do not expect data here, so we just discard it. + * + * @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_put (void *stream, + size_t size, + size_t nmemb, + void *cls) +{ + return size * nmemb; +} + + +/** + * Callback method used with libcurl when data for a GET request are + * received. Forward to MST + * + * @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) +{ + struct GNUNET_ATS_Session *s = cls; + struct GNUNET_TIME_Absolute now; + size_t len = size * nmemb; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p / request %p: Received %u bytes from peer `%s'\n", + s, + s->get.easyhandle, + len, + GNUNET_i2s (&s->address->peer)); + now = GNUNET_TIME_absolute_get (); + 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); + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p / request %p: No inbound bandwidth available! Next read was delayed for %s\n", + s, + s->get.easyhandle, + GNUNET_STRINGS_relative_time_to_string (delta, + GNUNET_YES)); + if (s->recv_wakeup_task != NULL) + { + GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); + s->recv_wakeup_task = NULL; + } + s->recv_wakeup_task + = GNUNET_SCHEDULER_add_delayed (delta, + &client_wake_up, + s); + return CURL_WRITEFUNC_PAUSE; + } + 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; } @@ -1099,124 +1290,147 @@ client_schedule (struct HTTP_Client_Plugin *plugin, int now) * Task performing curl operations * * @param cls plugin as closure - * @param tc gnunet scheduler task context */ static void -client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +client_run (void *cls) { struct HTTP_Client_Plugin *plugin = cls; int running; long http_statuscode; CURLMcode mret; + CURLMsg *msg; + int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */ + int msgs_left; - GNUNET_assert (cls != NULL); - - plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK; - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; - + plugin->client_perform_task = NULL; + /* While data are available or timeouts occured */ do { running = 0; + /* Perform operations for all handles */ mret = curl_multi_perform (plugin->curl_multi_handle, &running); - CURLMsg *msg; - int msgs_left; - - while ((msg = curl_multi_info_read (plugin->curl_multi_handle, &msgs_left))) + /* Get additional information for all handles */ + while (NULL != (msg = curl_multi_info_read (plugin->curl_multi_handle, &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; - } - - GNUNET_assert (CURLE_OK == - curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d)); - s = (struct Session *) d; - - if (GNUNET_YES != client_exist_session(plugin, s)) + struct GNUNET_ATS_Session *s = NULL; + char *d = NULL; /* curl requires 'd' to be a 'char *' */ + + GNUNET_assert (NULL != easy_h); + + /* Obtain session from easy handle */ + GNUNET_assert (CURLE_OK == curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d)); + s = (struct GNUNET_ATS_Session *) d; + GNUNET_assert (NULL != s); + + if (msg->msg != CURLMSG_DONE) + continue; /* This should not happen */ + + /* Get HTTP response code */ + GNUNET_break (CURLE_OK == curl_easy_getinfo (easy_h, + CURLINFO_RESPONSE_CODE, &http_statuscode)); + + if (easy_h == s->put.easyhandle) + put_request = GNUNET_YES; + else + put_request = GNUNET_NO; + + /* Log status of terminated request */ + if ((0 != msg->data.result) || (http_statuscode != 200)) + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: %s request to `%s' ended with status %i reason %i: `%s'\n", + s, msg->easy_handle, + (GNUNET_YES == put_request) ? "PUT" : "GET", + GNUNET_i2s (&s->address->peer), + http_statuscode, + msg->data.result, + curl_easy_strerror (msg->data.result)); + else + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p/request %p: %s request to `%s' ended normal\n", + s, msg->easy_handle, + (GNUNET_YES == put_request) ? "PUT" : "GET", + GNUNET_i2s (&s->address->peer)); + + /* Remove easy handle from multi handle */ + curl_multi_remove_handle (plugin->curl_multi_handle, easy_h); + + /* Clean up easy handle */ + curl_easy_cleanup (easy_h); + + /* Remove information */ + GNUNET_assert (plugin->cur_requests > 0); + plugin->cur_requests--; + LOG (GNUNET_ERROR_TYPE_INFO, + "%s request to %s done, number of requests decreased to %u\n", + (GNUNET_YES == put_request) ? "PUT" : "GET", + s->url, + plugin->cur_requests); + + if (GNUNET_YES == put_request) { - GNUNET_break (0); - return; + /* Clean up a PUT request */ + s->put.easyhandle = NULL; + s->put.s = NULL; + + switch (s->put.state) { + case H_NOT_CONNECTED: + case H_DISCONNECTED: + case H_TMP_DISCONNECTED: + /* This must not happen */ + GNUNET_break (0); + break; + case H_TMP_RECONNECT_REQUIRED: + /* Transport called send while disconnect in progess, reconnect */ + if (GNUNET_SYSERR == client_connect_put (s)) + { + /* Reconnect failed, disconnect session */ + http_client_plugin_session_disconnect (plugin, s); + } + break; + case H_TMP_DISCONNECTING: + /* PUT gets temporarily disconnected */ + s->put.state = H_TMP_DISCONNECTED; + break; + case H_PAUSED: + case H_CONNECTED: + /* PUT gets permanently disconnected */ + s->put.state = H_DISCONNECTED; + http_client_plugin_session_disconnect (plugin, s); + break; + default: + GNUNET_break (0); + break; + } } - - GNUNET_assert (s != NULL); - if (msg->msg == CURLMSG_DONE) + else if (GNUNET_NO == put_request) { - curl_easy_getinfo (easy_h, CURLINFO_RESPONSE_CODE, &http_statuscode); - if (easy_h == s->client_put) + /* Clean up a GET request */ + s->get.easyhandle = NULL; + s->get.s = NULL; + + /* If we are emulating an XHR client we need to make another GET + * request. + */ + if (GNUNET_YES == plugin->emulate_xhr) { - if ((0 != msg->data.result) || (http_statuscode != 200)) - { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: PUT connection to `%s' ended with status %i reason %i: `%s'\n", - s, msg->easy_handle, GNUNET_i2s (&s->target), - http_statuscode, - msg->data.result, - curl_easy_strerror (msg->data.result)); - } - else - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: PUT connection to `%s' ended normal\n", - s, msg->easy_handle, GNUNET_i2s (&s->target)); - if (s->client_get == NULL) - { - /* Disconnect other transmission direction and tell transport */ - } - curl_multi_remove_handle (plugin->curl_multi_handle, easy_h); - curl_easy_cleanup (easy_h); - s->put_tmp_disconnecting = GNUNET_NO; - s->put_tmp_disconnected = GNUNET_YES; - s->client_put = NULL; - s->put.easyhandle = NULL; - s->put.s = NULL; - - /* - * Handling a rare case: - * plugin_send was called during temporary put disconnect, - * reconnect required after connection was disconnected - */ - if (GNUNET_YES == s->put_reconnect_required) - { - s->put_reconnect_required = GNUNET_NO; - if (GNUNET_SYSERR == client_connect_put(s)) - { - GNUNET_break (s->client_put == NULL); - GNUNET_break (s->put_tmp_disconnected == GNUNET_NO); - } - } + if (GNUNET_SYSERR == client_connect_get (s)) + http_client_plugin_session_disconnect (plugin, s); } - if (easy_h == s->client_get) + else { - if ((0 != msg->data.result) || (http_statuscode != 200)) - { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: GET connection to `%s' ended with status %i reason %i: `%s'\n", - s, msg->easy_handle, GNUNET_i2s (&s->target), - http_statuscode, - msg->data.result, - curl_easy_strerror (msg->data.result)); - - } - else - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Session %p/connection %p: GET connection to `%s' ended normal\n", - s, msg->easy_handle, GNUNET_i2s (&s->target)); - /* Disconnect other transmission direction and tell transport */ - s->get.easyhandle = NULL; - s->get.s = NULL; - http_client_session_disconnect (plugin, s); + /* GET request was terminated, so disconnect session */ + http_client_plugin_session_disconnect (plugin, s); } } + else + GNUNET_break (0); /* Must not happen */ + + GNUNET_STATISTICS_set (plugin->env->stats, + HTTP_STAT_STR_CONNECTIONS, + plugin->cur_requests, + GNUNET_NO); } } while (mret == CURLM_CALL_MULTI_PERFORM); @@ -1224,113 +1438,297 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } +#ifdef TCP_STEALTH +/** + * Open TCP socket with TCP STEALTH enabled. + * + * @param clientp our `struct GNUNET_ATS_Session *` + * @param purpose why does curl want to open a socket + * @param address what kind of socket does curl want to have opened? + * @return opened socket + */ +static curl_socket_t +open_tcp_stealth_socket_cb (void *clientp, + curlsocktype purpose, + struct curl_sockaddr *address) +{ + struct GNUNET_ATS_Session *s = clientp; + int ret; + + switch (purpose) + { + case CURLSOCKTYPE_IPCXN: + ret = socket (address->family, + address->socktype, + address->protocol); + if (-1 == ret) + return CURL_SOCKET_BAD; + if ( ( (SOCK_STREAM != address->socktype) || + ( (0 != address->protocol) && + (IPPROTO_TCP != address->protocol))) ) + return (curl_socket_t) ret; + if ( (0 != setsockopt (ret, + IPPROTO_TCP, + TCP_STEALTH, + &s->address->peer, + sizeof (struct GNUNET_PeerIdentity))) ) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("TCP_STEALTH not supported on this platform.\n")); + (void) close (ret); + return CURL_SOCKET_BAD; + } + return (curl_socket_t) ret; + case CURLSOCKTYPE_ACCEPT: + GNUNET_break (0); + return CURL_SOCKET_BAD; + break; + case CURLSOCKTYPE_LAST: + GNUNET_break (0); + return CURL_SOCKET_BAD; + default: + GNUNET_break (0); + return CURL_SOCKET_BAD; + } +} +#endif + + /** - * Connect GET connection for a session + * Connect GET request for a session * * @param s the session to connect * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ static int -client_connect_get (struct Session *s) +client_connect_get (struct GNUNET_ATS_Session *s) { CURLMcode mret; + struct HttpAddress *ha; + uint32_t options; - /* create get connection */ - s->client_get = curl_easy_init (); + ha = (struct HttpAddress *) s->address->address; + options = ntohl (ha->options); + /* create get request */ + s->get.easyhandle = curl_easy_init (); s->get.s = s; - s->get.easyhandle = s->client_get; + if (0 != (options & HTTP_OPTIONS_TCP_STEALTH)) + { +#ifdef TCP_STEALTH + curl_easy_setopt (s->get.easyhandle, + CURLOPT_OPENSOCKETFUNCTION, + &open_tcp_stealth_socket_cb); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_OPENSOCKETDATA, + s); +#else + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cannot connect, TCP STEALTH needed and not supported by kernel.\n"); + curl_easy_cleanup (s->get.easyhandle); + s->get.easyhandle = NULL; + s->get.s = NULL; + return GNUNET_SYSERR; +#endif + } + #if VERBOSE_CURL - curl_easy_setopt (s->client_get, CURLOPT_VERBOSE, 1L); - curl_easy_setopt (s->client_get, CURLOPT_DEBUGFUNCTION, &client_log); - curl_easy_setopt (s->client_get, CURLOPT_DEBUGDATA, &s->get); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_VERBOSE, + 1L); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_DEBUGFUNCTION, + &client_log); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_DEBUGDATA, + &s->get); #endif #if BUILD_HTTPS - curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + curl_easy_setopt (s->get.easyhandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); { - struct HttpAddress *ha; - ha = (struct HttpAddress *) s->address->address; - if (HTTP_OPTIONS_VERIFY_CERTIFICATE == - (ntohl (ha->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE)) + (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); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_SSL_VERIFYPEER, 1L); + curl_easy_setopt (s->get.easyhandle, + 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->get.easyhandle, + CURLOPT_SSL_VERIFYPEER, + 0L); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_SSL_VERIFYHOST, + 0L); } } - curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); - curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROTOCOLS, + CURLPROTO_HTTPS); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_REDIR_PROTOCOLS, + CURLPROTO_HTTPS); #else - curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP); - curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROTOCOLS, + CURLPROTO_HTTP); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_REDIR_PROTOCOLS, + CURLPROTO_HTTP); #endif - curl_easy_setopt (s->client_get, CURLOPT_URL, s->url); - //curl_easy_setopt (s->client_get, CURLOPT_HEADERFUNCTION, &curl_get_header_cb); - //curl_easy_setopt (s->client_get, CURLOPT_WRITEHEADER, ps); - curl_easy_setopt (s->client_get, CURLOPT_READFUNCTION, client_send_cb); - curl_easy_setopt (s->client_get, CURLOPT_READDATA, s); - curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive); - curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s); + if (NULL != s->plugin->proxy_hostname) + { + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROXY, + s->plugin->proxy_hostname); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROXYTYPE, + s->plugin->proxytype); + if (NULL != s->plugin->proxy_username) + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROXYUSERNAME, + s->plugin->proxy_username); + if (NULL != s->plugin->proxy_password) + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PROXYPASSWORD, + s->plugin->proxy_password); + if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel) + curl_easy_setopt (s->get.easyhandle, + CURLOPT_HTTPPROXYTUNNEL, + s->plugin->proxy_use_httpproxytunnel); + } + + if (GNUNET_YES == s->plugin->emulate_xhr) + { + char *url; + + GNUNET_asprintf (&url, + "%s,1", + s->url); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_URL, + url); + GNUNET_free(url); + } + else + { + curl_easy_setopt (s->get.easyhandle, + CURLOPT_URL, + s->url); + } + curl_easy_setopt (s->get.easyhandle, + CURLOPT_READFUNCTION, + &client_send_cb); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_READDATA, + s); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_WRITEFUNCTION, + &client_receive); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_WRITEDATA, + s); /* No timeout by default, timeout done with session timeout */ - 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, + curl_easy_setopt (s->get.easyhandle, + CURLOPT_TIMEOUT, + 0L); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_PRIVATE, s); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_CONNECTTIMEOUT_MS, (long) (HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL)); - curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, + curl_easy_setopt (s->get.easyhandle, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); #if CURL_TCP_NODELAY - curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1); + curl_easy_setopt (ps->recv_endpoint, + CURLOPT_TCP_NODELAY, + 1L); #endif - curl_easy_setopt (s->client_get, CURLOPT_FOLLOWLOCATION, 0); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_FOLLOWLOCATION, + 0L); - mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get); - if (mret != CURLM_OK) + mret = curl_multi_add_handle (s->plugin->curl_multi_handle, + s->get.easyhandle); + if (CURLM_OK != 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; + LOG (GNUNET_ERROR_TYPE_ERROR, + "Session %p : Failed to add GET handle to multihandle: `%s'\n", + s, + curl_multi_strerror (mret)); + curl_easy_cleanup (s->get.easyhandle); s->get.easyhandle = NULL; + s->get.s = NULL; GNUNET_break (0); return GNUNET_SYSERR; } - + s->plugin->cur_requests++; + LOG (GNUNET_ERROR_TYPE_INFO, + "GET request `%s' established, number of requests increased to %u\n", + s->url, + s->plugin->cur_requests); return GNUNET_OK; } /** - * Connect a HTTP put connection + * Connect a HTTP put request * * @param s the session to connect * @return #GNUNET_SYSERR for hard failure, #GNUNET_OK for ok */ static int -client_connect_put (struct Session *s) +client_connect_put (struct GNUNET_ATS_Session *s) { CURLMcode mret; + struct HttpAddress *ha; + uint32_t options; - /* create put connection */ - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name, - "Session %p : Init PUT handle\n", s); - s->client_put = curl_easy_init (); + ha = (struct HttpAddress *) s->address->address; + options = ntohl (ha->options); + /* create put request */ + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p: Init PUT handle\n", + s); + s->put.easyhandle = curl_easy_init (); s->put.s = s; - s->put.easyhandle = s->client_put; #if VERBOSE_CURL - curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L); - curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log); - curl_easy_setopt (s->client_put, CURLOPT_DEBUGDATA, &s->put); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_VERBOSE, + 1L); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_DEBUGFUNCTION, + &client_log); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_DEBUGDATA, + &s->put); #endif + if (0 != (options & HTTP_OPTIONS_TCP_STEALTH)) + { +#ifdef TCP_STEALTH + curl_easy_setopt (s->put.easyhandle, + CURLOPT_OPENSOCKETFUNCTION, + &open_tcp_stealth_socket_cb); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_OPENSOCKETDATA, + s); +#else + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cannot connect, TCP STEALTH needed and not supported by kernel.\n"); + curl_easy_cleanup (s->put.easyhandle); + s->put.easyhandle = NULL; + s->put.s = NULL; + s->put.state = H_DISCONNECTED; + return GNUNET_SYSERR; +#endif + } #if BUILD_HTTPS - curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_SSLVERSION, + CURL_SSLVERSION_TLSv1); { struct HttpAddress *ha; ha = (struct HttpAddress *) s->address->address; @@ -1338,120 +1736,184 @@ client_connect_put (struct Session *s) 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); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_SSL_VERIFYPEER, + 1L); + curl_easy_setopt (s->put.easyhandle, + 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->put.easyhandle, + CURLOPT_SSL_VERIFYPEER, + 0L); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_SSL_VERIFYHOST, + 0L); } } - curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); - curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROTOCOLS, + CURLPROTO_HTTPS); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_REDIR_PROTOCOLS, + CURLPROTO_HTTPS); #else - curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP); - curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROTOCOLS, + CURLPROTO_HTTP); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_REDIR_PROTOCOLS, + CURLPROTO_HTTP); #endif - curl_easy_setopt (s->client_put, CURLOPT_URL, s->url); - curl_easy_setopt (s->client_put, CURLOPT_UPLOAD, 1L); - //curl_easy_setopt (s->client_put, CURLOPT_HEADERFUNCTION, &client_curl_header); - //curl_easy_setopt (s->client_put, CURLOPT_WRITEHEADER, ps); - curl_easy_setopt (s->client_put, CURLOPT_READFUNCTION, client_send_cb); - curl_easy_setopt (s->client_put, CURLOPT_READDATA, s); - curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive_put); - curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s); + if (NULL != s->plugin->proxy_hostname) + { + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROXY, + s->plugin->proxy_hostname); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROXYTYPE, + s->plugin->proxytype); + if (NULL != s->plugin->proxy_username) + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROXYUSERNAME, + s->plugin->proxy_username); + if (NULL != s->plugin->proxy_password) + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PROXYPASSWORD, + s->plugin->proxy_password); + if (GNUNET_YES == s->plugin->proxy_use_httpproxytunnel) + curl_easy_setopt (s->put.easyhandle, + CURLOPT_HTTPPROXYTUNNEL, + s->plugin->proxy_use_httpproxytunnel); + } + + curl_easy_setopt (s->put.easyhandle, + CURLOPT_URL, + s->url); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_UPLOAD, + 1L); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_READFUNCTION, + &client_send_cb); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_READDATA, + s); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_WRITEFUNCTION, + &client_receive_put); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_WRITEDATA, + s); /* No timeout by default, timeout done with session timeout */ - 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, + curl_easy_setopt (s->put.easyhandle, + CURLOPT_TIMEOUT, + 0L); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_PRIVATE, + s); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_CONNECTTIMEOUT_MS, (long) (HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL)); - curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, + curl_easy_setopt (s->put.easyhandle, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); #if CURL_TCP_NODELAY - curl_easy_setopt (s->client_put, CURLOPT_TCP_NODELAY, 1); + curl_easy_setopt (s->put.easyhandle, CURLOPT_TCP_NODELAY, 1); #endif - mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_put); - if (mret != CURLM_OK) + mret = curl_multi_add_handle (s->plugin->curl_multi_handle, + s->put.easyhandle); + if (CURLM_OK != 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; + LOG (GNUNET_ERROR_TYPE_ERROR, + "Session %p : Failed to add PUT handle to multihandle: `%s'\n", + s, curl_multi_strerror (mret)); + curl_easy_cleanup (s->put.easyhandle); s->put.easyhandle = NULL; s->put.s = NULL; - s->put_tmp_disconnected = GNUNET_YES; + s->put.state = H_DISCONNECTED; return GNUNET_SYSERR; } - s->put_tmp_disconnected = GNUNET_NO; + s->put.state = H_CONNECTED; + s->plugin->cur_requests++; + + LOG (GNUNET_ERROR_TYPE_INFO, + "PUT request `%s' established, number of requests increased to %u\n", + s->url, s->plugin->cur_requests); + return GNUNET_OK; } /** - * Connect both PUT and GET connection for a session + * Connect both PUT and GET request for a session * * @param s the session to connect * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise */ static int -client_connect (struct Session *s) +client_connect (struct GNUNET_ATS_Session *s) { - struct HTTP_Client_Plugin *plugin = s->plugin; int res = GNUNET_OK; /* create url */ - if (NULL == http_common_plugin_address_to_string (NULL, - plugin->protocol, s->address->address, s->address->address_length)) + if (NULL == + http_common_plugin_address_to_string(plugin->protocol, + s->address->address, + s->address->address_length)) { - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, - plugin->name, - "Invalid address peer `%s'\n", - GNUNET_i2s (&s->target)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Invalid address peer `%s'\n", + GNUNET_i2s(&s->address->peer)); 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, + "Initiating outbound session peer `%s' using address `%s'\n", + GNUNET_i2s (&s->address->peer), s->url); - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - "Initiating outbound session peer `%s' using address `%s'\n", - GNUNET_i2s (&s->target), s->url); - - if ((GNUNET_SYSERR == client_connect_get (s)) || - (GNUNET_SYSERR == client_connect_put (s))) - { - GNUNET_break (0); + if (GNUNET_SYSERR == client_connect_get (s)) return GNUNET_SYSERR; + /* If we are emulating an XHR client then delay sending a PUT request until + * there is something to send. + */ + if (GNUNET_YES == plugin->emulate_xhr) + { + s->put.state = H_TMP_DISCONNECTED; } + else if (GNUNET_SYSERR == client_connect_put (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); - + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Session %p: connected with GET %p and PUT %p\n", + s, s->get.easyhandle, + s->put.easyhandle); /* Perform connect */ - plugin->cur_connections += 2; GNUNET_STATISTICS_set (plugin->env->stats, HTTP_STAT_STR_CONNECTIONS, - plugin->cur_connections, + plugin->cur_requests, GNUNET_NO); - /* Re-schedule since handles have changed */ - if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK) + if (NULL != plugin->client_perform_task) { GNUNET_SCHEDULER_cancel (plugin->client_perform_task); - plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK; + plugin->client_perform_task = NULL; } - plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, plugin); + + /* Schedule task to run immediately */ + plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, + plugin); return res; } @@ -1464,35 +1926,64 @@ client_connect (struct Session *s) * @return the network type */ static enum GNUNET_ATS_Network_Type -http_client_get_network (void *cls, - struct Session *session) +http_client_plugin_get_network (void *cls, + struct GNUNET_ATS_Session *session) +{ + return session->scope; +} + + +/** + * Function obtain the network type for an address. + * + * @param cls closure (`struct Plugin *`) + * @param address the address + * @return the network type + */ +static enum GNUNET_ATS_Network_Type +http_client_plugin_get_network_for_address (void *cls, + const struct GNUNET_HELLO_Address *address) { - return ntohl (session->ats_address_network_type); + struct HTTP_Client_Plugin *plugin = cls; + + return http_common_get_network_for_address (plugin->env, + address); } /** * Session was idle, so disconnect it * - * @param cls the `struct Session` of the idle session - * @param tc scheduler context + * @param cls the `struct GNUNET_ATS_Session` of the idle session */ static void -client_session_timeout (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +client_session_timeout (void *cls) { - 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)); + struct GNUNET_ATS_Session *s = cls; + struct GNUNET_TIME_Relative left; + + s->timeout_task = NULL; + left = GNUNET_TIME_absolute_get_remaining (s->timeout); + if (0 != left.rel_value_us) + { + /* not actually our turn yet, but let's at least update + the monitor, it may think we're about to die ... */ + notify_session_monitor (s->plugin, + s, + GNUNET_TRANSPORT_SS_UPDATE); + s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, + &client_session_timeout, + s); + return; + } + LOG (TIMEOUT_LOG, + "Session %p was idle for %s, disconnecting\n", + s, + GNUNET_STRINGS_relative_time_to_string (HTTP_CLIENT_SESSION_TIMEOUT, + GNUNET_YES)); + GNUNET_assert (GNUNET_OK == + http_client_plugin_session_disconnect (s->plugin, + s)); } @@ -1504,43 +1995,43 @@ client_session_timeout (void *cls, * @param address the address * @return the session or NULL of max connections exceeded */ -static struct Session * +static struct GNUNET_ATS_Session * http_client_plugin_get_session (void *cls, const struct GNUNET_HELLO_Address *address) { struct HTTP_Client_Plugin *plugin = cls; - struct Session * s = NULL; + struct GNUNET_ATS_Session *s; struct sockaddr *sa; - struct GNUNET_ATS_Information ats; + enum GNUNET_ATS_Network_Type net_type; size_t salen = 0; int res; - GNUNET_assert (address->address != NULL); + GNUNET_assert (NULL != address->address); /* find existing session */ s = client_lookup_session (plugin, address); - if (s != NULL) + if (NULL != s) return s; - if (plugin->max_connections <= plugin->cur_connections) + /* create a new session */ + if (plugin->max_requests <= plugin->cur_requests) { - 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)); + LOG (GNUNET_ERROR_TYPE_WARNING, + "Maximum number of requests (%u) reached: " + "cannot connect to peer `%s'\n", + plugin->max_requests, + GNUNET_i2s (&address->peer)); return NULL; } /* Determine network location */ - ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); - ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED); - sa = http_common_socket_from_address (address->address, address->address_length, &res); + net_type = GNUNET_ATS_NET_UNSPECIFIED; + sa = http_common_socket_from_address (address->address, + address->address_length, + &res); if (GNUNET_SYSERR == res) - { return NULL; - } - else if (GNUNET_YES == res) + if (GNUNET_YES == res) { GNUNET_assert (NULL != sa); if (AF_INET == sa->sa_family) @@ -1551,54 +2042,60 @@ http_client_plugin_get_session (void *cls, { 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))); + 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->target = address->peer; + s = GNUNET_new (struct GNUNET_ATS_Session); s->plugin = plugin; 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; + s->scope = net_type; + + s->put.state = H_NOT_CONNECTED; + s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT); 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->address->address, - s->address->address_length), - GNUNET_i2s (&s->target)); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Created new session %p for `%s' address `%s''\n", + s, + http_common_plugin_address_to_string (plugin->protocol, + s->address->address, + s->address->address_length), + GNUNET_i2s (&s->address->peer)); /* add new session */ - GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s); - + (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessions, + &s->address->peer, + s, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); /* 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, - plugin->protocol, s->address->address, - s->address->address_length), - GNUNET_i2s (&s->target)); + LOG (GNUNET_ERROR_TYPE_ERROR, + "Cannot connect to peer `%s' address `%s''\n", + http_common_plugin_address_to_string (plugin->protocol, + s->address->address, s->address->address_length), + GNUNET_i2s (&s->address->peer)); client_delete_session (s); return NULL; } + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_INIT); + notify_session_monitor (plugin, + s, + GNUNET_TRANSPORT_SS_UP); /* or handshake? */ return s; } @@ -1617,36 +2114,15 @@ client_start (struct HTTP_Client_Plugin *plugin) 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); + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Could not initialize curl multi handle, failed to start %s plugin!\n"), + plugin->name); return GNUNET_SYSERR; } return GNUNET_OK; } -/** - * Increment session timeout due to activity for session s - * - * param s the session - */ -static void -client_reschedule_session_timeout (struct Session *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)); -} - - /** * Another peer has suggested an address for this * peer and transport plugin. Check that this could be a valid @@ -1664,8 +2140,6 @@ 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; } @@ -1682,8 +2156,6 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) { struct GNUNET_TRANSPORT_PluginFunctions *api = cls; struct HTTP_Client_Plugin *plugin = api->cls; - struct Session *pos; - struct Session *next; if (NULL == api->cls) { @@ -1691,36 +2163,30 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) GNUNET_free (api); return NULL; } - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - _("Shutting down plugin `%s'\n"), - plugin->name); - - - next = plugin->head; - while (NULL != (pos = next)) - { - next = pos->next; - http_client_session_disconnect (plugin, pos); - } - if (GNUNET_SCHEDULER_NO_TASK != plugin->client_perform_task) + LOG (GNUNET_ERROR_TYPE_DEBUG, + _("Shutting down plugin `%s'\n"), + plugin->name); + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, + &destroy_session_cb, + plugin); + if (NULL != plugin->client_perform_task) { GNUNET_SCHEDULER_cancel (plugin->client_perform_task); - plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK; + plugin->client_perform_task = NULL; } - - if (NULL != plugin->curl_multi_handle) { curl_multi_cleanup (plugin->curl_multi_handle); plugin->curl_multi_handle = NULL; } curl_global_cleanup (); - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - _("Shutdown for plugin `%s' complete\n"), - plugin->name); - + LOG (GNUNET_ERROR_TYPE_DEBUG, + _("Shutdown for plugin `%s' complete\n"), + plugin->name); + GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions); + GNUNET_free_non_null (plugin->proxy_hostname); + GNUNET_free_non_null (plugin->proxy_username); + GNUNET_free_non_null (plugin->proxy_password); GNUNET_free (plugin); GNUNET_free (api); return NULL; @@ -1736,47 +2202,245 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) static int client_configure_plugin (struct HTTP_Client_Plugin *plugin) { - unsigned long long max_connections; + unsigned long long max_requests; + char *proxy_type; /* Optional parameters */ - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg, - plugin->name, - "MAX_CONNECTIONS", &max_connections)) - max_connections = 128; - plugin->max_connections = max_connections; - - GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, - _("Maximum number of connections is %u\n"), - plugin->max_connections); + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg, + plugin->name, + "MAX_CONNECTIONS", + &max_requests)) + max_requests = 128; + plugin->max_requests = max_requests; + + LOG (GNUNET_ERROR_TYPE_DEBUG, + _("Maximum number of requests is %u\n"), + plugin->max_requests); + + /* Read proxy configuration */ + if (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, + plugin->name, + "PROXY", + &plugin->proxy_hostname)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found proxy host: `%s'\n", + plugin->proxy_hostname); + /* proxy username */ + if (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, + plugin->name, + "PROXY_USERNAME", + &plugin->proxy_username)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found proxy username name: `%s'\n", + plugin->proxy_username); + } + + /* proxy password */ + if (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, + plugin->name, + "PROXY_PASSWORD", + &plugin->proxy_password)) + { + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found proxy password name: `%s'\n", + plugin->proxy_password); + } + + /* proxy type */ + if (GNUNET_OK == + GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, + plugin->name, + "PROXY_TYPE", + &proxy_type)) + { + GNUNET_STRINGS_utf8_toupper (proxy_type, proxy_type); + + if (0 == strcmp(proxy_type, "HTTP")) + plugin->proxytype = CURLPROXY_HTTP; + else if (0 == strcmp(proxy_type, "SOCKS4")) + plugin->proxytype = CURLPROXY_SOCKS4; + else if (0 == strcmp(proxy_type, "SOCKS5")) + plugin->proxytype = CURLPROXY_SOCKS5; + else if (0 == strcmp(proxy_type, "SOCKS4A")) + plugin->proxytype = CURLPROXY_SOCKS4A; + else if (0 == strcmp(proxy_type, "SOCKS5_HOSTNAME ")) + plugin->proxytype = CURLPROXY_SOCKS5_HOSTNAME ; + else + { + LOG (GNUNET_ERROR_TYPE_ERROR, + _("Invalid proxy type: `%s', disabling proxy! Check configuration!\n"), + proxy_type); + + GNUNET_free (proxy_type); + GNUNET_free (plugin->proxy_hostname); + plugin->proxy_hostname = NULL; + GNUNET_free_non_null (plugin->proxy_username); + plugin->proxy_username = NULL; + GNUNET_free_non_null (plugin->proxy_password); + plugin->proxy_password = NULL; + + return GNUNET_SYSERR; + } + + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Found proxy type: `%s'\n", + proxy_type); + } + + /* proxy http tunneling */ + plugin->proxy_use_httpproxytunnel + = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, + plugin->name, + "PROXY_HTTP_TUNNELING"); + if (GNUNET_SYSERR == plugin->proxy_use_httpproxytunnel) + plugin->proxy_use_httpproxytunnel = GNUNET_NO; + + GNUNET_free_non_null (proxy_type); + } + + /* Should we emulate an XHR client for testing? */ + plugin->emulate_xhr + = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, + plugin->name, + "EMULATE_XHR"); return GNUNET_OK; } +/** + * Function to convert an address to a human-readable string. + * + * @param cls closure + * @param addr address to convert + * @param addrlen address length + * @return res string if conversion was successful, NULL otherwise + */ static const char * -http_plugin_address_to_string (void *cls, - const void *addr, - size_t addrlen) +http_client_plugin_address_to_string (void *cls, + const void *addr, + size_t addrlen) { - return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen); + return http_common_plugin_address_to_string (PLUGIN_NAME, + addr, + addrlen); } +/** + * Function that will be called whenever the transport service wants to + * notify the plugin that a session is still active and in use and + * therefore the session timeout for this session has to be updated + * + * @param cls closure + * @param peer which peer was the session for + * @param session which session is being updated + */ static void http_client_plugin_update_session_timeout (void *cls, - const struct GNUNET_PeerIdentity *peer, - struct Session *session) + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_ATS_Session *session) +{ + client_reschedule_session_timeout (session); +} + + +/** + * Function that will be called whenever the transport service wants to + * notify the plugin that the inbound quota changed and that the plugin + * should update it's delay for the next receive value + * + * @param cls closure + * @param peer which peer was the session for + * @param s which session is being updated + * @param delay new delay to use for receiving + */ +static void +http_client_plugin_update_inbound_delay (void *cls, + const struct GNUNET_PeerIdentity *peer, + struct GNUNET_ATS_Session *s, + struct GNUNET_TIME_Relative delay) +{ + s->next_receive = GNUNET_TIME_relative_to_absolute (delay); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "New inbound delay %s\n", + GNUNET_STRINGS_relative_time_to_string (delay, + GNUNET_NO)); + if (s->recv_wakeup_task != NULL) + { + GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); + s->recv_wakeup_task + = GNUNET_SCHEDULER_add_delayed (delay, + &client_wake_up, + s); + } +} + + +/** + * Return information about the given session to the + * monitor callback. + * + * @param cls the `struct Plugin` with the monitor callback (`sic`) + * @param peer peer we send information about + * @param value our `struct GNUNET_ATS_Session` to send information about + * @return #GNUNET_OK (continue to iterate) + */ +static int +send_session_info_iter (void *cls, + const struct GNUNET_PeerIdentity *peer, + void *value) +{ + struct HTTP_Client_Plugin *plugin = cls; + struct GNUNET_ATS_Session *session = value; + + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_INIT); + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_UP); /* FIXME: or handshake? */ + return GNUNET_OK; +} + + +/** + * Begin monitoring sessions of a plugin. There can only + * be one active monitor per plugin (i.e. if there are + * multiple monitors, the transport service needs to + * multiplex the generated events over all of them). + * + * @param cls closure of the plugin + * @param sic callback to invoke, NULL to disable monitor; + * plugin will being by iterating over all active + * sessions immediately and then enter monitor mode + * @param sic_cls closure for @a sic + */ +static void +http_client_plugin_setup_monitor (void *cls, + GNUNET_TRANSPORT_SessionInfoCallback sic, + void *sic_cls) { struct HTTP_Client_Plugin *plugin = cls; - /* lookup if session is really existing */ - if (GNUNET_YES != client_exist_session (plugin, session)) + plugin->sic = sic; + plugin->sic_cls = sic_cls; + if (NULL != sic) { - GNUNET_break (0); - return; + GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, + &send_session_info_iter, + plugin); + /* signal end of first iteration */ + sic (sic_cls, NULL, NULL); } - client_reschedule_session_timeout (session); } + /** * Entry point for the plugin. */ @@ -1793,7 +2457,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) initialze the plugin or the API */ api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); api->cls = NULL; - api->address_to_string = &http_plugin_address_to_string; + api->address_to_string = &http_client_plugin_address_to_string; api->string_to_address = &http_common_plugin_string_to_address; api->address_pretty_printer = &http_common_plugin_address_pretty_printer; return api; @@ -1801,20 +2465,24 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) plugin = GNUNET_new (struct HTTP_Client_Plugin); plugin->env = env; + plugin->sessions = GNUNET_CONTAINER_multipeermap_create (128, + GNUNET_YES); api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions); api->cls = plugin; api->send = &http_client_plugin_send; - api->disconnect_session = &http_client_session_disconnect; + api->disconnect_session = &http_client_plugin_session_disconnect; api->query_keepalive_factor = &http_client_query_keepalive_factor; - api->disconnect_peer = &http_client_peer_disconnect; + api->disconnect_peer = &http_client_plugin_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->address_to_string = &http_client_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->get_network = &http_client_plugin_get_network; + api->get_network_for_address = &http_client_plugin_get_network_for_address; api->update_session_timeout = &http_client_plugin_update_session_timeout; - + api->update_inbound_delay = &http_client_plugin_update_inbound_delay; + api->setup_monitor = &http_client_plugin_setup_monitor; #if BUILD_HTTPS plugin->name = "transport-https_client"; plugin->protocol = "https"; @@ -1823,7 +2491,6 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) plugin->protocol = "http"; #endif plugin->last_tag = 1; - plugin->options = 0; /* Setup options */ if (GNUNET_SYSERR == client_configure_plugin (plugin)) {