#define _RECEIVE 0
#define _SEND 1
-struct ServerConnection
-{
- /* _RECV or _SEND */
- int direction;
-
- /* should this connection get disconnected? GNUNET_YES/NO */
- int disconnect;
-
- struct Session *session;
- struct MHD_Connection *mhd_conn;
-};
+static struct Plugin * p;
/**
* 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 now or with MHD delay
* @return gnunet task identifier
*/
static GNUNET_SCHEDULER_TaskIdentifier
-server_schedule (struct Plugin *plugin, struct MHD_Daemon *daemon_handle,
+server_schedule (struct Plugin *plugin,
+ struct MHD_Daemon *daemon_handle,
int now);
static void
vsnprintf (text, sizeof (text), fmt, ap);
va_end (ap);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Server: %s\n", text);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: %s\n", text);
}
/**
server_load_file (const char *file)
{
struct GNUNET_DISK_FileHandle *gn_file;
- struct stat fstat;
+ uint64_t fsize;
char *text = NULL;
- if (0 != STAT (file, &fstat))
+ if (GNUNET_OK != GNUNET_DISK_file_size (file,
+ &fsize, GNUNET_NO, GNUNET_YES))
return NULL;
- text = GNUNET_malloc (fstat.st_size + 1);
+ text = GNUNET_malloc (fsize + 1);
gn_file =
GNUNET_DISK_file_open (file, GNUNET_DISK_OPEN_READ,
GNUNET_DISK_PERM_USER_READ);
GNUNET_free (text);
return NULL;
}
- if (GNUNET_SYSERR == GNUNET_DISK_file_read (gn_file, text, fstat.st_size))
+ if (GNUNET_SYSERR == GNUNET_DISK_file_read (gn_file, text, fsize))
{
GNUNET_free (text);
GNUNET_DISK_file_close (gn_file);
return NULL;
}
- text[fstat.st_size] = '\0';
+ text[fsize] = '\0';
GNUNET_DISK_file_close (gn_file);
return text;
}
}
/* read key & certificates from file */
-#if VERBOSE_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Loading TLS certificate from key-file `%s' cert-file`%s'\n",
key_file, cert_file);
-#endif
plugin->key = server_load_file (key_file);
plugin->cert = server_load_file (cert_file);
GNUNET_free_non_null (plugin->cert);
plugin->cert = NULL;
-#if VERBOSE_SERVER
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No usable TLS certificate found, creating certificate\n");
-#endif
errno = 0;
cert_creation =
- GNUNET_OS_start_process (NULL, NULL,
+ GNUNET_OS_start_process (GNUNET_NO, NULL, NULL,
"gnunet-transport-certificate-creation",
"gnunet-transport-certificate-creation",
key_file, cert_file, NULL);
return GNUNET_SYSERR;
}
GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (cert_creation));
- GNUNET_OS_process_close (cert_creation);
+ GNUNET_OS_process_destroy (cert_creation);
plugin->key = server_load_file (key_file);
plugin->cert = server_load_file (cert_file);
}
GNUNET_free (key_file);
GNUNET_free (cert_file);
-#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
-#endif
-
return res;
}
#endif
/**
* 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 Plugin *plugin, int now)
+server_reschedule (struct Plugin *plugin, struct MHD_Daemon *server, int now)
{
- if (plugin->server_v4 != NULL)
+ 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 = server_schedule (plugin, plugin->server_v4, now);
}
- if (plugin->server_v6 != NULL)
+ 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);
* @param client clien
* @param message the message to be forwarded to transport service
*/
-static void
+static int
server_receive_mst_cb (void *cls, void *client,
const struct GNUNET_MessageHeader *message)
{
struct Session *s = cls;
-#if VERBOSE_SERVER
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == exist_session(p, s))
+ return GNUNET_OK;
+
struct Plugin *plugin = s->plugin;
-#endif
struct GNUNET_TIME_Relative delay;
delay = http_plugin_receive (s, &s->target, message, s, s->addr, s->addrlen);
if (delay.rel_value > 0)
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: peer `%s' address `%s' next read delayed for %llu ms\n",
GNUNET_i2s (&s->target),
http_plugin_address_to_string (NULL, s->addr, s->addrlen),
delay);
-#endif
}
+ return GNUNET_OK;
}
+
/**
* Callback called by MHD when it needs data to send
* @param cls current session
server_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
{
struct Session *s = cls;
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Server: %X can sent maximum %u \n", s, max);
-#endif
+ ssize_t bytes_read = 0;
struct HTTP_Message *msg;
- int bytes_read = 0;
- //static int c = 0;
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == exist_session(p, s))
+ return 0;
msg = s->msg_head;
- if (msg != NULL)
+ if (NULL != msg)
{
/* sending */
- if ((msg->size - msg->pos) <= max)
- {
- memcpy (buf, &msg->buf[msg->pos], (msg->size - msg->pos));
- bytes_read = msg->size - msg->pos;
- msg->pos += (msg->size - msg->pos);
- }
- else
- {
- memcpy (buf, &msg->buf[msg->pos], max);
- msg->pos += max;
- bytes_read = max;
- }
+ 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_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
GNUNET_free (msg);
}
}
-
-#if VERBOSE_CLIENT
- struct Plugin *plugin = s->plugin;
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Server: %X: sent %u bytes\n", s, bytes_read);
-#endif
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Server: %p: sent %u bytes\n", s, bytes_read);
return bytes_read;
}
-static struct ServerConnection *
+
+static struct Session *
server_lookup_session (struct 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;
+ for (s = plugin->server_semi_head; NULL != s; s = s->next)
+ if ((s->server_recv == sc) || (s->server_send == sc))
+ return s;
+ return NULL;
+}
+
+
+static struct ServerConnection *
+server_lookup_serverconnection (struct Plugin *plugin,
struct MHD_Connection *mhd_connection, const char *url,
const char *method)
{
struct Session *t;
struct ServerConnection *sc = NULL;
const union MHD_ConnectionInfo *conn_info;
-
+ struct GNUNET_ATS_Information ats;
struct IPv4HttpAddress a4;
struct IPv6HttpAddress a6;
struct sockaddr_in *s4;
struct GNUNET_PeerIdentity target;
int check = GNUNET_NO;
uint32_t tag = 0;
- int direction;
+ int direction = GNUNET_SYSERR;
- conn_info =
- MHD_get_connection_info (mhd_connection,
+ 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 MHD_NO;
+ return NULL;
if ((strlen (&url[1]) >= 105) && (url[104] == ';'))
{
if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
direction = _RECEIVE;
- if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
+ else if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
direction = _SEND;
+ else
+ {
+ GNUNET_break_op (0);
+ goto error;
+ }
+
if (check == GNUNET_NO)
goto error;
plugin->cur_connections++;
-
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: New inbound connection from %s with tag %u\n",
+ "Server: New %s connection from %s with tag %u\n",
+ method,
GNUNET_i2s (&target), tag);
-#endif
- /* find duplicate session */
+ /* find duplicate session */
t = plugin->head;
-
while (t != NULL)
{
if ((t->inbound) &&
}
if (t != NULL)
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Duplicate session, dismissing new connection from peer `%s'\n",
GNUNET_i2s (&target));
-#endif
goto error;
}
if (t == NULL)
goto create;
-
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Found existing semi-session for `%s'\n",
GNUNET_i2s (&target));
-#endif
if ((direction == _SEND) && (t->server_send != NULL))
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Duplicate GET session, dismissing new connection from peer `%s'\n",
GNUNET_i2s (&target));
-#endif
goto error;
}
else
GNUNET_CONTAINER_DLL_remove (plugin->server_semi_head,
plugin->server_semi_tail, s);
GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Found matching semi-session, merging session for peer `%s'\n",
GNUNET_i2s (&target));
-#endif
+ plugin->inbound_sessions ++;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# HTTP inbound sessions",
+ plugin->inbound_sessions,
+ GNUNET_NO);
+ GNUNET_assert (NULL != s);
goto found;
}
if ((direction == _RECEIVE) && (t->server_recv != NULL))
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Duplicate PUT session, dismissing new connection from peer `%s'\n",
GNUNET_i2s (&target));
-#endif
goto error;
}
else
GNUNET_CONTAINER_DLL_remove (plugin->server_semi_head,
plugin->server_semi_tail, s);
GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Found matching semi-session, merging session for peer `%s'\n",
GNUNET_i2s (&target));
-#endif
+ plugin->inbound_sessions ++;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# HTTP inbound sessions",
+ plugin->inbound_sessions,
+ GNUNET_NO);
+ GNUNET_assert (NULL != s);
goto found;
}
create:
/* create new session */
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Creating new session for peer `%s' \n",
GNUNET_i2s (&target));
-#endif
-
switch (conn_info->client_addr->sa_family)
{
case (AF_INET):
memcpy (&a4.ipv4_addr, &s4->sin_addr, sizeof (struct in_addr));
a = &a4;
a_len = sizeof (struct IPv4HttpAddress);
+ ats = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) s4, sizeof (struct sockaddr_in));
break;
case (AF_INET6):
s6 = ((struct sockaddr_in6 *) conn_info->client_addr);
memcpy (&a6.ipv6_addr, &s6->sin6_addr, sizeof (struct in6_addr));
a = &a6;
a_len = sizeof (struct IPv6HttpAddress);
+ ats = plugin->env->get_address_type (plugin->env->cls, (const struct sockaddr *) s6, sizeof (struct sockaddr_in6));
break;
default:
GNUNET_break (0);
goto error;
}
-
- s = create_session (plugin, &target, a, a_len, NULL, NULL);
-
+ s = create_session (plugin, &target, a, a_len);
+ GNUNET_assert (NULL != s);
+ s->ats_address_network_type = ats.value;
s->inbound = GNUNET_YES;
- s->next_receive = GNUNET_TIME_absolute_get_zero ();
+ s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
s->tag = tag;
- if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
- s->server_recv = s;
- if (0 == strcmp (MHD_HTTP_METHOD_GET, method))
- s->server_send = s;
+ s->server_recv = NULL;
+ s->server_send = NULL;
+
GNUNET_CONTAINER_DLL_insert (plugin->server_semi_head,
plugin->server_semi_tail, s);
goto found;
error:
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Invalid connection request\n");
-#endif
return NULL;
found:
#if MHD_VERSION >= 0x00090E00
int to = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Setting timeout for %X to %u sec.\n", sc, to);
-#endif
+ "Server: Setting timeout for %p to %u sec.\n", sc, to);
MHD_set_connection_option (mhd_connection, MHD_CONNECTION_OPTION_TIMEOUT, to);
- server_reschedule (plugin, GNUNET_NO);
+
+ 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);
#endif
return sc;
}
const char *upload_data, size_t * upload_data_size,
void **httpSessionCache)
{
-
struct Plugin *plugin = cls;
struct ServerConnection *sc = *httpSessionCache;
- struct Session *s = NULL;
-
- int res = MHD_YES;
+ struct Session *s;
struct MHD_Response *response;
+ int res = MHD_YES;
GNUNET_assert (cls != NULL);
- /* new connection */
if (sc == NULL)
{
- sc = server_lookup_session (plugin, mhd_connection, url, method);
+ /* new connection */
+ sc = server_lookup_serverconnection (plugin, mhd_connection, url, method);
if (sc != NULL)
(*httpSessionCache) = sc;
else
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 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);
-#if VERBOSE_SERVER
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sent HTTP/1.1: 200 OK as PUT Response\n");
-#endif
MHD_destroy_response (response);
return MHD_YES;
}
/* Check if both directions are connected */
if ((sc->session->server_recv == NULL) || (sc->session->server_send == NULL))
{
+ /* Delayed read from since not both semi-connections are connected */
return MHD_YES;
}
if (sc->direction == _SEND)
{
response =
- MHD_create_response_from_callback (-1, 32 * 1024, &server_send_callback,
- s, NULL);
- res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, 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)
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Peer `%s' PUT on address `%s' connected\n",
GNUNET_i2s (&s->target),
- http_plugin_address_to_string (NULL, s->addr, s->addrlen));
-#endif
+ http_plugin_address_to_string (NULL, s->addr,
+ s->addrlen));
return MHD_YES;
}
- /* Recieving data */
+ /* Receiving data */
if ((*upload_data_size > 0))
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: 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_plugin_address_to_string (NULL, s->addr,
+ s->addrlen),
*upload_data_size);
-#endif
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
if ((s->next_receive.abs_value <= now.abs_value))
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: %X: PUT with %u bytes forwarded to MST\n", s,
+ "Server: %p: PUT with %u bytes forwarded to MST\n", s,
*upload_data_size);
-#endif
if (s->msg_tk == NULL)
{
s->msg_tk = GNUNET_SERVER_mst_create (&server_receive_mst_cb, s);
}
- res =
GNUNET_SERVER_mst_receive (s->msg_tk, s, upload_data,
*upload_data_size, GNUNET_NO, GNUNET_NO);
int to = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
struct ServerConnection *t = NULL;
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: Received %u bytes\n", *upload_data_size);
-#endif
-
/* Setting timeouts for other connections */
if (s->server_recv != NULL)
{
t = s->server_recv;
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Setting timeout for %X to %u sec.\n", t,
+ "Server: Setting timeout for %p to %u sec.\n", t,
to);
-#endif
MHD_set_connection_option (t->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
to);
}
if (s->server_send != NULL)
{
t = s->server_send;
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Server: Setting timeout for %X to %u sec.\n", t,
+ "Server: Setting timeout for %p to %u sec.\n", t,
to);
-#endif
MHD_set_connection_option (t->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
to);
}
- server_reschedule (plugin, GNUNET_NO);
+ 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);
#endif
(*upload_data_size) = 0;
}
else
{
-#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Server: %X no inbound bandwidth available! Next read was delayed by %llu ms\n",
+ "Server: %p no inbound bandwidth available! Next read was delayed by %llu ms\n",
s, now.abs_value - s->next_receive.abs_value);
-#endif
}
return MHD_YES;
}
void **httpSessionCache)
{
struct ServerConnection *sc = *httpSessionCache;
- struct ServerConnection *tc = *httpSessionCache;
+ struct ServerConnection *tc = NULL;
struct Session *s = NULL;
struct Session *t = NULL;
struct Plugin *plugin = NULL;
if (sc == NULL)
return;
- s = sc->session;
+ if (NULL == (s = server_lookup_session (p, sc)))
+ return;
+
+ GNUNET_assert (NULL != p);
+ if (GNUNET_NO == exist_session(p, s))
+ return;
+
plugin = s->plugin;
if (sc->direction == _SEND)
{
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Server: %X peer `%s' GET on address `%s' disconnected\n",
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Server: %p peer `%s' GET on address `%s' disconnected\n",
s->server_send, GNUNET_i2s (&s->target),
http_plugin_address_to_string (NULL, s->addr, s->addrlen));
-#endif
s->server_send = NULL;
-
- if (s->server_recv != NULL)
+ if (NULL != (tc = s->server_recv))
{
- tc = s->server_recv;
tc->disconnect = GNUNET_YES;
+ GNUNET_assert (NULL != tc->mhd_conn);
#if MHD_VERSION >= 0x00090E00
- MHD_set_connection_option (sc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
+ MHD_set_connection_option (tc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
1);
#endif
}
}
if (sc->direction == _RECEIVE)
{
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Server: %X peer `%s' PUT on address `%s' disconnected\n",
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Server: %p peer `%s' PUT on address `%s' disconnected\n",
s->server_recv, GNUNET_i2s (&s->target),
http_plugin_address_to_string (NULL, s->addr, s->addrlen));
-#endif
s->server_recv = NULL;
- if (s->server_send != NULL)
+ if (NULL != (tc = s->server_send))
{
- tc = s->server_send;
tc->disconnect = GNUNET_YES;
+ GNUNET_assert (NULL != tc->mhd_conn);
#if MHD_VERSION >= 0x00090E00
- MHD_set_connection_option (sc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
+ MHD_set_connection_option (tc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT,
1);
#endif
}
s->msg_tk = NULL;
}
}
+
GNUNET_free (sc);
t = plugin->server_semi_head;
}
plugin->cur_connections--;
- server_reschedule (plugin, GNUNET_NO);
+ 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);
if ((s->server_send == NULL) && (s->server_recv == NULL))
{
-#if VERBOSE_SERVER
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Server: peer `%s' on address `%s' disconnected\n",
GNUNET_i2s (&s->target),
http_plugin_address_to_string (NULL, s->addr, s->addrlen));
-#endif
if (s->msg_tk != NULL)
{
GNUNET_SERVER_mst_destroy (s->msg_tk);
s->msg_tk = NULL;
}
+ GNUNET_assert (plugin->inbound_sessions > 0);
+ plugin->inbound_sessions --;
+ GNUNET_STATISTICS_set (plugin->env->stats,
+ "# HTTP inbound sessions",
+ plugin->inbound_sessions, GNUNET_NO);
+
notify_session_end (s->plugin, &s->target, s);
}
}
int
server_disconnect (struct Session *s)
{
- struct Plugin *plugin = s->plugin;
- struct Session *t = plugin->head;
-
- while (t != NULL)
+ if (s->server_send != NULL)
{
- if (t->inbound == GNUNET_YES)
- {
- if (t->server_send != NULL)
- {
- ((struct ServerConnection *) t->server_send)->disconnect = GNUNET_YES;
- }
- if (t->server_send != NULL)
- {
- ((struct ServerConnection *) t->server_send)->disconnect = GNUNET_YES;
- }
- }
- t = t->next;
+ ((struct ServerConnection *) s->server_send)->disconnect = GNUNET_YES;
}
+ if (s->server_recv != NULL)
+ {
+ ((struct ServerConnection *) s->server_recv)->disconnect = GNUNET_YES;
+ }
+
return GNUNET_OK;
}
int
server_send (struct Session *s, struct HTTP_Message *msg)
{
- GNUNET_CONTAINER_DLL_insert (s->msg_head, s->msg_tail, msg);
- server_reschedule (s->plugin, GNUNET_YES);
+ GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
+
+ 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);
+ }
+ else
+ return GNUNET_SYSERR;
return GNUNET_OK;
}
GNUNET_assert (cls != NULL);
plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
-
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Running IPv4 server\n");
+#if 0
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Running IPv4 server\n");
#endif
+ plugin->server_v4_immediately = GNUNET_NO;
GNUNET_assert (MHD_YES == MHD_run (plugin->server_v4));
- if (plugin->server_v4 != NULL)
- plugin->server_v4_task =
- server_schedule (plugin, plugin->server_v4, GNUNET_NO);
+ server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
}
struct Plugin *plugin = cls;
GNUNET_assert (cls != NULL);
-
plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
-
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Running IPv6 server\n");
+#if 0
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Running IPv6 server\n");
#endif
+ plugin->server_v6_immediately = GNUNET_NO;
GNUNET_assert (MHD_YES == MHD_run (plugin->server_v6));
- if (plugin->server_v6 != NULL)
- plugin->server_v6_task =
- server_schedule (plugin, plugin->server_v6, GNUNET_NO);
+ server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
}
/**
struct GNUNET_NETWORK_FDSet *wws;
struct GNUNET_NETWORK_FDSet *wes;
int max;
- unsigned long long timeout;
+ unsigned MHD_LONG_LONG timeout;
static unsigned long long last_timeout = 0;
int haveto;
GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
}
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Scheduling IPv4 server task in %llu ms\n", tv);
+#if 0
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Scheduling IPv4 server task in %llu ms\n", tv);
#endif
ret =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK, tv, wrs, wws,
+ tv, wrs, wws,
&server_v4_run, plugin);
}
if (daemon_handle == plugin->server_v6)
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
}
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Scheduling IPv6 server task in %llu ms\n", tv);
+#if 0
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Scheduling IPv6 server task in %llu ms\n", tv);
#endif
ret =
GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
- GNUNET_SCHEDULER_NO_TASK, tv, wrs, wws,
+ tv, wrs, wws,
&server_v6_run, plugin);
}
GNUNET_NETWORK_fdset_destroy (wrs);
{
int res = GNUNET_OK;
unsigned int timeout;
+ p = plugin;
+ GNUNET_assert (NULL != plugin);
#if BUILD_HTTPS
res = server_load_certificate (plugin);
#if MHD_VERSION >= 0x00090E00
- timeout = GNUNET_CONSTANTS_DISCONNECT_SESSION_TIMEOUT.rel_value / 1000;
+ timeout = HTTP_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);
plugin->name, plugin->port);
return GNUNET_SYSERR;
}
+ server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
+
if ((plugin->ipv6 == GNUNET_YES) && (plugin->server_v6 == NULL))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
plugin->name, plugin->port);
return GNUNET_SYSERR;
}
-
- server_reschedule (plugin, GNUNET_NO);
-
-#if DEBUG_HTTP
+ server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"%s server component started on port %u\n", plugin->name,
plugin->port);
-#endif
return res;
}
struct Session *s = NULL;
struct Session *t = NULL;
-#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "server_stop\n");
-#endif
-
struct MHD_Daemon *server_v4_tmp = plugin->server_v4;
plugin->server_v4 = NULL;
while (s != NULL)
{
#if VERBOSE_SERVER
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+ 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 = s->msg_head;
+ 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);
+ 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);
}
GNUNET_free (msg);
msg = tmp;
s = t;
}
+ p = NULL;
+
#if BUILD_HTTPS
GNUNET_free_non_null (plugin->crypto_init);
GNUNET_free_non_null (plugin->cert);
GNUNET_free_non_null (plugin->key);
#endif
-#if DEBUG_HTTP
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"%s server component stopped\n", plugin->name);
-#endif
}
projects / oweals / gnunet.git / blobdiff