/*
This file is part of GNUnet
- (C) 2002-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2002-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* 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:
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,
static void
client_reschedule_session_timeout (struct 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);
}
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);
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);
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);
{
struct 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);
{
struct Session *s = cls;
- s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+ s->recv_wakeup_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
LOG (GNUNET_ERROR_TYPE_DEBUG,
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);
struct 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);
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,
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;
+ plugin->client_perform_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
}
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
/**
* Open TCP socket with TCP STEALTH enabled.
+ *
+ * @param clientp our `struct 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,
return (curl_socket_t) ret;
if ( (0 != setsockopt (ret,
IPPROTO_TCP,
- SO_TCPSTEALTH,
- &s->target,
+ 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;
}
case CURLSOCKTYPE_LAST:
GNUNET_break (0);
return CURL_SOCKET_BAD;
+ default:
+ GNUNET_break (0);
+ return CURL_SOCKET_BAD;
}
}
#endif
s->get.s = s;
if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
{
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
curl_easy_setopt (s->get.easyhandle,
CURLOPT_OPENSOCKETFUNCTION,
&open_tcp_stealth_socket_cb);
#endif
if (0 != (options & HTTP_OPTIONS_TCP_STEALTH))
{
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
curl_easy_setopt (s->put.easyhandle,
CURLOPT_OPENSOCKETFUNCTION,
&open_tcp_stealth_socket_cb);
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;
}
http_client_plugin_get_network (void *cls,
struct Session *session)
{
- return ntohl (session->ats_address_network_type);
+ return session->scope;
}
struct 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)
{
struct HTTP_Client_Plugin *plugin = cls;
struct 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);
+ net_type = GNUNET_ATS_NET_UNSPECIFIED;
sa = http_common_socket_from_address (address->address,
address->address_length,
&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->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);
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)
{
"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,