* @brief HTTP/S server transport plugin
* @author Matthias Wachs
*/
-
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_server_lib.h"
+#include "gnunet_util_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_plugin.h"
#include "gnunet_nat_lib.h"
#define _SEND 1
-/* Enable output for debbuging URL's of incoming requests */
+/**
+ * Enable output for debbuging URL's of incoming requests
+ */
#define DEBUG_URL_PARSE GNUNET_NO
struct ServerConnection
{
- /* _RECV or _SEND */
+ /**
+ * _RECV or _SEND
+ */
int direction;
- /* Should this connection get disconnected? GNUNET_YES/NO */
+ /**
+ * Should this connection get disconnected? GNUNET_YES/NO
+ */
int disconnect;
- /* For PUT connections: Is this the first or last callback with size 0 */
+ /**
+ * For PUT connections: Is this the first or last callback with size 0
+ */
int connected;
- /* The session this server connection belongs to */
+ /**
+ * The session this server connection belongs to
+ */
struct Session *session;
- /* The MHD connection */
+ /**
+ * The MHD connection
+ */
struct MHD_Connection *mhd_conn;
- /* The MHD daemon */
+ /**
+ * The MHD daemon
+ */
struct MHD_Daemon *mhd_daemon;
};
/**
* Linked list head of open sessions.
*/
-
struct Session *head;
/**
*/
int verify_external_hostname;
-
/**
* Maximum number of sockets the plugin can use
* Each http inbound /outbound connections are two connections
};
-/**
- * The http_server plugin handle
- */
-static struct HTTP_Server_Plugin * p;
-
-
/**
* Start session timeout for session s
* @param s the session
/**
- * Disconnect a session s
+ * Disconnect session @a s
+ *
+ * @param cls closure with the `struct HTTP_Server_Plugin`
* @param s the session
+ * @return #GNUNET_OK on success
*/
static int
-server_disconnect (struct Session *s);
+http_server_plugin_disconnect_session (void *cls,
+ struct Session *s);
/**
*
* @param plugin the plugin handle
* @param s the session
- * @return GNUNET_YES on success, GNUNET_NO on error
+ * @return #GNUNET_YES on success, #GNUNET_NO on error
*/
static 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
+ * @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);
+server_reschedule (struct HTTP_Server_Plugin *plugin,
+ struct MHD_Daemon *server,
+ int now);
/**
* @param cls closure
* @param session which session must be used
* @param msgbuf the message to transmit
- * @param msgbuf_size number of bytes in 'msgbuf'
+ * @param msgbuf_size number of bytes in @a msgbuf
* @param priority how important is the message (most plugins will
* ignore message priority and just FIFO)
* @param to how long to wait at most for the transmission (does not
* been transmitted (or if the transport is ready
* for the next transmission call; or if the
* peer disconnected...); can be NULL
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
* @return number of bytes used (on the physical network, with overheads);
* -1 on hard errors (i.e. address invalid); 0 is a legal value
* and does NOT mean that the message was not transmitted (DV)
}
else
{
- if (GNUNET_YES == session->server_send->disconnect)
- return GNUNET_SYSERR;
+ if (GNUNET_YES == session->server_send->disconnect)
+ return GNUNET_SYSERR;
}
if (NULL != session->server_send)
{
- server_reschedule (session->plugin,
- session->server_send->mhd_daemon,
- GNUNET_YES);
- server_reschedule_session_timeout (session);
+ server_reschedule (session->plugin,
+ session->server_send->mhd_daemon,
+ GNUNET_YES);
}
return bytes_sent;
}
-
/**
* Function that can be used to force the plugin to disconnect
* from the given peer and cancel all previous transmissions
* @param target peer from which to disconnect
*/
static void
-http_server_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
+http_server_plugin_disconnect_peer (void *cls,
+ const struct GNUNET_PeerIdentity *target)
{
struct HTTP_Server_Plugin *plugin = cls;
- struct Session *next = NULL;
- struct Session *pos = NULL;
+ struct Session *next;
+ struct Session *pos;
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))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Disconnecting session %p to `%s'\n",
pos, GNUNET_i2s (target));
- server_disconnect (pos);
+ http_server_plugin_disconnect_session (plugin, pos);
}
}
-
}
*
* @param cls closure
* @param addr pointer to the address
- * @param addrlen length of addr
- * @return GNUNET_OK if this is a plausible address for this peer
+ * @param addrlen length of @a addr
+ * @return #GNUNET_OK if this is a plausible address for this peer
* and transport
*/
static int
-http_server_plugin_address_suggested (void *cls, const void *addr,
- size_t addrlen)
+http_server_plugin_address_suggested (void *cls,
+ const void *addr,
+ size_t addrlen)
{
- struct HttpAddressWrapper *next;
- struct HttpAddressWrapper *pos;
- const struct HttpAddress *haddr = addr;
-
- if ((NULL != p->ext_addr) &&
- GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
- p->ext_addr, p->ext_addr_len)))
- {
- /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
- if ((ntohl(haddr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
- (p->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
- return GNUNET_NO; /* VERIFY option not set as required! */
- return GNUNET_OK;
- }
-
- next = p->addr_head;
- while (NULL != (pos = next))
- {
- next = pos->next;
- if (GNUNET_YES == (http_common_cmp_addresses(addr,
- addrlen,
- pos->address,
- pos->addrlen)))
- return GNUNET_OK;
-
- }
- return GNUNET_NO;
+ struct HTTP_Server_Plugin *plugin = cls;
+ struct HttpAddressWrapper *next;
+ struct HttpAddressWrapper *pos;
+ const struct HttpAddress *haddr = addr;
+
+ if ((NULL != plugin->ext_addr) &&
+ GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
+ plugin->ext_addr,
+ plugin->ext_addr_len)))
+ {
+ /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
+ if ((ntohl (haddr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
+ (plugin->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ return GNUNET_NO; /* VERIFY option not set as required! */
+ return GNUNET_OK;
+ }
+ next = plugin->addr_head;
+ while (NULL != (pos = next))
+ {
+ next = pos->next;
+ if (GNUNET_YES == (http_common_cmp_addresses(addr,
+ addrlen,
+ pos->address,
+ pos->addrlen)))
+ return GNUNET_OK;
+ }
+ return GNUNET_NO;
}
* Deleting the session
* Must not be used afterwards
*
+ * @param cls closure with the `struct HTTP_ServerPlugin`
* @param s the session to delete
+ * @return #GNUNET_OK on success
*/
-static void
-server_delete_session (struct Session *s)
+static int
+server_delete_session (void *cls,
+ struct Session *s)
{
- struct HTTP_Server_Plugin *plugin = s->plugin;
- server_stop_session_timeout(s);
+ struct HTTP_Server_Plugin *plugin = cls;
+ struct HTTP_Message *msg;
+ struct HTTP_Message *tmp;
+ server_stop_session_timeout(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)
+ msg = s->msg_head;
+ while (NULL != msg)
{
tmp = msg->next;
-
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
- if (msg->transmit_cont != NULL)
- {
+ if (NULL != msg->transmit_cont)
msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR,
msg->size, msg->pos + msg->overhead);
- }
GNUNET_free (msg);
msg = tmp;
}
-
- if (s->msg_tk != NULL)
+ if (NULL != s->msg_tk)
{
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_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
"Session %p destroyed\n", s);
GNUNET_free (s);
+ return GNUNET_OK;
}
* @param plugin plugin
* @param daemon_handle the MHD daemon handle
* @param now schedule immediately
- * @return gnunet task identifier
+ * @return task identifier
*/
static GNUNET_SCHEDULER_TaskIdentifier
server_schedule (struct HTTP_Server_Plugin *plugin,
- struct MHD_Daemon *daemon_handle,
+ 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
+ * @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)
+server_reschedule (struct HTTP_Server_Plugin *plugin,
+ struct MHD_Daemon *server,
+ int now)
{
if ((server == plugin->server_v4) && (plugin->server_v4 != NULL))
{
/**
- * Disconnect session s
+ * Disconnect session @a s
*
+ * @param cls closure with the `struct HTTP_Server_Plugin`
* @param s the session
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
-server_disconnect (struct Session *s)
+http_server_plugin_disconnect_session (void *cls,
+ struct Session *s)
{
- struct ServerConnection * send = NULL;
- struct ServerConnection * recv = NULL;
+ struct HTTP_Server_Plugin *plugin = cls;
+ struct ServerConnection * send;
+ struct ServerConnection * recv;
- if (GNUNET_NO == server_exist_session (p, s))
+ if (GNUNET_NO == server_exist_session (plugin, s))
{
- GNUNET_break (0);
- return GNUNET_SYSERR;
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
}
send = (struct ServerConnection *) s->server_send;
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
+ MHD_set_connection_option (send->mhd_conn,
+ MHD_CONNECTION_OPTION_TIMEOUT,
+ 1);
server_reschedule (s->plugin, send->mhd_daemon, GNUNET_YES);
}
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
+ MHD_set_connection_option (recv->mhd_conn,
+ MHD_CONNECTION_OPTION_TIMEOUT,
+ 1);
server_reschedule (s->plugin, recv->mhd_daemon, GNUNET_YES);
}
return GNUNET_OK;
}
+/**
+ * Function that is called to get the keepalive factor.
+ * GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT is divided by this number to
+ * calculate the interval between keepalive packets.
+ *
+ * @param cls closure with the `struct Plugin`
+ * @return keepalive factor
+ */
+static unsigned int
+http_server_query_keepalive_factor (void *cls)
+{
+ return 3;
+}
+
+static void
+http_server_plugin_update_session_timeout (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session *session)
+{
+ struct HTTP_Server_Plugin *plugin = cls;
+
+ if (GNUNET_NO == server_exist_session (plugin, session))
+ return;
+
+ server_reschedule_session_timeout (session);
+}
+
/**
* Tell MHD that the connection should timeout after @a to seconds.
* @param to timeout in seconds
*/
static void
-server_mhd_connection_timeout (struct HTTP_Server_Plugin *plugin,
+server_mhd_connection_timeout (struct HTTP_Server_Plugin *plugin,
struct Session *s,
unsigned int to)
{
-#if MHD_VERSION >= 0x00090E00
/* Setting timeouts for other connections */
if (NULL != s->server_recv)
{
to);
server_reschedule (plugin, s->server_send->mhd_daemon, GNUNET_NO);
}
-#endif
}
+
/**
* Parse incoming URL for tag and target
*
* @param url incoming url
* @param target where to store the target
* @param tag where to store the tag
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
-
static int
-server_parse_url (struct HTTP_Server_Plugin *plugin, const char * url, struct GNUNET_PeerIdentity * target, uint32_t *tag)
+server_parse_url (struct HTTP_Server_Plugin *plugin,
+ const char *url,
+ struct GNUNET_PeerIdentity *target,
+ uint32_t *tag)
{
char * tag_start = NULL;
char * tag_end = NULL;
char * target_start = NULL;
char * separator = NULL;
- char hash[plugin->peer_id_length+1];
- int hash_length;
+ unsigned int hash_length;
unsigned long int ctag;
/* URL parsing
if (DEBUG_URL_PARSE) GNUNET_break (0);
return GNUNET_SYSERR;
}
- memcpy (hash, target_start, hash_length);
- hash[hash_length] = '\0';
-
- if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((const char *) hash, &(target->hashPubKey)))
- {
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_public_key_from_string (target_start,
+ hash_length,
+ &target->public_key))
+ {
/* hash conversion failed */
if (DEBUG_URL_PARSE) GNUNET_break (0);
return GNUNET_SYSERR;
}
-
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Found target `%s' in url\n", GNUNET_h2s_full(&target->hashPubKey));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
+ "Found target `%s' in URL\n",
+ GNUNET_i2s_full (target));
return GNUNET_OK;
}
return NULL;
}
- s = GNUNET_malloc (sizeof (struct Session));
+ s = GNUNET_new (struct Session);
memcpy (&s->target, &target, sizeof (struct GNUNET_PeerIdentity));
s->plugin = plugin;
s->addr = addr;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Creating new session %p for peer `%s' connecting from `%s'\n",
s, GNUNET_i2s (&target),
- http_common_plugin_address_to_string (NULL, p->protocol, addr, addr_len));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ addr, addr_len));
}
- sc = GNUNET_malloc (sizeof (struct ServerConnection));
+ sc = GNUNET_new (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)
plugin->env->session_start (NULL, &s->target, PLUGIN_NAME, NULL, 0 ,s, NULL, 0);
}
-#if MHD_VERSION >= 0x00090E00
if ((NULL == s->server_recv) || (NULL == s->server_send))
{
to = (HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL);
- MHD_set_connection_option (mhd_connection,
+ MHD_set_connection_option (mhd_connection,
MHD_CONNECTION_OPTION_TIMEOUT, to);
server_reschedule (plugin, sc->mhd_daemon, GNUNET_NO);
}
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Session %p for peer `%s' fully connected\n",
s, GNUNET_i2s (&target));
- to = (SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+ to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
server_mhd_connection_timeout (plugin, s, to);
}
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Setting timeout for %p to %u sec.\n", sc, to);
-#endif
return sc;
}
return NULL;
}
-int
-server_exist_session (struct HTTP_Server_Plugin *plugin, struct Session *s)
+
+static 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;
}
struct HTTP_Message *msg;
char *stat_txt;
- GNUNET_assert (NULL != p);
- if (GNUNET_NO == server_exist_session (p, s))
+ if (GNUNET_NO == server_exist_session (s->plugin, s))
return 0;
msg = s->msg_head;
if (NULL != 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);
- GNUNET_asprintf (&stat_txt, "# bytes currently in %s_server buffers", p->protocol);
- GNUNET_STATISTICS_update (p->env->stats,
+ GNUNET_asprintf (&stat_txt, "# bytes currently in %s_server buffers",
+ s->plugin->protocol);
+ GNUNET_STATISTICS_update (s->plugin->env->stats,
stat_txt, -bytes_read, GNUNET_NO);
GNUNET_free (stat_txt);
- GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_server", p->protocol);
- GNUNET_STATISTICS_update (p->env->stats,
+ GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_server",
+ s->plugin->protocol);
+ GNUNET_STATISTICS_update (s->plugin->env->stats,
stat_txt, bytes_read, GNUNET_NO);
GNUNET_free (stat_txt);
}
* @param cls current session as closure
* @param client client
* @param message the message to be forwarded to transport service
- * @return GNUNET_OK
+ * @return #GNUNET_OK
*/
static int
server_receive_mst_cb (void *cls, void *client,
struct GNUNET_TIME_Relative delay;
char *stat_txt;
- GNUNET_assert (NULL != p);
- if (GNUNET_NO == server_exist_session(p, s))
+ if (GNUNET_NO == server_exist_session (s->plugin, s))
return GNUNET_OK;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Peer `%s' address `%s' next read delayed for %s\n",
GNUNET_i2s (&s->target),
- http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen),
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ s->addr, s->addrlen),
GNUNET_STRINGS_relative_time_to_string (delay,
GNUNET_YES));
}
s, sc,
GNUNET_i2s (&s->target),
http_common_plugin_address_to_string (NULL,
- p->protocol,
+ plugin->protocol,
s->addr,
s->addrlen));
sc->connected = GNUNET_YES;
s, sc,
GNUNET_i2s (&s->target),
http_common_plugin_address_to_string (NULL,
- p->protocol,
+ plugin->protocol,
s->addr,
s->addrlen));
sc->connected = GNUNET_NO;
s, sc,
GNUNET_i2s (&s->target),
http_common_plugin_address_to_string (NULL,
- p->protocol,
+ plugin->protocol,
s->addr,
s->addrlen),
*upload_data_size);
/**
* Callback from MHD when a connection disconnects
*
- * @param cls closure
+ * @param cls closure with the `struct HTTP_Server_Plugin *`
* @param connection the disconnected MHD connection
* @param httpSessionCache the pointer to distinguish
*/
server_disconnect_cb (void *cls, struct MHD_Connection *connection,
void **httpSessionCache)
{
+ struct HTTP_Server_Plugin *plugin = cls;
struct ServerConnection *sc = *httpSessionCache;
struct Session *s = NULL;
struct Session *t = NULL;
- struct HTTP_Server_Plugin *plugin = NULL;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, p->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
+ plugin->name,
"Disconnect for connection %p \n", sc);
if (sc == NULL)
return;
- if (NULL == (s = server_lookup_session (p, sc)))
+ if (NULL == (s = server_lookup_session (plugin, sc)))
return;
-
- GNUNET_assert (NULL != p);
- for (t = p->head; t != NULL; t = t->next)
- {
+ for (t = plugin->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, p->protocol, s->addr, s->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ s->addr, s->addrlen));
s->server_send = NULL;
if (NULL != (s->server_recv))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Peer `%s' connection %p PUT on address `%s' disconnected\n",
GNUNET_i2s (&s->target), s->server_recv,
- http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ s->addr, s->addrlen));
s->server_recv = NULL;
/* Do not terminate session when PUT disconnects
if (NULL != (s->server_send))
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Peer `%s' on address `%s' disconnected\n",
GNUNET_i2s (&s->target),
- http_common_plugin_address_to_string (NULL, p->protocol, s->addr, s->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ s->addr, s->addrlen));
if ((GNUNET_YES == s->session_passed) && (GNUNET_NO == s->session_ended))
{
s->session_ended = GNUNET_YES;
plugin->env->session_end (plugin->env->cls, &s->target, s);
}
- server_delete_session (s);
+ server_delete_session (plugin, s);
}
-
}
/**
* Check if incoming connection is accepted.
-
+ *
* @param cls plugin as closure
* @param addr address of incoming connection
* @param addr_len address length of incoming connection
* @return MHD_YES if connection is accepted, MHD_NO if connection is rejected
- *
*/
static int
server_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
}
}
+
static void
server_log (void *arg, const char *fmt, va_list ap)
{
}
-#define UNSIGNED_MHD_LONG_LONG unsigned MHD_LONG_LONG
-
/**
* Function that queries MHD's select sets and
* starts the task waiting for them.
struct GNUNET_NETWORK_FDSet *wws;
struct GNUNET_NETWORK_FDSet *wes;
int max;
- UNSIGNED_MHD_LONG_LONG timeout;
+ MHD_UNSIGNED_LONG_LONG timeout;
static unsigned long long last_timeout = 0;
int haveto;
* Load ssl certificate
*
* @param plugin the plugin
- * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
*/
static int
server_load_certificate (struct HTTP_Server_Plugin *plugin)
{
int res = GNUNET_OK;
-
- char *sh;
char *key_file;
char *cert_file;
- /* Get crypto init string from config
- * If not present just use default values */
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
- "PATHS",
- "SERVICEHOME",
- &sh))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- "Failed to get servicehome!\n");
- return GNUNET_SYSERR;
- }
-
-
- if (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
- plugin->name,
- "CRYPTO_INIT",
- &plugin->crypto_init))
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Using crypto init string `%s'\n",
- plugin->crypto_init);
- else
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Using default crypto init string \n");
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg, plugin->name,
"KEY_FILE", &key_file))
{
- GNUNET_break (0);
- GNUNET_asprintf (&key_file, "%s/%s", sh, "https_key.key");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name, "CERT_FILE");
+ return GNUNET_SYSERR;
}
-
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (plugin->env->cfg, plugin->name,
"CERT_FILE", &cert_file))
{
- GNUNET_break (0);
- GNUNET_asprintf (&cert_file, "%s/%s", sh, "https_cert.crt");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name, "CERT_FILE");
+ GNUNET_free (key_file);
+ return GNUNET_SYSERR;
}
- GNUNET_free (sh);
+ /* Get crypto init string from config. If not present, use
+ * default values */
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg,
+ plugin->name,
+ "CRYPTO_INIT",
+ &plugin->crypto_init))
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Using crypto init string `%s'\n",
+ plugin->crypto_init);
+ else
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Using default crypto init string \n");
+
/* read key & certificates from file */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Trying to loading TLS certificate from key-file `%s' cert-file`%s'\n",
if ((plugin->key == NULL) || (plugin->cert == NULL))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
- _
- ("No usable TLS certificate found and creating one failed!\n"),
- "transport-https");
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ plugin->name,
+ _("No usable TLS certificate found and creating one at `%s/%s' failed!\n"),
+ key_file, cert_file);
GNUNET_free (key_file);
GNUNET_free (cert_file);
"MHD can set timeout per connection! Default time out %u sec.\n",
timeout);
#else
- timeout = SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
+ timeout = HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
"MHD cannot set timeout per connection! Default time out %u sec.\n",
timeout);
GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
}
- p = NULL;
-
#if BUILD_HTTPS
GNUNET_free_non_null (plugin->crypto_init);
GNUNET_free_non_null (plugin->cert);
struct HTTP_Server_Plugin *plugin = cls;
struct HttpAddressWrapper *w = NULL;
- w = GNUNET_malloc (sizeof (struct HttpAddressWrapper));
+ w = GNUNET_new (struct HttpAddressWrapper);
w->address = http_common_address_from_socket (plugin->protocol, addr, addrlen);
if (NULL == w->address)
{
GNUNET_CONTAINER_DLL_insert(plugin->addr_head, plugin->addr_tail, w);
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to add address `%s'\n",
- http_common_plugin_address_to_string (NULL, p->protocol, w->address, w->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ w->address, w->addrlen));
#if BUILD_HTTPS
plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "https_client");
#else
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Notifying transport to remove address `%s'\n",
- http_common_plugin_address_to_string (NULL, p->protocol, w->address, w->addrlen));
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ w->address, w->addrlen));
GNUNET_CONTAINER_DLL_remove (plugin->addr_head, plugin->addr_tail, w);
#if BUILD_HTTPS
plugin->env->notify_address (plugin->env->cls, add_remove, w->address, w->addrlen, "https_client");
* Get valid server addresses
*
* @param plugin the plugin handle
- * @param serviceName the servicename
+ * @param service_name the servicename
* @param cfg configuration handle
* @param addrs addresses
* @param addr_lens address length
*/
static int
server_get_addresses (struct HTTP_Server_Plugin *plugin,
- const char *serviceName,
+ const char *service_name,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct sockaddr ***addrs, socklen_t ** addr_lens)
{
disablev6 = !plugin->use_ipv6;
port = 0;
- if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "PORT"))
+ if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "PORT"))
{
GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_number (cfg, serviceName,
+ GNUNET_CONFIGURATION_get_value_number (cfg, service_name,
"PORT", &port));
if (port > 65535)
{
}
- if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "BINDTO"))
+ if (GNUNET_CONFIGURATION_have_value (cfg, service_name, "BINDTO"))
{
GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (cfg, serviceName,
+ GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
"BINDTO", &hostname));
}
else
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Resolving `%s' since that is where `%s' will bind to.\n",
- hostname, serviceName);
+ hostname, service_name);
memset (&hints, 0, sizeof (struct addrinfo));
if (disablev6)
hints.ai_family = AF_INET;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Binding %s plugin to specific IPv4 address: `%s'\n",
plugin->protocol, bind4_address);
- plugin->server_addr_v4 = GNUNET_malloc (sizeof (struct sockaddr_in));
+ plugin->server_addr_v4 = GNUNET_new (struct sockaddr_in);
if (1 != inet_pton (AF_INET, bind4_address,
&plugin->server_addr_v4->sin_addr))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Binding %s plugin to specific IPv6 address: `%s'\n",
plugin->protocol, bind6_address);
- plugin->server_addr_v6 = GNUNET_malloc (sizeof (struct sockaddr_in6));
+ plugin->server_addr_v6 = GNUNET_new (struct sockaddr_in6);
if (1 !=
inet_pton (AF_INET6, bind6_address, &plugin->server_addr_v6->sin6_addr))
{
plugin->max_connections);
- plugin->peer_id_length = strlen (GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey));
+ plugin->peer_id_length = strlen (GNUNET_i2s_full (plugin->env->my_identity));
return GNUNET_OK;
}
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 %s, disconnecting\n",
- s,
- GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ s,
+ GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
GNUNET_YES));
/* call session destroy function */
- GNUNET_assert (GNUNET_OK == server_disconnect (s));
+ GNUNET_assert (GNUNET_OK ==
+ http_server_plugin_disconnect_session (s->plugin, s));
}
{
GNUNET_assert (NULL != s);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
- s->timeout_task = GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT,
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
&server_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
"Timeout for session %p set to %s\n",
s,
- GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
GNUNET_YES));
}
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,
+ s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
&server_session_timeout,
s);
GNUNET_log (TIMEOUT_LOG,
"Timeout rescheduled for session %p set to %s\n",
s,
- GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+ GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
GNUNET_YES));
}
if (GNUNET_SCHEDULER_NO_TASK != plugin->notify_ext_task)
{
- GNUNET_SCHEDULER_cancel (plugin->notify_ext_task);
- plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (plugin->notify_ext_task);
+ plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
}
if (NULL != plugin->ext_addr)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Notifying transport to remove address `%s'\n",
- http_common_plugin_address_to_string (NULL,
- p->protocol,
- plugin->ext_addr,
- plugin->ext_addr_len));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Notifying transport to remove address `%s'\n",
+ http_common_plugin_address_to_string (NULL,
+ plugin->protocol,
+ plugin->ext_addr,
+ plugin->ext_addr_len));
#if BUILD_HTTPS
- plugin->env->notify_address (plugin->env->cls,
- GNUNET_NO,
- plugin->ext_addr,
- plugin->ext_addr_len,
- "https_client");
+ plugin->env->notify_address (plugin->env->cls,
+ GNUNET_NO,
+ plugin->ext_addr,
+ plugin->ext_addr_len,
+ "https_client");
#else
plugin->env->notify_address (plugin->env->cls,
GNUNET_NO,
plugin->ext_addr_len,
"http_client");
#endif
-
}
/* Stop to report addresses to transport service */
next = plugin->head;
while (NULL != (pos = next))
{
- next = pos->next;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Removing left over session %p\n", pos);
-
- if ((GNUNET_YES == pos->session_passed) && (GNUNET_NO == pos->session_ended))
- {
- /* Notify transport immediately that this session is invalid */
- pos->session_ended = GNUNET_YES;
- plugin->env->session_end (plugin->env->cls, &pos->target, pos);
- }
+ next = pos->next;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Removing left over session %p\n", pos);
- server_delete_session (pos);
+ if ((GNUNET_YES == pos->session_passed) && (GNUNET_NO == pos->session_ended))
+ {
+ /* Notify transport immediately that this session is invalid */
+ pos->session_ended = GNUNET_YES;
+ plugin->env->session_end (plugin->env->cls, &pos->target, pos);
+ }
+ server_delete_session (plugin, pos);
}
/* Clean up */
return NULL;
}
-const char *http_plugin_address_to_string (void *cls,
- const void *addr,
- size_t addrlen)
+
+static const char *
+http_plugin_address_to_string (void *cls,
+ const void *addr,
+ size_t addrlen)
{
#if BUILD_HTTPS
- return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
#else
- return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
#endif
-
}
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct HTTP_Server_Plugin *plugin;
- 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 = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = NULL;
api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
return api;
}
-
- api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
+ plugin = GNUNET_new (struct HTTP_Server_Plugin);
+ plugin->env = env;
+ api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
api->cls = plugin;
api->send = &http_server_plugin_send;
- api->disconnect = &http_server_plugin_disconnect;
+ api->disconnect_peer = &http_server_plugin_disconnect_peer;
+ api->disconnect_session = &http_server_plugin_disconnect_session;
+ api->query_keepalive_factor = &http_server_query_keepalive_factor;
api->check_address = &http_server_plugin_address_suggested;
api->get_session = &http_server_plugin_get_session;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
api->get_network = &http_server_get_network;
-
+ api->update_session_timeout = &http_server_plugin_update_session_timeout;
#if BUILD_HTTPS
plugin->name = "transport-https_server";
plugin->protocol = "https";
/* Configure plugin */
if (GNUNET_SYSERR == server_configure_plugin (plugin))
{
- LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
- return NULL;
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
}
/* Check IPv6 support */
if (GNUNET_SYSERR == server_start (plugin))
{
- LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
- return NULL;
+ LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+ return NULL;
}
return api;
}
projects / oweals / gnunet.git / blobdiff