/*
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
/**
* Information we keep with MHD for an HTTP request.
*/
-struct ServerConnection
+struct ServerRequest
{
/**
- * The session this server connection belongs to
+ * The session this server request belongs to
+ * Can be NULL, when session was disconnected and freed
*/
struct Session *session;
int direction;
/**
- * For PUT connections: Is this the first or last callback with size 0
- * For GET connections: Have we sent a message
+ * For PUT requests: Is this the first or last callback with size 0
+ * For GET requests: Have we sent a message
*/
int connected;
/**
* Client recv handle
*/
- struct ServerConnection *server_recv;
+ struct ServerRequest *server_recv;
/**
* Client send handle
*/
- struct ServerConnection *server_send;
+ struct ServerRequest *server_send;
/**
* Address
/**
* Session timeout task
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task * timeout_task;
/**
* Task to resume MHD handling when receiving is allowed again
*/
- GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task;
+ struct GNUNET_SCHEDULER_Task * recv_wakeup_task;
/**
* Number of bytes waiting for transmission to this peer.
uint32_t tag;
/**
- * ATS network type in NBO
+ * ATS network type.
*/
- uint32_t ats_address_network_type;
+ enum GNUNET_ATS_Network_Type scope;
/**
* #GNUNET_YES if this session is known to the service.
/**
* MHD IPv4 task
*/
- GNUNET_SCHEDULER_TaskIdentifier server_v4_task;
+ struct GNUNET_SCHEDULER_Task * server_v4_task;
/**
* MHD IPv6 task
*/
- GNUNET_SCHEDULER_TaskIdentifier server_v6_task;
+ struct GNUNET_SCHEDULER_Task * server_v6_task;
/**
* Task calling transport service about external address
*/
- GNUNET_SCHEDULER_TaskIdentifier notify_ext_task;
+ struct GNUNET_SCHEDULER_Task * notify_ext_task;
/**
* Notify transport only about external address
/**
* Maximum number of sockets the plugin can use
- * Each http inbound /outbound connections are two connections
+ * Each http request /request connections are two connections
*/
- unsigned int max_connections;
+ unsigned int max_request;
/**
* Current number of sockets the plugin can use
- * Each http inbound /outbound connections are two connections
+ * Each http connection are two requests
*/
- unsigned int cur_connections;
+ unsigned int cur_request;
/**
* Did we immediately end the session in disconnect_cb
{
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,
{
struct HTTP_Server_Plugin *plugin = s->plugin;
struct HTTP_Message *msg;
- struct ServerConnection *send;
- struct ServerConnection *recv;
- 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->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;
if (NULL != s->server_recv)
MHD_resume_connection (s->server_recv->mhd_conn);
}
s->bytes_in_queue -= msg->size;
GNUNET_free (msg);
}
+
GNUNET_assert (0 == s->msgs_in_queue);
GNUNET_assert (0 == s->bytes_in_queue);
- send = s->server_send;
- if (NULL != send)
+
+ if (NULL != s->server_send)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Server: %p / %p Terminating inbound PUT session to peer `%s'\n",
- s, send,
+ s, s->server_send,
GNUNET_i2s (&s->target));
- send->session = NULL;
- MHD_set_connection_option (send->mhd_conn,
+ s->server_send->session = NULL;
+ MHD_set_connection_option (s->server_send->mhd_conn,
MHD_CONNECTION_OPTION_TIMEOUT,
1 /* 0 = no timeout, so this is MIN */);
- server_reschedule (plugin,
- send->mhd_daemon,
- GNUNET_YES);
+ server_reschedule (plugin, s->server_send->mhd_daemon, GNUNET_YES);
}
- recv = s->server_recv;
- if (NULL != recv)
+
+ if (NULL != s->server_recv)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Server: %p / %p Terminating inbound GET session to peer `%s'\n",
- s, recv, GNUNET_i2s (&s->target));
- recv->session = NULL;
- MHD_set_connection_option (recv->mhd_conn,
+ s, s->server_recv, GNUNET_i2s (&s->target));
+ s->server_recv->session = NULL;
+ MHD_set_connection_option (s->server_recv->mhd_conn,
MHD_CONNECTION_OPTION_TIMEOUT,
1 /* 0 = no timeout, so this is MIN */);
- server_reschedule (plugin,
- recv->mhd_daemon,
- GNUNET_YES);
+ server_reschedule (plugin, s->server_recv->mhd_daemon, GNUNET_YES);
}
notify_session_monitor (plugin,
s,
- GNUNET_TRANSPORT_SS_DOWN);
+ GNUNET_TRANSPORT_SS_DONE);
if (GNUNET_YES == s->known_to_service)
+ {
plugin->env->session_end (plugin->env->cls,
s->address,
s);
+ s->known_to_service = GNUNET_NO;
+ }
if (NULL != s->msg_tk)
{
GNUNET_SERVER_mst_destroy (s->msg_tk);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Session %p destroyed\n",
s);
+
GNUNET_free (s);
}
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)
{
static void
server_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);
}
char *stat_txt;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Session %p/connection %p: Sending message with %u to peer `%s'\n",
+ "Session %p/request %p: Sending message with %u to peer `%s'\n",
session,
session->server_send,
msgbuf_size,
}
+/**
+ * Terminate session during shutdown.
+ *
+ * @param cls the `struct HTTP_Server_Plugin *`
+ * @param peer for which this is a session
+ * @param value the `struct Session` to clean up
+ * @return #GNUNET_OK (continue to iterate)
+ */
+static int
+destroy_session_shutdown_cb (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ void *value)
+{
+ struct Session *s = value;
+ struct ServerRequest *sc_send;
+ struct ServerRequest *sc_recv;
+
+ sc_send = s->server_send;
+ sc_recv = s->server_recv;
+ server_delete_session (s);
+
+ GNUNET_free_non_null (sc_send);
+ GNUNET_free_non_null (sc_recv);
+
+ return GNUNET_OK;
+}
+
/**
* Terminate session.
*
return GNUNET_OK;
}
-
/**
* Function that can be used to force the plugin to disconnect
* from the given peer and cancel all previous transmissions
{
struct HTTP_Server_Plugin *plugin = cls;
- plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v4_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
plugin->server_v4_immediately = GNUNET_NO;
{
struct HTTP_Server_Plugin *plugin = cls;
- plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v6_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
plugin->server_v6_immediately = GNUNET_NO;
*
* @param plugin plugin
* @param daemon_handle the MHD daemon handle
+ * @param now schedule now
* @return gnunet task identifier
*/
-static GNUNET_SCHEDULER_TaskIdentifier
+static struct GNUNET_SCHEDULER_Task *
server_schedule (struct HTTP_Server_Plugin *plugin,
struct MHD_Daemon *daemon_handle,
int now)
{
- GNUNET_SCHEDULER_TaskIdentifier ret;
+ struct GNUNET_SCHEDULER_Task * ret;
fd_set rs;
fd_set ws;
fd_set es;
struct GNUNET_TIME_Relative tv;
if (GNUNET_YES == plugin->in_shutdown)
- return GNUNET_SCHEDULER_NO_TASK;
+ return NULL;
- ret = GNUNET_SCHEDULER_NO_TASK;
+ ret = NULL;
FD_ZERO (&rs);
FD_ZERO (&ws);
FD_ZERO (&es);
if (daemon_handle == plugin->server_v4)
{
- if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+ if (plugin->server_v4_task != NULL)
{
GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
- plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v4_task = NULL;
}
#if 0
LOG (GNUNET_ERROR_TYPE_DEBUG,
}
if (daemon_handle == plugin->server_v6)
{
- if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+ if (plugin->server_v6_task != NULL)
{
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
- plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v6_task = NULL;
}
#if 0
LOG (GNUNET_ERROR_TYPE_DEBUG,
if (GNUNET_YES == now)
plugin->server_v4_immediately = GNUNET_YES;
- if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+ if (plugin->server_v4_task != NULL)
{
GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
- plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v4_task = NULL;
}
plugin->server_v4_task = server_schedule (plugin, plugin->server_v4, now);
}
if (GNUNET_YES == now)
plugin->server_v6_immediately = GNUNET_YES;
- if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+ if (plugin->server_v6_task != NULL)
{
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
- plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v6_task = NULL;
}
plugin->server_v6_task = server_schedule (plugin, plugin->server_v6, now);
}
* @param method PUT or GET
* @return the server connecetion
*/
-static struct ServerConnection *
+static struct ServerRequest *
server_lookup_connection (struct HTTP_Server_Plugin *plugin,
struct MHD_Connection *mhd_connection,
const char *url,
const char *method)
{
struct Session *s = NULL;
- struct ServerConnection *sc = NULL;
+ struct ServerRequest *sc = NULL;
const union MHD_ConnectionInfo *conn_info;
struct HttpAddress *addr;
- struct GNUNET_ATS_Information ats;
struct GNUNET_PeerIdentity target;
size_t addr_len;
struct SessionTagContext stc;
uint32_t options;
int direction = GNUNET_SYSERR;
unsigned int to;
+ enum GNUNET_ATS_Network_Type scope;
conn_info = MHD_get_connection_info (mhd_connection,
MHD_CONNECTION_INFO_CLIENT_ADDRESS);
(conn_info->client_addr->sa_family != AF_INET6))
return NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "New %s connection from %s\n",
+ "New %s request from %s\n",
method,
url);
stc.tag = 0;
else
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Invalid method %s connection from %s\n",
+ "Invalid method %s for request from %s\n",
method, url);
return NULL;
}
- plugin->cur_connections++;
+ plugin->cur_request++;
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "New %s connection from %s with tag %u (%u of %u)\n",
+ "New %s request from %s with tag %u (%u of %u)\n",
method,
GNUNET_i2s (&target),
stc.tag,
- plugin->cur_connections, plugin->max_connections);
+ plugin->cur_request, plugin->max_request);
/* find existing session */
stc.res = NULL;
GNUNET_CONTAINER_multipeermap_get_multiple (plugin->sessions,
conn_info->client_addr,
sizeof (struct sockaddr_in));
addr_len = http_common_address_get_size (addr);
- ats = plugin->env->get_address_type (plugin->env->cls,
- conn_info->client_addr,
- sizeof (struct sockaddr_in));
+ scope = plugin->env->get_address_type (plugin->env->cls,
+ conn_info->client_addr,
+ sizeof (struct sockaddr_in));
break;
case (AF_INET6):
addr = http_common_address_from_socket (plugin->protocol,
conn_info->client_addr,
sizeof (struct sockaddr_in6));
addr_len = http_common_address_get_size (addr);
- ats = plugin->env->get_address_type (plugin->env->cls,
- conn_info->client_addr,
- sizeof (struct sockaddr_in6));
+ scope = plugin->env->get_address_type (plugin->env->cls,
+ conn_info->client_addr,
+ sizeof (struct sockaddr_in6));
break;
default:
- /* external host name */
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.type = htonl (GNUNET_ATS_NET_WAN);
+ /* external host name */
return NULL;
}
s = GNUNET_new (struct Session);
s->target = target;
s->plugin = plugin;
+ s->scope = scope;
s->address = GNUNET_HELLO_address_allocate (&s->target,
PLUGIN_NAME,
addr,
addr_len,
GNUNET_HELLO_ADDRESS_INFO_INBOUND);
- s->ats_address_network_type = ats.value;
s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
s->tag = stc.tag;
s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_SERVER_SESSION_TIMEOUT);
&s->target,
s,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ notify_session_monitor (plugin,
+ s,
+ GNUNET_TRANSPORT_SS_INIT);
notify_session_monitor (plugin,
s,
GNUNET_TRANSPORT_SS_HANDSHAKE);
(NULL != s->server_recv) )
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Duplicate PUT connection from `%s' tag %u, dismissing new connection\n",
+ "Duplicate PUT request from `%s' tag %u, dismissing new request\n",
GNUNET_i2s (&target),
stc.tag);
return NULL;
if ((_SEND == direction) && (NULL != s->server_send))
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Duplicate GET connection from `%s' tag %u, dismissing new connection\n",
+ "Duplicate GET request from `%s' tag %u, dismissing new request\n",
GNUNET_i2s (&target),
stc.tag);
return NULL;
}
- sc = GNUNET_new (struct ServerConnection);
+ sc = GNUNET_new (struct ServerRequest);
if (conn_info->client_addr->sa_family == AF_INET)
sc->mhd_daemon = plugin->server_v4;
if (conn_info->client_addr->sa_family == AF_INET6)
sc->session = s;
sc->options = options;
if (direction == _SEND)
+ {
s->server_send = sc;
+ }
if (direction == _RECEIVE)
+ {
s->server_recv = sc;
+ }
- if ( (NULL != s->server_send) &&
- (NULL != s->server_recv) )
+ if ((GNUNET_NO == s->known_to_service) &&
+ (NULL != s->server_send) &&
+ (NULL != s->server_recv) )
{
s->known_to_service = GNUNET_YES;
- plugin->env->session_start (NULL, s->address ,s, NULL, 0);
+ notify_session_monitor (plugin,
+ s,
+ GNUNET_TRANSPORT_SS_UP);
+ plugin->env->session_start (plugin->env->cls,
+ s->address,
+ s,
+ s->scope);
}
- if ( (NULL == s->server_recv) ||
- (NULL == s->server_send) )
- {
- to = (HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL);
- MHD_set_connection_option (mhd_connection,
- MHD_CONNECTION_OPTION_TIMEOUT, to);
- server_reschedule (plugin, sc->mhd_daemon, GNUNET_NO);
- }
- else
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Session %p for peer `%s' fully connected\n",
- s, GNUNET_i2s (&target));
- to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
- server_mhd_connection_timeout (plugin, s, to);
- }
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Setting timeout for %p to %u sec.\n", sc, to);
+ to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+ server_mhd_connection_timeout (plugin, s, to);
return sc;
}
char *buf,
size_t max)
{
- struct Session *s = cls;
- struct ServerConnection *sc;
+ struct ServerRequest *sc = cls;
+ struct Session *s = sc->session;
ssize_t bytes_read = 0;
struct HTTP_Message *msg;
char *stat_txt;
+ if (NULL == s)
+ {
+ /* session is disconnecting */
+ return 0;
+ }
+
sc = s->server_send;
if (NULL == sc)
return 0;
GNUNET_free (msg);
notify_session_monitor (s->plugin,
s,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_UPDATE);
}
}
if (0 < bytes_read)
{
struct Session *s = cls;
struct HTTP_Server_Plugin *plugin = s->plugin;
- struct GNUNET_ATS_Information atsi;
struct GNUNET_TIME_Relative delay;
char *stat_txt;
- 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));
-
if (GNUNET_NO == s->known_to_service)
{
s->known_to_service = GNUNET_YES;
- plugin->env->session_start (NULL,
+ plugin->env->session_start (plugin->env->cls,
s->address,
s,
- NULL,
- 0);
+ s->scope);
notify_session_monitor (plugin,
s,
GNUNET_TRANSPORT_SS_UP);
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_server",
plugin->protocol);
void **httpSessionCache)
{
struct HTTP_Server_Plugin *plugin = cls;
- struct ServerConnection *sc = *httpSessionCache;
+ struct ServerRequest *sc = *httpSessionCache;
struct Session *s;
struct MHD_Response *response;
int res = MHD_YES;
LOG (GNUNET_ERROR_TYPE_DEBUG,
_("Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data size %u\n"),
sc,
- plugin->cur_connections,
- plugin->max_connections,
+ plugin->cur_request,
+ plugin->max_request,
method,
version,
url,
if (0 == strcmp (MHD_HTTP_METHOD_OPTIONS, method))
{
response = MHD_create_response_from_buffer (0, NULL,
- MHD_RESPMEM_PERSISTENT);
+ MHD_RESPMEM_PERSISTENT);
add_cors_headers(response);
res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
/* Session was already disconnected;
sent HTTP/1.1: 200 OK as response */
response = MHD_create_response_from_data (strlen ("Thank you!"),
- "Thank you!",
- MHD_NO, MHD_NO);
+ "Thank you!", MHD_NO, MHD_NO);
add_cors_headers(response);
MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
if (sc->direction == _SEND)
{
- response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
- 32 * 1024,
- &server_send_callback, s,
- NULL);
+ response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN, 32 * 1024,
+ &server_send_callback, sc, NULL);
add_cors_headers(response);
MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
sc->connected = GNUNET_NO;
/* Sent HTTP/1.1: 200 OK as PUT Response\ */
response = MHD_create_response_from_data (strlen ("Thank you!"),
- "Thank you!",
- MHD_NO, MHD_NO);
+ "Thank you!", MHD_NO, MHD_NO);
add_cors_headers(response);
MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
{
s->msg_tk = GNUNET_SERVER_mst_create (&server_receive_mst_cb, s);
}
- GNUNET_SERVER_mst_receive (s->msg_tk, s, upload_data,
- *upload_data_size, GNUNET_NO, GNUNET_NO);
+ GNUNET_SERVER_mst_receive (s->msg_tk, s, upload_data, *upload_data_size,
+ GNUNET_NO, GNUNET_NO);
server_mhd_connection_timeout (plugin, s,
- GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us / 1000LL
+ / 1000LL);
(*upload_data_size) = 0;
}
else
{
/* delay processing */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Session %p / Connection %p: no inbound bandwidth available! Next read was delayed by %s\n",
- s, sc,
- GNUNET_STRINGS_relative_time_to_string (delay,
- GNUNET_YES));
- GNUNET_assert (s->server_recv->mhd_conn == mhd_connection);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p / Connection %p: no inbound bandwidth available! Next read was delayed by %s\n",
+ s, sc, GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
+ GNUNET_assert(s->server_recv->mhd_conn == mhd_connection);
MHD_suspend_connection (s->server_recv->mhd_conn);
- if (GNUNET_SCHEDULER_NO_TASK == s->recv_wakeup_task)
+ if (NULL == s->recv_wakeup_task)
s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delay,
- &server_wake_up,
- s);
+ &server_wake_up, s);
}
return MHD_YES;
}
void **httpSessionCache)
{
struct HTTP_Server_Plugin *plugin = cls;
- struct ServerConnection *sc = *httpSessionCache;
- struct Session *s;
+ struct ServerRequest *sc = *httpSessionCache;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Disconnect for connection %p\n",
sc);
if (NULL == sc)
- return; /* never really got setup */
- if (NULL == (s = sc->session))
- return; /* session already dead */
- if (sc->direction == _SEND)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' connection %p, GET on address `%s' disconnected\n",
- GNUNET_i2s (&s->target),
- s->server_send,
- http_common_plugin_address_to_string (plugin->protocol,
- s->address->address,
- s->address->address_length));
- s->server_send = NULL;
- if (! ( (0 != (sc->options & OPTION_LONG_POLL)) &&
- (NULL != s->server_recv) ) )
- {
- server_delete_session (s);
- GNUNET_free (sc);
- plugin->cur_connections--;
- return;
- }
+ /* CORS pre-flight request finished */
+ return;
}
- if (sc->direction == _RECEIVE)
+
+ if (NULL != sc->session)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' connection %p PUT on address `%s' disconnected\n",
- GNUNET_i2s (&s->target),
- s->server_recv,
- http_common_plugin_address_to_string (plugin->protocol,
- s->address->address,
- s->address->address_length));
- s->server_recv = NULL;
- if (NULL != s->msg_tk)
+ if (sc->direction == _SEND)
{
- GNUNET_SERVER_mst_destroy (s->msg_tk);
- s->msg_tk = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer `%s' connection %p, GET on address `%s' disconnected\n",
+ GNUNET_i2s (&sc->session->target),
+ sc->session->server_send,
+ http_common_plugin_address_to_string (plugin->protocol,
+ sc->session->address->address,
+ sc->session->address->address_length));
+
+ sc->session->server_send = NULL;
+ }
+ else if (sc->direction == _RECEIVE)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer `%s' connection %p PUT on address `%s' disconnected\n",
+ GNUNET_i2s (&sc->session->target),
+ sc->session->server_recv,
+ http_common_plugin_address_to_string (plugin->protocol,
+ sc->session->address->address,
+ sc->session->address->address_length));
+ sc->session->server_recv = NULL;
+ if (NULL != sc->session->msg_tk)
+ {
+ GNUNET_SERVER_mst_destroy (sc->session->msg_tk);
+ sc->session->msg_tk = NULL;
+ }
}
}
GNUNET_free (sc);
- plugin->cur_connections--;
-
- if ( (NULL == s->server_send) &&
- (NULL == s->server_recv) )
- {
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' on address `%s' disconnected\n",
- GNUNET_i2s (&s->target),
- http_common_plugin_address_to_string (plugin->protocol,
- s->address->address,
- s->address->address_length));
-
- server_delete_session (s);
- }
+ plugin->cur_request--;
}
{
struct HTTP_Server_Plugin *plugin = cls;
- if (plugin->cur_connections <= plugin->max_connections)
+ if (plugin->cur_request <= plugin->max_request)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
_("Accepting connection (%u of %u) from `%s'\n"),
- plugin->cur_connections, plugin->max_connections,
+ plugin->cur_request, plugin->max_request,
GNUNET_a2s (addr, addr_len));
return MHD_YES;
}
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Server reached maximum number connections (%u), rejecting new connection\n"),
- plugin->max_connections);
+ plugin->max_request);
return MHD_NO;
}
}
NULL, NULL, NULL,
"gnunet-transport-certificate-creation",
"gnunet-transport-certificate-creation",
- key_file, cert_file, NULL);
- if (cert_creation == NULL)
+ key_file,
+ cert_file,
+ NULL);
+ if (NULL == cert_creation)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Could not create a new TLS certificate, program `gnunet-transport-certificate-creation' could not be started!\n"));
}
GNUNET_free (key_file);
GNUNET_free (cert_file);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "TLS certificate loaded\n");
return res;
}
#endif
/**
- * Start the HTTP server
+ * Invoke `MHD_start_daemon` with the various options we need to
+ * setup the HTTP server with the given listen address.
*
- * @param plugin the plugin handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
+ * @param plugin our plugin
+ * @param addr listen address to use
+ * @param v6 MHD_NO_FLAG or MHD_USE_IPv6, depending on context
+ * @return NULL on error
*/
-static int
-server_start (struct HTTP_Server_Plugin *plugin)
+static struct MHD_Daemon *
+run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
+ const struct sockaddr_in *addr,
+ int v6)
{
+ struct MHD_Daemon *server;
unsigned int timeout;
- char *msg;
- GNUNET_assert (NULL != plugin);
-
-#if BUILD_HTTPS
- if (GNUNET_SYSERR == server_load_certificate (plugin))
- {
- LOG (GNUNET_ERROR_TYPE_ERROR,
- "Could not load or create server certificate! Loading plugin failed!\n");
- return GNUNET_SYSERR;
- }
-#endif
-
#if MHD_VERSION >= 0x00090E00
timeout = HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL;
"MHD cannot set timeout per connection! Default time out %u sec.\n",
timeout);
#endif
-
- plugin->server_v4 = NULL;
- if (plugin->use_ipv4 == GNUNET_YES)
- {
- plugin->server_v4 = MHD_start_daemon (
+ server = MHD_start_daemon (
#if VERBOSE_SERVER
- MHD_USE_DEBUG |
+ MHD_USE_DEBUG |
+#endif
+#if BUILD_HTTPS
+ MHD_USE_SSL |
#endif
+ MHD_USE_SUSPEND_RESUME |
+ v6,
+ plugin->port,
+ &server_accept_cb, plugin,
+ &server_access_cb, plugin,
+ MHD_OPTION_SOCK_ADDR,
+ addr,
+ MHD_OPTION_CONNECTION_LIMIT,
+ (unsigned int) plugin->max_request,
#if BUILD_HTTPS
- MHD_USE_SSL |
+ MHD_OPTION_HTTPS_PRIORITIES,
+ plugin->crypto_init,
+ MHD_OPTION_HTTPS_MEM_KEY,
+ plugin->key,
+ MHD_OPTION_HTTPS_MEM_CERT,
+ plugin->cert,
+#endif
+ MHD_OPTION_CONNECTION_TIMEOUT,
+ timeout,
+ MHD_OPTION_CONNECTION_MEMORY_LIMIT,
+ (size_t) (2 *
+ GNUNET_SERVER_MAX_MESSAGE_SIZE),
+ MHD_OPTION_NOTIFY_COMPLETED,
+ &server_disconnect_cb, plugin,
+ MHD_OPTION_EXTERNAL_LOGGER,
+ &server_log, NULL,
+ MHD_OPTION_END);
+#ifdef TCP_STEALTH
+ if ( (NULL != server) &&
+ (0 != (plugin->options & HTTP_OPTIONS_TCP_STEALTH)) )
+ {
+ const union MHD_DaemonInfo *di;
+
+ di = MHD_get_daemon_info (server,
+ MHD_DAEMON_INFO_LISTEN_FD,
+ NULL);
+ if ( (0 != setsockopt ((int) di->listen_fd,
+ IPPROTO_TCP,
+ TCP_STEALTH,
+ plugin->env->my_identity,
+ sizeof (struct GNUNET_PeerIdentity))) )
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("TCP_STEALTH not supported on this platform.\n"));
+ MHD_stop_daemon (server);
+ server = NULL;
+ }
+ }
#endif
- MHD_NO_FLAG, plugin->port,
- &server_accept_cb, plugin,
- &server_access_cb, plugin,
- MHD_OPTION_SOCK_ADDR,
- (struct sockaddr_in *)
- plugin->server_addr_v4,
- MHD_OPTION_CONNECTION_LIMIT,
- (unsigned int)
- plugin->max_connections,
+ return server;
+}
+
+
+/**
+ * Start the HTTP server
+ *
+ * @param plugin the plugin handle
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
+ */
+static int
+server_start (struct HTTP_Server_Plugin *plugin)
+{
+ const char *msg;
+
+ GNUNET_assert (NULL != plugin);
#if BUILD_HTTPS
- MHD_OPTION_HTTPS_PRIORITIES,
- plugin->crypto_init,
- MHD_OPTION_HTTPS_MEM_KEY,
- plugin->key,
- MHD_OPTION_HTTPS_MEM_CERT,
- plugin->cert,
+ if (GNUNET_SYSERR == server_load_certificate (plugin))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not load or create server certificate! Loading plugin failed!\n"));
+ return GNUNET_SYSERR;
+ }
#endif
- MHD_OPTION_CONNECTION_TIMEOUT,
- timeout,
- MHD_OPTION_CONNECTION_MEMORY_LIMIT,
- (size_t) (2 *
- GNUNET_SERVER_MAX_MESSAGE_SIZE),
- MHD_OPTION_NOTIFY_COMPLETED,
- &server_disconnect_cb, plugin,
- MHD_OPTION_EXTERNAL_LOGGER,
- server_log, NULL, MHD_OPTION_END);
- if (plugin->server_v4 == NULL)
+
+
+
+ plugin->server_v4 = NULL;
+ if (GNUNET_YES == plugin->use_ipv4)
+ {
+ plugin->server_v4
+ = run_mhd_start_daemon (plugin,
+ (const struct sockaddr_in *) plugin->server_addr_v4,
+ MHD_NO_FLAG);
+
+ if (NULL == plugin->server_v4)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to start %s IPv4 server component on port %u\n",
- plugin->name, plugin->port);
+ plugin->name,
+ plugin->port);
}
else
server_reschedule (plugin,
plugin->server_v6 = NULL;
- if (plugin->use_ipv6 == GNUNET_YES)
+ if (GNUNET_YES == plugin->use_ipv6)
{
- plugin->server_v6 = MHD_start_daemon (
-#if VERBOSE_SERVER
- MHD_USE_DEBUG |
-#endif
-#if BUILD_HTTPS
- MHD_USE_SSL |
-#endif
- MHD_USE_IPv6, plugin->port,
- &server_accept_cb, plugin,
- &server_access_cb, plugin,
- MHD_OPTION_SOCK_ADDR,
- (struct sockaddr_in6 *)
- plugin->server_addr_v6,
- MHD_OPTION_CONNECTION_LIMIT,
- (unsigned int)
- plugin->max_connections,
-#if BUILD_HTTPS
- MHD_OPTION_HTTPS_PRIORITIES,
- plugin->crypto_init,
- MHD_OPTION_HTTPS_MEM_KEY,
- plugin->key,
- MHD_OPTION_HTTPS_MEM_CERT,
- plugin->cert,
-#endif
- MHD_OPTION_CONNECTION_TIMEOUT,
- timeout,
- MHD_OPTION_CONNECTION_MEMORY_LIMIT,
- (size_t) (2 *
- GNUNET_SERVER_MAX_MESSAGE_SIZE),
- MHD_OPTION_NOTIFY_COMPLETED,
- &server_disconnect_cb, plugin,
- MHD_OPTION_EXTERNAL_LOGGER,
- server_log, NULL, MHD_OPTION_END);
- if (plugin->server_v6 == NULL)
+ plugin->server_v6
+ = run_mhd_start_daemon (plugin,
+ (const struct sockaddr_in *) plugin->server_addr_v6,
+ MHD_USE_IPv6);
+ if (NULL == plugin->server_v6)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to start %s IPv6 server component on port %u\n",
- plugin->name, plugin->port);
+ plugin->name,
+ plugin->port);
}
else
- server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
+ {
+ server_reschedule (plugin,
+ plugin->server_v6,
+ GNUNET_NO);
+ }
}
-
- msg = "No";
- if ((plugin->server_v6 == NULL) && (plugin->server_v4 == NULL))
+ msg = "No";
+ if ( (NULL == plugin->server_v6) &&
+ (NULL == plugin->server_v4) )
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"%s %s server component started on port %u\n",
- msg, plugin->name, plugin->port);
- sleep (10);
+ msg,
+ plugin->name,
+ plugin->port);
return GNUNET_SYSERR;
}
- else if ((plugin->server_v6 != NULL) && (plugin->server_v4 != NULL))
- msg = "IPv4 and IPv6";
- else if (plugin->server_v6 != NULL)
- msg = "IPv6";
- else if (plugin->server_v4 != NULL)
- msg = "IPv4";
+ if ((NULL != plugin->server_v6) &&
+ (NULL != plugin->server_v4))
+ msg = "IPv4 and IPv6";
+ else if (NULL != plugin->server_v6)
+ msg = "IPv6";
+ else if (NULL != plugin->server_v4)
+ msg = "IPv4";
LOG (GNUNET_ERROR_TYPE_DEBUG,
"%s %s server component started on port %u\n",
- msg, plugin->name, plugin->port);
+ msg,
+ plugin->name,
+ plugin->port);
return GNUNET_OK;
}
unsigned int urlen;
char *url;
- plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->notify_ext_task = NULL;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
urlen = strlen (url) + 1;
ext_addr = GNUNET_malloc (sizeof (struct HttpAddress) + urlen);
- ext_addr->options = htonl(plugin->options);
+ ext_addr->options = htonl (plugin->options);
ext_addr->urlen = htonl (urlen);
ext_addr_len = sizeof (struct HttpAddress) + urlen;
memcpy (&ext_addr[1], url, urlen);
"MAX_CONNECTIONS",
&max_connections))
max_connections = 128;
- plugin->max_connections = max_connections;
+ plugin->max_request = max_connections;
LOG (GNUNET_ERROR_TYPE_DEBUG,
_("Maximum number of connections is %u\n"),
- plugin->max_connections);
+ plugin->max_request);
plugin->peer_id_length = strlen (GNUNET_i2s_full (plugin->env->my_identity));
return NULL;
}
plugin->in_shutdown = GNUNET_YES;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_INFO,
_("Shutting down plugin `%s'\n"),
plugin->name);
- if (GNUNET_SCHEDULER_NO_TASK != plugin->notify_ext_task)
+ if (NULL != plugin->notify_ext_task)
{
GNUNET_SCHEDULER_cancel (plugin->notify_ext_task);
- plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->notify_ext_task = NULL;
}
if (NULL != plugin->ext_addr)
MHD_stop_daemon (plugin->server_v6);
plugin->server_v6 = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != plugin->server_v4_task)
+ if (NULL != plugin->server_v4_task)
{
GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
- plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v4_task = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != plugin->server_v6_task)
+ if (NULL != plugin->server_v6_task)
{
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
- plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->server_v6_task = NULL;
}
#if BUILD_HTTPS
GNUNET_free_non_null (plugin->crypto_init);
GNUNET_free_non_null (plugin->key);
#endif
GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
- &destroy_session_cb,
+ &destroy_session_shutdown_cb,
plugin);
GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
plugin->sessions = NULL;
/**
- * 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 called for a quick conversion of the binary address to
+ * a numeric address. Note that the caller must not free the
+ * address and that the next call to this function is allowed
+ * to override the address again.
*
- * @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 cls unused
+ * @param addr binary address
+ * @param addrlen length of the address
+ * @return string representing the same address
*/
static const char *
http_server_plugin_address_to_string (void *cls,
http_server_plugin_get_network (void *cls,
struct Session *session)
{
- return ntohl (session->ats_address_network_type);
+ return session->scope;
}
static void
http_server_plugin_update_inbound_delay (void *cls,
const struct GNUNET_PeerIdentity *peer,
- struct Session *s,
+ struct Session *session,
struct GNUNET_TIME_Relative delay)
{
- s->next_receive = GNUNET_TIME_relative_to_absolute (delay);
+ session->next_receive = GNUNET_TIME_relative_to_absolute (delay);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"New inbound delay %s\n",
GNUNET_STRINGS_relative_time_to_string (delay,
GNUNET_NO));
- if (GNUNET_SCHEDULER_NO_TASK != s->recv_wakeup_task)
+ if (NULL != session->recv_wakeup_task)
{
- GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
- s->recv_wakeup_task
+ GNUNET_SCHEDULER_cancel (session->recv_wakeup_task);
+ session->recv_wakeup_task
= GNUNET_SCHEDULER_add_delayed (delay,
&server_wake_up,
- s);
+ session);
}
}
notify_session_monitor (plugin,
session,
- GNUNET_TRANSPORT_SS_UP);
+ GNUNET_TRANSPORT_SS_INIT);
return GNUNET_OK;
}
plugin->env = env;
plugin->sessions = GNUNET_CONTAINER_multipeermap_create (128,
GNUNET_YES);
+
api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = plugin;
api->send = &http_server_plugin_send;
plugin->protocol = "http";
#endif
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ plugin->name,
+ "TCP_STEALTH"))
+ {
+#ifdef TCP_STEALTH
+ plugin->options |= HTTP_OPTIONS_TCP_STEALTH;
+#else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("TCP_STEALTH not supported on this platform.\n"));
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
+#endif
+ }
+
/* Compile URL regex */
if (regcomp(&plugin->url_regex,
URL_REGEX,
projects / oweals / gnunet.git / blobdiff