#include "gnunet_container_lib.h"
#include "gnunet_nat_lib.h"
+#include "plugin_transport_http_common.h"
#include "microhttpd.h"
#if BUILD_HTTPS
#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
/**
* Encapsulation of all of the state of the plugin.
*/
struct Plugin;
-
/**
* Session handle for connections.
*/
struct Session
{
- /**
- * To whom are we talking to (set to our identity
- * if we are still waiting for the welcome message)
- */
- struct GNUNET_PeerIdentity target;
-
/**
* Stored in a linked list.
*/
struct Session *prev;
/**
- * Pointer to the global plugin struct.
+ * To whom are we talking to (set to our identity
+ * if we are still waiting for the welcome message)
*/
- struct HTTP_Server_Plugin *plugin;
+ struct GNUNET_PeerIdentity target;
/**
- * The client (used to identify this connection)
+ * Pointer to the global plugin struct.
*/
- /* void *client; */
+ struct HTTP_Server_Plugin *plugin;
/**
- * Continuation function to call once the transmission buffer
- * has again space available. NULL if there is no
- * continuation to call.
+ * next pointer for double linked list
*/
- GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
+ struct HTTP_Message *msg_head;
/**
- * Closure for transmit_cont.
+ * previous pointer for double linked list
*/
- void *transmit_cont_cls;
+ struct HTTP_Message *msg_tail;
/**
- * At what time did we reset last_received last?
+ * Message stream tokenizer for incoming data
*/
- struct GNUNET_TIME_Absolute last_quota_update;
+ struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
/**
- * How many bytes have we received since the "last_quota_update"
- * timestamp?
+ * Client send handle
*/
- uint64_t last_received;
+ struct ServerConnection *server_recv;
/**
- * Number of bytes per ms that this peer is allowed
- * to send to us.
+ * Client send handle
*/
- uint32_t quota;
+ struct ServerConnection *server_send;
/**
- * next pointer for double linked list
+ * Address
*/
- struct HTTP_Message *msg_head;
+ void *addr;
/**
- * previous pointer for double linked list
+ * Address length
*/
- struct HTTP_Message *msg_tail;
+ size_t addrlen;
/**
- * Message stream tokenizer for incoming data
+ * Unique HTTP/S connection tag for this connection
*/
- struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
+ uint32_t tag;
/**
- * Server handles
+ * ATS network type in NBO
*/
+ uint32_t ats_address_network_type;
/**
- * Client send handle
+ * Was session given to transport service?
*/
- struct ServerConnection *server_recv;
+ int session_passed;
/**
- * Client send handle
+ * Absolute time when to receive data again
+ * Used for receive throttling
*/
- struct ServerConnection *server_send;
+ struct GNUNET_TIME_Absolute next_receive;
/**
- * Address
+ * Session timeout task
*/
- void *addr;
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+};
- /**
- * Address length
- */
- size_t addrlen;
+struct ServerConnection
+{
+ /* _RECV or _SEND */
+ int direction;
+
+ /* Should this connection get disconnected? GNUNET_YES/NO */
+ int disconnect;
+ /* 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;
};
/**
struct GNUNET_TRANSPORT_PluginEnvironment *env;
/**
- * Linked list of open sessions.
+ * Linked list head of open sessions.
*/
struct Session *head;
+ /**
+ * Linked list tail of open sessions.
+ */
struct Session *tail;
-
- char *name;
- char *protocol;
- char *external_hostname;
-
/**
- * libCurl TLS crypto init string, can be set to enhance performance
- *
- * Example:
- *
- * Use RC4-128 instead of AES:
- * NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
- *
+ * Plugin name
*/
- char *crypto_init;
+ char *name;
/**
- * TLS key
+ * Protocol
*/
- char *key;
+ char *protocol;
/**
- * TLS certificate
+ * External address
*/
- char *cert;
-
+ char *external_hostname;
/**
* Maximum number of sockets the plugin can use
* External hostname the plugin can be connected to, can be different to
* the host's FQDN, used e.g. for reverse proxying
*/
- struct HttpAddress *ext_addr;
+ char *ext_addr;
/**
* External address length
*/
int server_v6_immediately;
-
- /**
- * 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 Session *server_semi_head;
-
- struct Session *server_semi_tail;
-
-
/**
* MHD IPv4 daemon
*/
* MHD IPv4 daemon
*/
struct MHD_Daemon *server_v6;
-};
-GNUNET_NETWORK_STRUCT_BEGIN
+#if BUILD_HTTPS
+ /**
+ * Crypto related
+ *
+ * Example:
+ *
+ * Use RC4-128 instead of AES:
+ * NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
+ *
+ */
+ char *crypto_init;
-/**
- * HTTP addresses including a full URI
- */
-struct HttpAddress
-{
/**
- * Length of the address following in NBO
+ * TLS key
*/
- uint32_t addr_len GNUNET_PACKED;
+ char *key;
/**
- * Address following
+ * TLS certificate
*/
- void *addr GNUNET_PACKED;
+ char *cert;
+#endif
+
};
-GNUNET_NETWORK_STRUCT_END
/**
* Wrapper to manage addresses
*/
struct HttpAddressWrapper *prev;
- struct HttpAddress *addr;
+ void *addr;
+
+ size_t addrlen;
};
/**
};
-static struct Plugin * p;
+static struct HTTP_Server_Plugin * p;
+/**
+ * Start session timeout
+ */
+static void
+server_start_session_timeout (struct Session *s);
+
+/**
+ * Increment session timeout due to activity
+ */
+static void
+server_reschedule_session_timeout (struct Session *s);
+
+/**
+ * Cancel timeout
+ */
+static void
+server_stop_session_timeout (struct Session *s);
+
+/**
+ * Disconnect a session
+ */
+int
+server_disconnect (struct Session *s);
+
+int
+server_exist_session (struct HTTP_Server_Plugin *plugin, struct Session *s);
+
+/**
+ * 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);
/**
* 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;
GNUNET_assert (plugin != NULL);
GNUNET_assert (session != NULL);
+ if (GNUNET_NO == server_exist_session (plugin, session))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_assert (NULL != session->server_send);
+
+ if (GNUNET_YES == session->server_send->disconnect)
+ return GNUNET_SYSERR;
+
+ /* 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);
+
+ GNUNET_CONTAINER_DLL_insert_tail (session->msg_head, session->msg_tail, msg);
+
+ server_reschedule (session->plugin, session->server_send->mhd_daemon, GNUNET_YES);
+ server_reschedule_session_timeout (session);
+
/* struct Plugin *plugin = cls; */
return bytes_sent;
}
static void
http_server_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
{
- // struct Plugin *plugin = cls;
- // FIXME
-}
+ 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));
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- * the specific address format depends on the transport
- * @param addrlen length of the address
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for asc
- */
-static void
-http_server_plugin_address_pretty_printer (void *cls, const char *type,
- const void *addr, size_t addrlen,
- int numeric,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TRANSPORT_AddressStringCallback
- asc, void *asc_cls)
-{
- asc (asc_cls, NULL);
-}
+ 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));
+ GNUNET_assert (GNUNET_OK == server_disconnect (pos));
+ }
+ }
+}
/**
static int
http_server_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
{
- /* struct Plugin *plugin = cls; */
+ struct HTTP_Server_Plugin *plugin = cls;
+ struct HttpAddressWrapper *next;
+ struct HttpAddressWrapper *pos;
- /* check if the address is plausible; if so,
- * add it to our list! */
- return GNUNET_OK;
-}
+ if ((NULL != plugin->ext_addr) && GNUNET_YES == (http_common_cmp_addresses (addr, addrlen, plugin->ext_addr, plugin->ext_addr_len)))
+ return GNUNET_OK;
+
+ next = plugin->addr_head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (GNUNET_YES == (http_common_cmp_addresses(addr,
+ addrlen,
+ pos->addr,
+ pos->addrlen)))
+ return GNUNET_OK;
+
+ }
+
+ return GNUNET_NO;
+}
/**
- * 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.
+ * Creates a new outbound session the transport
+ * service will use to send data to the peer
*
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
+ * Since HTTP/S server cannot create sessions, always return NULL
+ *
+ * @param cls the plugin
+ * @param address the address
+ * @return always NULL
*/
-static const char *
-http_server_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
+static struct Session *
+http_server_plugin_get_session (void *cls,
+ const struct GNUNET_HELLO_Address *address)
{
- GNUNET_break (0);
return NULL;
}
* Must not be used afterwards
*/
-void
-server_delete_session (struct Session *s)
+void
+server_delete_session (struct Session *s)
+{
+ struct HTTP_Server_Plugin *plugin = s->plugin;
+ server_stop_session_timeout(s);
+
+ if (GNUNET_YES == s->session_passed)
+ plugin->env->session_end (plugin->env->cls, &s->target, s);
+
+ GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
+ 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;
+ }
+
+ if (s->msg_tk != NULL)
+ {
+ GNUNET_SERVER_mst_destroy (s->msg_tk);
+ s->msg_tk = NULL;
+ }
+ GNUNET_free (s->addr);
+ GNUNET_free_non_null (s->server_recv);
+ GNUNET_free_non_null (s->server_send);
+ GNUNET_free (s);
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p destroyed\n", s);
+}
+
+
+/**
+* Cancel timeout
+*/
+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
+ * @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);
+ }
+}
+
+int
+server_disconnect (struct Session *s)
+{
+ struct ServerConnection * send;
+ struct ServerConnection * recv;
+
+ send = (struct ServerConnection *) s->server_send;
+ if (s->server_send != NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Server: %p / %p Terminating inbound PUT session to peer `%s'\n",
+ s, s->server_send, GNUNET_i2s (&s->target));
+
+ send->disconnect = GNUNET_YES;
+#if MHD_VERSION >= 0x00090E00
+ 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;
+ if (recv != NULL)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Server: %p / %p Terminating inbound GET session to peer `%s'\n",
+ s, s->server_recv, GNUNET_i2s (&s->target));
+
+ recv->disconnect = GNUNET_YES;
+#if MHD_VERSION >= 0x00090E00
+ 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;
+}
+
+static void
+server_mhd_connection_timeout (struct HTTP_Server_Plugin *plugin, struct Session *s, int to)
+{
+#if MHD_VERSION >= 0x00090E00
+ /* Setting timeouts for other connections */
+ if (s->server_recv != NULL)
+ {
+ 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);
+ }
+ if (s->server_send != NULL)
+ {
+ 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
+}
+
+
+static struct ServerConnection *
+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;
+ const union MHD_ConnectionInfo *conn_info;
+ struct GNUNET_ATS_Information ats;
+
+ char *addr;
+ size_t addr_len;
+
+ struct GNUNET_PeerIdentity target;
+ uint32_t tag = 0;
+ int direction = GNUNET_SYSERR;
+ int to;
+
+ /* url parsing variables */
+ size_t url_len;
+ char *url_end;
+ char *hash_start;
+ char *hash_end;
+ char *tag_start;
+ char *tag_end;
+
+ 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);
+ /* URL parsing
+ * URL is valid if it is in the form [peerid[103];tag]*/
+ url_len = strlen (url);
+ url_end = (char *) &url[url_len];
+
+ if (url_len < 105)
+ {
+ GNUNET_break (0);
+ goto error; /* too short */
+ }
+ hash_start = strrchr (url, '/');
+ if (NULL == hash_start)
+ {
+ GNUNET_break (0);
+ goto error; /* '/' delimiter not found */
+ }
+ if (hash_start >= url_end)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+ hash_start++;
+
+ hash_end = strrchr (hash_start, ';');
+ if (NULL == hash_end)
+ {
+ GNUNET_break (0);
+ goto error; /* ';' delimiter not found */
+ }
+
+ if (hash_end >= url_end)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+
+ if (hash_start >= hash_end)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+
+ if ((strlen(hash_start) - strlen(hash_end)) != 103)
+ {
+ GNUNET_break (0);
+ goto error; /* invalid hash length */
+ }
+
+ char hash[104];
+ memcpy (hash, hash_start, 103);
+ hash[103] = '\0';
+ if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((const char *) hash, &(target.hashPubKey)))
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+
+ if (hash_end >= url_end)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+
+ tag_start = &hash_end[1];
+ /* Converting tag */
+ tag_end = NULL;
+ tag = strtoul (tag_start, &tag_end, 10);
+ if (tag == 0)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+ if (tag_end == NULL)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+ if (tag_end != url_end)
+ {
+ GNUNET_break (0);
+ goto error; /* mal formed */
+ }
+
+ if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
+ direction = _RECEIVE;
+ else if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
+ direction = _SEND;
+ else
+ {
+ goto error;
+ }
+
+ 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);
+ goto error;
+ }
+ 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);
+ goto error;
+ }
+ }
+ 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:
+ GNUNET_break (0);
+ goto error;
+ }
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Creating new session for peer `%s' connecting from `%s'\n",
+ GNUNET_i2s (&target),
+ http_common_plugin_address_to_string (NULL, addr, addr_len));
+
+ 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;
+ server_start_session_timeout(s);
+ GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
+ }
+
+ 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->session = s;
+ if (direction == _SEND)
+ s->server_send = sc;
+ if (direction == _RECEIVE)
+ s->server_recv = sc;
+
+#if MHD_VERSION >= 0x00090E00
+ if ((NULL == s->server_recv) || (NULL == s->server_send))
+ {
+ to = (HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value / 1000);
+ 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 / 1000);
+ 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;
+
+/* Error condition */
+ error:
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid connection request\n");
+ return NULL;
+}
+
+static struct Session *
+server_lookup_session (struct HTTP_Server_Plugin *plugin,
+ struct ServerConnection * sc)
+{
+ struct Session *s;
+
+ 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;
+}
+
+
+/**
+ * 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 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;
+
+ 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);
+ GNUNET_free (msg);
+ }
+ }
+ 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);
+
+
+
+ return bytes_read;
+}
+
+/**
+ * Callback called by MessageStreamTokenizer when a message has arrived
+ * @param cls current session as closure
+ * @param client clien
+ * @param message the message to be forwarded to transport service
+ */
+static int
+server_receive_mst_cb (void *cls, void *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct Session *s = cls;
+ struct GNUNET_ATS_Information atsi[2];
+ struct GNUNET_TIME_Relative delay;
+
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == server_exist_session(p, s))
+ return GNUNET_OK;
+
+ struct HTTP_Server_Plugin *plugin = s->plugin;
+
+ atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+ atsi[0].value = htonl (1);
+ atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ atsi[1].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,
+ (const struct GNUNET_ATS_Information *) &atsi, 2,
+ s, s->addr, s->addrlen);
+ s->session_passed = GNUNET_YES;
+ s->next_receive = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
+ if (delay.rel_value > 0)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' address `%s' next read delayed for %llu ms\n",
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL, s->addr, s->addrlen),
+ delay);
+ }
+ server_reschedule_session_timeout (s);
+ return GNUNET_OK;
+}
+
+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 = s->plugin;
- stop_session_timeout(s);
+ struct HTTP_Server_Plugin *plugin = cls;
+ int res = MHD_YES;
- GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
- struct HTTP_Message *msg = s->msg_head;
- struct HTTP_Message *tmp = NULL;
+ struct ServerConnection *sc = *httpSessionCache;
+ struct Session *s;
+ struct MHD_Response *response;
- while (msg != NULL)
+ GNUNET_assert (cls != NULL);
+ if (sc == NULL)
{
- tmp = msg->next;
-
- GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
- if (msg->transmit_cont != NULL)
+ /* new connection */
+ sc = server_lookup_connection (plugin, mhd_connection, url, method);
+ if (sc != NULL)
+ (*httpSessionCache) = sc;
+ else
{
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE), HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO);
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
+ MHD_destroy_response (response);
+ return res;
}
- GNUNET_free (msg);
- msg = tmp;
}
-
- if (s->msg_tk != NULL)
+ else
{
- GNUNET_SERVER_mst_destroy (s->msg_tk);
- s->msg_tk = NULL;
+ /* 'old' connection */
+ if (NULL == server_lookup_session (plugin, sc))
+ {
+ /* Session was already disconnected */
+ return MHD_NO;
+ }
}
- GNUNET_free (s->addr);
- GNUNET_free_non_null (s->server_recv);
- GNUNET_free_non_null (s->server_send);
- GNUNET_free (s);
-}
+ /* existing connection */
+ sc = (*httpSessionCache);
+ s = sc->session;
-static void *
-server_find_address (struct HTTP_Server_Plugin *plugin, const struct sockaddr *addr, socklen_t addrlen)
-{
- struct HttpAddressWrapper *w = NULL;
- char *saddr;
+ GNUNET_assert (NULL != s);
+ /* connection is to be disconnected */
+ if (sc->disconnect == GNUNET_YES)
+ {
+ /* Sent HTTP/1.1: 200 OK as PUT Response\ */
+ response = MHD_create_response_from_data (strlen ("Thank you!"),
+ "Thank you!",
+ MHD_NO, MHD_NO);
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
+ }
- GNUNET_asprintf(&saddr, "%s://%s", plugin->protocol, GNUNET_a2s (addr, addrlen));
- w = plugin->addr_head;
- while (NULL != w)
+ GNUNET_assert (s != NULL);
+ /* Check if both directions are connected */
+ if ((sc->session->server_recv == NULL) || (sc->session->server_send == NULL))
{
- if (0 == strcmp (saddr, w->addr->addr))
- break;
- w = w->next;
+ /* Delayed read from since not both semi-connections are connected */
+ return MHD_YES;
}
- GNUNET_free (saddr);
- return w;
-}
+ 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)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' PUT on address `%s' connected\n",
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL,
+ s->addr,
+ s->addrlen));
+ return MHD_YES;
+ }
-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)
-{
- GNUNET_break (0);
- return MHD_NO;
+ /* Receiving data */
+ if ((*upload_data_size > 0))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Peer `%s' PUT on address `%s' received %u bytes\n",
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL,
+ s->addr,
+ s->addrlen),
+ *upload_data_size);
+ struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+
+ if ((s->next_receive.abs_value <= now.abs_value))
+ {
+ 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);
+#if MHD_VERSION >= 0x00090E00
+ server_mhd_connection_timeout (plugin, s, GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
+#endif
+ (*upload_data_size) = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%p no inbound bandwidth available! Next read was delayed by %llu ms\n",
+ s, now.abs_value - s->next_receive.abs_value);
+ }
+ return MHD_YES;
+ }
+ else
+ return MHD_NO;
+ }
+ return res;
}
static void
server_disconnect_cb (void *cls, struct MHD_Connection *connection,
void **httpSessionCache)
{
- GNUNET_break (0);
+ struct ServerConnection *sc = *httpSessionCache;
+ struct Session *s = NULL;
+ struct Session *t = NULL;
+ struct HTTP_Server_Plugin *plugin = NULL;
+
+ 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 (t == s)
+ break;
+ }
+ if (NULL == t)
+ return;
+
+ 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, 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, s->addr, s->addrlen));
+ s->server_recv = NULL;
+ 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, s->addr, s->addrlen));
+
+ server_delete_session (s);
+ }
}
/**
server_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
{
struct HTTP_Server_Plugin *plugin = cls;
- GNUNET_break (0);
+
if (plugin->cur_connections <= plugin->max_connections)
return MHD_YES;
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Server: Cannot accept new connections\n");
+ 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;
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: %s\n", text);
}
-/**
- * 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,
- 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);
- }
-}
/**
* Call MHD IPv4 to process pending requests and then go back
* @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;
#if MHD_VERSION >= 0x00090E00
- timeout = HTTP_NOT_VALIDATED_TIMEOUT.rel_value / 1000;
+ timeout = HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value / 1000;
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 / 1000;
GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
"MHD cannot set timeout per connection! Default time out %u sec.\n",
timeout);
void
server_stop (struct HTTP_Server_Plugin *plugin)
{
- struct Session *s = NULL;
- struct Session *t = NULL;
-
- struct MHD_Daemon *server_v4_tmp = plugin->server_v4;
- plugin->server_v4 = 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_v4_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)
+ if (plugin->server_v4 != NULL)
{
- MHD_stop_daemon (server_v6_tmp);
+ MHD_stop_daemon (plugin->server_v4);
+ plugin->server_v4 = NULL;
}
-
- /* cleaning up semi-sessions never propagated */
- s = plugin->server_semi_head;
- while (s != NULL)
+ if ( plugin->server_v6 != 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;
+ MHD_stop_daemon (plugin->server_v6);
+ plugin->server_v6 = NULL;
}
p = NULL;
{
struct HTTP_Server_Plugin *plugin = cls;
struct HttpAddressWrapper *w = NULL;
- char *saddr;
- size_t haddrlen;
- GNUNET_asprintf(&saddr, "%s://%s", plugin->protocol, GNUNET_a2s (addr, addrlen));
-
- haddrlen = sizeof (struct HttpAddress) + strlen(saddr) + 1;
w = GNUNET_malloc (sizeof (struct HttpAddressWrapper));
- w->addr = GNUNET_malloc (haddrlen);
- w->addr->addr = &w->addr[1];
- w->addr->addr_len = htonl (strlen(saddr) + 1);
- memcpy (w->addr->addr, saddr, strlen(saddr) + 1);
- GNUNET_free (saddr);
+ w->addr = http_common_address_from_socket (plugin->protocol, addr, addrlen);
+ if (NULL == w->addr)
+ {
+ GNUNET_free (w);
+ return;
+ }
+ w->addrlen = http_common_address_get_size (w->addr);
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", w->addr->addr);
+ "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, haddrlen);
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client");
}
socklen_t addrlen)
{
struct HTTP_Server_Plugin *plugin = cls;
- struct HttpAddressWrapper *w = NULL;
- size_t haddrlen;
+ struct HttpAddressWrapper *w = plugin->addr_head;
+ size_t saddr_len;
+ void * saddr = http_common_address_from_socket (plugin->protocol, addr, addrlen);
+ if (NULL == saddr)
+ return;
+ saddr_len = http_common_address_get_size (saddr);
+
+ while (NULL != w)
+ {
+ if (GNUNET_YES == http_common_cmp_addresses(w->addr, w->addrlen, saddr, saddr_len))
+ break;
+ w = w->next;
+ }
+ GNUNET_free (saddr);
- w = server_find_address (plugin, addr, addrlen);
if (NULL == w)
return;
- haddrlen = sizeof (struct HttpAddress) + ntohl (w->addr->addr_len);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Notifying transport to remove address `%s'\n", http_server_plugin_address_to_string (NULL, w->addr, haddrlen));
-
-
+ "Notifying transport to remove address `%s'\n",
+ http_common_plugin_address_to_string (NULL, w->addr, w->addrlen));
GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
- plugin->env->notify_address (plugin->env->cls, add_remove, w->addr,
- sizeof (struct HttpAddress) + ntohl (w->addr->addr_len));
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client");
GNUNET_free (w->addr);
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:
server_notify_external_hostname (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct HTTP_Server_Plugin *plugin = cls;
- struct HttpAddress *eaddr;
- char *addr;
- size_t eaddr_len;
- size_t uri_len;
plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- GNUNET_asprintf(&addr, "%s://%s", plugin->protocol, plugin->external_hostname);
- uri_len = strlen (addr) + 1;
- eaddr_len = sizeof (struct HttpAddress) + uri_len;
- eaddr = GNUNET_malloc (eaddr_len);
- eaddr->addr_len = htonl (uri_len);
- eaddr->addr = (void *) &eaddr[1];
- memcpy (&eaddr->addr, addr, uri_len);
+ GNUNET_asprintf(&plugin->ext_addr, "%s://%s", plugin->protocol, plugin->external_hostname);
+ plugin->ext_addr_len = strlen (plugin->ext_addr) + 1;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Notifying transport about external hostname address `%s'\n", addr);
-
- GNUNET_free (addr);
- plugin->env->notify_address (plugin->env->cls, GNUNET_YES, eaddr, eaddr_len);
- plugin->ext_addr = eaddr;
- plugin->ext_addr_len = eaddr_len;
+ "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,
+ "http_client");
}
return GNUNET_OK;
}
+/**
+ * Session was idle, so disconnect it
+ */
+
+static void
+server_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_assert (NULL != 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) SERVER_SESSION_TIMEOUT.rel_value);
+
+ /* call session destroy function */
+ GNUNET_assert (GNUNET_OK == server_disconnect (s));
+}
+
+/**
+* Start session timeout
+*/
+static void
+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 (SERVER_SESSION_TIMEOUT,
+ &server_session_timeout,
+ s);
+ GNUNET_log (TIMEOUT_LOG,
+ "Timeout for session %p set to %llu ms\n",
+ s, (unsigned long long) SERVER_SESSION_TIMEOUT.rel_value);
+}
+
+
+/**
+* Increment session timeout due to activity
+*/
+static void
+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 (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) SERVER_SESSION_TIMEOUT.rel_value);
+}
/**
* Exit point from the plugin.
{
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;
+ }
+
+ 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_server_plugin_address_to_string (NULL,
+ http_common_plugin_address_to_string (NULL,
plugin->ext_addr,
plugin->ext_addr_len));
plugin->env->notify_address (plugin->env->cls,
GNUNET_NO,
plugin->ext_addr,
- plugin->ext_addr_len);
+ plugin->ext_addr_len,
+ "http_client");
}
/* Stop to report addresses to transport service */
server_stop (plugin);
+ next = plugin->head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ GNUNET_CONTAINER_DLL_remove( plugin->head, plugin->tail, pos);
+ server_delete_session (pos);
+ }
+
/* Clean up */
GNUNET_free_non_null (plugin->external_hostname);
GNUNET_free_non_null (plugin->ext_addr);
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;
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_common_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->disconnect = &http_server_plugin_disconnect;
- api->address_pretty_printer = &http_server_plugin_address_pretty_printer;
api->check_address = &http_server_plugin_address_suggested;
- api->address_to_string = &http_server_plugin_address_to_string;
+ api->get_session = &http_server_plugin_get_session;
+
+ api->address_to_string = &http_common_plugin_address_to_string;
+ api->string_to_address = &http_common_plugin_string_to_address;
+ api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
#if BUILD_HTTPS
plugin->name = "transport-https_server";