#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 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
-
#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
*/
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;
- size_t addrlen;
-
/**
- * Inbound or outbound connection
- * Outbound: GNUNET_NO (client is used to send and receive)
- * Inbound : GNUNET_YES (server is used to send and receive)
+ * Address length
*/
- int inbound;
+ size_t addrlen;
/**
* Unique HTTP/S connection tag for this connection
*/
uint32_t ats_address_network_type;
+ /**
+ * Was session given to transport service?
+ */
+ int session_passed;
+
/**
* Absolute time when to receive data again
* Used for receive throttling
int disconnect;
/* The session this server connection belongs to */
- struct HttpServerSession *session;
+ struct Session *session;
/* The MHD connection */
struct MHD_Connection *mhd_conn;
+
+ /* The MHD daemon */
+ struct MHD_Daemon *mhd_daemon;
};
/**
* 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
*/
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
*/
};
-static struct Plugin * p;
+static struct HTTP_Server_Plugin * p;
/**
* Start session timeout
*/
static void
-server_start_session_timeout (struct HttpServerSession *s);
+server_start_session_timeout (struct Session *s);
-#if 0
/**
* Increment session timeout due to activity
*/
static void
-server_reschedule_session_timeout (struct HttpServerSession *s);
-#endif
+server_reschedule_session_timeout (struct Session *s);
+
/**
* Cancel timeout
*/
static void
-server_stop_session_timeout (struct HttpServerSession *s);
+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);
- GNUNET_break (0);
+ 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;
- 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));
+ GNUNET_assert (GNUNET_OK == server_disconnect (pos));
+ }
+ }
+
}
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;
+ struct HttpAddressWrapper *next;
+ struct HttpAddressWrapper *pos;
+
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)
+ next = plugin->addr_head;
+ while (NULL != (pos = next))
{
+ next = pos->next;
if (GNUNET_YES == (http_common_cmp_addresses(addr,
addrlen,
- w->addr,
- w->addrlen)))
+ pos->addr,
+ pos->addrlen)))
return GNUNET_OK;
+
}
return GNUNET_NO;
*/
void
-server_delete_session (struct HttpServerSession *s)
+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;
GNUNET_free_non_null (s->server_recv);
GNUNET_free_non_null (s->server_send);
GNUNET_free (s);
-}
-
-int
-server_disconnect (struct HttpServerSession *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
- }
-
- 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
- }
-
- /* Schedule connection immediately */
-#if 0
- if (s->addrlen == sizeof (struct IPv4HttpAddress))
- {
- server_reschedule (s->plugin, s->plugin->server_v4, GNUNET_YES);
- }
- else if (s->addrlen == sizeof (struct IPv6HttpAddress))
- {
- server_reschedule (s->plugin, s->plugin->server_v6, GNUNET_YES);
- }
-#endif
- return GNUNET_OK;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p destroyed\n", s);
}
* Cancel timeout
*/
static void
-server_stop_session_timeout (struct HttpServerSession *s)
+server_stop_session_timeout (struct Session *s)
{
GNUNET_assert (NULL != s);
}
}
+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 HttpServerSession *s = NULL;
- struct HttpServerSession *t;
+ struct Session *s = NULL;
struct ServerConnection *sc = NULL;
const union MHD_ConnectionInfo *conn_info;
struct GNUNET_ATS_Information ats;
struct GNUNET_PeerIdentity target;
uint32_t tag = 0;
int direction = GNUNET_SYSERR;
+ int to;
/* url parsing variables */
size_t 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 */
}
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 = 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 */
}
plugin->cur_connections, plugin->max_connections);
/* find duplicate session */
- t = plugin->head;
- while (t != NULL)
- {
- if ((t->inbound) &&
- (0 == memcmp (&t->target, &target, sizeof (struct GNUNET_PeerIdentity)))
- &&
- /* FIXME add source address comparison */
- (t->tag == tag))
+ s = plugin->head;
+ while (s != NULL)
+ {
+ if ((0 == memcmp (&s->target, &target, sizeof (struct GNUNET_PeerIdentity))) &&
+ (s->tag == tag))
break;
- t = t->next;
+ s = s->next;
}
- if (t != NULL)
+ if (s != NULL)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Duplicate session, dismissing new connection from peer `%s'\n",
- GNUNET_i2s (&target));
- goto error;
+ 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;
+ }
}
-
- /* find semi-session */
- t = plugin->server_semi_head;
-
- while (t != NULL)
+ else
{
- /* FIXME add source address comparison */
- if ((0 == memcmp (&t->target, &target, sizeof (struct GNUNET_PeerIdentity)))
- && (t->tag == tag))
+ /* 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;
}
- t = t->next;
- }
-
- if (t == NULL)
- goto create;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Found existing semi-session for `%s'\n",
- GNUNET_i2s (&target));
- if ((direction == _SEND) && (t->server_send != NULL))
- {
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Duplicate GET session, dismissing new connection from peer `%s'\n",
- GNUNET_i2s (&target));
- goto error;
- }
- else
- {
- s = t;
- GNUNET_CONTAINER_DLL_remove (plugin->server_semi_head,
- plugin->server_semi_tail, s);
- GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Found matching semi-session, merging session for peer `%s'\n",
- GNUNET_i2s (&target));
- GNUNET_assert (NULL != s);
- goto found;
- }
- if ((direction == _RECEIVE) && (t->server_recv != NULL))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Duplicate PUT session, dismissing new connection from peer `%s'\n",
- GNUNET_i2s (&target));
- goto error;
- }
- else
- {
- s = t;
- GNUNET_CONTAINER_DLL_remove (plugin->server_semi_head,
- plugin->server_semi_tail, s);
+ "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);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Found matching semi-session, merging session for peer `%s'\n",
- GNUNET_i2s (&target));
- GNUNET_assert (NULL != s);
- goto found;
- }
-
-create:
-/* create new session */
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Creating new session for peer `%s' \n",
- GNUNET_i2s (&target));
- 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;
}
- s = GNUNET_malloc (sizeof (struct HttpServerSession));
- 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->inbound = GNUNET_YES;
- s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
- s->tag = tag;
- s->server_recv = NULL;
- s->server_send = NULL;
-
- server_start_session_timeout(s);
-
- GNUNET_CONTAINER_DLL_insert (plugin->server_semi_head,
- plugin->server_semi_tail, s);
- goto found;
-error:
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Invalid connection request\n");
- return NULL;
-
-found:
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;
s->server_recv = sc;
#if MHD_VERSION >= 0x00090E00
- int to = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
+ 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);
- MHD_set_connection_option (mhd_connection, MHD_CONNECTION_OPTION_TIMEOUT, to);
-
- struct MHD_Daemon *d = NULL;
-#if 0
- if (s->addrlen == sizeof (struct IPv6HttpAddress))
- d = plugin->server_v6;
- if (s->addrlen == sizeof (struct IPv4HttpAddress))
- d = plugin->server_v4;
-#endif
- server_reschedule (plugin, d, GNUNET_NO);
#endif
return sc;
+/* Error condition */
+ error:
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid connection request\n");
+ return NULL;
}
-static struct HttpServerSession *
+static struct Session *
server_lookup_session (struct HTTP_Server_Plugin *plugin,
struct ServerConnection * sc)
{
- struct HttpServerSession *s;
+ struct Session *s;
for (s = plugin->head; NULL != s; s = s->next)
if ((s->server_recv == sc) || (s->server_send == sc))
return s;
- for (s = plugin->server_semi_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,
int res = MHD_YES;
struct ServerConnection *sc = *httpSessionCache;
- struct HttpServerSession *s;
+ struct Session *s;
struct MHD_Response *response;
GNUNET_assert (cls != NULL);
s = sc->session;
GNUNET_assert (NULL != s);
-#if 0
/* 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!",
+ 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);
if (sc->direction == _SEND)
{
- response =
- MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
- 32 * 1024,
- &server_send_callback, s,
- NULL);
+ response = MHD_create_response_from_callback (MHD_SIZE_UNKNOWN,
+ 32 * 1024,
+ &server_send_callback, s,
+ NULL);
MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
MHD_destroy_response (response);
return MHD_YES;
if (*upload_data_size == 0)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Peer `%s' PUT on address `%s' connected\n",
+ "Peer `%s' PUT on address `%s' connected\n",
GNUNET_i2s (&s->target),
- http_plugin_address_to_string (NULL, s->addr,
- s->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ s->addr,
+ s->addrlen));
return MHD_YES;
}
if ((*upload_data_size > 0))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: peer `%s' PUT on address `%s' received %u bytes\n",
+ "Peer `%s' PUT on address `%s' received %u bytes\n",
GNUNET_i2s (&s->target),
- http_plugin_address_to_string (NULL, s->addr,
- s->addrlen),
+ 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,
- "Server: %p: PUT with %u bytes forwarded to MST\n", s,
+ "PUT with %u bytes forwarded to MST\n",
*upload_data_size);
if (s->msg_tk == NULL)
{
}
GNUNET_SERVER_mst_receive (s->msg_tk, s, upload_data,
*upload_data_size, GNUNET_NO, GNUNET_NO);
-
#if MHD_VERSION >= 0x00090E00
- int to = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
- struct ServerConnection *t = NULL;
-
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Received %u bytes\n", *upload_data_size);
- /* Setting timeouts for other connections */
- if (s->server_recv != NULL)
- {
- t = s->server_recv;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Setting timeout for %p to %u sec.\n", t,
- to);
- MHD_set_connection_option (t->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
- to);
- }
- if (s->server_send != NULL)
- {
- t = s->server_send;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Setting timeout for %p to %u sec.\n", t,
- to);
- MHD_set_connection_option (t->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
- to);
- }
- struct MHD_Daemon *d = NULL;
-
- if (s->addrlen == sizeof (struct IPv6HttpAddress))
- d = plugin->server_v6;
- if (s->addrlen == sizeof (struct IPv4HttpAddress))
- d = plugin->server_v4;
- server_reschedule (plugin, d, GNUNET_NO);
+ 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,
- "Server: %p no inbound bandwidth available! Next read was delayed by %llu ms\n",
+ "%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;
}
-#endif
return res;
}
server_disconnect_cb (void *cls, struct MHD_Connection *connection,
void **httpSessionCache)
{
- /* FIXME SPLIT */
- 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);
+ }
}
/**
* @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 HttpServerSession *s = NULL;
- struct HttpServerSession *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;
- 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)
"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);
+ plugin->env->notify_address (plugin->env->cls, add_remove, w->addr, w->addrlen, "http_client");
}
"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, w->addrlen);
+ 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:
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", plugin->ext_addr);
- plugin->env->notify_address (plugin->env->cls, GNUNET_YES, plugin->ext_addr, plugin->ext_addr_len );
+ 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 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);
+ 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 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,
+ 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);
+ s, (unsigned long long) SERVER_SESSION_TIMEOUT.rel_value);
}
-#if 0
-/**
- * Session was idle, so disconnect it
- */
-
/**
* Increment session timeout due to activity
*/
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);
+ s, (unsigned long long) SERVER_SESSION_TIMEOUT.rel_value);
}
-#endif
/**
* 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)
{
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;
projects / oweals / gnunet.git / blobdiff