#include "microhttpd.h"
#include <curl/curl.h>
-#define DEBUG_HTTP GNUNET_YES
+#define DEBUG_HTTP GNUNET_NO
#define DEBUG_CURL GNUNET_NO
+#define DEBUG_MHD GNUNET_YES
#define DEBUG_CONNECTIONS GNUNET_NO
#define DEBUG_SESSION_SELECTION GNUNET_NO
#define INBOUND GNUNET_NO
#define OUTBOUND GNUNET_YES
+#define PROTOCOL_PREFIX "http"
+
/**
* Text of the response sent back after the last bytes of a PUT
* request have been received (just to formally obey the HTTP
struct sockaddr_in6 * bind6_address;
char * bind_hostname;
int use_ipv6;
+ int use_ipv4;
+ void * mhd_log;
};
{
struct Plugin *plugin = cls;
char *url = NULL;
+ char *addr_str = (char *) http_plugin_address_to_string(NULL, addr, addrlen);
GNUNET_assert ((addr!=NULL) && (addrlen != 0));
GNUNET_asprintf(&url,
- "http://%s/%s;%u",
- http_plugin_address_to_string(NULL, addr, addrlen),
+ "%s://%s/%s;%u", PROTOCOL_PREFIX, addr_str,
(char *) (&plugin->my_ascii_hash_ident),id);
-
+ GNUNET_free_non_null(addr_str);
return url;
}
return GNUNET_OK;
}
+int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value);
+
/**
* Removes a session from the linked list of sessions
* @param pc peer context
GNUNET_SERVER_mst_destroy (ps->msgtok);
GNUNET_free(ps->url);
+ if (ps->direction==INBOUND)
+ {
+ if (ps->recv_endpoint != NULL)
+ {
+ curl_easy_cleanup(ps->recv_endpoint);
+ ps->recv_endpoint = NULL;
+ }
+ if (ps->send_endpoint != NULL)
+ {
+ curl_easy_cleanup(ps->send_endpoint);
+ ps->send_endpoint = NULL;
+ }
+ }
+
msg = ps->pending_msgs_head;
while (msg!=NULL)
{
{
msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
}
- GNUNET_free(msg);
GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
+ GNUNET_free(msg);
msg = ps->pending_msgs_head;
}
GNUNET_CONTAINER_DLL_remove(pc->head,pc->tail,ps);
GNUNET_free(ps);
ps = NULL;
+
+ /* no sessions left remove peer */
+ if (pc->head==NULL)
+ {
+#if DEBUG_HTTP
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No sessions left for peer `%s', removing context\n",GNUNET_i2s(&pc->identity));
+#endif
+ remove_peer_context_Iterator(plugin, &pc->identity.hashPubKey, pc);
+ }
+
return GNUNET_OK;
}
#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing context for peer `%s'\n",GNUNET_i2s(&pc->identity));
#endif
+ GNUNET_CONTAINER_multihashmap_remove (plugin->peers, &pc->identity.hashPubKey, pc);
while (ps!=NULL)
{
plugin->env->session_end(plugin, &pc->identity, ps);
ps=tmp;
}
GNUNET_free(pc);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# HTTP peers active"),
+ -1,
+ GNUNET_NO);
return GNUNET_YES;
}
GNUNET_assert(cls !=NULL);
af = addr->sa_family;
- if ((af == AF_INET) && (plugin->bind6_address == NULL))
+ if ((af == AF_INET) && (plugin->use_ipv4 == GNUNET_YES) && (plugin->bind6_address == NULL))
{
struct in_addr bnd_cmp = ((struct sockaddr_in *) addr)->sin_addr;
-
t4 = GNUNET_malloc(sizeof(struct IPv4HttpAddress));
/* Not skipping loopback addresses
if (INADDR_LOOPBACK == ntohl(((struct sockaddr_in *) addr)->sin_addr.s_addr))
}
GNUNET_free (t4);
}
- else if ((af == AF_INET6) && (plugin->use_ipv6==GNUNET_YES) && (plugin->bind4_address == NULL))
+ else if ((af == AF_INET6) && (plugin->use_ipv6 == GNUNET_YES) && (plugin->bind4_address == NULL))
{
struct in6_addr bnd_cmp6 = ((struct sockaddr_in6 *) addr)->sin6_addr;
- t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
if (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
{
return GNUNET_OK;
}
-
+ t6 = GNUNET_malloc(sizeof(struct IPv6HttpAddress));
+ GNUNET_assert(t6 != NULL);
if (plugin->bind6_address != NULL)
{
if (0 == memcmp(&plugin->bind6_address->sin6_addr, &bnd_cmp6, sizeof (struct in6_addr)))
}
GNUNET_free (t6);
}
- //return GNUNET_NO;
return GNUNET_OK;
}
+void mhd_logger (void * arg, const char * fmt, va_list ap)
+{
+ char text[1024];
+ vsnprintf(text, 1024, fmt, ap);
+ va_end(ap);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"MHD: %s \n", text);
+}
/**
* Callback called by MHD when a connection is terminated
/* if both connections disconnected, remove session */
if ((ps->send_connected == GNUNET_NO) && (ps->recv_connected == GNUNET_NO))
{
+ GNUNET_STATISTICS_update (pc->plugin->env->stats,
+ gettext_noop ("# HTTP inbound sessions for peers active"),
+ -1,
+ GNUNET_NO);
remove_session(pc,ps,GNUNET_YES,GNUNET_SYSERR);
}
}
{
struct Session *ps = cls;
- struct HTTP_PeerContext *pc = ps->peercontext;
GNUNET_assert(ps != NULL);
+
+ struct HTTP_PeerContext *pc = ps->peercontext;
GNUNET_assert(pc != NULL);
#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
int res = GNUNET_NO;
int send_error_to_client;
- void * addr;
- size_t addr_len;
+ void * addr = NULL;
+ size_t addr_len = 0 ;
GNUNET_assert(cls !=NULL);
send_error_to_client = GNUNET_NO;
pc->last_session = NULL;
memcpy(&pc->identity, &pi_in, sizeof(struct GNUNET_PeerIdentity));
GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# HTTP peers active"),
+ 1,
+ GNUNET_NO);
}
conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS );
addr_len = sizeof(struct IPv6HttpAddress);
}
+ GNUNET_assert (addr != NULL);
+ GNUNET_assert (addr_len != 0);
+
ps = NULL;
/* only inbound sessions here */
ps->session_id =id_num;
ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# HTTP inbound sessions for peers active"),
+ 1,
+ GNUNET_NO);
}
*httpSessionCache = ps;
{
struct Session * ps = stream;
- char * tmp;
- size_t len = size * nmemb;
long http_result = 0;
int res;
/* Getting last http result code */
+ GNUNET_assert(NULL!=ps);
if (ps->recv_connected==GNUNET_NO)
{
- GNUNET_assert(NULL!=ps);
res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
if (CURLE_OK == res)
{
}
}
+#if DEBUG_CURL
+ char * tmp;
+ size_t len = size * nmemb;
tmp = NULL;
if ((size * nmemb) < SIZE_MAX)
tmp = GNUNET_malloc (len+1);
if (tmp[len-2] == 13)
tmp[len-2]= '\0';
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Header: %s\n",ps,tmp);
}
if (NULL != tmp)
GNUNET_free (tmp);
+#endif
return size * nmemb;
}
return CURL_READFUNC_PAUSE;
}
- msg = ps->pending_msgs_tail;
+ GNUNET_assert (msg!=NULL);
+
/* data to send */
if (msg->pos < msg->size)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos);
#endif
/* Calling transmit continuation */
- if (( NULL != ps->pending_msgs_tail) && (NULL != ps->pending_msgs_tail->transmit_cont))
+ if (NULL != ps->pending_msgs_tail->transmit_cont)
msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
remove_http_message(ps, msg);
}
const struct GNUNET_MessageHeader *message)
{
struct Session *ps = cls;
- struct HTTP_PeerContext *pc = ps->peercontext;
GNUNET_assert(ps != NULL);
+
+ struct HTTP_PeerContext *pc = ps->peercontext;
GNUNET_assert(pc != NULL);
#if DEBUG_HTTP
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
struct HTTP_PeerContext *pc = NULL;
struct HTTP_Message * cur_msg = NULL;
long http_result;
+ char * tmp;
GNUNET_assert(cls !=NULL);
break;
/* get session for affected curl handle */
GNUNET_assert ( msg->easy_handle != NULL );
- curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, (char *) &ps);
+ curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &tmp);
+ ps = (struct Session *) tmp;
GNUNET_assert ( ps != NULL );
pc = ps->peercontext;
GNUNET_assert ( pc != NULL );
ps->send_connected = GNUNET_NO;
ps->send_active = GNUNET_NO;
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
- curl_easy_cleanup(ps->send_endpoint);
- ps->send_endpoint=NULL;
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint=NULL;
cur_msg = ps->pending_msgs_tail;
if (( NULL != cur_msg) && ( NULL != cur_msg->transmit_cont))
cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
ps->recv_connected = GNUNET_NO;
ps->recv_active = GNUNET_NO;
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
- curl_easy_cleanup(ps->recv_endpoint);
- ps->recv_endpoint=NULL;
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
}
}
else
ps->send_connected = GNUNET_NO;
ps->send_active = GNUNET_NO;
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
- curl_easy_cleanup(ps->send_endpoint);
- ps->send_endpoint =NULL;
+ //curl_easy_cleanup(ps->send_endpoint);
+ //ps->send_endpoint =NULL;
}
if (msg->easy_handle == ps->recv_endpoint)
{
ps->recv_connected = GNUNET_NO;
ps->recv_active = GNUNET_NO;
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
- curl_easy_cleanup(ps->recv_endpoint);
- ps->recv_endpoint=NULL;
+ //curl_easy_cleanup(ps->recv_endpoint);
+ //ps->recv_endpoint=NULL;
}
}
if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected == GNUNET_NO))
* @param ses session to send data to
* @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
*/
-static int curl_schedule(void *cls )
+static int curl_schedule(void *cls)
{
struct Plugin *plugin = cls;
fd_set rs;
GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
}
-
max = -1;
FD_ZERO (&rs);
FD_ZERO (&ws);
/* Check if session is connected to receive data, otherwise connect to peer */
if (ps->recv_connected == GNUNET_NO)
{
+ int fresh = GNUNET_NO;
if (ps->recv_endpoint == NULL)
{
- ps->recv_endpoint = curl_easy_init();
+ fresh = GNUNET_YES;
+ ps->recv_endpoint = curl_easy_init();
+ }
#if DEBUG_CURL
curl_easy_setopt(ps->recv_endpoint, CURLOPT_VERBOSE, 1L);
#endif
curl_easy_setopt(ps->recv_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
- mret = curl_multi_add_handle(plugin->multi_handle, ps->recv_endpoint);
- if (mret != CURLM_OK)
+ if (fresh==GNUNET_YES)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Connection: %X: %s failed at %s:%d: `%s'\n"),
- ps,
- "curl_multi_add_handle", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return GNUNET_SYSERR;
+ mret = curl_multi_add_handle(plugin->multi_handle, ps->recv_endpoint);
+ if (mret != CURLM_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Connection: %X: %s failed at %s:%d: `%s'\n"),
+ ps,
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
+ return GNUNET_SYSERR;
+ }
}
if (curl_schedule (plugin) == GNUNET_SYSERR)
+ {
+#if DEBUG_CONNECTIONS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: could not schedule curl task\n",ps);
+#endif
return GNUNET_SYSERR;
+ }
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not connected, initiating connection\n",ps);
#endif
- }
}
/* waiting for receive direction */
}
}
/* not connected, initiate connection */
- if ((ps->send_connected==GNUNET_NO) && (NULL == ps->send_endpoint))
+ if (ps->send_connected==GNUNET_NO)
{
- ps->send_endpoint = curl_easy_init();
+ int fresh = GNUNET_NO;
+ if (NULL == ps->send_endpoint)
+ {
+ ps->send_endpoint = curl_easy_init();
+ fresh = GNUNET_YES;
+ }
GNUNET_assert (ps->send_endpoint != NULL);
GNUNET_assert (NULL != ps->pending_msgs_tail);
#if DEBUG_CONNECTIONS
curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
- mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint);
- if (mret != CURLM_OK)
+ if (fresh==GNUNET_YES)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Connection: %X: %s failed at %s:%d: `%s'\n"),
- ps,
- "curl_multi_add_handle", __FILE__, __LINE__,
- curl_multi_strerror (mret));
- return GNUNET_SYSERR;
+ mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint);
+ if (mret != CURLM_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Connection: %X: %s failed at %s:%d: `%s'\n"),
+ ps,
+ "curl_multi_add_handle", __FILE__, __LINE__,
+ curl_multi_strerror (mret));
+ return GNUNET_SYSERR;
+ }
}
}
if (curl_schedule (plugin) == GNUNET_SYSERR)
pc->last_session = NULL;
memcpy(&pc->identity, target, sizeof(struct GNUNET_PeerIdentity));
GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey, pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# HTTP peers active"),
+ 1,
+ GNUNET_NO);
}
ps = send_select_session (plugin, pc, addr, addrlen, force_address, session);
if (ps->msgtok == NULL)
ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps);
GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+/* FIXME */
+
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ gettext_noop ("# HTTP outbound sessions for peers active"),
+ 1,
+ GNUNET_NO);
}
else
{
asc (asc_cls, NULL);
return;
}
- res = GNUNET_asprintf(&ret,"http://%s:%u/",address,port);
+ res = GNUNET_asprintf(&ret,"%s://%s:%u/", PROTOCOL_PREFIX, address, port);
GNUNET_free (address);
GNUNET_assert(res != 0);
asc (asc_cls, ret);
plugin->peers = NULL;
plugin->bind4_address = NULL;
plugin->use_ipv6 = GNUNET_YES;
+ plugin->use_ipv4 = GNUNET_YES;
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
plugin->use_ipv6 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
"transport-http",
"USE_IPv6");
-
-
-
+ }
+ /* Reading port number from config file */
+ if (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "USE_IPv4"))
+ {
+ plugin->use_ipv4 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+ "transport-http",
+ "USE_IPv4");
}
/* Reading port number from config file */
if ((GNUNET_OK !=
}
/* Reading ipv4 addresse to bind to from config file */
- if (GNUNET_CONFIGURATION_have_value (env->cfg,
- "transport-http", "BINDTO4"))
+ if ((plugin->use_ipv4==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "BINDTO4")))
{
GNUNET_break (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_string (env->cfg,
plugin->bind4_address->sin_family = AF_INET;
plugin->bind4_address->sin_port = htons (port);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"v4 Hostname `%s'!\n",plugin->bind_hostname);
-
if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
}
/* Reading ipv4 addresse to bind to from config file */
- if (GNUNET_CONFIGURATION_have_value (env->cfg,
- "transport-http", "BINDTO6"))
+ if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
+ "transport-http", "BINDTO6")))
{
- GNUNET_break (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (env->cfg,
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg,
"transport-http",
"BINDTO6",
- &plugin->bind_hostname));
-
- plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
- plugin->bind6_address->sin6_family = AF_INET6;
- plugin->bind6_address->sin6_port = htons (port);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"v6 Hostname `%s'!\n",plugin->bind_hostname);
-
- if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+ &plugin->bind_hostname))
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "http",
- _("Misconfigured address to bind to in configuration!\n"),
- "transport-http");
- GNUNET_free(plugin->bind6_address);
- GNUNET_free(plugin->bind_hostname);
- plugin->bind_hostname = NULL;
- plugin->bind6_address = NULL;
-
+ plugin->bind6_address = GNUNET_malloc(sizeof(struct sockaddr_in6));
+ plugin->bind6_address->sin6_family = AF_INET6;
+ plugin->bind6_address->sin6_port = htons (port);
+
+ if (inet_pton(AF_INET6,plugin->bind_hostname, &plugin->bind6_address->sin6_addr)<=0)
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+ "http",
+ _("Misconfigured address to bind to in configuration!\n"),
+ "transport-http");
+ GNUNET_free(plugin->bind6_address);
+ GNUNET_free(plugin->bind_hostname);
+ plugin->bind_hostname = NULL;
+ plugin->bind6_address = NULL;
+ }
}
-
- char * tmp = GNUNET_malloc(50);
- inet_ntop(AF_INET6,&plugin->bind6_address->sin6_addr,tmp,50);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"v6 Hostname reverse `%s'!\n",tmp);
- GNUNET_free(tmp);
}
GNUNET_assert ((port > 0) && (port <= 65535));
{
struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
plugin->http_server_daemon_v6 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
MHD_USE_DEBUG |
#endif
MHD_USE_IPv6,
plugin , &mdh_access_cb, plugin,
MHD_OPTION_SOCK_ADDR, tmp,
MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32,
- MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
+ //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+ MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
MHD_OPTION_END);
}
- if ((plugin->http_server_daemon_v4 == NULL) && (port != 0))
+ if ((plugin->http_server_daemon_v4 == NULL) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
{
plugin->http_server_daemon_v4 = MHD_start_daemon (
-#if DEBUG_CONNECTIONS
+#if DEBUG_MHD
MHD_USE_DEBUG |
#endif
MHD_NO_FLAG,
plugin , &mdh_access_cb, plugin,
MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *)plugin->bind4_address,
MHD_OPTION_CONNECTION_LIMIT, (unsigned int) 32,
- MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
+ //MHD_OPTION_PER_IP_CONNECTION_LIMIT, (unsigned int) 6,
MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (16 * 1024),
MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, NULL,
+ MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
MHD_OPTION_END);
}
if (plugin->http_server_daemon_v4 != NULL)
}
else
{
-#if DEBUG_HTTP
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No MHD was started, transport plugin not functional!\n");
-#endif
+ char * tmp = NULL;
+ if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_YES))
+ GNUNET_asprintf(&tmp,"with IPv4 and IPv6 enabled");
+ if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_YES))
+ GNUNET_asprintf(&tmp,"with IPv4 enabled");
+ if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->use_ipv4 == GNUNET_NO))
+ GNUNET_asprintf(&tmp,"with IPv6 enabled");
+ if ((plugin->use_ipv6 == GNUNET_NO) && (plugin->use_ipv4 == GNUNET_NO))
+ GNUNET_asprintf(&tmp,"with NO IP PROTOCOL enabled");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,"HTTP Server with %s could not be started on port %u! https plugin failed!\n",tmp, port);
+ GNUNET_free(tmp);
libgnunet_plugin_transport_http_done (api);
return NULL;
}
if ( NULL == plugin->multi_handle )
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
- "http",
+ "https",
_("Could not initialize curl multi handle, failed to start http plugin!\n"),
- "transport-http");
+ "transport-https");
libgnunet_plugin_transport_http_done (api);
return NULL;
}