/*
This file is part of GNUnet
- (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2002-2013 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
*/
#include "platform.h"
-#include "gnunet_protocols.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_service_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
#include "gnunet_transport_plugin.h"
-
-#include "gnunet_container_lib.h"
#include "gnunet_nat_lib.h"
#include "plugin_transport_http_common.h"
-#include "microhttpd.h"
+#include <microhttpd.h>
+
+
#if BUILD_HTTPS
+#define PLUGIN_NAME "https_server"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_server_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_server_done
#else
+#define PLUGIN_NAME "http_server"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_server_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_server_done
#endif
-#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define HTTP_ERROR_RESPONSE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\"><HTML><HEAD><TITLE>404 Not Found</TITLE></HEAD><BODY><H1>Not Found</H1>The requested URL was not found on this server.<P><HR><ADDRESS></ADDRESS></BODY></HTML>"
+#define _RECEIVE 0
+#define _SEND 1
-#define TESTING GNUNET_NO
-#if TESTING
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_ERROR
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-#else
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
-#define TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
-#endif
+/* Enable output for debbuging URL's of incoming requests */
+#define DEBUG_URL_PARSE GNUNET_NO
/**
*/
struct Plugin;
-
/**
* Session handle for connections.
*/
-struct HttpServerSession
+struct Session
{
/**
* Stored in a linked list.
*/
- struct HttpServerSession *next;
+ struct Session *next;
/**
* Stored in a linked list.
*/
- struct HttpServerSession *prev;
+ struct Session *prev;
/**
* To whom are we talking to (set to our identity
*/
void *addr;
+ /**
+ * Address length
+ */
+ size_t addrlen;
+
+ /**
+ * Unique HTTP/S connection tag for this connection
+ */
+ uint32_t tag;
+
+ /**
+ * ATS network type in NBO
+ */
+ uint32_t ats_address_network_type;
+
+ /**
+ * Was session given to transport service?
+ */
+ int session_passed;
+
+ /**
+ * Did we immediately end the session in disconnect_cb
+ */
+ int session_ended;
+
+ /**
+ * Are incoming connection established at the moment
+ */
+ int connect_in_progress;
+
+ /**
+ * Absolute time when to receive data again
+ * Used for receive throttling
+ */
+ struct GNUNET_TIME_Absolute next_receive;
+
/**
* Session timeout task
*/
GNUNET_SCHEDULER_TaskIdentifier timeout_task;
};
+
struct ServerConnection
{
/* _RECV or _SEND */
/* Should this connection get disconnected? GNUNET_YES/NO */
int disconnect;
+ /* For PUT connections: Is this the first or last callback with size 0 */
+ int connected;
+
/* The session this server connection belongs to */
struct Session *session;
/* The MHD connection */
struct MHD_Connection *mhd_conn;
+
+ /* The MHD daemon */
+ struct MHD_Daemon *mhd_daemon;
};
+
/**
* Encapsulation of all of the state of the plugin.
*/
* Linked list head of open sessions.
*/
- struct HttpServerSession *head;
+ struct Session *head;
/**
* Linked list tail of open sessions.
*/
- struct HttpServerSession *tail;
+ struct Session *tail;
/**
* Plugin name
*/
char *protocol;
+ /**
+ * My options to be included in the address
+ */
+ uint32_t options;
+
/**
* External address
*/
char *external_hostname;
+ /**
+ * Verify external address
+ */
+ int verify_external_hostname;
+
+
/**
* Maximum number of sockets the plugin can use
* Each http inbound /outbound connections are two connections
*/
unsigned int cur_connections;
+ /**
+ * Did we immediately end the session in disconnect_cb
+ */
+ int in_shutdown;
+
+ /**
+ * Length of peer id
+ */
+ int peer_id_length;
+
/**
* External hostname the plugin can be connected to, can be different to
* the host's FQDN, used e.g. for reverse proxying
*/
- char *ext_addr;
+ struct HttpAddress *ext_addr;
+
+ /**
+ * Notify transport only about external address
+ */
+ unsigned int external_only;
/**
* External address length
*/
struct GNUNET_NAT_Handle *nat;
- /**
- * Server semi connections
- * A full session consists of 2 semi-connections: send and receive
- * If not both directions are established the server keeps this sessions here
- */
- struct HttpServerSession *server_semi_head;
-
- struct HttpServerSession *server_semi_tail;
-
/**
* List of own addresses
*/
};
+
/**
* Wrapper to manage addresses
*/
*/
struct HttpAddressWrapper *prev;
- void *addr;
+ struct HttpAddress *address;
size_t addrlen;
};
+
/**
* Message to send using http
*/
*/
size_t size;
+ /**
+ * HTTP/S specific overhead
+ */
+ size_t overhead;
+
/**
* Continuation function to call once the transmission buffer
* has again space available. NULL if there is no
};
-static struct Plugin * p;
+/**
+ * The http_server plugin handle
+ */
+static struct HTTP_Server_Plugin * p;
+
-#if 0
/**
- * Start session timeout
+ * Start session timeout for session s
+ * @param s the session
*/
static void
-server_start_session_timeout (struct HttpServerSession *s);
+server_start_session_timeout (struct Session *s);
+
/**
- * Increment session timeout due to activity
+ * Increment session timeout due to activity for session s
+ * @param s the session
*/
static void
-server_reschedule_session_timeout (struct HttpServerSession *s);
-#endif
+server_reschedule_session_timeout (struct Session *s);
+
+
+/**
+ * Cancel timeout for session s
+ * @param s the session
+ */
+static void
+server_stop_session_timeout (struct Session *s);
+
+
+/**
+ * Disconnect a session s
+ * @param s the session
+ */
+static int
+server_disconnect (struct Session *s);
+
+
+/**
+ * Does session s exist?
+ *
+ * @param plugin the plugin handle
+ * @param s the session
+ * @return GNUNET_YES on success, GNUNET_NO on error
+ */
+static int
+server_exist_session (struct HTTP_Server_Plugin *plugin, struct Session *s);
+
+
/**
- * Cancel timeout
+ * Reschedule the execution of both IPv4 and IPv6 server
+ * @param plugin the plugin
+ * @param server which server to schedule v4 or v6?
+ * @param now GNUNET_YES to schedule execution immediately, GNUNET_NO to wait
+ * until timeout
*/
static void
-server_stop_session_timeout (struct HttpServerSession *s);
+server_reschedule (struct HTTP_Server_Plugin *plugin, struct MHD_Daemon *server,
+ int now);
+
/**
* Function that can be used by the transport service to transmit
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
struct HTTP_Server_Plugin *plugin = cls;
+ struct HTTP_Message *msg;
int bytes_sent = 0;
+ char *stat_txt;
GNUNET_assert (plugin != NULL);
GNUNET_assert (session != NULL);
- GNUNET_break (0);
+ if (GNUNET_NO == server_exist_session (plugin, session))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (NULL == session->server_send)
+ {
+ if (GNUNET_NO == session->connect_in_progress)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, session->plugin->name,
+ "Session %p/connection %p: Sending message with %u bytes to peer `%s' with FAILED\n",
+ session, session->server_send,
+ msgbuf_size, GNUNET_i2s (&session->target));
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ }
+ else
+ {
+ if (GNUNET_YES == session->server_send->disconnect)
+ return GNUNET_SYSERR;
+ }
+
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
+ "Session %p/connection %p: Sending message with %u to peer `%s' with \n",
+ session, session->server_send,
+ msgbuf_size, GNUNET_i2s (&session->target));
+
+ /* create new message and schedule */
+ bytes_sent = sizeof (struct HTTP_Message) + msgbuf_size;
+ msg = GNUNET_malloc (bytes_sent);
+ 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);
- /* struct Plugin *plugin = cls; */
+ GNUNET_CONTAINER_DLL_insert_tail (session->msg_head, session->msg_tail, msg);
+
+ GNUNET_asprintf (&stat_txt, "# bytes currently in %s_server buffers", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, msgbuf_size, GNUNET_NO);
+ GNUNET_free (stat_txt);
+
+ if (NULL != session->server_send)
+ {
+ server_reschedule (session->plugin,
+ session->server_send->mhd_daemon,
+ GNUNET_YES);
+ server_reschedule_session_timeout (session);
+ }
return bytes_sent;
}
static void
http_server_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
{
- // struct Plugin *plugin = cls;
- GNUNET_break (0);
+ struct HTTP_Server_Plugin *plugin = cls;
+ struct Session *next = NULL;
+ struct Session *pos = NULL;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Transport tells me to disconnect `%s'\n",
+ GNUNET_i2s (target));
+
+ next = plugin->head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (0 == memcmp (target, &pos->target, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Disconnecting session %p to `%s'\n",
+ pos, GNUNET_i2s (target));
+ server_disconnect (pos);
+ }
+ }
+
}
* and transport
*/
static int
-http_server_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
+http_server_plugin_address_suggested (void *cls, const void *addr,
+ size_t addrlen)
{
- struct HTTP_Server_Plugin *plugin = cls;
- struct HttpAddressWrapper *w = plugin->addr_head;
-
- if ((NULL != plugin->ext_addr) && GNUNET_YES == (http_common_cmp_addresses (addr, addrlen, plugin->ext_addr, plugin->ext_addr_len)))
- return GNUNET_OK;
-
- while (NULL != w)
- {
- if (GNUNET_YES == (http_common_cmp_addresses(addr,
- addrlen,
- w->addr,
- w->addrlen)))
- return GNUNET_OK;
- }
-
- return GNUNET_NO;
+ struct HttpAddressWrapper *next;
+ struct HttpAddressWrapper *pos;
+ const struct HttpAddress *haddr = addr;
+
+ if ((NULL != p->ext_addr) &&
+ GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
+ p->ext_addr, p->ext_addr_len)))
+ {
+ /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
+ if ((ntohl(haddr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
+ (p->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ return GNUNET_NO; /* VERIFY option not set as required! */
+ return GNUNET_OK;
+ }
+
+ next = p->addr_head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (GNUNET_YES == (http_common_cmp_addresses(addr,
+ addrlen,
+ pos->address,
+ pos->addrlen)))
+ return GNUNET_OK;
+
+ }
+ return GNUNET_NO;
}
+
/**
* Creates a new outbound session the transport
* service will use to send data to the peer
/**
* Deleting the session
* Must not be used afterwards
+ *
+ * @param s the session to delete
*/
-
-void
-server_delete_session (struct HttpServerSession *s)
+static void
+server_delete_session (struct Session *s)
{
struct HTTP_Server_Plugin *plugin = s->plugin;
server_stop_session_timeout(s);
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
if (msg->transmit_cont != NULL)
{
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR,
+ msg->size, msg->pos + msg->overhead);
}
GNUNET_free (msg);
msg = tmp;
GNUNET_free (s->addr);
GNUNET_free_non_null (s->server_recv);
GNUNET_free_non_null (s->server_send);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p destroyed\n", s);
GNUNET_free (s);
}
-int
-server_disconnect (struct HttpServerSession *s)
+
+/**
+* Cancel timeout for session s
+*
+* @param s the session
+*/
+static void
+server_stop_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (TIMEOUT_LOG, "Timeout stopped for session %p\n", s);
+ }
+}
+
+
+/**
+ * Function that queries MHD's select sets and
+ * starts the task waiting for them.
+ * @param plugin plugin
+ * @param daemon_handle the MHD daemon handle
+ * @param now schedule immediately
+ * @return gnunet task identifier
+ */
+static GNUNET_SCHEDULER_TaskIdentifier
+server_schedule (struct HTTP_Server_Plugin *plugin,
+ struct MHD_Daemon *daemon_handle,
+ int now);
+
+
+/**
+ * Reschedule the execution of both IPv4 and IPv6 server
+ * @param plugin the plugin
+ * @param server which server to schedule v4 or v6?
+ * @param now GNUNET_YES to schedule execution immediately, GNUNET_NO to wait
+ * until timeout
+ */
+static void
+server_reschedule (struct HTTP_Server_Plugin *plugin, struct MHD_Daemon *server,
+ int now)
+{
+ if ((server == plugin->server_v4) && (plugin->server_v4 != NULL))
+ {
+ if (GNUNET_YES == plugin->server_v4_immediately)
+ return; /* No rescheduling, server will run asap */
+
+ if (GNUNET_YES == now)
+ plugin->server_v4_immediately = GNUNET_YES;
+
+ if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
+ plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ plugin->server_v4_task = server_schedule (plugin, plugin->server_v4, now);
+ }
+
+ if ((server == plugin->server_v6) && (plugin->server_v6 != NULL))
+ {
+ if (GNUNET_YES == plugin->server_v6_immediately)
+ return; /* No rescheduling, server will run asap */
+
+ if (GNUNET_YES == now)
+ plugin->server_v6_immediately = GNUNET_YES;
+
+ if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
+ plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ plugin->server_v6_task = server_schedule (plugin, plugin->server_v6, now);
+ }
+}
+
+
+/**
+ * Disconnect session s
+ *
+ * @param s the session
+ * @return GNUNET_OK on success
+ */
+static int
+server_disconnect (struct Session *s)
{
- struct ServerConnection * send;
- struct ServerConnection * recv;
+ struct ServerConnection * send = NULL;
+ struct ServerConnection * recv = NULL;
+
+ if (GNUNET_NO == server_exist_session (p, s))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
send = (struct ServerConnection *) s->server_send;
if (s->server_send != NULL)
MHD_set_connection_option (send->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
1);
#endif
+ server_reschedule (s->plugin, send->mhd_daemon, GNUNET_YES);
}
recv = (struct ServerConnection *) s->server_recv;
MHD_set_connection_option (recv->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
1);
#endif
+ server_reschedule (s->plugin, recv->mhd_daemon, GNUNET_YES);
}
+ return GNUNET_OK;
+}
- /* Schedule connection immediately */
-#if 0
- if (s->addrlen == sizeof (struct IPv4HttpAddress))
+
+
+/**
+ * Tell MHD that the connection should timeout after @a to seconds.
+ *
+ * @param plugin our plugin
+ * @param s session for which the timeout changes
+ * @param to timeout in seconds
+ */
+static void
+server_mhd_connection_timeout (struct HTTP_Server_Plugin *plugin,
+ struct Session *s,
+ unsigned int to)
+{
+#if MHD_VERSION >= 0x00090E00
+ /* Setting timeouts for other connections */
+ if (NULL != s->server_recv)
{
- server_reschedule (s->plugin, s->plugin->server_v4, GNUNET_YES);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Setting timeout for %p to %u sec.\n",
+ s->server_recv, to);
+ MHD_set_connection_option (s->server_recv->mhd_conn,
+ MHD_CONNECTION_OPTION_TIMEOUT,
+ to);
+ server_reschedule (plugin, s->server_recv->mhd_daemon, GNUNET_NO);
}
- else if (s->addrlen == sizeof (struct IPv6HttpAddress))
+ if (NULL != s->server_send)
{
- server_reschedule (s->plugin, s->plugin->server_v6, GNUNET_YES);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Setting timeout for %p to %u sec.\n",
+ s->server_send, to);
+ MHD_set_connection_option (s->server_send->mhd_conn,
+ MHD_CONNECTION_OPTION_TIMEOUT,
+ to);
+ server_reschedule (plugin, s->server_send->mhd_daemon, GNUNET_NO);
}
#endif
- return GNUNET_OK;
-
}
-
/**
-* Cancel timeout
-*/
-static void
-server_stop_session_timeout (struct HttpServerSession *s)
-{
- GNUNET_assert (NULL != s);
-
- if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
- {
- GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log (TIMEOUT_LOG, "Timeout stopped for session %p\n", s);
- }
-}
+ * Parse incoming URL for tag and target
+ *
+ * @param plugin plugin
+ * @param url incoming url
+ * @param target where to store the target
+ * @param tag where to store the tag
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
static int
-server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
- const char *url, const char *method, const char *version,
- const char *upload_data, size_t * upload_data_size,
- void **httpSessionCache)
+server_parse_url (struct HTTP_Server_Plugin *plugin,
+ const char *url,
+ struct GNUNET_PeerIdentity *target,
+ uint32_t *tag)
{
- /* FIXME SPLIT */
- return MHD_NO;
-}
+ char * tag_start = NULL;
+ char * tag_end = NULL;
+ char * target_start = NULL;
+ char * separator = NULL;
+ unsigned int hash_length;
+ unsigned long int ctag;
-static void
-server_disconnect_cb (void *cls, struct MHD_Connection *connection,
- void **httpSessionCache)
-{
- /* FIXME SPLIT */
- GNUNET_break (0);
-}
+ /* URL parsing
+ * URL is valid if it is in the form [prefix with (multiple) '/'][peerid[103];tag]*/
-/**
- * Check if incoming connection is accepted.
- * NOTE: Here every connection is accepted
- * @param cls plugin as closure
- * @param addr address of incoming connection
- * @param addr_len address length of incoming connection
- * @return MHD_YES if connection is accepted, MHD_NO if connection is rejected
+ if (NULL == url)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ /* convert tag */
+
+ /* find separator */
+ separator = strrchr (url, ';');
+
+ if (NULL == separator)
+ {
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ tag_start = separator + 1;
+
+ if (strlen (tag_start) == 0)
+ {
+ /* No tag after separator */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ ctag = strtoul (tag_start, &tag_end, 10);
+ if (ctag == 0)
+ {
+ /* tag == 0 , invalid */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if ((ctag == ULONG_MAX) && (ERANGE == errno))
+ {
+ /* out of range: > ULONG_MAX */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (ctag > UINT32_MAX)
+ {
+ /* out of range: > UINT32_MAX */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ (*tag) = (uint32_t) ctag;
+ if (NULL == tag_end)
+ {
+ /* no char after tag */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (url[strlen(url)] != tag_end[0])
+ {
+ /* there are more not converted chars after tag */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (DEBUG_URL_PARSE)
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Found tag `%u' in url\n", (*tag));
+
+ /* convert peer id */
+ target_start = strrchr (url, '/');
+ if (NULL == target_start)
+ {
+ /* no leading '/' */
+ target_start = (char *) url;
+ }
+ target_start++;
+ hash_length = separator - target_start;
+ if (hash_length != plugin->peer_id_length)
+ {
+ /* no char after tag */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_public_key_from_string (target_start,
+ hash_length,
+ &target->public_key))
+ {
+ /* hash conversion failed */
+ if (DEBUG_URL_PARSE) GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
+ "Found target `%s' in URL\n",
+ GNUNET_i2s_full (target));
+ return GNUNET_OK;
+}
+
+
+/**
+ * Lookup a mhd connection and create one if none is found
*
+ * @param plugin the plugin handle
+ * @param mhd_connection the incoming mhd_connection
+ * @param url incoming requested URL
+ * @param method PUT or GET
+ * @return the server connecetion
*/
-static int
-server_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
+static struct ServerConnection *
+server_lookup_connection (struct HTTP_Server_Plugin *plugin,
+ struct MHD_Connection *mhd_connection, const char *url,
+ const char *method)
{
- struct HTTP_Server_Plugin *plugin = cls;
- GNUNET_break (0);
- if (plugin->cur_connections <= plugin->max_connections)
- return MHD_YES;
+ struct Session *s = NULL;
+ struct ServerConnection *sc = NULL;
+ const union MHD_ConnectionInfo *conn_info;
+ struct GNUNET_ATS_Information ats;
+ struct HttpAddress *addr;
+ size_t addr_len;
+ struct GNUNET_PeerIdentity target;
+ uint32_t tag = 0;
+ int direction = GNUNET_SYSERR;
+ unsigned int to;
+
+ conn_info = MHD_get_connection_info (mhd_connection,
+ MHD_CONNECTION_INFO_CLIENT_ADDRESS);
+ if ((conn_info->client_addr->sa_family != AF_INET) &&
+ (conn_info->client_addr->sa_family != AF_INET6))
+ return NULL;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "New %s connection from %s\n", method, url);
+
+ if (GNUNET_SYSERR == server_parse_url (plugin, url, &target, &tag))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid url %s\n", url);
+ return NULL;
+ }
+ if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
+ direction = _RECEIVE;
+ else if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
+ direction = _SEND;
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Server: Cannot accept new connections\n");
- return MHD_NO;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid method %s connection from %s\n", method, url);
+ return NULL;
+ }
+
+ plugin->cur_connections++;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "New %s connection from %s with tag %u (%u of %u)\n",
+ method,
+ GNUNET_i2s (&target), tag,
+ plugin->cur_connections, plugin->max_connections);
+ /* find duplicate session */
+ s = plugin->head;
+ while (s != NULL)
+ {
+ if ((0 == memcmp (&s->target, &target, sizeof (struct GNUNET_PeerIdentity))) &&
+ (s->tag == tag))
+ break;
+ s = s->next;
+ }
+ if (s != NULL)
+ {
+ if ((_RECEIVE == direction) && (NULL != s->server_recv))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Duplicate PUT connection from `%s' tag %u, dismissing new connection\n",
+ GNUNET_i2s (&target),
+ tag);
+ return NULL;
+
+ }
+ if ((_SEND == direction) && (NULL != s->server_send))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Duplicate GET connection from `%s' tag %u, dismissing new connection\n",
+ GNUNET_i2s (&target),
+ tag);
+ return NULL;
+ }
+ }
+ else
+ {
+ /* create new session */
+ switch (conn_info->client_addr->sa_family)
+ {
+ case (AF_INET):
+ addr = http_common_address_from_socket (plugin->protocol, 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));
+ 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));
+ break;
+ default:
+ /* external host name */
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.type = htonl (GNUNET_ATS_NET_WAN);
+ return NULL;
+ }
+
+ s = GNUNET_malloc (sizeof (struct Session));
+ memcpy (&s->target, &target, sizeof (struct GNUNET_PeerIdentity));
+ s->plugin = plugin;
+ s->addr = addr;
+ s->addrlen = addr_len;
+ s->ats_address_network_type = ats.value;
+ s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
+ s->tag = tag;
+ s->server_recv = NULL;
+ s->server_send = NULL;
+ s->session_passed = GNUNET_NO;
+ s->session_ended = GNUNET_NO;
+ s->connect_in_progress = GNUNET_YES;
+ server_start_session_timeout(s);
+ GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Creating new session %p for peer `%s' connecting from `%s'\n",
+ s, GNUNET_i2s (&target),
+ http_common_plugin_address_to_string (NULL, p->protocol, addr, addr_len));
+ }
+ sc = GNUNET_malloc (sizeof (struct ServerConnection));
+ 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->mhd_daemon = plugin->server_v6;
+ sc->mhd_conn = mhd_connection;
+ sc->direction = direction;
+ sc->connected = GNUNET_NO;
+ sc->session = s;
+ if (direction == _SEND)
+ s->server_send = sc;
+ if (direction == _RECEIVE)
+ s->server_recv = sc;
+
+ if ((NULL != s->server_send) && (NULL != s->server_recv))
+ {
+ s->connect_in_progress = GNUNET_NO; /* PUT and GET are connected */
+ plugin->env->session_start (NULL, &s->target, PLUGIN_NAME, NULL, 0 ,s, NULL, 0);
+ }
+
+#if MHD_VERSION >= 0x00090E00
+ 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
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p for peer `%s' fully connected\n",
+ s, GNUNET_i2s (&target));
+ to = (SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+ server_mhd_connection_timeout (plugin, s, to);
}
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Setting timeout for %p to %u sec.\n", sc, to);
+#endif
+ return sc;
}
-static void
-server_log (void *arg, const char *fmt, va_list ap)
+
+/**
+ * Lookup a session for a server connection
+ *
+ * @param plugin the plugin
+ * @param sc the server connection
+ * @return the session found or NULL
+ */
+static struct Session *
+server_lookup_session (struct HTTP_Server_Plugin *plugin,
+ struct ServerConnection * sc)
{
- char text[1024];
+ struct Session *s;
- vsnprintf (text, sizeof (text), fmt, ap);
- va_end (ap);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: %s\n", text);
+ for (s = plugin->head; NULL != s; s = s->next)
+ if ((s->server_recv == sc) || (s->server_send == sc))
+ return s;
+ return NULL;
+}
+
+int
+server_exist_session (struct HTTP_Server_Plugin *plugin, struct Session *s)
+{
+ struct Session * head;
+
+ GNUNET_assert (NULL != plugin);
+ GNUNET_assert (NULL != s);
+
+ for (head = plugin->head; head != NULL; head = head->next)
+ {
+ if (head == s)
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
}
+
/**
- * Function that queries MHD's select sets and
- * starts the task waiting for them.
- * @param plugin plugin
- * @param daemon_handle the MHD daemon handle
- * @return gnunet task identifier
+ * Callback called by MHD when it needs data to send
+ *
+ * @param cls current session
+ * @param pos position in buffer
+ * @param buf the buffer to write data to
+ * @param max max number of bytes available in buffer
+ * @return bytes written to buffer
*/
-static GNUNET_SCHEDULER_TaskIdentifier
-server_schedule (struct HTTP_Server_Plugin *plugin, struct MHD_Daemon *daemon_handle,
- int now);
+static ssize_t
+server_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
+{
+ struct Session *s = cls;
+ ssize_t bytes_read = 0;
+ struct HTTP_Message *msg;
+ char *stat_txt;
+
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == server_exist_session (p, s))
+ return 0;
+ msg = s->msg_head;
+ if (NULL != msg)
+ {
+ /* sending */
+ bytes_read = GNUNET_MIN (msg->size - msg->pos,
+ max);
+ memcpy (buf, &msg->buf[msg->pos], bytes_read);
+ msg->pos += bytes_read;
+
+ /* removing message */
+ if (msg->pos == msg->size)
+ {
+ GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
+ if (NULL != msg->transmit_cont)
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK,
+ msg->size, msg->size + msg->overhead);
+ GNUNET_free (msg);
+ }
+ }
+ if (0 < bytes_read)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Sent %u bytes to peer `%s' with session %p \n", bytes_read, GNUNET_i2s (&s->target), s);
+ GNUNET_asprintf (&stat_txt, "# bytes currently in %s_server buffers", p->protocol);
+ GNUNET_STATISTICS_update (p->env->stats,
+ stat_txt, -bytes_read, GNUNET_NO);
+ GNUNET_free (stat_txt);
+ GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_server", p->protocol);
+ GNUNET_STATISTICS_update (p->env->stats,
+ stat_txt, bytes_read, GNUNET_NO);
+ GNUNET_free (stat_txt);
+ }
+ return bytes_read;
+}
+
/**
- * Reschedule the execution of both IPv4 and IPv6 server
- * @param plugin the plugin
- * @param server which server to schedule v4 or v6?
- * @param now GNUNET_YES to schedule execution immediately, GNUNET_NO to wait
- * until timeout
+ * Callback called by MessageStreamTokenizer when a message has arrived
+ *
+ * @param cls current session as closure
+ * @param client client
+ * @param message the message to be forwarded to transport service
+ * @return GNUNET_OK
+ */
+static int
+server_receive_mst_cb (void *cls, void *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct Session *s = cls;
+ struct HTTP_Server_Plugin *plugin = s->plugin;
+ struct GNUNET_ATS_Information atsi;
+ struct GNUNET_TIME_Relative delay;
+ char *stat_txt;
+
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == server_exist_session(p, s))
+ return GNUNET_OK;
+
+
+ atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ atsi.value = s->ats_address_network_type;
+ GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
+
+
+ delay = plugin->env->receive (plugin->env->cls,
+ &s->target,
+ message,
+ s, NULL, 0);
+
+ plugin->env->update_address_metrics (plugin->env->cls,
+ &s->target,
+ NULL, 0, s, &atsi, 1);
+
+ GNUNET_asprintf (&stat_txt, "# bytes received via %s_server", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, ntohs (message->size), GNUNET_NO);
+ GNUNET_free (stat_txt);
+
+ s->session_passed = GNUNET_YES;
+ s->next_receive = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
+ if (delay.rel_value_us > 0)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' address `%s' next read delayed for %s\n",
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
+ }
+ server_reschedule_session_timeout (s);
+ return GNUNET_OK;
+}
+
+
+/**
+ * MHD callback for a new incoming connection
+ *
+ * @param cls the plugin handle
+ * @param mhd_connection the mhd connection
+ * @param url the requested URL
+ * @param method GET or PUT
+ * @param version HTTP version
+ * @param upload_data upload data
+ * @param upload_data_size sizeof upload data
+ * @param httpSessionCache the session cache to remember the connection
+ * @return MHD_YES if connection is accepted, MHD_NO on reject
+ */
+static int
+server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
+ const char *url, const char *method, const char *version,
+ const char *upload_data, size_t * upload_data_size,
+ void **httpSessionCache)
+{
+ struct HTTP_Server_Plugin *plugin = cls;
+ int res = MHD_YES;
+
+ struct ServerConnection *sc = *httpSessionCache;
+ struct Session *s;
+ struct MHD_Response *response;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("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,
+ method, version, url, (*upload_data_size));
+
+ GNUNET_assert (cls != NULL);
+ if (sc == NULL)
+ {
+ /* new connection */
+ sc = server_lookup_connection (plugin, mhd_connection, url, method);
+ if (sc != NULL)
+ {
+ (*httpSessionCache) = sc;
+ }
+ else
+ {
+ response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE), HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO);
+ MHD_add_response_header (response,
+ MHD_HTTP_HEADER_CONTENT_TYPE,
+ "text/html");
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
+ MHD_destroy_response (response);
+ return res;
+ }
+ }
+ else
+ {
+ /* 'old' connection */
+ if (NULL == server_lookup_session (plugin, sc))
+ {
+ /* Session was already disconnected */
+ return MHD_NO;
+ }
+ }
+
+ /* existing connection */
+ sc = (*httpSessionCache);
+ s = sc->session;
+ GNUNET_assert (NULL != s);
+ /* connection is to be disconnected */
+ if (sc->disconnect == GNUNET_YES)
+ {
+ /* Sent HTTP/1.1: 200 OK as response */
+ response = MHD_create_response_from_data (strlen ("Thank you!"),
+ "Thank you!",
+ MHD_NO, MHD_NO);
+ MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
+ }
+ GNUNET_assert (s != NULL);
+
+ if (sc->direction == _SEND)
+ {
+ response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
+ 32 * 1024,
+ &server_send_callback, s,
+ NULL);
+ MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
+ }
+ if (sc->direction == _RECEIVE)
+ {
+ if ((*upload_data_size == 0) && (sc->connected == GNUNET_NO))
+ {
+ /* (*upload_data_size == 0) first callback when header are passed */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p / Connection %p: Peer `%s' PUT on address `%s' connected\n",
+ s, sc,
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL,
+ p->protocol,
+ s->addr,
+ s->addrlen));
+ sc->connected = GNUNET_YES;
+ return MHD_YES;
+ }
+ else if ((*upload_data_size == 0) && (sc->connected == GNUNET_YES))
+ {
+ /* (*upload_data_size == 0) when upload is complete */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p / Connection %p: Peer `%s' PUT on address `%s' finished upload\n",
+ s, sc,
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL,
+ p->protocol,
+ s->addr,
+ s->addrlen));
+ 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);
+ MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
+ }
+ else if ((*upload_data_size > 0) && (sc->connected == GNUNET_YES))
+ {
+ /* (*upload_data_size > 0) for every segment received */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p / Connection %p: Peer `%s' PUT on address `%s' received %u bytes\n",
+ s, sc,
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL,
+ p->protocol,
+ s->addr,
+ s->addrlen),
+ *upload_data_size);
+ struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+
+ if ((s->next_receive.abs_value_us <= now.abs_value_us))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "PUT with %u bytes forwarded to MST\n",
+ *upload_data_size);
+ if (s->msg_tk == NULL)
+ {
+ 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);
+ server_mhd_connection_timeout (plugin, s,
+ GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+ (*upload_data_size) = 0;
+ }
+ else
+ {
+ 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 (GNUNET_TIME_absolute_get_duration (s->next_receive),
+ GNUNET_YES));
+ }
+ return MHD_YES;
+ }
+ else
+ {
+ GNUNET_break (0);
+ return MHD_NO;
+ }
+ }
+ return res;
+}
+
+
+/**
+ * Callback from MHD when a connection disconnects
+ *
+ * @param cls closure
+ * @param connection the disconnected MHD connection
+ * @param httpSessionCache the pointer to distinguish
*/
static void
-server_reschedule (struct HTTP_Server_Plugin *plugin, struct MHD_Daemon *server, int now)
+server_disconnect_cb (void *cls, struct MHD_Connection *connection,
+ void **httpSessionCache)
{
- if ((server == plugin->server_v4) && (plugin->server_v4 != NULL))
+ struct ServerConnection *sc = *httpSessionCache;
+ struct Session *s = NULL;
+ struct Session *t = NULL;
+ struct HTTP_Server_Plugin *plugin = NULL;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, p->name,
+ "Disconnect for connection %p \n", sc);
+
+ if (sc == NULL)
+ return;
+
+ if (NULL == (s = server_lookup_session (p, sc)))
+ return;
+
+ GNUNET_assert (NULL != p);
+ for (t = p->head; t != NULL; t = t->next)
{
- if (GNUNET_YES == plugin->server_v4_immediately)
- return; /* No rescheduling, server will run asap */
+ if (t == s)
+ break;
+ }
+ if (NULL == t)
+ return;
- if (GNUNET_YES == now)
- plugin->server_v4_immediately = GNUNET_YES;
+ plugin = s->plugin;
+ if (sc->direction == _SEND)
+ {
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' connection %p, GET on address `%s' disconnected\n",
+ GNUNET_i2s (&s->target), s->server_send,
+ http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen));
+ s->server_send = NULL;
+ if (NULL != (s->server_recv))
+ {
+ s->server_recv->disconnect = GNUNET_YES;
+ GNUNET_assert (NULL != s->server_recv->mhd_conn);
+#if MHD_VERSION >= 0x00090E00
+ MHD_set_connection_option (s->server_recv->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
+ 1);
+#endif
+ server_reschedule (plugin, s->server_recv->mhd_daemon, GNUNET_NO);
+ }
+ }
+ if (sc->direction == _RECEIVE)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' connection %p PUT on address `%s' disconnected\n",
+ GNUNET_i2s (&s->target), s->server_recv,
+ http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen));
+ s->server_recv = NULL;
+ /* Do not terminate session when PUT disconnects
+ if (NULL != (s->server_send))
+ {
+ s->server_send->disconnect = GNUNET_YES;
+ GNUNET_assert (NULL != s->server_send->mhd_conn);
+#if MHD_VERSION >= 0x00090E00
+ MHD_set_connection_option (s->server_send->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
+ 1);
+#endif
+ server_reschedule (plugin, s->server_send->mhd_daemon, GNUNET_NO);
+ }*/
+ if (s->msg_tk != NULL)
+ {
+ GNUNET_SERVER_mst_destroy (s->msg_tk);
+ s->msg_tk = NULL;
+ }
+ }
+
+ GNUNET_free (sc);
+ plugin->cur_connections--;
+
+ if ((s->server_send == NULL) && (s->server_recv == NULL))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' on address `%s' disconnected\n",
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen));
+
+ if ((GNUNET_YES == s->session_passed) && (GNUNET_NO == s->session_ended))
+ {
+ /* Notify transport immediately that this session is invalid */
+ s->session_ended = GNUNET_YES;
+ plugin->env->session_end (plugin->env->cls, &s->target, s);
+ }
+ server_delete_session (s);
+ }
+
+}
+
+
+/**
+ * Check if incoming connection is accepted.
+
+ * @param cls plugin as closure
+ * @param addr address of incoming connection
+ * @param addr_len address length of incoming connection
+ * @return MHD_YES if connection is accepted, MHD_NO if connection is rejected
+ *
+ */
+static int
+server_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
+{
+ struct HTTP_Server_Plugin *plugin = cls;
- if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
- plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
- }
- plugin->server_v4_task = server_schedule (plugin, plugin->server_v4, now);
+ if (plugin->cur_connections <= plugin->max_connections)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("Accepting connection (%u of %u) from `%s'\n"),
+ plugin->cur_connections, plugin->max_connections,
+ GNUNET_a2s (addr, addr_len));
+ return MHD_YES;
}
-
- if ((server == plugin->server_v6) && (plugin->server_v6 != NULL))
+ else
{
- if (GNUNET_YES == plugin->server_v6_immediately)
- return; /* No rescheduling, server will run asap */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
+ _("Server reached maximum number connections (%u), rejecting new connection\n"),
+ plugin->max_connections);
+ return MHD_NO;
+ }
+}
- if (GNUNET_YES == now)
- plugin->server_v6_immediately = GNUNET_YES;
+static void
+server_log (void *arg, const char *fmt, va_list ap)
+{
+ char text[1024];
- if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
- plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
- }
- plugin->server_v6_task = server_schedule (plugin, plugin->server_v6, now);
- }
+ vsnprintf (text, sizeof (text), fmt, ap);
+ va_end (ap);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: %s\n", text);
}
+
/**
* Call MHD IPv4 to process pending requests and then go back
* and schedule the next run.
}
+#define UNSIGNED_MHD_LONG_LONG unsigned MHD_LONG_LONG
+
/**
* Function that queries MHD's select sets and
* starts the task waiting for them.
+ *
* @param plugin plugin
* @param daemon_handle the MHD daemon handle
* @return gnunet task identifier
*/
static GNUNET_SCHEDULER_TaskIdentifier
-server_schedule (struct HTTP_Server_Plugin *plugin, struct MHD_Daemon *daemon_handle,
+server_schedule (struct HTTP_Server_Plugin *plugin,
+ struct MHD_Daemon *daemon_handle,
int now)
{
GNUNET_SCHEDULER_TaskIdentifier ret;
struct GNUNET_NETWORK_FDSet *wws;
struct GNUNET_NETWORK_FDSet *wes;
int max;
- unsigned MHD_LONG_LONG timeout;
+ UNSIGNED_MHD_LONG_LONG timeout;
static unsigned long long last_timeout = 0;
int haveto;
struct GNUNET_TIME_Relative tv;
+ if (GNUNET_YES == plugin->in_shutdown)
+ return GNUNET_SCHEDULER_NO_TASK;
+
ret = GNUNET_SCHEDULER_NO_TASK;
FD_ZERO (&rs);
FD_ZERO (&ws);
{
if (timeout != last_timeout)
{
-#if VERBOSE_SERVER
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "SELECT Timeout changed from %llu to %llu\n",
+ "SELECT Timeout changed from %llu to %llu (ms)\n",
last_timeout, timeout);
-#endif
last_timeout = timeout;
}
- tv.rel_value = (uint64_t) timeout;
+ if (timeout <= GNUNET_TIME_UNIT_SECONDS.rel_value_us / 1000LL)
+ tv.rel_value_us = (uint64_t) timeout * 1000LL;
+ else
+ tv = GNUNET_TIME_UNIT_SECONDS;
}
else
tv = GNUNET_TIME_UNIT_SECONDS;
#if BUILD_HTTPS
+/**
+ * Load ssl certificate from file
+ *
+ * @param file filename
+ * @return content of the file
+ */
static char *
server_load_file (const char *file)
{
#if BUILD_HTTPS
-
+/**
+ * Load ssl certificate
+ *
+ * @param plugin the plugin
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
+ */
static int
server_load_certificate (struct HTTP_Server_Plugin *plugin)
{
int res = GNUNET_OK;
-
char *key_file;
char *cert_file;
- /* Get crypto init string from config
- * If not present just use default values */
-
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
- plugin->name,
- "CRYPTO_INIT",
- &plugin->crypto_init))
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Using crypto init string `%s'\n",
- plugin->crypto_init);
- else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Using default crypto init string \n");
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg, plugin->name,
"KEY_FILE", &key_file))
{
- key_file = GNUNET_strdup ("https_key.key");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name, "CERT_FILE");
+ return GNUNET_SYSERR;
}
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg, plugin->name,
"CERT_FILE", &cert_file))
{
- GNUNET_asprintf (&cert_file, "%s", "https_cert.crt");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name, "CERT_FILE");
+ GNUNET_free (key_file);
+ return GNUNET_SYSERR;
}
+ /* Get crypto init string from config. If not present, use
+ * default values */
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name,
+ "CRYPTO_INIT",
+ &plugin->crypto_init))
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Using crypto init string `%s'\n",
+ plugin->crypto_init);
+ else
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Using default crypto init string \n");
/* read key & certificates from file */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
if ((plugin->key == NULL) || (plugin->cert == NULL))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- _
- ("No usable TLS certificate found and creating one failed!\n"),
- "transport-https");
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name,
+ _("No usable TLS certificate found and creating one at `%s/%s' failed!\n"),
+ key_file, cert_file);
GNUNET_free (key_file);
GNUNET_free (cert_file);
}
#endif
-int
+
+/**
+ * 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)
{
unsigned int timeout;
+ char *msg;
GNUNET_assert (NULL != plugin);
#if BUILD_HTTPS
#if MHD_VERSION >= 0x00090E00
- timeout = HTTP_NOT_VALIDATED_TIMEOUT.rel_value / 1000;
+ timeout = HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"MHD can set timeout per connection! Default time out %u sec.\n",
timeout);
#else
- timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000;
+ timeout = SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
"MHD cannot set timeout per connection! Default time out %u sec.\n",
timeout);
#endif
+
plugin->server_v4 = NULL;
if (plugin->use_ipv4 == GNUNET_YES)
{
&server_disconnect_cb, plugin,
MHD_OPTION_EXTERNAL_LOGGER,
server_log, NULL, MHD_OPTION_END);
+ if (plugin->server_v4 == NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Failed to start %s IPv4 server component on port %u\n",
+ plugin->name, plugin->port);
+ }
+ else
+ server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
}
+
+
plugin->server_v6 = NULL;
if (plugin->use_ipv6 == GNUNET_YES)
{
&server_disconnect_cb, plugin,
MHD_OPTION_EXTERNAL_LOGGER,
server_log, NULL, MHD_OPTION_END);
-
- }
-
- if ((plugin->use_ipv4 == GNUNET_YES) && (plugin->server_v4 == NULL))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Failed to start %s IPv4 server component on port %u\n",
- plugin->name, plugin->port);
- return GNUNET_SYSERR;
+ if (plugin->server_v6 == NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ "Failed to start %s IPv6 server component on port %u\n",
+ plugin->name, plugin->port);
+ }
+ else
+ server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
}
- server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
- if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->server_v6 == NULL))
+ msg = "No";
+ if ((plugin->server_v6 == NULL) && (plugin->server_v4 == NULL))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Failed to start %s IPv6 server component on port %u\n",
- plugin->name, plugin->port);
+ "%s %s server component started on port %u\n",
+ msg, plugin->name, plugin->port);
+ sleep (10);
return GNUNET_SYSERR;
}
- server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
+ 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";
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "%s server component started on port %u\n", plugin->name,
- plugin->port);
+ "%s %s server component started on port %u\n",
+ msg, plugin->name, plugin->port);
return GNUNET_OK;
}
void
server_stop (struct HTTP_Server_Plugin *plugin)
{
- struct HttpServerSession *s = NULL;
- struct HttpServerSession *t = NULL;
-
- struct MHD_Daemon *server_v4_tmp = plugin->server_v4;
- plugin->server_v4 = NULL;
+ if (plugin->server_v4 != NULL)
+ {
+ MHD_stop_daemon (plugin->server_v4);
+ plugin->server_v4 = NULL;
+ }
+ if ( plugin->server_v6 != NULL)
+ {
+ MHD_stop_daemon (plugin->server_v6);
+ plugin->server_v6 = NULL;
+ }
- struct MHD_Daemon *server_v6_tmp = plugin->server_v6;
- plugin->server_v6 = NULL;
if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
}
-
- if (server_v6_tmp != NULL)
- {
- MHD_stop_daemon (server_v4_tmp);
- }
- if (server_v6_tmp != NULL)
- {
- MHD_stop_daemon (server_v6_tmp);
- }
-
- /* cleaning up semi-sessions never propagated */
- s = plugin->server_semi_head;
- while (s != NULL)
- {
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Deleting semi-sessions %p\n", s);
-#endif
- t = s->next;
- struct HTTP_Message *msg = s->msg_head;
- struct HTTP_Message *tmp = NULL;
-
- while (msg != NULL)
- {
- tmp = msg->next;
-
- GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
- if (msg->transmit_cont != NULL)
- {
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
- }
- GNUNET_free (msg);
- msg = tmp;
- }
-
- server_delete_session (s);
- s = t;
- }
-
p = NULL;
#if BUILD_HTTPS
"%s server component stopped\n", plugin->name);
}
+
+/**
+ * Add an address to the server's set of addresses and notify transport
+ *
+ * @param cls the plugin handle
+ * @param add_remove GNUNET_YES on add, GNUNET_NO on remove
+ * @param addr the address
+ * @param addrlen address length
+ */
static void
server_add_address (void *cls, int add_remove, const struct sockaddr *addr,
socklen_t addrlen)
struct HTTP_Server_Plugin *plugin = cls;
struct HttpAddressWrapper *w = NULL;
- if ((AF_INET == addr->sa_family) && (GNUNET_NO == plugin->use_ipv4))
- return;
-
- if ((AF_INET6 == addr->sa_family) && (GNUNET_NO == plugin->use_ipv6))
- return;
-
w = GNUNET_malloc (sizeof (struct HttpAddressWrapper));
- w->addr = http_common_address_from_socket (plugin->protocol, addr, addrlen);
- if (NULL == w->addr)
+ w->address = http_common_address_from_socket (plugin->protocol, addr, addrlen);
+ if (NULL == w->address)
{
GNUNET_free (w);
return;
}
- w->addrlen = http_common_address_get_size (w->addr);
+ w->addrlen = http_common_address_get_size (w->address);
GNUNET_CONTAINER_DLL_insert(plugin->addr_head, plugin->addr_tail, w);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to add address `%s'\n",
- http_common_plugin_address_to_string(NULL, w->addr, w->addrlen));
-
- plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen);
+ http_common_plugin_address_to_string (NULL, p->protocol, w->address, w->addrlen));
+#if BUILD_HTTPS
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "https_client");
+#else
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "http_client");
+#endif
}
+/**
+ * Remove an address from the server's set of addresses and notify transport
+ *
+ * @param cls the plugin handle
+ * @param add_remove GNUNET_YES on add, GNUNET_NO on remove
+ * @param addr the address
+ * @param addrlen address length
+ */
static void
server_remove_address (void *cls, int add_remove, const struct sockaddr *addr,
socklen_t addrlen)
while (NULL != w)
{
- if (GNUNET_YES == http_common_cmp_addresses(w->addr, w->addrlen, saddr, saddr_len))
+ if (GNUNET_YES == http_common_cmp_addresses(w->address, w->addrlen, saddr, saddr_len))
break;
w = w->next;
}
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to remove address `%s'\n",
- http_common_plugin_address_to_string (NULL, w->addr, w->addrlen));
+ http_common_plugin_address_to_string (NULL, p->protocol, w->address, w->addrlen));
GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
- plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen);
- GNUNET_free (w->addr);
+#if BUILD_HTTPS
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "https_client");
+#else
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "http_client");
+#endif
+ GNUNET_free (w->address);
GNUNET_free (w);
}
struct HTTP_Server_Plugin *plugin = cls;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "NPMC called %s to address `%s'\n",
+ "NAT called to %s address `%s'\n",
(add_remove == GNUNET_NO) ? "remove" : "add",
GNUNET_a2s (addr, addrlen));
+ if (AF_INET == addr->sa_family)
+ {
+ struct sockaddr_in *s4 = (struct sockaddr_in *) addr;
+
+ if (GNUNET_NO == plugin->use_ipv4)
+ return;
+
+ if ((NULL != plugin->server_addr_v4) &&
+ (0 != memcmp (&plugin->server_addr_v4->sin_addr,
+ &s4->sin_addr, sizeof (struct in_addr))))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Skipping address `%s' (not bindto address)\n",
+ GNUNET_a2s (addr, addrlen));
+ return;
+ }
+ }
+
+ if (AF_INET6 == addr->sa_family)
+ {
+ struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) addr;
+ if (GNUNET_NO == plugin->use_ipv6)
+ return;
+
+ if ((NULL != plugin->server_addr_v6) &&
+ (0 != memcmp (&plugin->server_addr_v6->sin6_addr,
+ &s6->sin6_addr, sizeof (struct in6_addr))))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Skipping address `%s' (not bindto address)\n",
+ GNUNET_a2s (addr, addrlen));
+ return;
+ }
+ }
+
switch (add_remove)
{
case GNUNET_YES:
}
+/**
+ * Get valid server addresses
+ *
+ * @param plugin the plugin handle
+ * @param service_name the servicename
+ * @param cfg configuration handle
+ * @param addrs addresses
+ * @param addr_lens address length
+ * @return number of addresses
+ */
static int
server_get_addresses (struct HTTP_Server_Plugin *plugin,
- const char *serviceName,
+ const char *service_name,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct sockaddr ***addrs, socklen_t ** addr_lens)
{
disablev6 = !plugin->use_ipv6;
port = 0;
- if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "PORT"))
+ if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
{
GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, serviceName,
+ GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
"PORT", &port));
if (port > 65535)
{
}
- if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "BINDTO"))
+ if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
{
GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, serviceName,
+ GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
"BINDTO", &hostname));
}
else
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Resolving `%s' since that is where `%s' will bind to.\n",
- hostname, serviceName);
+ hostname, service_name);
memset (&hints, 0, sizeof (struct addrinfo));
if (disablev6)
hints.ai_family = AF_INET;
return resi;
}
+
+/**
+ * Ask NAT for addresses
+ *
+ * @param plugin the plugin handle
+ */
static void
server_start_report_addresses (struct HTTP_Server_Plugin *plugin)
{
}
+/**
+ * Stop NAT for addresses
+ *
+ * @param plugin the plugin handle
+ */
static void
server_stop_report_addresses (struct HTTP_Server_Plugin *plugin)
{
{
w = plugin->addr_head;
GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
- GNUNET_free (w->addr);
+ GNUNET_free (w->address);
GNUNET_free (w);
}
}
/**
* Check if IPv6 supported on this system
+ *
+ * @param plugin the plugin handle
+ * @return GNUNET_YES on success, else GNUNET_NO
*/
static int
server_check_ipv6_support (struct HTTP_Server_Plugin *plugin)
/**
- * Function called when the service shuts down. Unloads our plugins
- * and cancels pending validations.
+ * Notify server about our external hostname
*
- * @param cls closure, unused
+ * @param cls plugin
* @param tc task context (unused)
*/
static void
server_notify_external_hostname (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct HTTP_Server_Plugin *plugin = cls;
+ unsigned int urlen;
+ char *url;
plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
-
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- GNUNET_asprintf(&plugin->ext_addr, "%s://%s", plugin->protocol, plugin->external_hostname);
- plugin->ext_addr_len = strlen (plugin->ext_addr) + 1;
+ GNUNET_asprintf(&url, "%s://%s", plugin->protocol, plugin->external_hostname);
+
+ urlen = strlen (url) + 1;
+ plugin->ext_addr = GNUNET_malloc (sizeof (struct HttpAddress) + urlen);
+ plugin->ext_addr->options = htonl(plugin->options);
+ plugin->ext_addr->urlen = htonl (urlen);
+ plugin->ext_addr_len = sizeof (struct HttpAddress) + urlen;
+ memcpy (&plugin->ext_addr[1], url, urlen);
+ GNUNET_free (url);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Notifying transport about external hostname address `%s'\n", plugin->ext_addr);
- plugin->env->notify_address (plugin->env->cls, GNUNET_YES, plugin->ext_addr, plugin->ext_addr_len );
+ "Notifying transport about external hostname address `%s'\n", plugin->external_hostname);
+
+#if BUILD_HTTPS
+ if (GNUNET_YES == plugin->verify_external_hostname)
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, plugin->name,
+ "Enabling SSL verification for external hostname address `%s'\n", plugin->external_hostname);
+ plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
+ plugin->ext_addr, plugin->ext_addr_len,
+ "https_client");
+#else
+ plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
+ plugin->ext_addr, plugin->ext_addr_len,
+ "http_client");
+#endif
}
+/**
+ * Configure the plugin
+ *
+ * @param plugin plugin handle
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
static int
server_configure_plugin (struct HTTP_Server_Plugin *plugin)
{
unsigned long long max_connections;
char *bind4_address = NULL;
char *bind6_address = NULL;
+ char *eh_tmp = NULL;
+ int external_hostname_use_port;
/* Use IPv4? */
if (GNUNET_CONFIGURATION_have_value
}
plugin->port = port;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, plugin->name,
_("Using port %u\n"), plugin->port);
if ((plugin->use_ipv4 == GNUNET_YES) &&
GNUNET_free (bind6_address);
}
+ plugin->verify_external_hostname = GNUNET_NO;
+#if BUILD_HTTPS
+ plugin->verify_external_hostname = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, plugin->name,
+ "VERIFY_EXTERNAL_HOSTNAME");
+ if (GNUNET_SYSERR == plugin->verify_external_hostname)
+ plugin->verify_external_hostname = GNUNET_NO;
+ if (GNUNET_YES == plugin->verify_external_hostname)
+ plugin->options |= HTTP_OPTIONS_VERIFY_CERTIFICATE;
+#endif
+ external_hostname_use_port = GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, plugin->name,
+ "EXTERNAL_HOSTNAME_USE_PORT");
+ if (GNUNET_SYSERR == external_hostname_use_port)
+ external_hostname_use_port = GNUNET_NO;
+
+
if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, plugin->name,
- "EXTERNAL_HOSTNAME", &plugin->external_hostname))
+ "EXTERNAL_HOSTNAME", &eh_tmp))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ char * tmp = NULL;
+ char * pos = NULL;
+ char * pos_url = NULL;
+
+ if (NULL != strstr(eh_tmp, "://"))
+ {
+ tmp = &strstr(eh_tmp, "://")[3];
+ }
+ else
+ tmp = eh_tmp;
+
+ if (GNUNET_YES == external_hostname_use_port)
+ {
+ if ( (strlen (tmp) > 1) && (NULL != (pos = strchr(tmp, '/'))) )
+ {
+ pos_url = pos + 1;
+ pos[0] = '\0';
+ GNUNET_asprintf (&plugin->external_hostname, "%s:%u/%s", tmp, (uint16_t) port, (NULL == pos_url) ? "" : pos_url);
+ }
+ else
+ GNUNET_asprintf (&plugin->external_hostname, "%s:%u", tmp, (uint16_t) port);
+ }
+ else
+ plugin->external_hostname = GNUNET_strdup (tmp);
+ GNUNET_free (eh_tmp);
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, plugin->name,
_("Using external hostname `%s'\n"), plugin->external_hostname);
plugin->notify_ext_task = GNUNET_SCHEDULER_add_now (&server_notify_external_hostname, plugin);
+
+ /* Use only configured external hostname */
+ if (GNUNET_CONFIGURATION_have_value
+ (plugin->env->cfg, plugin->name, "EXTERNAL_HOSTNAME_ONLY"))
+ {
+ plugin->external_only =
+ GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, plugin->name,
+ "EXTERNAL_HOSTNAME_ONLY");
+ }
+ else
+ plugin->external_only = GNUNET_NO;
+
+ if (GNUNET_YES == plugin->external_only)
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("Notifying transport only about hostname `%s'\n"), plugin->external_hostname);
}
else
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"No external hostname configured\n");
-
/* Optional parameters */
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (plugin->env->cfg,
plugin->name,
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
_("Maximum number of connections is %u\n"),
plugin->max_connections);
+
+
+ plugin->peer_id_length = strlen (GNUNET_i2s_full (plugin->env->my_identity));
+
return GNUNET_OK;
}
-#if 0
+
/**
* Session was idle, so disconnect it
+ *
+ * @param cls the session
+ * @param tc task context
*/
static void
server_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_assert (NULL != cls);
- struct HttpServerSession *s = cls;
+ struct Session *s = cls;
s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_log (TIMEOUT_LOG,
- "Session %p was idle for %llu ms, disconnecting\n",
- s, (unsigned long long) TIMEOUT.rel_value);
+ "Session %p was idle for %s, disconnecting\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ GNUNET_YES));
/* call session destroy function */
GNUNET_assert (GNUNET_OK == server_disconnect (s));
/**
-* Start session timeout
+* Start session timeout for session s
+*
+* @param s the session
*/
static void
-server_start_session_timeout (struct HttpServerSession *s)
+server_start_session_timeout (struct Session *s)
{
GNUNET_assert (NULL != s);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &session_timeout,
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT,
+ &server_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
- "Timeout for session %p set to %llu ms\n",
- s, (unsigned long long) TIMEOUT.rel_value);
+ "Timeout for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ GNUNET_YES));
}
/**
-* Increment session timeout due to activity
+* Increment session timeout due to activity session s
+*
+* @param s the session
*/
static void
-server_reschedule_session_timeout (struct HttpServerSession *s)
+server_reschedule_session_timeout (struct Session *s)
{
GNUNET_assert (NULL != s);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &session_timeout,
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT,
+ &server_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
- "Timeout rescheduled for session %p set to %llu ms\n",
- s, (unsigned long long) TIMEOUT.rel_value);
+ "Timeout rescheduled for session %p set to %s\n",
+ s,
+ GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ GNUNET_YES));
}
-#endif
+
/**
* Exit point from the plugin.
+ *
+ * @param cls api
+ * @return NULL
*/
void *
LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct HTTP_Server_Plugin *plugin = api->cls;
+ struct Session *pos;
+ struct Session *next;
+
+ if (NULL == api->cls)
+ {
+ /* Free for stub mode */
+ GNUNET_free (api);
+ return NULL;
+ }
+ plugin->in_shutdown = GNUNET_YES;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("Shutting down plugin `%s'\n"),
+ plugin->name);
if (GNUNET_SCHEDULER_NO_TASK != plugin->notify_ext_task)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to remove address `%s'\n",
http_common_plugin_address_to_string (NULL,
+ p->protocol,
plugin->ext_addr,
plugin->ext_addr_len));
+#if BUILD_HTTPS
plugin->env->notify_address (plugin->env->cls,
GNUNET_NO,
plugin->ext_addr,
- plugin->ext_addr_len);
+ plugin->ext_addr_len,
+ "https_client");
+#else
+ plugin->env->notify_address (plugin->env->cls,
+ GNUNET_NO,
+ plugin->ext_addr,
+ plugin->ext_addr_len,
+ "http_client");
+#endif
+
}
/* Stop to report addresses to transport service */
server_stop_report_addresses (plugin);
-
server_stop (plugin);
+ next = plugin->head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Removing left over session %p\n", pos);
+
+ if ((GNUNET_YES == pos->session_passed) && (GNUNET_NO == pos->session_ended))
+ {
+ /* Notify transport immediately that this session is invalid */
+ pos->session_ended = GNUNET_YES;
+ plugin->env->session_end (plugin->env->cls, &pos->target, pos);
+ }
+
+ server_delete_session (pos);
+ }
/* Clean up */
GNUNET_free_non_null (plugin->external_hostname);
GNUNET_free_non_null (plugin->server_addr_v4);
GNUNET_free_non_null (plugin->server_addr_v6);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("Shutdown for plugin `%s' complete\n"),
+ plugin->name);
+
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
}
+const char *http_plugin_address_to_string (void *cls,
+ const void *addr,
+ size_t addrlen)
+{
+#if BUILD_HTTPS
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
+#else
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
+#endif
+
+}
+
+
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+http_server_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return ntohl (session->ats_address_network_type);
+}
+
/**
* Entry point for the plugin.
+ *
+ * @param cls env
+ * @return api
*/
void *
LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
plugin = GNUNET_malloc (sizeof (struct HTTP_Server_Plugin));
plugin->env = env;
+ p = plugin;
+
+ if (NULL == env->receive)
+ {
+ /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
+ initialze the plugin or the API */
+ api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ api->cls = NULL;
+ api->address_to_string = &http_plugin_address_to_string;
+ api->string_to_address = &http_common_plugin_string_to_address;
+ api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
+ return api;
+ }
+
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
api->send = &http_server_plugin_send;
api->check_address = &http_server_plugin_address_suggested;
api->get_session = &http_server_plugin_get_session;
- api->address_to_string = &http_common_plugin_address_to_string;
+ api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
+ api->get_network = &http_server_get_network;
#if BUILD_HTTPS
plugin->name = "transport-https_server";
plugin->use_ipv6 = server_check_ipv6_support (plugin);
/* Report addresses to transport service */
- server_start_report_addresses (plugin);
+ if (GNUNET_NO == plugin->external_only)
+ server_start_report_addresses (plugin);
if (GNUNET_SYSERR == server_start (plugin))
{
LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
return NULL;
}
-
return api;
}
-
-
-
/* end of plugin_transport_http_server.c */