/*
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
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.
*/
/**
#include "gnunet_protocols.h"
#include "gnunet_transport_plugin.h"
#include "plugin_transport_http_common.h"
+#if HAVE_CURL_CURL_H
#include <curl/curl.h>
+#elif HAVE_GNURL_CURL_H
+#include <gnurl/curl.h>
+#endif
#define LOG(kind,...) GNUNET_log_from(kind, PLUGIN_NAME, __VA_ARGS__)
/**
* Session handle for HTTP(S) connections.
*/
-struct Session;
+struct GNUNET_ATS_Session;
/**
/**
* The related session
*/
- struct Session *s;
+ struct GNUNET_ATS_Session *s;
};
/**
* Session handle for connections.
*/
-struct Session
+struct GNUNET_ATS_Session
{
/**
* The URL to connect to
/**
* 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.
unsigned int msgs_in_queue;
/**
- * ATS network type in NBO
+ * ATS network type.
*/
- uint32_t ats_address_network_type;
+ enum GNUNET_ATS_Network_Type scope;
};
/**
* curl perform task
*/
- GNUNET_SCHEDULER_TaskIdentifier client_perform_task;
+ struct GNUNET_SCHEDULER_Task * client_perform_task;
/**
* Type of proxy server:
int emulate_xhr;
};
+
/**
* Disconnect a session
*
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
static int
-http_client_plugin_session_disconnect (void *cls, struct Session *s);
+http_client_plugin_session_disconnect (void *cls, struct GNUNET_ATS_Session *s);
+
/**
* If a session monitor is attached, notify it about the new
*/
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;
* @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 (GNUNET_SCHEDULER_NO_TASK != s->recv_wakeup_task)
+ if (NULL != s->recv_wakeup_task)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
- s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+ s->recv_wakeup_task = NULL;
}
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_remove (plugin->sessions,
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)
plugin->cur_requests--;
s->get.easyhandle = NULL;
}
+
GNUNET_STATISTICS_set (plugin->env->stats,
HTTP_STAT_STR_CONNECTIONS,
plugin->cur_requests,
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);
* @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);
}
* @param tc gnunet scheduler task context
*/
static void
-client_run (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+client_run (void *cls);
/**
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);
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));
+ 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)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("%s failed at %s:%d: `%s'\n"),
return GNUNET_OK;
}
+
#if VERBOSE_CURL
/**
* Loggging function
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)
{
ttype = "UNSPECIFIED";
break;
}
- memcpy (text, data, size);
+ GNUNET_memcpy (text, data, size);
if (text[size - 1] == '\n')
{
text[size] = '\0';
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
static int
-client_connect_get (struct Session *s);
+client_connect_get (struct GNUNET_ATS_Session *s);
/**
* @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);
/**
* 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,
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));
+ 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);
GNUNET_free (stat_txt);
notify_session_monitor (plugin,
s,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
if (H_TMP_DISCONNECTING == s->put.state)
{
/* PUT request is currently getting disconnected */
if (H_PAUSED == s->put.state)
{
/* PUT request was paused, unpause */
- GNUNET_assert (s->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK);
+ 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/request %p: unpausing request\n",
s, s->put.easyhandle);
*/
static int
http_client_plugin_session_disconnect (void *cls,
- struct Session *s)
+ struct GNUNET_ATS_Session *s)
{
struct HTTP_Client_Plugin *plugin = cls;
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);
*
* @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
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;
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);
+ GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
+ target,
+ &destroy_session_cb,
+ plugin);
}
/**
* Closure for #session_lookup_client_by_address().
*/
-struct SessionClientCtx
+struct GNUNET_ATS_SessionClientCtx
{
/**
* Address we are looking for.
/**
* 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
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))
* @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;
* after a while (so that gnurl stops asking). This task
* 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/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);
+ curl_easy_pause (s->put.easyhandle,
+ CURLPAUSE_CONT);
client_schedule (s->plugin, GNUNET_YES);
}
* @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`
+ * @param cls our `struct GNUNET_ATS_Session`
* @return bytes written to stream, returning 0 will terminate request!
*/
static size_t
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;
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p/request %p: PUT request finished\n",
- s, s->put.easyhandle);
+ 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,
+ 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;
}
/* 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/request %p: sent message with %u bytes sent, removing message from queue\n",
- s, s->put.easyhandle, msg->size, msg->pos);
+ s,
+ s->put.easyhandle,
+ msg->size,
+ msg->pos);
/* Calling transmit continuation */
GNUNET_CONTAINER_DLL_remove (s->msg_head,
s->msg_tail,
}
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);
* 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/request %p: Waking up GET handle\n",
s, s->get.easyhandle);
if (H_PAUSED == s->put.state)
{
/* PUT request was paused, unpause */
- GNUNET_assert (s->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK);
+ 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;
s->put.state = H_CONNECTED;
if (NULL != s->put.easyhandle)
curl_easy_pause (s->put.easyhandle, CURLPAUSE_CONT);
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);
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 / request %p: Received %u bytes from peer `%s'\n",
- s, s->get.easyhandle,
- len, GNUNET_i2s (&s->address->peer));
+ 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)
{
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,
* 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;
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
{
while (NULL != (msg = curl_multi_info_read (plugin->curl_multi_handle, &msgs_left)))
{
CURL *easy_h = msg->easy_handle;
- struct Session *s = NULL;
+ 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 Session *) d;
+ s = (struct GNUNET_ATS_Session *) d;
GNUNET_assert (NULL != s);
if (msg->msg != CURLMSG_DONE)
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
GNUNET_assert (plugin->cur_requests > 0);
plugin->cur_requests--;
LOG (GNUNET_ERROR_TYPE_INFO,
- "%s request done, number of requests decreased to %u\n",
+ "%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)
}
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);
}
+#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 request for a session
*
* @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;
+ ha = (struct HttpAddress *) s->address->address;
+ options = ntohl (ha->options);
/* create get request */
s->get.easyhandle = curl_easy_init ();
s->get.s = s;
+ 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->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);
+ 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->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->get.easyhandle, CURLOPT_SSL_VERIFYPEER, 1L);
- curl_easy_setopt (s->get.easyhandle, 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->get.easyhandle, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->get.easyhandle, 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->get.easyhandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
- curl_easy_setopt (s->get.easyhandle, 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->get.easyhandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
- curl_easy_setopt (s->get.easyhandle, 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 (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);
+ 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);
+ 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);
+ 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);
+ 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_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_HEADERFUNCTION, &curl_get_header_cb);
- //curl_easy_setopt (s->get.easyhandle, CURLOPT_WRITEHEADER, ps);
- 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);
+ }
+ 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->get.easyhandle, CURLOPT_TIMEOUT, 0);
- curl_easy_setopt (s->get.easyhandle, CURLOPT_PRIVATE, s);
- curl_easy_setopt (s->get.easyhandle, 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->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->get.easyhandle, CURLOPT_FOLLOWLOCATION, 0);
+ curl_easy_setopt (s->get.easyhandle,
+ CURLOPT_FOLLOWLOCATION,
+ 0L);
mret = curl_multi_add_handle (s->plugin->curl_multi_handle,
s->get.easyhandle);
curl_easy_cleanup (s->get.easyhandle);
s->get.easyhandle = NULL;
s->get.s = NULL;
- s->get.easyhandle = 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);
+ 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;
}
* @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;
+ 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);
+ "Session %p: Init PUT handle\n",
+ s);
s->put.easyhandle = curl_easy_init ();
s->put.s = s;
#if VERBOSE_CURL
- 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);
+ 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->put.easyhandle, 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;
if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
(ntohl (ha->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
{
- curl_easy_setopt (s->put.easyhandle, CURLOPT_SSL_VERIFYPEER, 1L);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, CURLOPT_PROXY, s->plugin->proxy_hostname);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, 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->put.easyhandle, 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->put.easyhandle, CURLOPT_HTTPPROXYTUNNEL,
- 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_HEADERFUNCTION, &client_curl_header);
- //curl_easy_setopt (s->put.easyhandle, CURLOPT_WRITEHEADER, ps);
- 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);
+ 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->put.easyhandle, CURLOPT_TIMEOUT, 0);
- curl_easy_setopt (s->put.easyhandle, CURLOPT_PRIVATE, s);
- curl_easy_setopt (s->put.easyhandle, 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->put.easyhandle, CURLOPT_BUFFERSIZE,
2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
s, curl_multi_strerror (mret));
curl_easy_cleanup (s->put.easyhandle);
s->put.easyhandle = NULL;
- s->put.easyhandle = NULL;
s->put.s = NULL;
s->put.state = H_DISCONNECTED;
return GNUNET_SYSERR;
* @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))
- {
- LOG(GNUNET_ERROR_TYPE_DEBUG, "Invalid address peer `%s'\n",
- GNUNET_i2s(&s->address->peer));
- return GNUNET_SYSERR;
- }
+ 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->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,
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p: connected with GET %p and PUT %p\n",
- s, s->get.easyhandle, s->put.easyhandle);
+ s, s->get.easyhandle,
+ s->put.easyhandle);
/* Perform connect */
GNUNET_STATISTICS_set (plugin->env->stats,
HTTP_STAT_STR_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;
}
/* Schedule task to run immediately */
- plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, plugin);
+ plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run,
+ plugin);
return res;
}
*/
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)
{
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);
* @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;
}
/* 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)
{
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 = GNUNET_new (struct GNUNET_ATS_Session);
s->plugin = plugin;
s->address = GNUNET_HELLO_address_copy (address);
- s->ats_address_network_type = ats.value;
+ s->scope = net_type;
s->put.state = H_NOT_CONNECTED;
s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_CLIENT_SESSION_TIMEOUT);
client_delete_session (s);
return NULL;
}
- notify_session_monitor (plugin, s, GNUNET_TRANSPORT_SS_UP); /* or handshake? */
+ notify_session_monitor (plugin,
+ s,
+ GNUNET_TRANSPORT_SS_INIT);
+ notify_session_monitor (plugin,
+ s,
+ GNUNET_TRANSPORT_SS_UP); /* or handshake? */
return s;
}
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)
{
unsigned long long max_requests;
char *proxy_type;
-
/* Optional parameters */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
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",
/**
- * 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,
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);
}
*
* @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);
"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);
+ s->recv_wakeup_task
+ = GNUNET_SCHEDULER_add_delayed (delay,
+ &client_wake_up,
+ s);
}
}
*
* @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
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;
}
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;
projects / oweals / gnunet.git / blobdiff