X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http_client.c;h=ceed94af8b2d700e7ddd7bdcde231364bd593e57;hb=abdec5e11ff11bb10d32c013e11344a54786f80f;hp=68b25afe59ffd32c162d6bcb602106d15923b150;hpb=783e60f8924e639220c0dbf0d6aa55164ad79a91;p=oweals%2Fgnunet.git diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 68b25afe5..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-2014 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,8 +14,8 @@ 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. */ /** @@ -37,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) @@ -49,7 +49,11 @@ #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__) @@ -59,6 +63,46 @@ */ 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 @@ -106,17 +150,22 @@ struct HTTP_Message /** - * 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 */ @@ -125,21 +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; - /** * The URL to connect to */ @@ -155,25 +198,15 @@ struct Session */ struct HTTP_Client_Plugin *plugin; - /** - * Client send handle - */ - void *client_put; - /** * Handle for the HTTP PUT request. */ - struct ConnectionHandle put; + struct RequestHandle put; /** * Handle for the HTTP GET request. */ - struct ConnectionHandle get; - - /** - * Client receive handle - */ - void *client_get; + struct RequestHandle get; /** * next pointer for double linked list @@ -193,17 +226,17 @@ struct Session /** * Session timeout task */ - GNUNET_SCHEDULER_TaskIdentifier put_disconnect_task; + struct GNUNET_SCHEDULER_Task *put_disconnect_task; /** * Session timeout task */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + struct GNUNET_SCHEDULER_Task *timeout_task; /** * Task to wake up client receive handle when receiving is allowed again */ - GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task; + struct GNUNET_SCHEDULER_Task *recv_wakeup_task; /** * Absolute time when to receive data again. @@ -233,29 +266,9 @@ struct Session unsigned int msgs_in_queue; /** - * ATS network type in NBO - */ - uint32_t ats_address_network_type; - - /** - * Is the client PUT handle currently paused? - */ - int put_paused; - - /** - * Is the client PUT handle disconnect in progress? + * ATS network type. */ - int put_tmp_disconnecting; - - /** - * Is the client PUT handle temporarily disconnected? - */ - int put_tmp_disconnected; - - /** - * We received data to send while disconnecting, reconnect immediately - */ - int put_reconnect_required; + enum GNUNET_ATS_Network_Type scope; }; @@ -317,7 +330,7 @@ struct HTTP_Client_Plugin /** * curl perform task */ - GNUNET_SCHEDULER_TaskIdentifier client_perform_task; + struct GNUNET_SCHEDULER_Task * client_perform_task; /** * Type of proxy server: @@ -344,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 @@ -369,9 +382,23 @@ struct HTTP_Client_Plugin */ uint16_t use_ipv4; + /** + * Should we emulate an XHR client for testing? + */ + int emulate_xhr; }; +/** + * 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 @@ -383,7 +410,7 @@ struct HTTP_Client_Plugin */ static void notify_session_monitor (struct HTTP_Client_Plugin *plugin, - struct Session *session, + struct GNUNET_ATS_Session *session, enum GNUNET_TRANSPORT_SessionState state) { struct GNUNET_TRANSPORT_SessionInfo info; @@ -410,28 +437,70 @@ notify_session_monitor (struct HTTP_Client_Plugin *plugin, * @param s the session to delete */ static void -client_delete_session (struct Session *s) +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 (GNUNET_SCHEDULER_NO_TASK != s->timeout_task) + if (NULL != s->timeout_task) { GNUNET_SCHEDULER_cancel (s->timeout_task); - s->timeout_task = GNUNET_SCHEDULER_NO_TASK; + s->timeout_task = NULL; s->timeout = GNUNET_TIME_UNIT_ZERO_ABS; } - if (GNUNET_SCHEDULER_NO_TASK != s->put_disconnect_task) + if (NULL != s->put_disconnect_task) { GNUNET_SCHEDULER_cancel (s->put_disconnect_task); - s->put_disconnect_task = GNUNET_SCHEDULER_NO_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->target, + &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)) { @@ -445,7 +514,7 @@ client_delete_session (struct Session *s) s->bytes_in_queue -= pos->size; if (NULL != pos->transmit_cont) pos->transmit_cont (pos->transmit_cont_cls, - &s->target, + &s->address->peer, GNUNET_SYSERR, pos->size, pos->pos + s->overhead); @@ -456,7 +525,7 @@ client_delete_session (struct Session *s) GNUNET_assert (0 == s->bytes_in_queue); notify_session_monitor (plugin, s, - GNUNET_TRANSPORT_SS_DOWN); + GNUNET_TRANSPORT_SS_DONE); if (NULL != s->msg_tk) { GNUNET_SERVER_mst_destroy (s->msg_tk); @@ -474,9 +543,9 @@ client_delete_session (struct Session *s) * @param s the session */ static void -client_reschedule_session_timeout (struct Session *s) +client_reschedule_session_timeout (struct GNUNET_ATS_Session *s) { - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); + GNUNET_assert (NULL != s->timeout_task); s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT); } @@ -488,8 +557,7 @@ client_reschedule_session_timeout (struct Session *s) * @param tc gnunet scheduler task context */ static void -client_run (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +client_run (void *cls); /** @@ -514,10 +582,10 @@ client_schedule (struct HTTP_Client_Plugin *plugin, struct GNUNET_TIME_Relative timeout; /* Cancel previous scheduled task */ - if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK) + if (plugin->client_perform_task != NULL) { GNUNET_SCHEDULER_cancel (plugin->client_perform_task); - plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK; + plugin->client_perform_task = NULL; } max = -1; FD_ZERO (&rs); @@ -526,22 +594,25 @@ client_schedule (struct HTTP_Client_Plugin *plugin, 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)); + 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) + 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 (mret != CURLM_OK) + if (CURLM_OK != mret) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + LOG (GNUNET_ERROR_TYPE_ERROR, _("%s failed at %s:%d: `%s'\n"), "curl_multi_timeout", __FILE__, __LINE__, curl_multi_strerror (mret)); @@ -553,6 +624,7 @@ client_schedule (struct HTTP_Client_Plugin *plugin, 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, @@ -563,6 +635,7 @@ client_schedule (struct HTTP_Client_Plugin *plugin, } +#if VERBOSE_CURL /** * Loggging function * @@ -580,11 +653,13 @@ client_log (CURL *curl, 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) { @@ -606,7 +681,7 @@ client_log (CURL *curl, ttype = "UNSPECIFIED"; break; } - memcpy (text, data, size); + GNUNET_memcpy (text, data, size); if (text[size - 1] == '\n') { text[size] = '\0'; @@ -617,22 +692,32 @@ client_log (CURL *curl, text[size + 1] = '\0'; } LOG (GNUNET_ERROR_TYPE_DEBUG, - "Connection %p %s: %s", + "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 connection + * 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 Session *s); +client_connect_put (struct GNUNET_ATS_Session *s); /** @@ -657,14 +742,14 @@ client_connect_put (struct Session *s); * 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, + struct GNUNET_ATS_Session *s, const char *msgbuf, size_t msgbuf_size, unsigned int priority, @@ -677,19 +762,21 @@ http_client_plugin_send (void *cls, char *stat_txt; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %p: Sending message with %u to peer `%s' \n", - s, s->client_put, - msgbuf_size, GNUNET_i2s (&s->target)); + "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_memcpy (msg->buf, + msgbuf, + msgbuf_size); GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg); @@ -704,43 +791,43 @@ http_client_plugin_send (void *cls, GNUNET_free (stat_txt); notify_session_monitor (plugin, s, - GNUNET_TRANSPORT_SS_UP); - if (GNUNET_YES == s->put_tmp_disconnecting) + GNUNET_TRANSPORT_SS_UPDATE); + if (H_TMP_DISCONNECTING == s->put.state) { - /* PUT connection is currently getting disconnected */ - s->put_reconnect_required = GNUNET_YES; + /* PUT request is currently getting disconnected */ + s->put.state = H_TMP_RECONNECT_REQUIRED; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %jp: currently disconnecting, reconnecting immediately\n", + "Session %p/request %p: currently disconnecting, reconnecting immediately\n", s, - s->client_put); + s->put.easyhandle); return msgbuf_size; } - 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; + s->put_disconnect_task = NULL; LOG (GNUNET_ERROR_TYPE_DEBUG, - "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); + "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 */ - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p: Reconnecting PUT connection\n", - s); - s->put_tmp_disconnected = GNUNET_NO; - GNUNET_break (NULL == s->client_put); + /* 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); + client_schedule (s->plugin, GNUNET_YES); return msgbuf_size; } @@ -754,100 +841,27 @@ http_client_plugin_send (void *cls, */ static int http_client_plugin_session_disconnect (void *cls, - struct Session *s) + 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 (NULL != s->client_put) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "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) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "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_assert (0 < s->msgs_in_queue); - s->msgs_in_queue--; - GNUNET_assert (msg->size <= s->bytes_in_queue); - s->bytes_in_queue -= msg->size; - 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); LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p: notifying transport about ending session\n",s); - - plugin->env->session_end (plugin->env->cls, s->address, s); + "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; } @@ -871,7 +885,7 @@ http_client_query_keepalive_factor (void *cls) * * @param cls the `struct HTTP_Client_Plugin *` * @param peer identity of the peer - * @param value the `struct Session *` + * @param value the `struct GNUNET_ATS_Session *` * @return #GNUNET_OK (continue iterating) */ static int @@ -880,7 +894,7 @@ destroy_session_cb (void *cls, void *value) { struct HTTP_Client_Plugin *plugin = cls; - struct Session *session = value; + struct GNUNET_ATS_Session *session = value; http_client_plugin_session_disconnect (plugin, session); return GNUNET_OK; @@ -914,7 +928,7 @@ http_client_plugin_peer_disconnect (void *cls, /** * Closure for #session_lookup_client_by_address(). */ -struct SessionClientCtx +struct GNUNET_ATS_SessionClientCtx { /** * Address we are looking for. @@ -924,16 +938,16 @@ struct SessionClientCtx /** * Session that was found. */ - struct Session *ret; + struct GNUNET_ATS_Session *ret; }; /** * Locate the seession object for a given address. * - * @param cls the `struct SessionClientCtx *` + * @param cls the `struct GNUNET_ATS_SessionClientCtx *` * @param key peer identity - * @param value the `struct Session` to check + * @param value the `struct GNUNET_ATS_Session` to check * @return #GNUNET_NO if found, #GNUNET_OK if not */ static int @@ -941,8 +955,8 @@ session_lookup_client_by_address (void *cls, const struct GNUNET_PeerIdentity *key, void *value) { - struct SessionClientCtx *sc_ctx = cls; - struct Session *s = 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)) @@ -961,11 +975,11 @@ session_lookup_client_by_address (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 SessionClientCtx sc_ctx; + struct GNUNET_ATS_SessionClientCtx sc_ctx; sc_ctx.address = address; sc_ctx.ret = NULL; @@ -979,25 +993,23 @@ client_lookup_session (struct HTTP_Client_Plugin *plugin, /** * 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 pauses the PUT. + * is the delayed task that actually disconnects the PUT. * - * @param cls the `struct Session *` with the put - * @param tc scheduler context + * @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; + struct GNUNET_ATS_Session *s = cls; - s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK; + s->put_disconnect_task = NULL; LOG (GNUNET_ERROR_TYPE_DEBUG, - "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); + "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); } @@ -1009,8 +1021,8 @@ 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, @@ -1018,30 +1030,42 @@ client_send_cb (void *stream, 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 == s->put_tmp_disconnecting) + if (H_TMP_DISCONNECTING == s->put.state) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %p: disconnect due to inactivity\n", - s, - s->client_put); + "Session %p/request %p: disconnect due to inactivity\n", + s, s->put.easyhandle); return 0; } if (NULL == msg) { + 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/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; + "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 */ @@ -1049,13 +1073,18 @@ client_send_cb (void *stream, /* 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) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %p: sent message with %u bytes sent, removing message from queue\n", - s, s->client_put, msg->size, msg->pos); + "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, @@ -1066,7 +1095,7 @@ client_send_cb (void *stream, s->bytes_in_queue -= msg->size; if (NULL != msg->transmit_cont) msg->transmit_cont (msg->transmit_cont_cls, - &s->target, + &s->address->peer, GNUNET_OK, msg->size, msg->size + s->overhead); @@ -1075,7 +1104,7 @@ client_send_cb (void *stream, } notify_session_monitor (plugin, s, - GNUNET_TRANSPORT_SS_UP); + GNUNET_TRANSPORT_SS_UPDATE); GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol); @@ -1100,34 +1129,28 @@ client_send_cb (void *stream, * 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 GNUNET_ATS_Session *s = cls; - s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK; - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) - return; + s->recv_wakeup_task = NULL; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %p: Waking up GET handle\n", - s, - s->client_get); - if (GNUNET_YES == s->put_paused) + "Session %p/request %p: Waking up GET handle\n", + s, s->get.easyhandle); + 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; - s->put_paused = GNUNET_NO; - if (NULL != s->client_put) - curl_easy_pause (s->client_put, CURLPAUSE_CONT); + s->put_disconnect_task = NULL; + s->put.state = H_CONNECTED; + if (NULL != s->put.easyhandle) + curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT); } - 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); } @@ -1144,25 +1167,16 @@ 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; - atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE); - atsi.value = s->ats_address_network_type; - GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED)); - delay = s->plugin->env->receive (plugin->env->cls, s->address, s, message); - plugin->env->update_address_metrics (plugin->env->cls, - s->address, s, - &atsi, 1); - GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol); @@ -1177,7 +1191,7 @@ client_receive_mst_cb (void *cls, { LOG (GNUNET_ERROR_TYPE_DEBUG, "Client: peer `%s' address `%s' next read delayed for %s\n", - GNUNET_i2s (&s->target), + GNUNET_i2s (&s->address->peer), http_common_plugin_address_to_string (s->plugin->protocol, s->address->address, s->address->address_length), @@ -1190,7 +1204,7 @@ client_receive_mst_cb (void *cls, /** - * Callback method used with libcurl when data for a PUT connection are + * 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 @@ -1210,7 +1224,7 @@ client_receive_put (void *stream, /** - * Callback method used with libcurl when data for a GET connection are + * Callback method used with libcurl when data for a GET request are * received. Forward to MST * * @param stream pointer where to write data @@ -1225,14 +1239,16 @@ client_receive (void *stream, size_t nmemb, void *cls) { - struct Session *s = cls; + struct GNUNET_ATS_Session *s = cls; struct GNUNET_TIME_Absolute now; size_t len = size * nmemb; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p / connection %p: Received %u bytes from peer `%s'\n", - s, s->client_get, - len, GNUNET_i2s (&s->target)); + "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) { @@ -1241,15 +1257,15 @@ client_receive (void *stream, = GNUNET_TIME_absolute_get_difference (now, s->next_receive); LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %s\n", + "Session %p / request %p: No inbound bandwidth available! Next read was delayed for %s\n", s, - s->client_get, + s->get.easyhandle, GNUNET_STRINGS_relative_time_to_string (delta, GNUNET_YES)); - if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK) + if (s->recv_wakeup_task != NULL) { GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); - s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK; + s->recv_wakeup_task = NULL; } s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delta, @@ -1274,124 +1290,147 @@ client_receive (void *stream, * Task performing curl operations * * @param cls plugin as closure - * @param tc 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; - 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; + struct GNUNET_ATS_Session *s = NULL; + char *d = NULL; /* curl requires 'd' to be a 'char *' */ - if (NULL == easy_h) - { - GNUNET_break (0); + 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, - "Client: connection to ended with reason %i: `%s', %i handles running\n", + "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), running); - continue; - } - - GNUNET_assert (CURLE_OK == - curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d)); - s = (struct Session *) d; - GNUNET_assert (s != NULL); - if (msg->msg == CURLMSG_DONE) + 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 (CURLE_OK == curl_easy_getinfo (easy_h, - CURLINFO_RESPONSE_CODE, &http_statuscode)); - if (easy_h == s->client_put) - { - if ((0 != msg->data.result) || (http_statuscode != 200)) + /* 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)) { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "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 - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p/connection %p: PUT connection to `%s' ended normal\n", - s, msg->easy_handle, - GNUNET_i2s (&s->target)); - if (NULL == s->client_get) - { - /* Disconnect other transmission direction and tell transport */ - /* FIXME? */ - } - 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); - } + /* 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; } - if (easy_h == s->client_get) + } + else if (GNUNET_NO == put_request) + { + /* 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)) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "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 - LOG (GNUNET_ERROR_TYPE_DEBUG, - "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; + if (GNUNET_SYSERR == client_connect_get (s)) http_client_plugin_session_disconnect (plugin, s); } + else + { + /* 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); @@ -1399,128 +1438,297 @@ client_run (void *cls, } +#ifdef TCP_STEALTH /** - * Connect GET connection for a session + * 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 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 - if (s->plugin->proxy_hostname != NULL) + if (NULL != s->plugin->proxy_hostname) { - curl_easy_setopt (s->client_get, CURLOPT_PROXY, s->plugin->proxy_hostname); - curl_easy_setopt (s->client_get, CURLOPT_PROXYTYPE, s->plugin->proxytype); + 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->client_get, CURLOPT_PROXYUSERNAME, - 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->client_get, CURLOPT_PROXYPASSWORD, - 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->client_get, CURLOPT_HTTPPROXYTUNNEL, - s->plugin->proxy_use_httpproxytunnel); + curl_easy_setopt (s->get.easyhandle, + CURLOPT_HTTPPROXYTUNNEL, + s->plugin->proxy_use_httpproxytunnel); } - 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 (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) { 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->client_get); - s->client_get = NULL; - s->get.s = NULL; + 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 */ + 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->client_put = curl_easy_init (); + "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; @@ -1528,134 +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_put, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS); - curl_easy_setopt (s->client_put, 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_put, CURLOPT_PROTOCOLS, CURLPROTO_HTTP); - curl_easy_setopt (s->client_put, 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 - if (s->plugin->proxy_hostname != NULL) + if (NULL != s->plugin->proxy_hostname) { - curl_easy_setopt (s->client_put, CURLOPT_PROXY, s->plugin->proxy_hostname); - curl_easy_setopt (s->client_put, CURLOPT_PROXYTYPE, s->plugin->proxytype); + 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->client_put, CURLOPT_PROXYUSERNAME, - 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->client_put, CURLOPT_PROXYPASSWORD, - 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->client_put, CURLOPT_HTTPPROXYTUNNEL, - s->plugin->proxy_use_httpproxytunnel); + curl_easy_setopt (s->put.easyhandle, + CURLOPT_HTTPPROXYTUNNEL, + s->plugin->proxy_use_httpproxytunnel); } - 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); + 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) { 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->client_put); - s->client_put = NULL; + 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 (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)) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Invalid address peer `%s'\n", - GNUNET_i2s (&s->target)); + GNUNET_i2s(&s->address->peer)); return GNUNET_SYSERR; } - GNUNET_asprintf (&s->url, "%s/%s;%u", - http_common_plugin_address_to_url (NULL, + 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_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->target), s->url); + GNUNET_i2s (&s->address->peer), s->url); - if ((GNUNET_SYSERR == client_connect_get (s)) || - (GNUNET_SYSERR == client_connect_put (s))) - { - plugin->env->session_end (plugin->env->cls, s->address, s); - client_delete_session (s); + 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; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Session %p: connected with connections GET %p and PUT %p\n", - s, - s->client_get, - s->client_put); + "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; } @@ -1669,26 +1927,42 @@ client_connect (struct Session *s) */ static enum GNUNET_ATS_Network_Type http_client_plugin_get_network (void *cls, - struct Session *session) + 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; + struct GNUNET_ATS_Session *s = cls; struct GNUNET_TIME_Relative left; - s->timeout_task = GNUNET_SCHEDULER_NO_TASK; + s->timeout_task = NULL; left = GNUNET_TIME_absolute_get_remaining (s->timeout); if (0 != left.rel_value_us) { @@ -1696,7 +1970,7 @@ client_session_timeout (void *cls, the monitor, it may think we're about to die ... */ notify_session_monitor (s->plugin, s, - GNUNET_TRANSPORT_SS_UP); + GNUNET_TRANSPORT_SS_UPDATE); s->timeout_task = GNUNET_SCHEDULER_add_delayed (left, &client_session_timeout, s); @@ -1721,14 +1995,14 @@ 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; + 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; @@ -1739,20 +2013,22 @@ http_client_plugin_get_session (void *cls, if (NULL != s) return s; - if (plugin->max_connections <= plugin->cur_connections) + /* create a new session */ + if (plugin->max_requests <= plugin->cur_requests) { LOG (GNUNET_ERROR_TYPE_WARNING, - "Maximum number of connections (%u) reached: " + "Maximum number of requests (%u) reached: " "cannot connect to peer `%s'\n", - plugin->max_connections, + 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; if (GNUNET_YES == res) @@ -1766,28 +2042,26 @@ http_client_plugin_get_session (void *cls, { salen = sizeof (struct sockaddr_in6); } - ats = plugin->env->get_address_type (plugin->env->cls, sa, salen); + net_type = plugin->env->get_address_type (plugin->env->cls, sa, salen); GNUNET_free (sa); } else if (GNUNET_NO == res) { /* Cannot convert to sockaddr -> is external hostname */ - ats.value = htonl (GNUNET_ATS_NET_WAN); + net_type = GNUNET_ATS_NET_WAN; } - if (GNUNET_ATS_NET_UNSPECIFIED == ntohl (ats.value)) + if (GNUNET_ATS_NET_UNSPECIFIED == net_type) { GNUNET_break (0); return NULL; } - s = GNUNET_new (struct Session); - s->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, @@ -1798,11 +2072,11 @@ http_client_plugin_get_session (void *cls, http_common_plugin_address_to_string (plugin->protocol, s->address->address, s->address->address_length), - GNUNET_i2s (&s->target)); + GNUNET_i2s (&s->address->peer)); /* add new session */ (void) GNUNET_CONTAINER_multipeermap_put (plugin->sessions, - &s->target, + &s->address->peer, s, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); /* initiate new connection */ @@ -1811,12 +2085,14 @@ http_client_plugin_get_session (void *cls, 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->target)); + 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? */ @@ -1893,10 +2169,10 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls) GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions, &destroy_session_cb, plugin); - if (GNUNET_SCHEDULER_NO_TASK != plugin->client_perform_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; } if (NULL != plugin->curl_multi_handle) { @@ -1926,26 +2202,28 @@ 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; + &max_requests)) + max_requests = 128; + plugin->max_requests = max_requests; LOG (GNUNET_ERROR_TYPE_DEBUG, - _("Maximum number of connections is %u\n"), - plugin->max_connections); + _("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)) + 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", @@ -2025,23 +2303,23 @@ client_configure_plugin (struct HTTP_Client_Plugin *plugin) 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 called by the pretty printer for the resolved address for - * each human-readable address obtained. The callback can be called - * several times. The last invocation must be with a @a address of - * NULL and a @a res of #GNUNET_OK. Thus, to indicate conversion - * errors, the callback might be called first with @a address NULL and - * @a res being #GNUNET_SYSERR. In that case, there must still be a - * subsequent call later with @a address NULL and @a res #GNUNET_OK. + * Function to convert an address to a human-readable string. * * @param cls closure - * @param address one of the names for the host, NULL on last callback - * @param res #GNUNET_OK if conversion was successful, #GNUNET_SYSERR on failure, - * #GNUNET_OK on last callback + * @param addr address to convert + * @param addrlen address length + * @return res string if conversion was successful, NULL otherwise */ static const char * http_client_plugin_address_to_string (void *cls, @@ -2066,7 +2344,7 @@ http_client_plugin_address_to_string (void *cls, static void http_client_plugin_update_session_timeout (void *cls, const struct GNUNET_PeerIdentity *peer, - struct Session *session) + struct GNUNET_ATS_Session *session) { client_reschedule_session_timeout (session); } @@ -2079,13 +2357,13 @@ http_client_plugin_update_session_timeout (void *cls, * * @param cls closure * @param peer which peer was the session for - * @param session which session is being updated + * @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 Session *s, + struct GNUNET_ATS_Session *s, struct GNUNET_TIME_Relative delay) { s->next_receive = GNUNET_TIME_relative_to_absolute (delay); @@ -2093,13 +2371,13 @@ http_client_plugin_update_inbound_delay (void *cls, "New inbound delay %s\n", GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_NO)); - if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK) + 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); + &client_wake_up, + s); } } @@ -2110,7 +2388,7 @@ http_client_plugin_update_inbound_delay (void *cls, * * @param cls the `struct Plugin` with the monitor callback (`sic`) * @param peer peer we send information about - * @param value our `struct Session` to send information about + * @param value our `struct GNUNET_ATS_Session` to send information about * @return #GNUNET_OK (continue to iterate) */ static int @@ -2119,11 +2397,14 @@ send_session_info_iter (void *cls, void *value) { struct HTTP_Client_Plugin *plugin = cls; - struct Session *session = value; + struct GNUNET_ATS_Session *session = value; notify_session_monitor (plugin, session, - GNUNET_TRANSPORT_SS_UP); + GNUNET_TRANSPORT_SS_INIT); + notify_session_monitor (plugin, + session, + GNUNET_TRANSPORT_SS_UP); /* FIXME: or handshake? */ return GNUNET_OK; } @@ -2198,6 +2479,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls) 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_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;