X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_http.c;h=a0eecb16873ad0676c63b46ded915c6144f311a4;hb=efa03f35a02e6245adfcc6f59e6287a78204a447;hp=2293e4ba46cebdbbcb0ba2bca0351da3d9d03c1c;hpb=dd1c950fea7a51ea23a5ce3ecb36eced72d62af2;p=oweals%2Fgnunet.git

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index 2293e4ba4..a0eecb168 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -35,21 +35,35 @@
 #include "gnunet_resolver_service.h"
 #include "gnunet_server_lib.h"
 #include "gnunet_container_lib.h"
-#include "plugin_transport.h"
+#include "gnunet_transport_plugin.h"
 #include "gnunet_os_lib.h"
 #include "microhttpd.h"
 #include <curl/curl.h>
 
+#if BUILD_HTTPS
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_done
+#define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_https
+#define PROTOCOL_PREFIX "https"
+#else
+#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_init
+#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_done
+#define LIBGNUNET_PLUGIN_TRANSPORT_COMPONENT transport_http
+#define PROTOCOL_PREFIX "http"
+#endif
+
 #define DEBUG_HTTP GNUNET_NO
 #define DEBUG_CURL GNUNET_NO
-#define DEBUG_MHD GNUNET_YES
+#define DEBUG_MHD GNUNET_NO
 #define DEBUG_CONNECTIONS GNUNET_NO
 #define DEBUG_SESSION_SELECTION GNUNET_NO
+#define DEBUG_SCHEDULING GNUNET_NO
+#define CURL_TCP_NODELAY GNUNET_YES
 
 #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
@@ -81,6 +95,16 @@
  */
 struct IPv4HttpAddress
 {
+  /**
+   * Linked list next
+   */
+  struct IPv4HttpAddress * next;
+
+  /**
+   * Linked list previous
+   */
+  struct IPv4HttpAddress * prev;
+
   /**
    * IPv4 address, in network byte order.
    */
@@ -99,6 +123,16 @@ struct IPv4HttpAddress
  */
 struct IPv6HttpAddress
 {
+  /**
+   * Linked list next
+   */
+  struct IPv6HttpAddress * next;
+
+  /**
+   * Linked list previous
+   */
+  struct IPv6HttpAddress * prev;
+
   /**
    * IPv6 address.
    */
@@ -189,6 +223,16 @@ struct HTTP_PeerContext
    * Last session used to send data
    */
   struct Session * last_session;
+
+  /**
+   * The task resetting inbound quota delay
+   */
+  GNUNET_SCHEDULER_TaskIdentifier reset_task;
+
+  /**
+   * Delay from transport service inbound quota tracker when to receive data again
+   */
+  struct GNUNET_TIME_Relative delay;
 };
 
 
@@ -283,6 +327,7 @@ struct Session
    */
   unsigned int recv_force_disconnect;
 
+
   /**
    * id for next session
    * NOTE: 0 is not an ID, zero is not defined. A correct ID is always > 0
@@ -302,6 +347,17 @@ struct Session
    * inbound session: mhd_connection *
    */
   void * recv_endpoint;
+
+  /**
+   * Current queue size
+   */
+  size_t queue_length_cur;
+
+  /**
+	* Max queue size
+	*/
+  size_t queue_length_max;
+
 };
 
 /**
@@ -319,7 +375,10 @@ struct Plugin
    */
   struct GNUNET_STATISTICS_Handle *stats;
 
-  unsigned int port_inbound;
+  /**
+   * Plugin Port
+   */
+  uint16_t port_inbound;
 
   struct GNUNET_CONTAINER_MultiHashMap *peers;
 
@@ -353,18 +412,88 @@ struct Plugin
    */
   CURLM * multi_handle;
 
+  /**
+   * ipv4 DLL head
+   */
+  struct IPv4HttpAddress * ipv4_addr_head;
+
+  /**
+   * ipv4 DLL tail
+   */
+  struct IPv4HttpAddress * ipv4_addr_tail;
+
+  /**
+   * ipv6 DLL head
+   */
+  struct IPv6HttpAddress * ipv6_addr_head;
+
+  /**
+   * ipv6 DLL tail
+   */
+  struct IPv6HttpAddress * ipv6_addr_tail;
+
   /**
    * Our ASCII encoded, hashed peer identity
    * This string is used to distinguish between connections and is added to the urls
    */
   struct GNUNET_CRYPTO_HashAsciiEncoded my_ascii_hash_ident;
 
+  /**
+   * IPv4 Address the plugin binds to
+   */
   struct sockaddr_in * bind4_address;
+
+  /**
+   * IPv6 Address the plugins binds to
+   */
   struct sockaddr_in6 * bind6_address;
+
+  /**
+   * Hostname to bind to
+   */
   char * bind_hostname;
+
+  /**
+   * Is IPv4 enabled?
+   */
   int use_ipv6;
+
+  /**
+   * Is IPv6 enabled?
+   */
   int use_ipv4;
+
+  /**
+   * use local addresses?
+   */
+  int use_localaddresses;
+
+  /**
+   * maximum number of connections
+   */
+  int max_connect_per_transport;
+
+  /**
+   * Current number of connections;
+   */
+  int current_connections;
+
+  /**
+   * Closure passed by MHD to the mhd_logger function
+   */
   void * mhd_log;
+
+  /* only needed for HTTPS plugin */
+#if BUILD_HTTPS
+  /* The certificate MHD uses as an \0 terminated string */
+  char * cert;
+
+  /* The private key MHD uses as an \0 terminated string */
+  char * key;
+
+  /* crypto init string */
+  char * crypto_init;
+#endif
 };
 
 
@@ -398,162 +527,257 @@ static void http_server_daemon_v6_run (void *cls, const struct GNUNET_SCHEDULER_
 
 /**
  * Function setting up curl handle and selecting message to send
- * @param cls plugin
- * @param ses session to send data to
- * @param con connection
- * @return bytes sent to peer
+ *
+ * @param plugin plugin
+ * @param ps session
+ * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok
  */
-static ssize_t send_check_connections (void *cls, struct Session *ps);
+static int send_check_connections (struct Plugin *plugin, struct Session *ps);
 
 /**
  * Function setting up file descriptors and scheduling task to run
- * @param cls closure
- * @param ses session to send data to
- * @param
+ *
+ * @param  plugin plugin as closure
+ * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
  */
-static int curl_schedule(void *cls );
+static int curl_schedule (struct Plugin *plugin);
 
+/**
+ * Task scheduled to reset the inbound quota delay for a specific peer
+ * @param cls plugin as closure
+ * @param tc task context
+ */
+static void reset_inbound_quota_delay (void *cls,
+                                       const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct HTTP_PeerContext * pc = cls;
+  
+  GNUNET_assert(cls != NULL);
+  pc->reset_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  pc->delay = GNUNET_TIME_relative_get_zero ();
+}
 
 
-static char * create_url(void * cls, const void * addr, size_t addrlen, size_t id)
+/**
+ * Creates a valid url from passed address and id
+ * @param plugin plugin
+ * @param addr address to create url from
+ * @param addrlen address lenth
+ * @param id session id
+ * @return the created url
+ */
+static char * 
+create_url(struct Plugin *plugin, 
+	   const void * addr, size_t addrlen, 
+	   size_t id)
 {
-  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,
-                  "%s://%s/%s;%u", PROTOCOL_PREFIX,
-                  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;
 }
 
+
 /**
  * Removes a message from the linked list of messages
- * @param con connection to remove message from
- * @param msg message to remove
+ * @param ps session
+ * @param msg message
  * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success
  */
-static int remove_http_message (struct Session * ps, struct HTTP_Message * msg)
+static int 
+remove_http_message (struct Session * ps, 
+		     struct HTTP_Message * msg)
 {
-  GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_tail,msg);
+  GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,
+			      ps->pending_msgs_tail,
+			      msg);
   GNUNET_free(msg);
   return GNUNET_OK;
 }
 
-int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value);
+/**
+ * Iterator to remove peer context
+ * @param cls the plugin
+ * @param key the peers public key hashcode
+ * @param value the peer context
+ * @return GNUNET_YES on success
+ */
+static int 
+remove_peer_context_Iterator (void *cls,
+			      const GNUNET_HashCode *key, 
+			      void *value)
+{
+  struct Plugin *plugin = cls;
+  struct HTTP_PeerContext * pc = value;
+  struct Session * ps = pc->head;
+  struct Session * tmp = NULL;
+  struct HTTP_Message * msg = NULL;
+  struct HTTP_Message * msg_tmp = NULL;
+
+#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);
+      tmp = ps->next;
+      
+      GNUNET_free_non_null (ps->addr);
+      GNUNET_free(ps->url);
+      if (ps->msgtok != NULL)
+	GNUNET_SERVER_mst_destroy (ps->msgtok);
+      
+      msg = ps->pending_msgs_head;
+      while (msg!=NULL)
+	{
+	  msg_tmp = msg->next;
+	  GNUNET_free(msg);
+	  msg = msg_tmp;
+	}
+      if (ps->direction==OUTBOUND)
+	{
+	  if (ps->send_endpoint!=NULL)
+	    curl_easy_cleanup(ps->send_endpoint);
+	  if (ps->recv_endpoint!=NULL)
+	    curl_easy_cleanup(ps->recv_endpoint);
+	}      
+      GNUNET_free(ps);
+      ps=tmp;
+    }
+  GNUNET_free(pc);
+  GNUNET_STATISTICS_update (plugin->env->stats,
+			    gettext_noop ("# HTTP peers active"),
+			    -1,
+			    GNUNET_NO);
+  return GNUNET_YES;
+}
+
 
 /**
  * Removes a session from the linked list of sessions
  * @param pc peer context
  * @param ps session
  * @param call_msg_cont GNUNET_YES to call pending message continuations, otherwise no
- * @param call_msg_cont_result, result to call message continuations with
+ * @param call_msg_cont_result result to call message continuations with
  * @return GNUNET_SYSERR if msg not found, GNUNET_OK on success
  */
-static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps,  int call_msg_cont, int call_msg_cont_result)
+static int 
+remove_session (struct HTTP_PeerContext * pc, 
+		struct Session * ps,  
+		int call_msg_cont, 
+		int call_msg_cont_result)
 {
   struct HTTP_Message * msg;
   struct Plugin * plugin = ps->peercontext->plugin;
 
 #if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session %X with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound", ps, ps->session_id);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Connection %X: removing %s session %X with id %u\n", 
+	      ps,
+	      (ps->direction == INBOUND) 
+	      ? "inbound" 
+	      : "outbound", 
+	      ps, ps->session_id);
 #endif
   plugin->env->session_end(plugin, &pc->identity, ps);
-
   GNUNET_free_non_null (ps->addr);
   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;
-	  }
-  }
-
+    {
+      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)
-  {
-    if ((call_msg_cont == GNUNET_YES) && (msg->transmit_cont!=NULL))
     {
-      msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
+      if ((call_msg_cont == GNUNET_YES) && (msg->transmit_cont!=NULL))
+	{
+	  msg->transmit_cont (msg->transmit_cont_cls,
+			      &pc->identity,
+			      call_msg_cont_result);
+	}
+      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(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));
+      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);
-  }
-
+      remove_peer_context_Iterator(plugin, &pc->identity.hashPubKey, pc);
+    }
+  
   return GNUNET_OK;
 }
 
-int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void *value)
+static int check_localaddress (const struct sockaddr *addr, socklen_t addrlen)
 {
-  struct Plugin *plugin = cls;
-  struct HTTP_PeerContext * pc = value;
-  struct Session * ps = pc->head;
-  struct Session * tmp = NULL;
-  struct HTTP_Message * msg = NULL;
-  struct HTTP_Message * msg_tmp = NULL;
+	uint32_t res = 0;
+	int local = GNUNET_NO;
+	int af = addr->sa_family;
+    switch (af)
+    {
+      case AF_INET:
+      {
+    	  uint32_t netmask = 0x7F000000;
+    	  uint32_t address = ntohl (((struct sockaddr_in *) addr)->sin_addr.s_addr);
+    	  res = (address >> 24) ^ (netmask >> 24);
+    	  if (res != 0)
+    		  local = GNUNET_NO;
+    	  else
+    		  local = GNUNET_YES;
 #if DEBUG_HTTP
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Freeing context for peer `%s'\n",GNUNET_i2s(&pc->identity));
+    	    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    			  "Checking IPv4 address `%s': %s\n", GNUNET_a2s (addr, addrlen), (local==GNUNET_YES) ? "local" : "global");
 #endif
-  GNUNET_CONTAINER_multihashmap_remove (plugin->peers, &pc->identity.hashPubKey, pc);
-  while (ps!=NULL)
-  {
-	plugin->env->session_end(plugin, &pc->identity, ps);
-	tmp = ps->next;
-
-    GNUNET_free_non_null (ps->addr);
-    GNUNET_free(ps->url);
-    if (ps->msgtok != NULL)
-      GNUNET_SERVER_mst_destroy (ps->msgtok);
-
-    msg = ps->pending_msgs_head;
-    while (msg!=NULL)
-    {
-      msg_tmp = msg->next;
-      GNUNET_free(msg);
-      msg = msg_tmp;
-    }
-    if (ps->direction==OUTBOUND)
-    {
-      if (ps->send_endpoint!=NULL)
-        curl_easy_cleanup(ps->send_endpoint);
-      if (ps->recv_endpoint!=NULL)
-        curl_easy_cleanup(ps->recv_endpoint);
+    	    break;
+      }
+      case AF_INET6:
+      {
+    	   if (IN6_IS_ADDR_LOOPBACK  (&((struct sockaddr_in6 *) addr)->sin6_addr) ||
+    		   IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr))
+    		   local = GNUNET_YES;
+    	   else
+    		   local = GNUNET_NO;
+#if DEBUG_HTTP
+    	   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+    			  "Checking IPv6 address `%s' : %s\n", GNUNET_a2s (addr, addrlen), (local==GNUNET_YES) ? "local" : "global");
+#endif
+    	   break;
+      }
     }
-
-    GNUNET_free(ps);
-    ps=tmp;
-  }
-  GNUNET_free(pc);
-  GNUNET_STATISTICS_update (plugin->env->stats,
-			    gettext_noop ("# HTTP peers active"),
-			    -1,
-			    GNUNET_NO);
-  return GNUNET_YES;
+	return local;
 }
 
 /**
@@ -578,126 +802,189 @@ process_interfaces (void *cls,
   struct IPv6HttpAddress * t6;
   int af;
 
+  if (plugin->use_localaddresses == GNUNET_NO)
+  {
+	  if (GNUNET_YES == check_localaddress (addr, addrlen))
+	  {
+#if DEBUG_HTTP
+          GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+        	   PROTOCOL_PREFIX,
+			   "Not notifying transport of address `%s' (local address)\n",
+			   GNUNET_a2s (addr, addrlen));
+#endif
+		  return GNUNET_OK;
+	  }
+  }
+
 
   GNUNET_assert(cls !=NULL);
   af = addr->sa_family;
-  if ((af == AF_INET) && (plugin->use_ipv4 == GNUNET_YES) && (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))
-      {
+     // Not skipping loopback addresses
+
 
-        return GNUNET_OK;
-      }
-      */
       t4->ipv4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
       t4->u_port = htons (plugin->port_inbound);
-      if (plugin->bind4_address != NULL)
-      {
-    	  if (0 == memcmp(&plugin->bind4_address->sin_addr, &bnd_cmp, sizeof (struct in_addr)))
-    	  {
-          	  plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
-    	  }
+      if (plugin->bind4_address != NULL) {
+	if (0 == memcmp(&plugin->bind4_address->sin_addr, &bnd_cmp, sizeof (struct in_addr)))
+	  {
+	    GNUNET_CONTAINER_DLL_insert(plugin->ipv4_addr_head,
+					plugin->ipv4_addr_tail,t4);
+	          plugin->env->notify_address(plugin->env->cls,
+	                                      GNUNET_YES,
+	                                      t4, sizeof (struct IPv4HttpAddress));
+	    return GNUNET_OK;
+	  }
+	GNUNET_free (t4);
+	return GNUNET_OK;
       }
       else
-      {
-    	  plugin->env->notify_address(plugin->env->cls,"http",t4, sizeof (struct IPv4HttpAddress), GNUNET_TIME_UNIT_FOREVER_REL);
-      }
-      GNUNET_free (t4);
-    }
-  else if ((af == AF_INET6) && (plugin->use_ipv6 == GNUNET_YES)  && (plugin->bind4_address == NULL))
-    {
+	  {
+          GNUNET_CONTAINER_DLL_insert (plugin->ipv4_addr_head,
+				       plugin->ipv4_addr_tail,
+				       t4);
+          plugin->env->notify_address(plugin->env->cls,
+                                      GNUNET_YES,
+                                      t4, sizeof (struct IPv4HttpAddress));
+      	  return GNUNET_OK;
+	  }
+   }
+   if ((af == AF_INET6) &&
+	    (plugin->use_ipv6 == GNUNET_YES) && 
+	    (plugin->bind4_address == NULL) ) {
+
 	  struct in6_addr bnd_cmp6 = ((struct sockaddr_in6 *) addr)->sin6_addr;
-      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)))
-    	  {
+
+      if (plugin->bind6_address != NULL) {
+    	  if (0 == memcmp(&plugin->bind6_address->sin6_addr,
+						  &bnd_cmp6,
+						 sizeof (struct in6_addr))) {
     	      memcpy (&t6->ipv6_addr,
     	              &((struct sockaddr_in6 *) addr)->sin6_addr,
     	              sizeof (struct in6_addr));
     	      t6->u6_port = htons (plugin->port_inbound);
-    	      plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
-    	  }
-      }
-      else
-      {
-          memcpy (&t6->ipv6_addr,
-                  &((struct sockaddr_in6 *) addr)->sin6_addr,
-                  sizeof (struct in6_addr));
-          t6->u6_port = htons (plugin->port_inbound);
-          plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
-      }
-      GNUNET_free (t6);
-    }
+    	      plugin->env->notify_address(plugin->env->cls,
+    	                                  GNUNET_YES,
+    	                                  t6, sizeof (struct IPv6HttpAddress));
+    	      GNUNET_CONTAINER_DLL_insert(plugin->ipv6_addr_head,
+					  plugin->ipv6_addr_tail,
+					  t6);
+    	      return GNUNET_OK;
+	      }
+	  GNUNET_free (t6);
+	  return GNUNET_OK;
+	  }
+      memcpy (&t6->ipv6_addr,
+    		  &((struct sockaddr_in6 *) addr)->sin6_addr,
+    		  sizeof (struct in6_addr));
+      t6->u6_port = htons (plugin->port_inbound);
+      GNUNET_CONTAINER_DLL_insert(plugin->ipv6_addr_head,plugin->ipv6_addr_tail,t6);
+
+      plugin->env->notify_address(plugin->env->cls,
+                                  GNUNET_YES,
+				  t6, sizeof (struct IPv6HttpAddress));
+  }
   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
+ * External logging function for MHD
+ * @param arg arguments
+ * @param fmt format string
+ * @param ap  list of arguments
  */
-static void mhd_termination_cb (void *cls, struct MHD_Connection * connection, void **httpSessionCache)
+static void 
+mhd_logger (void * arg, 
+	    const char * fmt, 
+	    va_list ap)
+{
+  char text[1024];
+
+  vsnprintf(text, sizeof(text), fmt, ap);
+  va_end(ap);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+	      "MHD: %s\n", 
+	      text);
+}
+
+
+static void 
+mhd_termination_cb (void *cls, 
+		    struct MHD_Connection * connection, 
+		    void **httpSessionCache)
 {
   struct Session * ps = *httpSessionCache;
   if (ps == NULL)
     return;
   struct HTTP_PeerContext * pc = ps->peercontext;
+  struct Plugin *plugin = cls;
+
+  GNUNET_assert (cls != NULL);
+    plugin->current_connections--;
 
   if (connection==ps->recv_endpoint)
-  {
+    {
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound connection from peer `%s' was terminated\n", ps, GNUNET_i2s(&pc->identity));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: inbound connection from peer `%s' was terminated\n", 
+		  ps, 
+		  GNUNET_i2s(&pc->identity));
 #endif
-    ps->recv_active = GNUNET_NO;
-    ps->recv_connected = GNUNET_NO;
-    ps->recv_endpoint = NULL;
-  }
+      ps->recv_active = GNUNET_NO;
+      ps->recv_connected = GNUNET_NO;
+      ps->recv_endpoint = NULL;
+    }
   if (connection==ps->send_endpoint)
-  {
-
-    ps->send_active = GNUNET_NO;
-    ps->send_connected = GNUNET_NO;
-    ps->send_endpoint = NULL;
+    {
+      ps->send_active = GNUNET_NO;
+      ps->send_connected = GNUNET_NO;
+      ps->send_endpoint = NULL;
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection from peer `%s' was terminated\n", ps, GNUNET_i2s(&pc->identity));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: outbound connection from peer `%s' was terminated\n",
+		  ps, 
+		  GNUNET_i2s(&pc->identity));
 #endif
-  }
+    }
 
   /* if both connections disconnected, remove session */
-  if ((ps->send_connected == GNUNET_NO) && (ps->recv_connected == GNUNET_NO))
+  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);
+    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);
   }
 }
 
-static void mhd_write_mst_cb (void *cls,
-                              void *client,
-                              const struct GNUNET_MessageHeader *message)
+
+/**
+ * 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 void 
+mhd_write_mst_cb (void *cls,
+		  void *client,
+		  const struct GNUNET_MessageHeader *message)
 {
+  struct Session *ps  = cls; 
+  struct HTTP_PeerContext *pc = ps->peercontext;
+  struct GNUNET_TIME_Relative delay;
 
-  struct Session *ps  = cls;
   GNUNET_assert(ps != NULL);
-
-  struct HTTP_PeerContext *pc = ps->peercontext;
   GNUNET_assert(pc != NULL);
 #if DEBUG_HTTP
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -705,73 +992,130 @@ static void mhd_write_mst_cb (void *cls,
 	      ps,
 	      ntohs(message->type),
               ntohs(message->size),
-	      GNUNET_i2s(&(ps->peercontext)->identity),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
+	      GNUNET_i2s(&(ps->peercontext)->identity),
+	      http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
 #endif
-  pc->plugin->env->receive (ps->peercontext->plugin->env->cls,
-			    &pc->identity,
-			    message, 1, ps,
-			    NULL,
-			    0);
+  struct GNUNET_TRANSPORT_ATS_Information distance[2];
+  distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
+  distance[0].value = htonl (1);
+  distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+  distance[1].value = htonl (0);
+  delay = pc->plugin->env->receive (ps->peercontext->plugin->env->cls,
+				    &pc->identity,
+				    message,
+				    (const struct GNUNET_TRANSPORT_ATS_Information *) &distance,
+				    2,
+				    ps,
+				    NULL,
+				    0);
+  pc->delay = delay;
+  if (pc->reset_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (pc->reset_task);
+  
+  if (delay.rel_value > 0)
+    {
+#if DEBUG_HTTP
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: Inbound quota management: delay next read for %llu ms \n", 
+		  ps,
+		  delay.rel_value);
+#endif
+      pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc);
+    }
 }
 
+
 /**
- * Check if ip is allowed to connect.
+ * Check if incoming connection is accepted.
+ * NOTE: Here every 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
 mhd_accept_cb (void *cls,
-                      const struct sockaddr *addr, socklen_t addr_len)
+	       const struct sockaddr *addr, 
+	       socklen_t addr_len)
 {
-#if 0
   struct Plugin *plugin = cls;
-#endif
-  /* Every connection is accepted, nothing more to do here */
-  return MHD_YES;
+  GNUNET_assert (cls != NULL);
+
+  if (plugin->max_connect_per_transport > plugin->current_connections)
+  {
+    plugin->current_connections ++;
+    return MHD_YES;
+  }
+  else return MHD_NO;
 }
 
-int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max)
-{
-  int bytes_read = 0;
 
+/**
+ * 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
+mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
+{
   struct Session * ps = cls;
   struct HTTP_PeerContext * pc;
   struct HTTP_Message * msg;
+  int bytes_read = 0;
 
   GNUNET_assert (ps!=NULL);
+
   pc = ps->peercontext;
   msg = ps->pending_msgs_tail;
   if (ps->send_force_disconnect==GNUNET_YES)
-  {
+    {
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound forced to disconnect\n",ps);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: outbound forced to disconnect\n",
+		  ps);
 #endif
-    return -1;
-  }
-
-  if (msg!=NULL)
-  {
-    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;
+      return -1;
     }
-
-    if (msg->pos==msg->size)
+  
+  if (msg!=NULL)
     {
-      if (NULL!=msg->transmit_cont)
-        msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
-      remove_http_message(ps,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;
+	}
+      
+      /* removing message */
+      if (msg->pos==msg->size)
+	{
+	  if (NULL!=msg->transmit_cont)
+	    msg->transmit_cont (msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+	  ps->queue_length_cur -= msg->size;
+	  remove_http_message(ps,msg);
+	}
     }
-  }
+#if DEBUG_CONNECTIONS
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Connection %X: MHD has sent %u bytes\n", 
+	      ps, 
+	      bytes_read);
+#endif
   return bytes_read;
 }
 
+
 /**
  * Process GET or PUT request received via MHD.  For
  * GET, queue response that will send back our pending
@@ -780,250 +1124,290 @@ int mhd_send_callback (void *cls, uint64_t pos, char *buf, int max)
  * already exists and create a new one if not.
  */
 static int
-mdh_access_cb (void *cls,
-                       struct MHD_Connection *mhd_connection,
-                       const char *url,
-                       const char *method,
-                       const char *version,
-                       const char *upload_data,
-                       size_t * upload_data_size, void **httpSessionCache)
+mhd_access_cb (void *cls,
+	       struct MHD_Connection *mhd_connection,
+	       const char *url,
+	       const char *method,
+	       const char *version,
+	       const char *upload_data,
+	       size_t * upload_data_size,
+	       void **httpSessionCache)
 {
   struct Plugin *plugin = cls;
   struct MHD_Response *response;
   const union MHD_ConnectionInfo * conn_info;
-
-  struct sockaddr_in  *addrin;
-  struct sockaddr_in6 *addrin6;
-
+  const struct sockaddr *client_addr;
+  const struct sockaddr_in  *addrin;
+  const struct sockaddr_in6 *addrin6;
   char address[INET6_ADDRSTRLEN+14];
   struct GNUNET_PeerIdentity pi_in;
   size_t id_num = 0;
-
   struct IPv4HttpAddress ipv4addr;
   struct IPv6HttpAddress ipv6addr;
-
-  struct HTTP_PeerContext *pc;
+  struct HTTP_PeerContext *pc = NULL;
   struct Session *ps = NULL;
   struct Session *ps_tmp = NULL;
-
   int res = GNUNET_NO;
-  int send_error_to_client;
   void * addr = NULL;
   size_t addr_len = 0 ;
 
   GNUNET_assert(cls !=NULL);
-  send_error_to_client = GNUNET_NO;
 
   if (NULL == *httpSessionCache)
-  {
-    /* check url for peer identity , if invalid send HTTP 404*/
-    size_t len = strlen(&url[1]);
-    char * peer = GNUNET_malloc(104+1);
-
-    if ((len>104) && (url[104]==';'))
     {
-        char * id = GNUNET_malloc((len-104)+1);
-        strcpy(id,&url[105]);
-        memcpy(peer,&url[1],103);
-        peer[103] = '\0';
+      /* check url for peer identity , if invalid send HTTP 404*/
+      size_t len = strlen(&url[1]);
+      char * peer = GNUNET_malloc(104+1);
+      
+      if ( (len>104) && (url[104]==';'))
+	{
+	  char * id = GNUNET_malloc((len-104)+1);
+	  strcpy(id,&url[105]);
+	  memcpy(peer,&url[1],103);
+	  peer[103] = '\0';
         id_num = strtoul ( id, NULL , 10);
         GNUNET_free(id);
     }
     res = GNUNET_CRYPTO_hash_from_string (peer, &(pi_in.hashPubKey));
     GNUNET_free(peer);
     if ( GNUNET_SYSERR == res )
-    {
-      response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE),HTTP_ERROR_RESPONSE, MHD_NO, MHD_NO);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
-      MHD_destroy_response (response);
+      {
+	response = MHD_create_response_from_data (strlen (HTTP_ERROR_RESPONSE),
+						  HTTP_ERROR_RESPONSE,
+						  MHD_NO, MHD_NO);
+	res = MHD_queue_response (mhd_connection, MHD_HTTP_NOT_FOUND, response);
+	MHD_destroy_response (response);
 #if DEBUG_CONNECTIONS
       if (res == MHD_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, sent HTTP 1.1/404\n");
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		    "Peer has no valid ident, sent HTTP 1.1/404\n");
       else
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Peer has no valid ident, could not send error\n");
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		    "Peer has no valid ident, could not send error\n");
 #endif
       return res;
+      }
     }
-  }
   else
-  {
-    ps = *httpSessionCache;
-    pc = ps->peercontext;
-  }
-
-  if (NULL == *httpSessionCache)
-  {
-    /* get peer context */
-    pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &pi_in.hashPubKey);
-    /* Peer unknown */
-    if (pc==NULL)
     {
-      pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
-      pc->plugin = plugin;
-      pc->session_id_counter=1;
-      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);
+      ps = *httpSessionCache;
+      pc = ps->peercontext;
     }
-
-    conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS );
-    /* Incoming IPv4 connection */
-    if ( AF_INET == conn_info->client_addr->sin_family)
-    {
-      addrin = conn_info->client_addr;
-      inet_ntop(addrin->sin_family, &(addrin->sin_addr),address,INET_ADDRSTRLEN);
-      memcpy(&ipv4addr.ipv4_addr,&(addrin->sin_addr),sizeof(struct in_addr));
-      ipv4addr.u_port = addrin->sin_port;
-      addr = &ipv4addr;
-      addr_len = sizeof(struct IPv4HttpAddress);
-    }
-    /* Incoming IPv6 connection */
-    if ( AF_INET6 == conn_info->client_addr->sin_family)
-    {
-      addrin6 = (struct sockaddr_in6 *) conn_info->client_addr;
-      inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr),address,INET6_ADDRSTRLEN);
-      memcpy(&ipv6addr.ipv6_addr,&(addrin6->sin6_addr),sizeof(struct in6_addr));
-      ipv6addr.u6_port = addrin6->sin6_port;
-      addr = &ipv6addr;
-      addr_len = sizeof(struct IPv6HttpAddress);
-    }
-
-    GNUNET_assert (addr != NULL);
-    GNUNET_assert (addr_len != 0);
-
-    ps = NULL;
-    /* only inbound sessions here */
-
-    ps_tmp = pc->head;
-    while (ps_tmp!=NULL)
+  
+  if (NULL == *httpSessionCache)
     {
-      if ((ps_tmp->direction==INBOUND) && (ps_tmp->session_id == id_num) && (id_num!=0))
-      {
-        if ((ps_tmp->recv_force_disconnect!=GNUNET_YES) && (ps_tmp->send_force_disconnect!=GNUNET_YES))
-        ps=ps_tmp;
-        break;
-      }
-      ps_tmp=ps_tmp->next;
-    }
-
-    if (ps==NULL)
-    {
-      ps = GNUNET_malloc(sizeof (struct Session));
-      ps->addr = GNUNET_malloc(addr_len);
-      memcpy(ps->addr,addr,addr_len);
-      ps->addrlen = addr_len;
-      ps->direction=INBOUND;
-      ps->pending_msgs_head = NULL;
-      ps->pending_msgs_tail = NULL;
-      ps->send_connected=GNUNET_NO;
-      ps->send_active=GNUNET_NO;
-      ps->recv_connected=GNUNET_NO;
-      ps->recv_active=GNUNET_NO;
-      ps->peercontext=pc;
-      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);
-    }
+      /* get peer context */
+      pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &pi_in.hashPubKey);
+      /* Peer unknown */
+      if (pc==NULL)
+	{
+	  pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
+	  pc->plugin = plugin;
+	  pc->session_id_counter=1;
+	  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);
+	}
 
-    *httpSessionCache = ps;
-    if (ps->msgtok==NULL)
-      ps->msgtok = GNUNET_SERVER_mst_create (&mhd_write_mst_cb, ps);
+      conn_info = MHD_get_connection_info(mhd_connection, MHD_CONNECTION_INFO_CLIENT_ADDRESS );
+      /* Incoming IPv4 connection */
+      /* cast required for legacy MHD API < 0.9.6 */
+      client_addr = (const struct sockaddr *) conn_info->client_addr;
+      if ( AF_INET == client_addr->sa_family)
+	{
+	  addrin = (const struct sockaddr_in*) client_addr;
+	  inet_ntop(addrin->sin_family, &(addrin->sin_addr),address,INET_ADDRSTRLEN);
+	  memcpy(&ipv4addr.ipv4_addr,&(addrin->sin_addr),sizeof(struct in_addr));
+	  ipv4addr.u_port = addrin->sin_port;
+	  addr = &ipv4addr;
+	  addr_len = sizeof(struct IPv4HttpAddress);
+	}
+      /* Incoming IPv6 connection */
+      if ( AF_INET6 == client_addr->sa_family)
+	{
+	  addrin6 = (const struct sockaddr_in6 *) client_addr;
+	  inet_ntop(addrin6->sin6_family, &(addrin6->sin6_addr),address,INET6_ADDRSTRLEN);
+	  memcpy(&ipv6addr.ipv6_addr,&(addrin6->sin6_addr),sizeof(struct in6_addr));
+	  ipv6addr.u6_port = addrin6->sin6_port;
+	  addr = &ipv6addr;
+	  addr_len = sizeof(struct IPv6HttpAddress);
+	}
+      
+      GNUNET_assert (addr != NULL);
+      GNUNET_assert (addr_len != 0);
+      
+      ps = NULL;
+      /* only inbound sessions here */
+      
+      ps_tmp = pc->head;
+      while (ps_tmp!=NULL)
+	{
+	  if ((ps_tmp->direction==INBOUND) && (ps_tmp->session_id == id_num) && (id_num!=0))
+	    {
+	      if ((ps_tmp->recv_force_disconnect!=GNUNET_YES) && (ps_tmp->send_force_disconnect!=GNUNET_YES))
+		ps=ps_tmp;
+	      break;
+	    }
+	  ps_tmp=ps_tmp->next;
+	}
+      
+      if (ps==NULL)
+	{
+	  ps = GNUNET_malloc(sizeof (struct Session));
+	  ps->addr = GNUNET_malloc(addr_len);
+	  memcpy(ps->addr,addr,addr_len);
+	  ps->addrlen = addr_len;
+	  ps->direction=INBOUND;
+	  ps->pending_msgs_head = NULL;
+	  ps->pending_msgs_tail = NULL;
+	  ps->send_connected=GNUNET_NO;
+	  ps->send_active=GNUNET_NO;
+	  ps->recv_connected=GNUNET_NO;
+	  ps->recv_active=GNUNET_NO;
+	  ps->peercontext=pc;
+	  ps->session_id =id_num;
+	  ps->queue_length_cur = 0;
+	  ps->queue_length_max = GNUNET_SERVER_MAX_MESSAGE_SIZE;
+	  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;
+      if (ps->msgtok==NULL)
+	ps->msgtok = GNUNET_SERVER_mst_create (&mhd_write_mst_cb, ps);
 #if DEBUG_HTTP
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n",
-                ps,
-                method,
-                GNUNET_i2s(&pc->identity),
-                http_plugin_address_to_string(NULL, ps->addr, ps->addrlen));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: HTTP Daemon has new an incoming `%s' request from peer `%s' (`%s')\n",
+		  ps,
+		  method,
+		  GNUNET_i2s(&pc->identity),
+		  http_plugin_address_to_string(NULL, ps->addr, ps->addrlen));
 #endif
-  }
-
+    }
+  
   /* Is it a PUT or a GET request */
   if (0 == strcmp (MHD_HTTP_METHOD_PUT, method))
-  {
-    if (ps->recv_force_disconnect == GNUNET_YES)
     {
+      if (ps->recv_force_disconnect == GNUNET_YES)
+	{
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound connection was forced to disconnect\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: inbound connection was forced to disconnect\n",ps);
 #endif
-      ps->recv_active = GNUNET_NO;
-      return MHD_NO;
-    }
-    if ((*upload_data_size == 0) && (ps->recv_active==GNUNET_NO))
-    {
-      ps->recv_endpoint = mhd_connection;
-      ps->recv_connected = GNUNET_YES;
-      ps->recv_active = GNUNET_YES;
-      ps->recv_force_disconnect = GNUNET_NO;
+	  ps->recv_active = GNUNET_NO;
+	  return MHD_NO;
+	}
+      if ((*upload_data_size == 0) && (ps->recv_active==GNUNET_NO))
+	{
+	  ps->recv_endpoint = mhd_connection;
+	  ps->recv_connected = GNUNET_YES;
+	  ps->recv_active = GNUNET_YES;
+	  ps->recv_force_disconnect = GNUNET_NO;
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound PUT connection connected\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: inbound PUT connection connected\n",ps);
 #endif
-      return MHD_YES;
-    }
-
-    /* Transmission of all data complete */
-    if ((*upload_data_size == 0) && (ps->recv_active == GNUNET_YES))
-    {
-      response = MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),HTTP_PUT_RESPONSE, MHD_NO, MHD_NO);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+	  return MHD_YES;
+	}
+      
+      /* Transmission of all data complete */
+      if ((*upload_data_size == 0) && (ps->recv_active == GNUNET_YES))
+	{
+	  response = MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),
+						    HTTP_PUT_RESPONSE, 
+						    MHD_NO, MHD_NO);
+	  res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Sent HTTP/1.1: 200 OK as PUT Response\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: Sent HTTP/1.1: 200 OK as PUT Response\n",
+		      ps);
 #endif
-      MHD_destroy_response (response);
-      ps->recv_active=GNUNET_NO;
-      return MHD_YES;
-    }
-
-    /* Recieving data */
-    if ((*upload_data_size > 0) && (ps->recv_active == GNUNET_YES))
-    {
-      res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, upload_data,*upload_data_size, GNUNET_NO, GNUNET_NO);
-      (*upload_data_size) = 0;
-      return MHD_YES;
+	  MHD_destroy_response (response);
+	  ps->recv_active=GNUNET_NO;
+	  return MHD_YES;
+	}
+      
+      /* Recieving data */
+      if ((*upload_data_size > 0) && (ps->recv_active == GNUNET_YES))
+	{
+	  if (pc->delay.rel_value == 0)
+	    {
+#if DEBUG_HTTP
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Connection %X: PUT with %u bytes forwarded to MST\n", 
+			  ps, *upload_data_size);
+#endif
+	      res = GNUNET_SERVER_mst_receive(ps->msgtok, ps, 
+					      upload_data, *upload_data_size, 
+					      GNUNET_NO, GNUNET_NO);
+	      (*upload_data_size) = 0;
+	    }
+	  else
+	    {
+#if DEBUG_HTTP
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Connection %X: no inbound bandwidth available! Next read was delayed for  %llu ms\n", 
+			  ps, 
+			  ps->peercontext->delay.rel_value);
+#endif
+	    }
+	  return MHD_YES;
+	}
+      else
+	return MHD_NO;
     }
-    else
-      return MHD_NO;
-  }
   if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) )
-  {
-    if (ps->send_force_disconnect == GNUNET_YES)
     {
+      if (ps->send_force_disconnect == GNUNET_YES)
+	{
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection was  forced to disconnect\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: outbound connection was  forced to disconnect\n",
+		      ps);
 #endif
-      ps->send_active = GNUNET_NO;
-      return MHD_NO;
-    }
-	  ps->send_connected = GNUNET_YES;
-	  ps->send_active = GNUNET_YES;
-	  ps->send_endpoint = mhd_connection;
-	  ps->send_force_disconnect = GNUNET_NO;
+	  ps->send_active = GNUNET_NO;
+	  return MHD_NO;
+	}
+      ps->send_connected = GNUNET_YES;
+      ps->send_active = GNUNET_YES;
+      ps->send_endpoint = mhd_connection;
+      ps->send_force_disconnect = GNUNET_NO;
 #if DEBUG_CONNECTIONS
-	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET connection connected\n",ps);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: inbound GET connection connected\n",
+		  ps);
 #endif
-	  response = MHD_create_response_from_callback(-1,32 * 1024, &mhd_send_callback, ps, NULL);
-	  res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
-	  MHD_destroy_response (response);
-	  return MHD_YES;
-  }
+      response = MHD_create_response_from_callback(-1,32 * 1024, &mhd_send_callback, ps, NULL);
+      res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+      MHD_destroy_response (response);
+      return MHD_YES;
+    }
   return MHD_NO;
 }
 
+
 /**
  * Function that queries MHD's select sets and
  * starts the task waiting for them.
+ * @param plugin plugin
+ * @param daemon_handle the MHD daemon handle
+ * @return gnunet task identifier
  */
 static GNUNET_SCHEDULER_TaskIdentifier
-http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
+http_server_daemon_prepare (struct Plugin *plugin,
+			    struct MHD_Daemon *daemon_handle)
 {
-  struct Plugin *plugin = cls;
   GNUNET_SCHEDULER_TaskIdentifier ret;
   fd_set rs;
   fd_set ws;
@@ -1036,7 +1420,6 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
   int haveto;
   struct GNUNET_TIME_Relative tv;
 
-  GNUNET_assert(cls !=NULL);
   ret = GNUNET_SCHEDULER_NO_TASK;
   FD_ZERO(&rs);
   FD_ZERO(&ws);
@@ -1053,61 +1436,81 @@ http_server_daemon_prepare (void * cls, struct MHD_Daemon *daemon_handle)
                                 &max));
   haveto = MHD_get_timeout (daemon_handle, &timeout);
   if (haveto == MHD_YES)
-    tv.value = (uint64_t) timeout;
+    tv.rel_value = (uint64_t) timeout;
   else
-    tv = GNUNET_TIME_UNIT_FOREVER_REL;
-  GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max);
-  GNUNET_NETWORK_fdset_copy_native (wws, &ws, max);
-  GNUNET_NETWORK_fdset_copy_native (wes, &es, max);
+    tv = GNUNET_TIME_UNIT_SECONDS;
+  GNUNET_NETWORK_fdset_copy_native (wrs, &rs, max + 1);
+  GNUNET_NETWORK_fdset_copy_native (wws, &ws, max + 1);
+  GNUNET_NETWORK_fdset_copy_native (wes, &es, max + 1);
   if (daemon_handle == plugin->http_server_daemon_v4)
-  {
-	if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
+    {
+      if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
 	{
-		GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4);
-		plugin->http_server_daemon_v4 = GNUNET_SCHEDULER_NO_TASK;
+	  GNUNET_SCHEDULER_cancel(plugin->http_server_task_v4);
+	  plugin->http_server_daemon_v4 = GNUNET_SCHEDULER_NO_TASK;
 	}
-
-    ret = GNUNET_SCHEDULER_add_select (plugin->env->sched,
-                                       GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                       GNUNET_SCHEDULER_NO_TASK,
-                                       tv,
-                                       wrs,
-                                       wws,
-                                       &http_server_daemon_v4_run,
-                                       plugin);
-  }
+      
+      ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+					 GNUNET_SCHEDULER_NO_TASK,
+					 tv,
+					 wrs,
+					 wws,
+					 &http_server_daemon_v4_run,
+					 plugin);
+    }
   if (daemon_handle == plugin->http_server_daemon_v6)
-  {
-	if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
+    {
+      if (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
 	{
-		GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v6);
-		plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+	  GNUNET_SCHEDULER_cancel(plugin->http_server_task_v6);
+	  plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
 	}
-
-    ret = GNUNET_SCHEDULER_add_select (plugin->env->sched,
-                                       GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                       GNUNET_SCHEDULER_NO_TASK,
-                                       tv,
-                                       wrs,
-                                       wws,
-                                       &http_server_daemon_v6_run,
-                                       plugin);
-  }
+      
+      ret = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+					 GNUNET_SCHEDULER_NO_TASK,
+					 tv,
+					 wrs,
+					 wws,
+					 &http_server_daemon_v6_run,
+					 plugin);
+    }
   GNUNET_NETWORK_fdset_destroy (wrs);
   GNUNET_NETWORK_fdset_destroy (wws);
   GNUNET_NETWORK_fdset_destroy (wes);
   return ret;
 }
 
+
 /**
- * Call MHD to process pending requests and then go back
+ * Call MHD IPv4 to process pending requests and then go back
  * and schedule the next run.
+ * @param cls plugin as closure
+ * @param tc task context
  */
-static void http_server_daemon_v4_run (void *cls,
-                             const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void 
+http_server_daemon_v4_run (void *cls,
+			   const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Plugin *plugin = cls;
 
+#if DEBUG_SCHEDULING
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		"http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_READ_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) 
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v4_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP))
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_STARTUP\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v4_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n");
+#endif              
+      
   GNUNET_assert(cls !=NULL);
   plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
 
@@ -1116,18 +1519,38 @@ static void http_server_daemon_v4_run (void *cls,
 
   GNUNET_assert (MHD_YES == MHD_run (plugin->http_server_daemon_v4));
   plugin->http_server_task_v4 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v4);
-  return;
-}
+ }
 
 
 /**
- * Call MHD to process pending requests and then go back
+ * Call MHD IPv6 to process pending requests and then go back
  * and schedule the next run.
+ * @param cls plugin as closure
+ * @param tc task context
  */
-static void http_server_daemon_v6_run (void *cls,
-                             const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void 
+http_server_daemon_v6_run (void *cls,
+			   const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Plugin *plugin = cls;
+  
+#if DEBUG_SCHEDULING  
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_READ_READY))
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_READ_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_WRITE_READY)) 
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_WRITE_READY\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "http_server_daemon_v6_run: GNUNET_SCHEDULER_REASON_TIMEOUT\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_STARTUP))  
+     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		 "http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_STARTUP\n");
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))  
+     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		 "http_server_daemon_v6_run: GGNUNET_SCHEDULER_REASON_SHUTDOWN\n");
+#endif                                            
 
   GNUNET_assert(cls !=NULL);
   plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
@@ -1137,10 +1560,13 @@ static void http_server_daemon_v6_run (void *cls,
 
   GNUNET_assert (MHD_YES == MHD_run (plugin->http_server_daemon_v6));
   plugin->http_server_task_v6 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v6);
-  return;
 }
 
-static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *stream)
+
+static size_t 
+curl_get_header_cb( void *ptr, 
+		    size_t size, size_t nmemb, 
+		    void *stream)
 {
   struct Session * ps = stream;
 
@@ -1149,23 +1575,23 @@ static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *st
   /* Getting last http result code */
   GNUNET_assert(NULL!=ps);
   if (ps->recv_connected==GNUNET_NO)
-  {
-    res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
-    if (CURLE_OK == res)
     {
-      if (http_result == 200)
-      {
-        ps->recv_connected = GNUNET_YES;
-        ps->recv_active = GNUNET_YES;
+      res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
+      if (CURLE_OK == res)
+	{
+	  if (http_result == 200)
+	    {
+	      ps->recv_connected = GNUNET_YES;
+	      ps->recv_active = GNUNET_YES;
 #if DEBUG_CONNECTIONS
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: connected to recieve data\n",ps);
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: connected to recieve data\n",ps);
 #endif
-        // Calling send_check_connections again since receive is established
-        send_check_connections (ps->peercontext->plugin, ps);
-      }
+	      // Calling send_check_connections again since receive is established
+	      send_check_connections (ps->peercontext->plugin, ps);
+	    }
+	}
     }
-  }
-
+  
 #if DEBUG_CURL
   char * tmp;
   size_t len = size * nmemb;
@@ -1174,23 +1600,38 @@ static size_t curl_get_header_cb( void *ptr, size_t size, size_t nmemb, void *st
     tmp = GNUNET_malloc (len+1);
 
   if ((tmp != NULL) && (len > 0))
-  {
-    memcpy(tmp,ptr,len);
-    if (len>=2)
     {
-      if (tmp[len-2] == 13)
-        tmp[len-2]= '\0';
+      memcpy(tmp,ptr,len);
+      if (len>=2)
+	{
+	  if (tmp[len-2] == 13)
+	    tmp[len-2]= '\0';
+	}
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: Header: %s\n",
+		  ps, tmp);
     }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Header: %s\n",ps,tmp);
-  }
-  if (NULL != tmp)
-    GNUNET_free (tmp);
+  GNUNET_free_non_null (tmp);
 #endif
-
+  
   return size * nmemb;
 }
 
-static size_t curl_put_header_cb( void *ptr, size_t size, size_t nmemb, void *stream)
+
+/**
+ * Callback called by libcurl when new headers arrive
+ * Used to get HTTP result for curl operations
+ * @param ptr stream to read from
+ * @param size size of one char element
+ * @param nmemb number of char elements
+ * @param stream closure set by user
+ * @return bytes read by function
+ */
+static size_t 
+curl_put_header_cb(void *ptr, 
+		   size_t size, 
+		   size_t nmemb, 
+		   void *stream)
 {
   struct Session * ps = stream;
 
@@ -1201,43 +1642,45 @@ static size_t curl_put_header_cb( void *ptr, size_t size, size_t nmemb, void *st
 
   /* Getting last http result code */
   GNUNET_assert(NULL!=ps);
-  res = curl_easy_getinfo(ps->send_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
+  res = curl_easy_getinfo (ps->send_endpoint, CURLINFO_RESPONSE_CODE, &http_result);
   if (CURLE_OK == res)
-  {
-    if ((http_result == 100) && (ps->send_connected==GNUNET_NO))
     {
-      ps->send_connected = GNUNET_YES;
-      ps->send_active = GNUNET_YES;
+      if ((http_result == 100) && (ps->send_connected==GNUNET_NO))
+	{
+	  ps->send_connected = GNUNET_YES;
+	  ps->send_active = GNUNET_YES;
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: connected to send data\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: connected to send data\n",
+		      ps);
 #endif
-    }
-    if ((http_result == 200) && (ps->send_connected==GNUNET_YES))
-    {
-      ps->send_connected = GNUNET_NO;
-      ps->send_active = GNUNET_NO;
+	}
+      if ((http_result == 200) && (ps->send_connected==GNUNET_YES))
+	{
+	  ps->send_connected = GNUNET_NO;
+	  ps->send_active = GNUNET_NO;
 #if DEBUG_CONNECTIONS
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: sending disconnected\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: sending disconnected\n",
+		      ps);
 #endif
+	}
     }
-  }
-
+  
   tmp = NULL;
   if ((size * nmemb) < SIZE_MAX)
     tmp = GNUNET_malloc (len+1);
-
+  
   if ((tmp != NULL) && (len > 0))
-  {
-    memcpy(tmp,ptr,len);
-    if (len>=2)
     {
-      if (tmp[len-2] == 13)
-        tmp[len-2]= '\0';
+      memcpy(tmp,ptr,len);
+      if (len>=2)
+	{
+	  if (tmp[len-2] == 13)
+	    tmp[len-2]= '\0';
+	}
     }
-  }
-  if (NULL != tmp)
-    GNUNET_free (tmp);
-
+  GNUNET_free_non_null (tmp);
   return size * nmemb;
 }
 
@@ -1250,7 +1693,10 @@ static size_t curl_put_header_cb( void *ptr, size_t size, size_t nmemb, void *st
  * @param ptr source pointer, passed to the libcurl handle
  * @return bytes written to stream
  */
-static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
+static size_t 
+curl_send_cb(void *stream, 
+	     size_t size, size_t nmemb, 
+	     void *ptr)
 {
   struct Session * ps = ptr;
   struct HTTP_Message * msg = ps->pending_msgs_tail;
@@ -1258,63 +1704,73 @@ static size_t curl_send_cb(void *stream, size_t size, size_t nmemb, void *ptr)
   size_t len;
 
   if (ps->send_active == GNUNET_NO)
-	return CURL_READFUNC_PAUSE;
-
-
-  if ((ps->pending_msgs_tail == NULL) && (ps->send_active == GNUNET_YES))
-  {
+    return CURL_READFUNC_PAUSE;
+  if ( (ps->pending_msgs_tail == NULL) && 
+       (ps->send_active == GNUNET_YES) )
+    {
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: No Message to send, pausing connection\n",ps);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: No Message to send, pausing connection\n",
+		  ps);
 #endif
-    ps->send_active = GNUNET_NO;
+      ps->send_active = GNUNET_NO;
     return CURL_READFUNC_PAUSE;
-  }
-
+    }
+  
   GNUNET_assert (msg!=NULL);
-
+  
   /* data to send */
   if (msg->pos < msg->size)
-  {
-    /* data fit in buffer */
-    if ((msg->size - msg->pos) <= (size * nmemb))
-    {
-      len = (msg->size - msg->pos);
-      memcpy(stream, &msg->buf[msg->pos], len);
-      msg->pos += len;
-      bytes_sent = len;
-    }
-    else
     {
-      len = size*nmemb;
-      memcpy(stream, &msg->buf[msg->pos], len);
-      msg->pos += len;
-      bytes_sent = len;
+      /* data fit in buffer */
+      if ((msg->size - msg->pos) <= (size * nmemb))
+	{
+	  len = (msg->size - msg->pos);
+	  memcpy(stream, &msg->buf[msg->pos], len);
+	  msg->pos += len;
+	  bytes_sent = len;
+	}
+      else
+	{
+	  len = size*nmemb;
+	  memcpy(stream, &msg->buf[msg->pos], len);
+	  msg->pos += len;
+	  bytes_sent = len;
+	}
     }
-  }
   /* no data to send */
   else
-  {
-    bytes_sent = 0;
-  }
-
+    {
+      bytes_sent = 0;
+    }
+  
   if ( msg->pos == msg->size)
-  {
+    {
 #if DEBUG_CONNECTIONS
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes sent, removing message from queue \n",ps, msg->pos);
+      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->transmit_cont)
-      msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,&(ps->peercontext)->identity,GNUNET_OK);
-    remove_http_message(ps, msg);
-  }
+      /* Calling transmit continuation  */
+      if (NULL != ps->pending_msgs_tail->transmit_cont)
+	msg->transmit_cont (ps->pending_msgs_tail->transmit_cont_cls,
+			    &(ps->peercontext)->identity,
+			    GNUNET_OK);
+      ps->queue_length_cur -= msg->size;
+      remove_http_message(ps, msg);
+    }
   return bytes_sent;
 }
 
-static void curl_receive_mst_cb  (void *cls,
-                                void *client,
-                                const struct GNUNET_MessageHeader *message)
+
+static void 
+curl_receive_mst_cb  (void *cls,
+		      void *client,
+		      const struct GNUNET_MessageHeader *message)
 {
   struct Session *ps  = cls;
+  struct GNUNET_TIME_Relative delay;
   GNUNET_assert(ps != NULL);
 
   struct HTTP_PeerContext *pc = ps->peercontext;
@@ -1325,13 +1781,35 @@ static void curl_receive_mst_cb  (void *cls,
               ps,
               ntohs(message->type),
               ntohs(message->size),
-              GNUNET_i2s(&(pc->identity)),http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
+              GNUNET_i2s(&(pc->identity)),
+	      http_plugin_address_to_string(NULL,ps->addr,ps->addrlen));
+#endif
+  struct GNUNET_TRANSPORT_ATS_Information distance[2];
+  distance[0].type = htonl (GNUNET_TRANSPORT_ATS_QUALITY_NET_DISTANCE);
+  distance[0].value = htonl (1);
+  distance[1].type = htonl (GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR);
+  distance[1].value = htonl (0);
+
+  delay = pc->plugin->env->receive (pc->plugin->env->cls,
+				    &pc->identity,
+				    message,
+				    (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, 2,
+				    ps,
+				    ps->addr,
+				    ps->addrlen);
+  pc->delay = delay;
+  if (pc->reset_task != GNUNET_SCHEDULER_NO_TASK)
+	GNUNET_SCHEDULER_cancel (pc->reset_task);
+
+  if (delay.rel_value > 0)
+    {
+#if DEBUG_HTTP
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: Inbound quota management: delay next read for %llu ms\n", 
+		  ps, delay.rel_value);
 #endif
-  pc->plugin->env->receive (pc->plugin->env->cls,
-                            &pc->identity,
-                            message, 1, ps,
-                            ps->addr,
-                            ps->addrlen);
+      pc->reset_task = GNUNET_SCHEDULER_add_delayed (delay, &reset_inbound_quota_delay, pc);
+    }
 }
 
 
@@ -1344,163 +1822,190 @@ static void curl_receive_mst_cb  (void *cls,
 * @param ptr destination pointer, passed to the libcurl handle
 * @return bytes read from stream
 */
-static size_t curl_receive_cb( void *stream, size_t size, size_t nmemb, void *ptr)
+static size_t 
+curl_receive_cb( void *stream, size_t size, size_t nmemb, void *ptr)
 {
   struct Session * ps = ptr;
+
+  if (ps->peercontext->delay.rel_value > 0)
+    {
+#if DEBUG_HTTP
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Connection %X: no inbound bandwidth available! Next read was delayed for  %llu ms\n",
+		  ps, ps->peercontext->delay.rel_value);
+#endif
+      return 0;
+    }  
 #if DEBUG_CONNECTIONS
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: %u bytes received\n",ps, size*nmemb);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Connection %X: %u bytes received\n",
+	      ps, size*nmemb);
 #endif
-  GNUNET_SERVER_mst_receive(ps->msgtok, ps, stream, size*nmemb, GNUNET_NO, GNUNET_NO);
+  GNUNET_SERVER_mst_receive(ps->msgtok, ps, 
+			    stream, size*nmemb, 
+			    GNUNET_NO, GNUNET_NO);
   return (size * nmemb);
+}
+
 
+static void 
+curl_handle_finished (struct Plugin *plugin)
+{
+  struct Session *ps = NULL;
+  struct HTTP_PeerContext *pc = NULL;
+  struct CURLMsg *msg;
+  struct HTTP_Message * cur_msg = NULL;
+  int msgs_in_queue;
+  char * tmp;
+  long http_result;
+  
+  do
+    {
+      msg = curl_multi_info_read (plugin->multi_handle, &msgs_in_queue);
+      if ((msgs_in_queue == 0) || (msg == NULL))
+	break;
+      /* get session for affected curl handle */
+      GNUNET_assert ( msg->easy_handle != NULL );
+      curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &tmp);
+      ps = (struct Session *) tmp;
+      GNUNET_assert ( ps != NULL );
+      pc = ps->peercontext;
+      GNUNET_assert ( pc != NULL );
+      switch (msg->msg)
+	{
+	case CURLMSG_DONE:
+	  if ( (msg->data.result != CURLE_OK) &&
+	       (msg->data.result != CURLE_GOT_NOTHING) )
+	    {
+	      /* sending msg failed*/
+	      if (msg->easy_handle == ps->send_endpoint)
+		{
+#if DEBUG_CONNECTIONS
+		  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+			     _("Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"),
+			     ps,
+			     GNUNET_i2s(&pc->identity),
+			     http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+			     "curl_multi_perform",
+			     curl_easy_strerror (msg->data.result));
+#endif
+		  ps->send_connected = GNUNET_NO;
+		  ps->send_active = GNUNET_NO;
+		  curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+		  while (ps->pending_msgs_tail != NULL)
+		    {
+		      cur_msg = ps->pending_msgs_tail;
+		      if ( NULL != cur_msg->transmit_cont)
+			cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+		      ps->queue_length_cur -= cur_msg->size;
+		      remove_http_message(ps,cur_msg);
+		    }
+		}
+	      /* GET connection failed */
+	      if (msg->easy_handle == ps->recv_endpoint)
+		{
+#if DEBUG_CONNECTIONS
+		  GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+			     _("Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"),
+			     ps,
+			     GNUNET_i2s(&pc->identity),
+			     http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+			     "curl_multi_perform",
+			     curl_easy_strerror (msg->data.result));
+#endif
+		  ps->recv_connected = GNUNET_NO;
+		  ps->recv_active = GNUNET_NO;
+		  curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+		}
+	    }
+	  else
+	    {
+	      if (msg->easy_handle == ps->send_endpoint)
+		{
+		  GNUNET_assert (CURLE_OK == curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
+#if DEBUG_CONNECTIONS
+		  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			      "Connection %X: HTTP PUT connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+			      ps,
+			      GNUNET_i2s(&pc->identity),
+			      http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+			      http_result);
+#endif
+		  /* Calling transmit continuation  */
+		  while (ps->pending_msgs_tail != NULL)
+		    {
+		      cur_msg = ps->pending_msgs_tail;
+		      if ( NULL != cur_msg->transmit_cont)
+			{
+			  /* HTTP 1xx : Last message before here was informational */
+			  if ((http_result >=100) && (http_result < 200))
+			    cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+			  /* HTTP 2xx: successful operations */
+			  if ((http_result >=200) && (http_result < 300))
+			    cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
+			  /* HTTP 3xx..5xx: error */
+			  if ((http_result >=300) && (http_result < 600))
+			    cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
+			}
+		      ps->queue_length_cur -= cur_msg->size;
+		      remove_http_message(ps,cur_msg);
+		    }
+		  
+		  ps->send_connected = GNUNET_NO;
+		  ps->send_active = GNUNET_NO;
+		  curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+		}
+	      if (msg->easy_handle == ps->recv_endpoint)
+		{
+#if DEBUG_CONNECTIONS
+		  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			      "Connection %X: HTTP GET connection to peer `%s' (`%s') was closed with HTTP code %u\n",
+			      ps,
+			      GNUNET_i2s(&pc->identity),
+			      http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
+			      http_result);
+#endif
+		  ps->recv_connected = GNUNET_NO;
+		  ps->recv_active = GNUNET_NO;
+		  curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+		}
+	      plugin->current_connections--;
+	    }
+	  if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected == GNUNET_NO))
+	    remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
+	  break;
+	default:
+	  break;
+	}
+    }
+  while ( (msgs_in_queue > 0) );
 }
 
+
+/**
+ * Task performing curl operations
+ * @param cls plugin as closure
+ * @param tc gnunet scheduler task context
+ */
 static void curl_perform (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+			  const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Plugin *plugin = cls;
   static unsigned int handles_last_run;
   int running;
-  struct CURLMsg *msg;
   CURLMcode mret;
-  struct Session *ps = NULL;
-  struct HTTP_PeerContext *pc = NULL;
-  struct HTTP_Message * cur_msg = NULL;
-  long http_result;
-  char * tmp;
 
   GNUNET_assert(cls !=NULL);
 
   plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
-
   do
     {
       running = 0;
       mret = curl_multi_perform (plugin->multi_handle, &running);
       if ((running < handles_last_run) && (running>0))
-        {
-          do
-            {
-
-              msg = curl_multi_info_read (plugin->multi_handle, &running);
-              if (running == 0)
-            	  break;
-              /* get session for affected curl handle */
-              GNUNET_assert ( msg->easy_handle != NULL );
-              curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &tmp);
-              ps = (struct Session *) tmp;
-              GNUNET_assert ( ps != NULL );
-              pc = ps->peercontext;
-              GNUNET_assert ( pc != NULL );
-              switch (msg->msg)
-                {
-
-                case CURLMSG_DONE:
-                  if ( (msg->data.result != CURLE_OK) &&
-                       (msg->data.result != CURLE_GOT_NOTHING) )
-                  {
-                    /* sending msg failed*/
-                    if (msg->easy_handle == ps->send_endpoint)
-                    {
-#if DEBUG_CONNECTIONS
-                      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                                 _("Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"),
-                                 ps,
-                                 GNUNET_i2s(&pc->identity),
-                                 http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
-                                 "curl_multi_perform",
-                                 curl_easy_strerror (msg->data.result));
-#endif
-                      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;
-                      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);
-                    }
-                    /* GET connection failed */
-                    if (msg->easy_handle == ps->recv_endpoint)
-                    {
-#if DEBUG_CONNECTIONS
-                      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-                           _("Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"),
-                           ps,
-                           GNUNET_i2s(&pc->identity),
-                           http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
-                           "curl_multi_perform",
-                           curl_easy_strerror (msg->data.result));
-#endif
-                      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;
-                    }
-                  }
-                  else
-                  {
-                    if (msg->easy_handle == ps->send_endpoint)
-                    {
-                      GNUNET_assert (CURLE_OK == curl_easy_getinfo(msg->easy_handle, CURLINFO_RESPONSE_CODE, &http_result));
-#if DEBUG_CONNECTIONS
-                      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                  "Connection %X: HTTP PUT connection to peer `%s' (`%s') was closed with HTTP code %u\n",
-                                   ps,
-                                   GNUNET_i2s(&pc->identity),
-                                   http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
-                                   http_result);
-#endif
-                      /* Calling transmit continuation  */
-                      cur_msg = ps->pending_msgs_tail;
-                      if (( NULL != cur_msg) && (NULL != cur_msg->transmit_cont))
-                      {
-                        /* HTTP 1xx : Last message before here was informational */
-                        if ((http_result >=100) && (http_result < 200))
-                          cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
-                        /* HTTP 2xx: successful operations */
-                        if ((http_result >=200) && (http_result < 300))
-                          cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_OK);
-                        /* HTTP 3xx..5xx: error */
-                        if ((http_result >=300) && (http_result < 600))
-                          cur_msg->transmit_cont (cur_msg->transmit_cont_cls,&pc->identity,GNUNET_SYSERR);
-                      }
-                      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;
-                    }
-                    if (msg->easy_handle == ps->recv_endpoint)
-                    {
-#if DEBUG_CONNECTIONS
-                      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                  "Connection %X: HTTP GET connection to peer `%s' (`%s') was closed with HTTP code %u\n",
-                                   ps,
-                                   GNUNET_i2s(&pc->identity),
-                                   http_plugin_address_to_string(NULL, ps->addr, ps->addrlen),
-                                   http_result);
-#endif
-                      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;
-                    }
-                  }
-                  if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected == GNUNET_NO))
-                    remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
-                  break;
-                default:
-                  break;
-                }
-
-            }
-          while ( (running > 0) );
-        }
+    	  curl_handle_finished(plugin);
       handles_last_run = running;
     }
   while (mret == CURLM_CALL_MULTI_PERFORM);
@@ -1510,12 +2015,13 @@ static void curl_perform (void *cls,
 
 /**
  * Function setting up file descriptors and scheduling task to run
- * @param ses session to send data to
+ *
+ * @param  plugin plugin as closure
  * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
  */
-static int curl_schedule(void *cls)
+static int 
+curl_schedule(struct Plugin *plugin)
 {
-  struct Plugin *plugin = cls;
   fd_set rs;
   fd_set ws;
   fd_set es;
@@ -1525,14 +2031,13 @@ static int curl_schedule(void *cls)
   long to;
   CURLMcode mret;
 
-  GNUNET_assert(cls !=NULL);
-
   /* Cancel previous scheduled task */
   if (plugin->http_curl_task !=  GNUNET_SCHEDULER_NO_TASK)
-  {
-	  GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
-	  plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
-  }
+    {
+      GNUNET_SCHEDULER_cancel(plugin->http_curl_task);
+      plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+  
   max = -1;
   FD_ZERO (&rs);
   FD_ZERO (&ws);
@@ -1560,286 +2065,386 @@ static int curl_schedule(void *cls)
   gws = GNUNET_NETWORK_fdset_create ();
   GNUNET_NETWORK_fdset_copy_native (grs, &rs, max + 1);
   GNUNET_NETWORK_fdset_copy_native (gws, &ws, max + 1);
-  plugin->http_curl_task = GNUNET_SCHEDULER_add_select (plugin->env->sched,
-                                   GNUNET_SCHEDULER_PRIORITY_DEFAULT,
-                                   GNUNET_SCHEDULER_NO_TASK,
-                                   GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 0),
-                                   grs,
-                                   gws,
-                                   &curl_perform,
-                                   plugin);
+  plugin->http_curl_task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+							GNUNET_SCHEDULER_NO_TASK,
+							(to == -1) 
+							? GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+							: GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, to),
+							grs,
+							gws,
+							&curl_perform,
+							plugin);
   GNUNET_NETWORK_fdset_destroy (gws);
   GNUNET_NETWORK_fdset_destroy (grs);
   return GNUNET_OK;
 }
 
+
+#if DEBUG_CURL
+/**
+ * Function to log curl debug messages with GNUNET_log
+ * @param curl handle
+ * @param type curl_infotype
+ * @param data data
+ * @param size size
+ * @param cls  closure
+ * @return 0
+ */
+static int 
+curl_logger (CURL * curl,
+	     curl_infotype type, 
+	     char * data, size_t size, 
+	     void * cls)
+{
+  if (type == CURLINFO_TEXT)
+    {
+      char text[size+2];
+      memcpy(text,data,size);
+      if (text[size-1] == '\n')
+	text[size] = '\0';
+      else
+	{
+	  text[size] = '\n';
+	  text[size+1] = '\0';
+	}
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "CURL: Connection %X - %s", 
+		  cls, 
+		  text);
+    }
+  return 0;
+}
+#endif
+
+
 /**
  * Function setting up curl handle and selecting message to send
- * @param cls plugin
- * @param ses session to send data to
- * @param con connection
+ *
+ * @param plugin plugin
+ * @param ps session
  * @return GNUNET_SYSERR on failure, GNUNET_NO if connecting, GNUNET_YES if ok
  */
-static ssize_t send_check_connections (void *cls, struct Session *ps)
+static int 
+send_check_connections (struct Plugin *plugin, 
+			struct Session *ps)
 {
-  struct Plugin *plugin = cls;
   CURLMcode mret;
-  struct HTTP_Message * msg;
-
   struct GNUNET_TIME_Relative timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
 
-  GNUNET_assert(cls !=NULL);
+  if ((ps->direction == OUTBOUND) && (plugin->current_connections < plugin->max_connect_per_transport))
+    {
+      /* RECV DIRECTION */
+      /* Check if session is connected to receive data, otherwise connect to peer */
 
-  if (ps->direction == OUTBOUND)
-  {
-    /* RECV DIRECTION */
-    /* 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)
-        {
-            fresh = GNUNET_YES;
-        	ps->recv_endpoint = curl_easy_init();
-        }
+      if (ps->recv_connected == GNUNET_NO)
+	{
+	  int fresh = GNUNET_NO;
+	  if (ps->recv_endpoint == NULL)
+	    {
+	      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_URL, ps->url);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEHEADER, ps);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_READDATA, ps);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEDATA, ps);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_TIMEOUT, (long) timeout.value);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_PRIVATE, ps);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
-        curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
-
-        if (fresh==GNUNET_YES)
-        {
-			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);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_VERBOSE, 1L);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_DEBUGDATA , ps->recv_endpoint);
 #endif
-        	return GNUNET_SYSERR;
-        }
-#if DEBUG_CONNECTIONS
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not connected, initiating connection\n",ps);
+#if BUILD_HTTPS
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYPEER, 0);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_SSL_VERIFYHOST, 0);
 #endif
-    }
-
-    /* waiting for receive direction */
-    if (ps->recv_connected==GNUNET_NO)
-      return GNUNET_NO;
-
-    /* SEND DIRECTION */
-    /* Check if session is connected to send data, otherwise connect to peer */
-    if ((ps->send_connected == GNUNET_YES) && (ps->send_endpoint!= NULL))
-    {
-      if (ps->send_active == GNUNET_YES)
-      {
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_URL, ps->url);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEHEADER, ps);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_READDATA, ps);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_WRITEDATA, ps);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_TIMEOUT, (long) timeout.rel_value);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_PRIVATE, ps);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_BUFFERSIZE, 2*GNUNET_SERVER_MAX_MESSAGE_SIZE);
+#if CURL_TCP_NODELAY
+	  curl_easy_setopt(ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
+#endif
+	  if (fresh==GNUNET_YES)
+	    {
+	      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 (plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK)
+	    {
+	      GNUNET_SCHEDULER_cancel(plugin->http_curl_task);
+	      plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+	    }
+	  plugin->current_connections ++;
+	  plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin);
+	}
+      
+      /* waiting for receive direction */
+      if (ps->recv_connected==GNUNET_NO)
+	return GNUNET_NO;
+      
+      /* SEND DIRECTION */
+      /* Check if session is connected to send data, otherwise connect to peer */
+      if ((ps->send_connected == GNUNET_YES) && (ps->send_endpoint!= NULL))
+	{
+	  if (ps->send_active == GNUNET_YES)
+	    {
 #if DEBUG_CONNECTIONS
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound active, enqueueing message\n",ps);
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Connection %X: outbound active, enqueueing message\n",
+			  ps);
 #endif
-        return GNUNET_YES;
-      }
-      if (ps->send_active == GNUNET_NO)
-      {
+	      return GNUNET_YES;
+	    }
+	  if (ps->send_active == GNUNET_NO)
+	    {
 #if DEBUG_CONNECTIONS
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound paused, unpausing existing connection and enqueueing message\n",ps);
-#endif
-        if (CURLE_OK == curl_easy_pause(ps->send_endpoint,CURLPAUSE_CONT))
-        {
-			ps->send_active=GNUNET_YES;
-			return GNUNET_YES;
-        }
-        else
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Connection %X: outbound paused, unpausing existing connection and enqueueing message\n",
+			  ps);
+#endif
+	      if (CURLE_OK == curl_easy_pause(ps->send_endpoint,CURLPAUSE_CONT))
+		{
+		  ps->send_active=GNUNET_YES;
+		  if (plugin->http_curl_task !=  GNUNET_SCHEDULER_NO_TASK)
+		    {
+		      GNUNET_SCHEDULER_cancel(plugin->http_curl_task);
+		      plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+		    }
+		  plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin);
+		  return GNUNET_YES;
+		}
+	      else
         	return GNUNET_SYSERR;
-      }
-    }
-    /* not connected, initiate connection */
-    if (ps->send_connected==GNUNET_NO)
-    {
-    	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);
+	    }
+	}
+      /* not connected, initiate connection */
+      if ((ps->send_connected==GNUNET_NO) && (plugin->current_connections < plugin->max_connect_per_transport))
+	{
+	  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
-		GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound not connected, initiating connection\n",ps);
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "Connection %X: outbound not connected, initiating connection\n",
+		      ps);
 #endif
-		ps->send_active = GNUNET_NO;
-		msg = ps->pending_msgs_tail;
-
+	  ps->send_active = GNUNET_NO;
+	  
 #if DEBUG_CURL
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L);
-#endif
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_HEADERFUNCTION, &curl_put_header_cb);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEHEADER, ps);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_TIMEOUT, (long) timeout.value);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_PRIVATE, ps);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
-		curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, GNUNET_SERVER_MAX_MESSAGE_SIZE);
-
-		if (fresh==GNUNET_YES)
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_VERBOSE, 1L);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGFUNCTION , &curl_logger);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_DEBUGDATA , ps->send_endpoint);
+#endif
+#if BUILD_HTTPS
+	  curl_easy_setopt (ps->send_endpoint, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYPEER, 0);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_SSL_VERIFYHOST, 0);
+#endif
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_URL, ps->url);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_PUT, 1L);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_HEADERFUNCTION, &curl_put_header_cb);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEHEADER, ps);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_READFUNCTION, curl_send_cb);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_WRITEFUNCTION, curl_receive_cb);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_READDATA, ps);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_TIMEOUT, (long) timeout.rel_value);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_PRIVATE, ps);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_CONNECTTIMEOUT, HTTP_CONNECT_TIMEOUT);
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
+#if CURL_TCP_NODELAY
+	  curl_easy_setopt(ps->send_endpoint, CURLOPT_TCP_NODELAY, 1);
+#endif
+	  if (fresh==GNUNET_YES)
+	    {
+	      mret = curl_multi_add_handle(plugin->multi_handle, ps->send_endpoint);
+	      if (mret != CURLM_OK)
 		{
-			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;
-			}
+		  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 (plugin->http_curl_task !=  GNUNET_SCHEDULER_NO_TASK)
+	{
+	  GNUNET_SCHEDULER_cancel(plugin->http_curl_task);
+	  plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+	}
+      plugin->current_connections++;
+      plugin->http_curl_task = GNUNET_SCHEDULER_add_now (&curl_perform, plugin);
+      return GNUNET_YES;
     }
-    if (curl_schedule (plugin) == GNUNET_SYSERR)
-    	return GNUNET_SYSERR;
-    return GNUNET_YES;
-  }
   if (ps->direction == INBOUND)
-  {
-    GNUNET_assert (NULL != ps->pending_msgs_tail);
-    if ((ps->recv_connected==GNUNET_YES) && (ps->send_connected==GNUNET_YES) &&
-    	(ps->recv_force_disconnect==GNUNET_NO) && (ps->recv_force_disconnect==GNUNET_NO))
+    {
+      GNUNET_assert (NULL != ps->pending_msgs_tail);
+      if ((ps->recv_connected==GNUNET_YES) && (ps->send_connected==GNUNET_YES) &&
+	  (ps->recv_force_disconnect==GNUNET_NO) && (ps->recv_force_disconnect==GNUNET_NO))
     	return GNUNET_YES;
-  }
+    }
   return GNUNET_SYSERR;
 }
 
-static struct Session * send_select_session (void * cls, struct HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address, struct Session * session)
-{
-	struct Session * tmp = NULL;
-	int addr_given = GNUNET_NO;
-
-	if ((addr!=NULL) && (addrlen>0))
-		addr_given = GNUNET_YES;
 
-	if (force_address == GNUNET_YES)
+/**
+ * select best session to transmit data to peer
+ *
+ * @param pc peer context of target peer
+ * @param addr address of target peer
+ * @param addrlen address length
+ * @param force_address does transport service enforce address?
+ * @param session session passed by transport service
+ * @return selected session
+ *
+ */
+static struct Session * 
+send_select_session (struct HTTP_PeerContext *pc, 
+		     const void * addr, size_t addrlen, 
+		     int force_address, 
+		     struct Session * session)
+{
+  struct Session * tmp = NULL;
+  int addr_given = GNUNET_NO;
+  
+  if ((addr!=NULL) && (addrlen>0))
+    addr_given = GNUNET_YES;
+  
+  if (force_address == GNUNET_YES)
+    {
+      /* check session given as argument */
+      if ((session != NULL) && (addr_given == GNUNET_YES))
 	{
-		/* check session given as argument */
-		if ((session != NULL) && (addr_given == GNUNET_YES))
+	  if (0 == memcmp(session->addr, addr, addrlen))
+	    {
+	      /* connection can not be used, since it is disconnected */
+	      if ( (session->recv_force_disconnect==GNUNET_NO) && 
+		   (session->send_force_disconnect==GNUNET_NO) )
 		{
-		      if (0 == memcmp(session->addr, addr, addrlen))
-		      {
-		        /* connection can not be used, since it is disconnected */
-		        if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO))
-		        {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send to forced address \n", session);
+		  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			      "Session %X selected: Using session passed by transport to send to forced address \n", 
+			      session);
 #endif
-		        	return session;
-		        }
-		      }
+		  return session;
 		}
-		/* check last session used */
-		if ((pc->last_session != NULL)&& (addr_given == GNUNET_YES))
+	    }
+	}
+      /* check last session used */
+      if ((pc->last_session != NULL)&& (addr_given == GNUNET_YES))
+	{
+	  if (0 == memcmp(pc->last_session->addr, addr, addrlen))
+	    {
+	      /* connection can not be used, since it is disconnected */
+	      if ( (pc->last_session->recv_force_disconnect==GNUNET_NO) && 
+		   (pc->last_session->send_force_disconnect==GNUNET_NO) )
 		{
-		      if (0 == memcmp(pc->last_session->addr, addr, addrlen))
-		      {
-		        /* connection can not be used, since it is disconnected */
-		        if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO))
-		        {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session used to send to forced address \n", pc->last_session);
+		  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			      "Session %X selected: Using last session used to send to forced address \n", 
+			      pc->last_session);
 #endif
-		        	return pc->last_session;
-		        }
-		      }
+		  return pc->last_session;
 		}
-		/* find session in existing sessions */
-		tmp = pc->head;
-		while ((tmp!=NULL) && (addr_given == GNUNET_YES))
+	    }
+	}
+      /* find session in existing sessions */
+      tmp = pc->head;
+      while ((tmp!=NULL) && (addr_given == GNUNET_YES))
+	{
+	  if (0 == memcmp(tmp->addr, addr, addrlen))
+	    {
+	      /* connection can not be used, since it is disconnected */
+	      if ( (tmp->recv_force_disconnect==GNUNET_NO) &&
+		   (tmp->send_force_disconnect==GNUNET_NO) )
 		{
-
-			  if (0 == memcmp(tmp->addr, addr, addrlen))
-		      {
-		        /* connection can not be used, since it is disconnected */
-		        if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO))
-		        {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to forced address \n", session);
+		  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			      "Session %X selected: Using existing session to send to forced address \n", 
+			      session);
 #endif
-		        	  return session;
-		        }
-
-		      }
-			  tmp=tmp->next;
-		}
-		/* no session to use */
-		return NULL;
+		  return session;
+		}	      
+	    }
+	  tmp=tmp->next;
 	}
-	if ((force_address == GNUNET_NO) || (force_address == GNUNET_SYSERR))
+      /* no session to use */
+      return NULL;
+    }
+  if ((force_address == GNUNET_NO) || (force_address == GNUNET_SYSERR))
+    {
+      /* check session given as argument */
+      if (session != NULL)
 	{
-		/* check session given as argument */
-		if (session != NULL)
-		{
-			/* connection can not be used, since it is disconnected */
-			if ((session->recv_force_disconnect==GNUNET_NO) && (session->send_force_disconnect==GNUNET_NO))
-			{
+	  /* connection can not be used, since it is disconnected */
+	  if ( (session->recv_force_disconnect==GNUNET_NO) &&
+	       (session->send_force_disconnect==GNUNET_NO) )
+	    {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using session passed by transport to send not-forced address \n", session);
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Session %X selected: Using session passed by transport to send not-forced address\n", 
+			  session);
 #endif
-		        	  return session;
-			}
-
-		}
-		/* check last session used */
-		if (pc->last_session != NULL)
-		{
-			/* connection can not be used, since it is disconnected */
-			if ((pc->last_session->recv_force_disconnect==GNUNET_NO) && (pc->last_session->send_force_disconnect==GNUNET_NO))
-			{
+	      return session;
+	    }	  
+	}
+      /* check last session used */
+      if (pc->last_session != NULL)
+	{
+	  /* connection can not be used, since it is disconnected */
+	  if ( (pc->last_session->recv_force_disconnect==GNUNET_NO) &&
+	       (pc->last_session->send_force_disconnect==GNUNET_NO) )
+	    {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using last session to send to not-forced address \n", pc->last_session);
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Session %X selected: Using last session to send to not-forced address\n", 
+			  pc->last_session);
 #endif
-				return pc->last_session;
-			}
-		}
-		/* find session in existing sessions */
-		tmp = pc->head;
-		while (tmp!=NULL)
-		{
-			/* connection can not be used, since it is disconnected */
-			if ((tmp->recv_force_disconnect==GNUNET_NO) && (tmp->send_force_disconnect==GNUNET_NO))
-			{
+	      return pc->last_session;
+	    }
+	}
+      /* find session in existing sessions */
+      tmp = pc->head;
+      while (tmp!=NULL)
+	{
+	  /* connection can not be used, since it is disconnected */
+	  if ( (tmp->recv_force_disconnect==GNUNET_NO) && 
+	       (tmp->send_force_disconnect==GNUNET_NO) )
+	    {
 #if DEBUG_SESSION_SELECTION
-		        	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session %X selected: Using existing session to send to not-forced address \n", tmp);
+	      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			  "Session %X selected: Using existing session to send to not-forced address\n",
+			  tmp);
 #endif
-				return tmp;
-			}
-			tmp=tmp->next;
-		}
-		return NULL;
+	      return tmp;
+	    }
+	  tmp=tmp->next;
 	}
-	return NULL;
+      return NULL;
+    }
+  return NULL;
 }
 
+
 /**
  * Function that can be used by the transport service to transmit
  * a message using the plugin.   Note that in the case of a
@@ -1854,7 +2459,7 @@ static struct Session * send_select_session (void * cls, struct HTTP_PeerContext
  * @param msgbuf_size number of bytes in 'msgbuf'
  * @param priority how important is the message (most plugins will
  *                 ignore message priority and just FIFO)
- * @param timeout how long to wait at most for the transmission (does not
+ * @param to how long to wait at most for the transmission (does not
  *                require plugins to discard the message after the timeout,
  *                just advisory for the desired delay; most plugins will ignore
  *                this as well)
@@ -1898,95 +2503,106 @@ http_plugin_send (void *cls,
   GNUNET_assert(cls !=NULL);
 
 #if DEBUG_HTTP
-  char * force = GNUNET_malloc(40);
-  if (force_address == GNUNET_YES)
-    strcpy(force,"forced addr.");
-  if (force_address == GNUNET_NO)
-    strcpy(force,"any addr.");
-  if (force_address == GNUNET_SYSERR)
-    strcpy(force,"reliable bi-direc. address addr.");
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Transport tells me to send %u bytes to `%s' using %s (%s) and session: %X\n",
-                                      msgbuf_size,
-                                      GNUNET_i2s(target),
-                                      force,
-                                      http_plugin_address_to_string(NULL, addr, addrlen),
-                                      session);
+  char * force;
 
+  if (force_address == GNUNET_YES)
+    GNUNET_asprintf(&force, "forced addr.");
+  else if (force_address == GNUNET_NO)
+    GNUNET_asprintf(&force, "any addr.");
+  else if (force_address == GNUNET_SYSERR)
+    GNUNET_asprintf(&force,"reliable bi-direc. address addr.");
+  else
+    GNUNET_assert (0);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Transport tells me to send %u bytes to `%s' using %s (%s) and session: %X\n",
+	      msgbuf_size,
+	      GNUNET_i2s(target),
+	      force,
+	      http_plugin_address_to_string(NULL, addr, addrlen),
+	      session);
   GNUNET_free(force);
 #endif
 
   pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
   /* Peer unknown */
   if (pc==NULL)
-  {
-    pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
-    pc->plugin = plugin;
-    pc->session_id_counter=1;
-    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);
-
+    {
+      pc = GNUNET_malloc(sizeof (struct HTTP_PeerContext));
+      pc->plugin = plugin;
+      pc->session_id_counter=1;
+      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 (pc, addr, addrlen, force_address, session);
   /* session not existing, but address forced -> creating new session */
   if (ps==NULL)
-  {
-    if ((addr!=NULL) && (addrlen!=0))
     {
-      ps = GNUNET_malloc(sizeof (struct Session));
+      if ((addr!=NULL) && (addrlen!=0))
+	{
+	  ps = GNUNET_malloc(sizeof (struct Session));
 #if DEBUG_SESSION_SELECTION
-      if (force_address == GNUNET_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection & forced address: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
-      if (force_address != GNUNET_YES)
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing connection: creating new session %X to peer %s\n", ps, GNUNET_i2s(target));
+	  if (force_address == GNUNET_YES)
+	    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			"No existing connection & forced address: creating new session %X to peer %s\n", 
+			ps, GNUNET_i2s(target));
+	  if (force_address != GNUNET_YES)
+	    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+			"No existing connection: creating new session %X to peer %s\n", 
+			ps, GNUNET_i2s(target));
 #endif
-      if ((addrlen!=0) && (addr!=NULL))
-      {
-      ps->addr = GNUNET_malloc(addrlen);
-      memcpy(ps->addr,addr,addrlen);
-      ps->addrlen = addrlen;
-      }
+ 	  ps->addr = GNUNET_malloc(addrlen);
+	  memcpy(ps->addr,addr,addrlen);
+	  ps->addrlen = addrlen;
+  	  ps->direction=OUTBOUND;
+	  ps->recv_connected = GNUNET_NO;
+	  ps->recv_force_disconnect = GNUNET_NO;
+	  ps->send_connected = GNUNET_NO;
+	  ps->send_force_disconnect = GNUNET_NO;
+	  ps->pending_msgs_head = NULL;
+	  ps->pending_msgs_tail = NULL;
+	  ps->peercontext=pc;
+	  ps->session_id = pc->session_id_counter;
+	  ps->queue_length_cur = 0;
+	  ps->queue_length_max = GNUNET_SERVER_MAX_MESSAGE_SIZE;
+	  pc->session_id_counter++;
+	  ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
+	  if (ps->msgtok == NULL)
+	    ps->msgtok = GNUNET_SERVER_mst_create (&curl_receive_mst_cb, ps);
+	  GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
+	  GNUNET_STATISTICS_update (plugin->env->stats,
+				    gettext_noop ("# HTTP outbound sessions for peers active"),
+				    1,
+				    GNUNET_NO);
+	}
       else
-      {
-        ps->addr = NULL;
-        ps->addrlen = 0;
-      }
-      ps->direction=OUTBOUND;
-      ps->recv_connected = GNUNET_NO;
-      ps->recv_force_disconnect = GNUNET_NO;
-      ps->send_connected = GNUNET_NO;
-      ps->send_force_disconnect = GNUNET_NO;
-      ps->pending_msgs_head = NULL;
-      ps->pending_msgs_tail = NULL;
-      ps->peercontext=pc;
-      ps->session_id = pc->session_id_counter;
-      pc->session_id_counter++;
-      ps->url = create_url (plugin, ps->addr, ps->addrlen, ps->session_id);
-      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
-    {
+	{
 #if DEBUG_HTTP
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"No existing session found & and no address given: no way to send this message to peer `%s'!\n", GNUNET_i2s(target));
+	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		      "No existing session found & and no address given: no way to send this message to peer `%s'!\n", 
+		      GNUNET_i2s(target));
 #endif
-      return GNUNET_SYSERR;
+	  return GNUNET_SYSERR;
+	}
     }
-  }
-
+  
+  if (msgbuf_size >= (ps->queue_length_max - ps->queue_length_cur))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Queue %X full: %u bytes in queue available, message with %u is too big\n", 
+		  ps, 
+		  (ps->queue_length_max - ps->queue_length_cur), 
+		  msgbuf_size);
+      //return GNUNET_SYSERR;
+    }
+  
   /* create msg */
   msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size);
   msg->next = NULL;
@@ -1995,24 +2611,21 @@ http_plugin_send (void *cls,
   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(ps->pending_msgs_head,ps->pending_msgs_tail,msg);
-
-  if (send_check_connections (plugin, ps) != GNUNET_SYSERR)
-  {
-	  if (force_address != GNUNET_YES)
-		  pc->last_session = ps;
-
-	  if (pc->last_session==NULL)
-		  pc->last_session = ps;
-	  return msg->size;
-  }
-  else
-	  return GNUNET_SYSERR;
+  memcpy (msg->buf,msgbuf, msgbuf_size);  
+  GNUNET_CONTAINER_DLL_insert (ps->pending_msgs_head,
+			       ps->pending_msgs_tail,
+			       msg);
+  ps->queue_length_cur += msgbuf_size;
+  if (send_check_connections (plugin, ps) == GNUNET_SYSERR)
+    return GNUNET_SYSERR;
+  if (force_address != GNUNET_YES)
+    pc->last_session = ps;
+  if (pc->last_session==NULL)
+    pc->last_session = ps;
+  return msg->size;
 }
 
 
-
 /**
  * Function that can be used to force the plugin to disconnect
  * from the given peer and cancel all previous transmissions
@@ -2025,54 +2638,46 @@ static void
 http_plugin_disconnect (void *cls,
                             const struct GNUNET_PeerIdentity *target)
 {
-
-
   struct Plugin *plugin = cls;
   struct HTTP_PeerContext *pc = NULL;
   struct Session *ps = NULL;
-  //struct Session *tmp = NULL;
 
   pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
   if (pc==NULL)
     return;
   ps = pc->head;
-
   while (ps!=NULL)
-  {
-    /* Telling transport that session is getting disconnected */
-    plugin->env->session_end(plugin, target, ps);
-    if (ps->direction==OUTBOUND)
-    {
-      if (ps->send_endpoint!=NULL)
-      {
-        //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
-        //curl_easy_cleanup(ps->send_endpoint);
-        //ps->send_endpoint=NULL;
-        ps->send_force_disconnect = GNUNET_YES;
-      }
-      if (ps->recv_endpoint!=NULL)
-      {
-       //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
-       //curl_easy_cleanup(ps->recv_endpoint);
-       //ps->recv_endpoint=NULL;
-       ps->recv_force_disconnect = GNUNET_YES;
-      }
-    }
-
-    if (ps->direction==INBOUND)
-    {
-      ps->recv_force_disconnect = GNUNET_YES;
-      ps->send_force_disconnect = GNUNET_YES;
-    }
-
-    while (ps->pending_msgs_head!=NULL)
     {
-      remove_http_message(ps, ps->pending_msgs_head);
+      /* Telling transport that session is getting disconnected */
+      plugin->env->session_end(plugin, target, ps);
+      if (ps->direction==OUTBOUND)
+	{
+	  if (ps->send_endpoint!=NULL)
+	    {
+	      //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
+	      //curl_easy_cleanup(ps->send_endpoint);
+	      //ps->send_endpoint=NULL;
+	      ps->send_force_disconnect = GNUNET_YES;
+	    }
+	  if (ps->recv_endpoint!=NULL)
+	    {
+	      //GNUNET_assert(CURLM_OK == curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
+	      //curl_easy_cleanup(ps->recv_endpoint);
+	      //ps->recv_endpoint=NULL;
+	      ps->recv_force_disconnect = GNUNET_YES;
+	    }
+	}
+      if (ps->direction==INBOUND)
+	{
+	  ps->recv_force_disconnect = GNUNET_YES;
+	  ps->send_force_disconnect = GNUNET_YES;
+	}      
+      while (ps->pending_msgs_head!=NULL)
+	remove_http_message(ps, ps->pending_msgs_head);
+      ps->recv_active = GNUNET_NO;
+      ps->send_active = GNUNET_NO;
+      ps=ps->next;
     }
-    ps->recv_active = GNUNET_NO;
-    ps->send_active = GNUNET_NO;
-    ps=ps->next;
-  }
 }
 
 
@@ -2111,28 +2716,28 @@ http_plugin_address_pretty_printer (void *cls,
 
   GNUNET_assert(cls !=NULL);
   if (addrlen == sizeof (struct IPv6HttpAddress))
-  {
-    address = GNUNET_malloc (INET6_ADDRSTRLEN);
-    t6 = addr;
-    a6.sin6_addr = t6->ipv6_addr;
-    inet_ntop(AF_INET6, &(a6.sin6_addr),address,INET6_ADDRSTRLEN);
-    port = ntohs(t6->u6_port);
-  }
+    {
+      address = GNUNET_malloc (INET6_ADDRSTRLEN);
+      t6 = addr;
+      a6.sin6_addr = t6->ipv6_addr;
+      inet_ntop(AF_INET6, &(a6.sin6_addr),address,INET6_ADDRSTRLEN);
+      port = ntohs(t6->u6_port);
+    }
   else if (addrlen == sizeof (struct IPv4HttpAddress))
-  {
-    address = GNUNET_malloc (INET_ADDRSTRLEN);
-    t4 = addr;
-    a4.sin_addr.s_addr =  t4->ipv4_addr;
-    inet_ntop(AF_INET, &(a4.sin_addr),address,INET_ADDRSTRLEN);
-    port = ntohs(t4->u_port);
-  }
+    {
+      address = GNUNET_malloc (INET_ADDRSTRLEN);
+      t4 = addr;
+      a4.sin_addr.s_addr =  t4->ipv4_addr;
+      inet_ntop(AF_INET, &(a4.sin_addr),address,INET_ADDRSTRLEN);
+      port = ntohs(t4->u_port);
+    }
   else
-  {
-    /* invalid address */
-    GNUNET_break_op (0);
-    asc (asc_cls, NULL);
-    return;
-  }
+    {
+      /* invalid address */
+      GNUNET_break_op (0);
+      asc (asc_cls, NULL);
+      return;
+    }
   res = GNUNET_asprintf(&ret,"%s://%s:%u/", PROTOCOL_PREFIX, address, port);
   GNUNET_free (address);
   GNUNET_assert(res != 0);
@@ -2161,43 +2766,56 @@ http_plugin_address_suggested (void *cls,
   struct Plugin *plugin = cls;
   struct IPv4HttpAddress *v4;
   struct IPv6HttpAddress *v6;
-  unsigned int port;
+  struct IPv4HttpAddress *tv4 = plugin->ipv4_addr_head;
+  struct IPv6HttpAddress *tv6 = plugin->ipv6_addr_head;
 
   GNUNET_assert(cls !=NULL);
   if ((addrlen != sizeof (struct IPv4HttpAddress)) &&
       (addrlen != sizeof (struct IPv6HttpAddress)))
-    {
-      return GNUNET_SYSERR;
-    }
+    return GNUNET_SYSERR;
   if (addrlen == sizeof (struct IPv4HttpAddress))
     {
       v4 = (struct IPv4HttpAddress *) addr;
-      /* Not skipping loopback
-      if (INADDR_LOOPBACK == ntohl(v4->ipv4_addr))
-      {
-        return GNUNET_SYSERR;
-      } */
-      port = ntohs (v4->u_port);
-      if (port != plugin->port_inbound)
-      {
-        return GNUNET_SYSERR;
-      }
+      if (plugin->bind4_address!=NULL)
+	{
+    	  if (0 == memcmp (&plugin->bind4_address->sin_addr, &v4->ipv4_addr, sizeof(uint32_t)))
+	    return GNUNET_OK;
+    	  else
+	    return GNUNET_SYSERR;
+	}
+      while (tv4!=NULL)
+	{
+    	  if (0==memcmp (&tv4->ipv4_addr, &v4->ipv4_addr, sizeof(uint32_t)))
+	    break;
+    	  tv4 = tv4->next;
+	}
+      if (tv4 != NULL)
+        return GNUNET_OK;
+      else
+	return GNUNET_SYSERR;
     }
   if (addrlen == sizeof (struct IPv6HttpAddress))
     {
       v6 = (struct IPv6HttpAddress *) addr;
-      if (IN6_IS_ADDR_LINKLOCAL (&v6->ipv6_addr))
-        {
-          return GNUNET_SYSERR;
-        }
-      port = ntohs (v6->u6_port);
-      if (port != plugin->port_inbound)
-      {
-        return GNUNET_SYSERR;
-      }
+      if (plugin->bind6_address!=NULL)
+	{
+    	  if (0 == memcmp (&plugin->bind6_address->sin6_addr, &v6->ipv6_addr, sizeof(struct in6_addr)))
+	    return GNUNET_OK;
+    	  else
+	    return GNUNET_SYSERR;
+	}
+      while (tv6!=NULL)
+	{
+    	  if (0 == memcmp (&tv6->ipv6_addr, &v6->ipv6_addr, sizeof(struct in6_addr)))
+	    break;
+    	  tv6 = tv6->next;
+	}
+      if (tv6 !=NULL)
+        return GNUNET_OK;
+      else
+	return GNUNET_SYSERR;
     }
-
-  return GNUNET_OK;
+  return GNUNET_SYSERR;
 }
 
 
@@ -2258,98 +2876,159 @@ http_plugin_address_to_string (void *cls,
  * Exit point from the plugin.
  */
 void *
-libgnunet_plugin_transport_http_done (void *cls)
+LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
   struct Plugin *plugin = api->cls;
   CURLMcode mret;
+  struct IPv4HttpAddress * ipv4addr;
+  struct IPv6HttpAddress * ipv6addr;
   GNUNET_assert(cls !=NULL);
 
   if (plugin->http_server_daemon_v4 != NULL)
-  {
-    MHD_stop_daemon (plugin->http_server_daemon_v4);
-    plugin->http_server_daemon_v4 = NULL;
-  }
+    {
+      MHD_stop_daemon (plugin->http_server_daemon_v4);
+      plugin->http_server_daemon_v4 = NULL;
+    }
   if (plugin->http_server_daemon_v6 != NULL)
-  {
-    MHD_stop_daemon (plugin->http_server_daemon_v6);
-    plugin->http_server_daemon_v6 = NULL;
-  }
-
+    {
+      MHD_stop_daemon (plugin->http_server_daemon_v6);
+      plugin->http_server_daemon_v6 = NULL;
+    }
   if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4);
-    plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
-  }
-
+    {
+      GNUNET_SCHEDULER_cancel(plugin->http_server_task_v4);
+      plugin->http_server_task_v4 = GNUNET_SCHEDULER_NO_TASK;
+    }
   if ( plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v6);
-    plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
-  }
-
-
+    {
+      GNUNET_SCHEDULER_cancel(plugin->http_server_task_v6);
+      plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
+    }
+  
+  while (plugin->ipv4_addr_head!=NULL)
+    {
+      ipv4addr = plugin->ipv4_addr_head;
+      GNUNET_CONTAINER_DLL_remove(plugin->ipv4_addr_head,plugin->ipv4_addr_tail,ipv4addr);
+      GNUNET_free(ipv4addr);
+    }
+  
+  while (plugin->ipv6_addr_head!=NULL)
+    {
+      ipv6addr = plugin->ipv6_addr_head;
+      GNUNET_CONTAINER_DLL_remove(plugin->ipv6_addr_head,plugin->ipv6_addr_tail,ipv6addr);
+      GNUNET_free(ipv6addr);
+    }
+  
   /* free all peer information */
   if (plugin->peers!=NULL)
-  {
-	  GNUNET_CONTAINER_multihashmap_iterate (plugin->peers,
-											 &remove_peer_context_Iterator,
-											 plugin);
-	  GNUNET_CONTAINER_multihashmap_destroy (plugin->peers);
-  }
+    {
+      GNUNET_CONTAINER_multihashmap_iterate (plugin->peers,
+					     &remove_peer_context_Iterator,
+					     plugin);
+      GNUNET_CONTAINER_multihashmap_destroy (plugin->peers);
+    }
   if (plugin->multi_handle!=NULL)
-  {
-	  mret = curl_multi_cleanup(plugin->multi_handle);
-#if DEBUG_HTTP
-	  if ( CURLM_OK != mret)
-		GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up failed\n");
-#endif
-	  plugin->multi_handle = NULL;
-  }
+    {
+      mret = curl_multi_cleanup(plugin->multi_handle);
+      if (CURLM_OK != mret)
+	GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+		    "curl multihandle clean up failed\n");
+      plugin->multi_handle = NULL;
+    }
   curl_global_cleanup();
-
+  
   if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
-    plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
-  }
-
+    {
+      GNUNET_SCHEDULER_cancel(plugin->http_curl_task);
+      plugin->http_curl_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+  
   GNUNET_free_non_null (plugin->bind4_address);
   GNUNET_free_non_null (plugin->bind6_address);
   GNUNET_free_non_null(plugin->bind_hostname);
+#if BUILD_HTTPS
+  GNUNET_free_non_null (plugin->crypto_init);
+  GNUNET_free_non_null (plugin->cert);
+  GNUNET_free_non_null (plugin->key);
+#endif
   GNUNET_free (plugin);
   GNUNET_free (api);
 #if DEBUG_HTTP
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Unload http plugin complete...\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Unload %s plugin complete...\n", 
+	      PROTOCOL_PREFIX);
 #endif
   return NULL;
 }
 
+#if BUILD_HTTPS
+static char *
+load_certificate( const char * file )
+{
+  struct GNUNET_DISK_FileHandle * gn_file;
+  struct stat fstat;
+  char * text = NULL;
+
+  if (0!=STAT(file, &fstat))
+	  return NULL;
+  text = GNUNET_malloc (fstat.st_size+1);
+  gn_file = GNUNET_DISK_file_open(file, GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_USER_READ);
+  if (gn_file==NULL)
+    {
+      GNUNET_free(text);
+      return NULL;
+    }
+  if (GNUNET_SYSERR == GNUNET_DISK_file_read(gn_file, text, fstat.st_size))
+    {
+      GNUNET_free(text);
+      GNUNET_DISK_file_close(gn_file);
+      return NULL;
+    }
+  text[fstat.st_size] = '\0';
+  GNUNET_DISK_file_close(gn_file);
+  return text;
+}
+#endif
+
 
 /**
  * Entry point for the plugin.
  */
 void *
-libgnunet_plugin_transport_http_init (void *cls)
+LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
 {
   struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
   struct Plugin *plugin;
   struct GNUNET_TRANSPORT_PluginFunctions *api;
   struct GNUNET_TIME_Relative gn_timeout;
   long long unsigned int port;
+  unsigned long long tneigh;
+  char * component_name;
+#if BUILD_HTTPS
+  char * key_file = NULL;
+  char * cert_file = NULL;
+#endif
 
   GNUNET_assert(cls !=NULL);
 #if DEBUG_HTTP
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting http plugin...\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+	      "Starting %s plugin...\n", 
+	      PROTOCOL_PREFIX);
 #endif
+  GNUNET_asprintf(&component_name,
+		  "transport-%s",
+		  PROTOCOL_PREFIX);
 
   plugin = GNUNET_malloc (sizeof (struct Plugin));
   plugin->stats = env->stats;
   plugin->env = env;
   plugin->peers = NULL;
   plugin->bind4_address = NULL;
+  plugin->bind6_address = NULL;
   plugin->use_ipv6  = GNUNET_YES;
   plugin->use_ipv4  = GNUNET_YES;
+  plugin->use_localaddresses = GNUNET_NO;
 
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
   api->cls = plugin;
@@ -2360,194 +3039,350 @@ libgnunet_plugin_transport_http_init (void *cls)
   api->address_to_string = &http_plugin_address_to_string;
 
   /* Hashing our identity to use it in URLs */
-  GNUNET_CRYPTO_hash_to_enc ( &(plugin->env->my_identity->hashPubKey), &plugin->my_ascii_hash_ident);
+  GNUNET_CRYPTO_hash_to_enc (&(plugin->env->my_identity->hashPubKey), 
+			     &plugin->my_ascii_hash_ident);
 
-  /* Reading port number from config file */
+
+  if (GNUNET_CONFIGURATION_have_value (env->cfg, "TRANSPORT", "NEIGHBOUR_LIMIT"))
+  {
+    GNUNET_CONFIGURATION_get_value_number (env->cfg,
+                                         "TRANSPORT",
+                                         "NEIGHBOUR_LIMIT",
+                                         &tneigh);
+  }
+  else
+  {
+    tneigh = -1;
+  }
+  plugin->max_connect_per_transport = tneigh;
+
+
+  /* Use IPv6? */
   if (GNUNET_CONFIGURATION_have_value (env->cfg,
-          	  	  	  	  	  	  	   "transport-http", "USE_IPv6"))
+				       component_name, "USE_IPv6"))
     {
-	  plugin->use_ipv6 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-													   "transport-http",
-													   "USE_IPv6");
+      plugin->use_ipv6 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+							       component_name,
+							       "USE_IPv6");
     }
-  /* Reading port number from config file */
+  /* Use IPv4? */
   if (GNUNET_CONFIGURATION_have_value (env->cfg,
-          	  	  	  	  	  	  	   "transport-http", "USE_IPv4"))
+				       component_name, "USE_IPv4"))
     {
-	  plugin->use_ipv4 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
-													   "transport-http",
-													   "USE_IPv4");
+      plugin->use_ipv4 = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+							       component_name,"USE_IPv4");
+    }
+  /* use local addresses? */
+
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,
+				       component_name, "USE_LOCALADDR"))
+    {
+      plugin->use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
+							       component_name,
+							       "USE_LOCALADDR");
     }
   /* Reading port number from config file */
   if ((GNUNET_OK !=
        GNUNET_CONFIGURATION_get_value_number (env->cfg,
-                                              "transport-http",
+					      component_name,
                                               "PORT",
                                               &port)) ||
       (port > 65535) )
     {
       GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-                       "http",
+		       component_name,
                        _("Require valid port number for transport plugin `%s' in configuration!\n"),
-                       "transport-http");
-      libgnunet_plugin_transport_http_done (api);
+                       PROTOCOL_PREFIX);
+      GNUNET_free(component_name);
+      LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
       return NULL;
     }
 
   /* Reading ipv4 addresse to bind to from config file */
-  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,
-														   "transport-http",
-														   "BINDTO4",
-														   &plugin->bind_hostname));
-	  plugin->bind4_address = GNUNET_malloc(sizeof(struct sockaddr_in));
-	  plugin->bind4_address->sin_family = AF_INET;
-	  plugin->bind4_address->sin_port = htons (port);
-
+  if ( (plugin->use_ipv4==GNUNET_YES) && 
+       (GNUNET_CONFIGURATION_have_value (env->cfg,
+					 component_name, "BINDTO4")))
+    {
+      GNUNET_break (GNUNET_OK ==
+		    GNUNET_CONFIGURATION_get_value_string (env->cfg,
+							   component_name,
+							   "BINDTO4",
+							   &plugin->bind_hostname));
+      plugin->bind4_address = GNUNET_malloc(sizeof(struct sockaddr_in));
+      plugin->bind4_address->sin_family = AF_INET;
+      plugin->bind4_address->sin_port = htons (port);
+      
+      if (plugin->bind_hostname!=NULL)
+	{
 	  if (inet_pton(AF_INET,plugin->bind_hostname, &plugin->bind4_address->sin_addr)<=0)
-	  {
+	    {
+	      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+			       component_name,
+			       _("Misconfigured address to bind to in configuration!\n"));
+	      GNUNET_free(plugin->bind4_address);
+	      GNUNET_free(plugin->bind_hostname);
+	      plugin->bind_hostname = NULL;
+	      plugin->bind4_address = NULL;
+	    }
+	}
+    }
+  
+  /* Reading ipv4 addresse to bind to from config file */
+  if ( (plugin->use_ipv6==GNUNET_YES) && 
+       (GNUNET_CONFIGURATION_have_value (env->cfg,
+					 component_name, "BINDTO6")))
+    {
+      if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (env->cfg,
+							      component_name,
+							      "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);
+	  if (plugin->bind_hostname!=NULL)
+	    {
+	      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->bind4_address);
+				   component_name,
+				   _("Misconfigured address to bind to in configuration!\n"));
+		  GNUNET_free(plugin->bind6_address);
 		  GNUNET_free(plugin->bind_hostname);
 		  plugin->bind_hostname = NULL;
-		  plugin->bind4_address = NULL;
-	  }
-  }
-
-  /* Reading ipv4 addresse to bind to from config file */
-  if ((plugin->use_ipv6==GNUNET_YES) && (GNUNET_CONFIGURATION_have_value (env->cfg,
-          	  	  	  	  	  	  	   "transport-http", "BINDTO6")))
-  {
-	  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);
-
-		  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;
-		  }
-	  }
-  }
+		  plugin->bind6_address = NULL;
+		}
+	    }
+	}
+    }
+  
+#if BUILD_HTTPS
+  /* Reading HTTPS crypto related configuration */
+  /* Get crypto init string from config */
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,
+				       "transport-https", "CRYPTO_INIT"))
+    {
+      GNUNET_CONFIGURATION_get_value_string (env->cfg,
+					     "transport-https",
+					     "CRYPTO_INIT",
+					     &plugin->crypto_init);
+    }
+  else
+    {
+      GNUNET_asprintf(&plugin->crypto_init,"NORMAL");
+    }
+  
+  /* Get private key file from config */
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,
+				       "transport-https", "KEY_FILE"))
+    {
+    GNUNET_CONFIGURATION_get_value_filename (env->cfg,
+					     "transport-https",
+					     "KEY_FILE",
+					     &key_file);
+    }
+  if (key_file==NULL)
+    GNUNET_asprintf(&key_file,"https.key");
+  
+  /* Get private key file from config */
+  if (GNUNET_CONFIGURATION_have_value (env->cfg,"transport-https", "CERT_FILE"))
+    {
+    GNUNET_CONFIGURATION_get_value_filename (env->cfg,
+					     "transport-https",
+					     "CERT_FILE",
+					     &cert_file);
+    }
+  if (cert_file==NULL)
+    GNUNET_asprintf(&cert_file,"https.cert");
+  
+  /* read key & certificates from file */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+	      "Loading TLS certificate `%s' `%s'\n", 
+	      key_file, cert_file);
+
+  plugin->key = load_certificate( key_file );
+  plugin->cert = load_certificate( cert_file );
+
+  if ((plugin->key==NULL) || (plugin->cert==NULL))
+    {
+      char * cmd;
+      int ret = 0;
+      GNUNET_asprintf(&cmd,
+		      "gnunet-transport-certificate-creation %s %s", 
+		      key_file, cert_file);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "No usable TLS certificate found, creating certificate \n");
+      ret = system(cmd);
+      if (ret != 0)
+	{
+	  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+			   "https",
+			   _("Could not create a new TLS certificate, shell script `%s' failed!\n"),cmd,
+			   "transport-https");
+	  GNUNET_free (key_file);
+	  GNUNET_free (cert_file);
+	  GNUNET_free (component_name);
+	  LIBGNUNET_PLUGIN_TRANSPORT_DONE(api);
+	  GNUNET_free (cmd);
+	  return NULL;
+	}
+      GNUNET_free (cmd);
+      plugin->key = load_certificate( key_file );
+      plugin->cert = load_certificate( cert_file );
+      if ((plugin->key==NULL) || (plugin->cert==NULL))
+	{
+	  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+			   "https",
+			   _("No usable TLS certificate found and creating one failed! \n"),
+			   "transport-https");
+	  GNUNET_free (key_file);
+	  GNUNET_free (cert_file);
+	  GNUNET_free (component_name);
+	  
+	  LIBGNUNET_PLUGIN_TRANSPORT_DONE(api);
+	  return NULL;
+	}
+    }
+  GNUNET_free (key_file);
+  GNUNET_free (cert_file);
+  
+  GNUNET_assert((plugin->key!=NULL) && (plugin->cert!=NULL));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "TLS certificate loaded\n");
+#endif
 
   GNUNET_assert ((port > 0) && (port <= 65535));
   plugin->port_inbound = port;
   gn_timeout = GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
-  unsigned int timeout = (gn_timeout.value) / 1000;
-  if ((plugin->http_server_daemon_v6 == NULL) && (plugin->use_ipv6 == GNUNET_YES) && (port != 0))
-  {
-	struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
-    plugin->http_server_daemon_v6 = MHD_start_daemon (
+  unsigned int timeout = (gn_timeout.rel_value) / 1000;
+  if ( (plugin->http_server_daemon_v6 == NULL) && 
+       (plugin->use_ipv6 == GNUNET_YES) && 
+       (port != 0) )
+    {
+      struct sockaddr * tmp = (struct sockaddr *) plugin->bind6_address;
+      plugin->http_server_daemon_v6 = MHD_start_daemon (
 #if DEBUG_MHD
-    								   MHD_USE_DEBUG |
-#endif
-    								   MHD_USE_IPv6,
-                                       port,
-                                       &mhd_accept_cb,
-                                       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_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) && (plugin->use_ipv4 == GNUNET_YES) && (port != 0))
-  {
-  plugin->http_server_daemon_v4 = MHD_start_daemon (
+							MHD_USE_DEBUG |
+#endif
+#if BUILD_HTTPS
+							MHD_USE_SSL |
+#endif
+							MHD_USE_IPv6,
+							port,
+							&mhd_accept_cb, plugin,
+							&mhd_access_cb, plugin,
+							MHD_OPTION_SOCK_ADDR, tmp,
+							MHD_OPTION_CONNECTION_LIMIT, (unsigned int) plugin->max_connect_per_transport,
+#if BUILD_HTTPS
+							MHD_OPTION_HTTPS_PRIORITIES,  plugin->crypto_init,
+							MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
+							MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
+#endif
+							MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
+							MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (2 * GNUNET_SERVER_MAX_MESSAGE_SIZE),
+							MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, plugin,
+							MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
+							MHD_OPTION_END);
+    }
+  if ( (plugin->http_server_daemon_v4 == NULL) && 
+       (plugin->use_ipv4 == GNUNET_YES) && 
+       (port != 0) )
+    {
+      plugin->http_server_daemon_v4 = MHD_start_daemon (
 #if DEBUG_MHD
-    								   MHD_USE_DEBUG |
-#endif
-    								   MHD_NO_FLAG,
-                                       port,
-                                       &mhd_accept_cb,
-                                       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_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);
-  }
+							MHD_USE_DEBUG |
+#endif
+#if BUILD_HTTPS
+							MHD_USE_SSL |
+#endif
+							MHD_NO_FLAG,
+							port,
+							&mhd_accept_cb, plugin ,
+							&mhd_access_cb, plugin,
+							MHD_OPTION_SOCK_ADDR, (struct sockaddr_in *) plugin->bind4_address,
+                                                        MHD_OPTION_CONNECTION_LIMIT, (unsigned int) plugin->max_connect_per_transport,
+#if BUILD_HTTPS
+							MHD_OPTION_HTTPS_PRIORITIES,  plugin->crypto_init,
+							MHD_OPTION_HTTPS_MEM_KEY, plugin->key,
+							MHD_OPTION_HTTPS_MEM_CERT, plugin->cert,
+#endif
+							MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) timeout,
+							MHD_OPTION_CONNECTION_MEMORY_LIMIT, (size_t) (2 * GNUNET_SERVER_MAX_MESSAGE_SIZE),
+							MHD_OPTION_NOTIFY_COMPLETED, &mhd_termination_cb, plugin,
+							MHD_OPTION_EXTERNAL_LOGGER, mhd_logger, plugin->mhd_log,
+							MHD_OPTION_END);
+    }
   if (plugin->http_server_daemon_v4 != NULL)
     plugin->http_server_task_v4 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v4);
   if (plugin->http_server_daemon_v6 != NULL)
     plugin->http_server_task_v6 = http_server_daemon_prepare (plugin, plugin->http_server_daemon_v6);
-
-
+  
+  
   if (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
-  {
+    {
 #if DEBUG_HTTP
-	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address",port);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Starting MHD with IPv4 bound to %s with port %u\n",
+		  (plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address",port);
 #endif
-  }
-  else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK))
-  {
+    }
+  else if ( (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && 
+	    (plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK) )
+    {
 #if DEBUG_HTTP
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Starting MHD with IPv6 bound to %s with port %u\n",
+		  (plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port);
 #endif
-  }
-  else if ((plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && (plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK))
-  {
+    }
+  else if ( (plugin->http_server_task_v6 != GNUNET_SCHEDULER_NO_TASK) && 
+	    (plugin->http_server_task_v4 == GNUNET_SCHEDULER_NO_TASK) )
+    {
 #if DEBUG_HTTP
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting MHD with IPv4 and IPv6 bound to %s with port %u\n",(plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", port);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+		  "Starting MHD with IPv4 and IPv6 bound to %s with port %u\n",
+		  (plugin->bind_hostname!=NULL) ? plugin->bind_hostname : "every address", 
+		  port);
 #endif
-  }
+    }
   else
-  {
-	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;
-  }
-
+    {
+      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! %s plugin failed!\n"),
+		  tmp, port, PROTOCOL_PREFIX);
+      GNUNET_free (tmp);
+      GNUNET_free (component_name);
+      LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+      return NULL;
+    }
+  
   /* Initializing cURL */
   curl_global_init(CURL_GLOBAL_ALL);
   plugin->multi_handle = curl_multi_init();
-
+  
   if ( NULL == plugin->multi_handle )
-  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
-				   "https",
-				   _("Could not initialize curl multi handle, failed to start http plugin!\n"),
-				   "transport-https");
-    libgnunet_plugin_transport_http_done (api);
-    return NULL;
-  }
-
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+		       component_name,
+		       _("Could not initialize curl multi handle, failed to start %s plugin!\n"),
+		       PROTOCOL_PREFIX);
+      GNUNET_free(component_name);
+      LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
+      return NULL;
+    }
+  
   plugin->peers = GNUNET_CONTAINER_multihashmap_create (10);
   GNUNET_OS_network_interfaces_list (&process_interfaces, plugin);
-
+  
+  GNUNET_free(component_name);
   return api;
 }