[GNUnet-SVN] r23408 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-08-24 16:51:02 +0200 (Fri, 24 Aug 2012)
New Revision: 23408

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_common.h
   gnunet/src/transport/plugin_transport_http_server.c
   gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
Log:
changes


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-08-24 13:51:06 UTC 
(rev 23407)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-08-24 14:51:02 UTC 
(rev 23408)
@@ -33,6 +33,8 @@
 #endif
 
 
+#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
+
 #include "platform.h"
 #include "gnunet_protocols.h"
 #include "gnunet_connection_lib.h"
@@ -45,22 +47,56 @@
 #include <curl/curl.h>
 
 
-#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING
-
 /**
- * After how long do we expire an address that we
- * learned from another peer if it is not reconfirmed
- * by anyone?
+ * Encapsulation of all of the state of the plugin.
  */
-#define LEARNED_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_HOURS, 6)
+struct HTTP_Client_Plugin;
 
 
 /**
- * Encapsulation of all of the state of the plugin.
+ *  Message to send using http
  */
-struct HTTP_Client_Plugin;
+struct HTTP_Message
+{
+  /**
+   * next pointer for double linked list
+   */
+  struct HTTP_Message *next;
 
+  /**
+   * previous pointer for double linked list
+   */
+  struct HTTP_Message *prev;
 
+  /**
+   * buffer containing data to send
+   */
+  char *buf;
+
+  /**
+   * amount of data already sent
+   */
+  size_t pos;
+
+  /**
+   * buffer length
+   */
+  size_t size;
+
+  /**
+   * Continuation function to call once the transmission buffer
+   * has again space available.  NULL if there is no
+   * continuation to call.
+   */
+  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
+
+  /**
+   * Closure for transmit_cont.
+   */
+  void *transmit_cont_cls;
+};
+
+
 /**
  * Session handle for connections.
  */
@@ -70,7 +106,7 @@
    * To whom are we talking to (set to our identity
    * if we are still waiting for the welcome message)
    */
-  struct GNUNET_PeerIdentity sender;
+  struct GNUNET_PeerIdentity target;
 
   /**
    * Stored in a linked list.
@@ -78,44 +114,77 @@
   struct Session *next;
 
   /**
+   * Stored in a linked list.
+   */
+  struct Session *prev;
+
+  /**
+   * Address
+   */
+  void *addr;
+
+  /**
+   * Address length
+   */
+  size_t addrlen;
+
+  /**
+   * ATS network type in NBO
+   */
+  uint32_t ats_address_network_type;
+
+  /**
    * Pointer to the global plugin struct.
    */
   struct HTTP_Client_Plugin *plugin;
 
   /**
-   * The client (used to identify this connection)
+   * Is client send handle paused since there are no data to send?
+   * GNUNET_YES/NO
    */
-  /* void *client; */
+  int client_put_paused;
 
+
   /**
-   * Continuation function to call once the transmission buffer
-   * has again space available.  NULL if there is no
-   * continuation to call.
+   * Client send handle
    */
-  GNUNET_TRANSPORT_TransmitContinuation transmit_cont;
+  void *client_put;
 
   /**
-   * Closure for transmit_cont.
+   * Client receive handle
    */
-  void *transmit_cont_cls;
+  void *client_get;
 
   /**
-   * At what time did we reset last_received last?
+   * next pointer for double linked list
    */
-  struct GNUNET_TIME_Absolute last_quota_update;
+  struct HTTP_Message *msg_head;
 
   /**
-   * How many bytes have we received since the "last_quota_update"
-   * timestamp?
+   * previous pointer for double linked list
    */
-  uint64_t last_received;
+  struct HTTP_Message *msg_tail;
 
   /**
-   * Number of bytes per ms that this peer is allowed
-   * to send to us.
+   * Message stream tokenizer for incoming data
    */
-  uint32_t quota;
+  struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
 
+  /**
+   * Session timeout task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+  /**
+   * Task to wake up client receive handle when receiving is allowed again
+   */
+  GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task;
+
+  /**
+  * Absolute time when to receive data again
+  * Used for receive throttling
+  */
+ struct GNUNET_TIME_Absolute next_receive;
 };
 
 /**
@@ -149,6 +218,23 @@
   char *protocol;
 
   /**
+   * Maximum number of sockets the plugin can use
+   * Each http inbound /outbound connections are two connections
+   */
+  unsigned int max_connections;
+
+  /**
+   * Current number of sockets the plugin can use
+   * Each http inbound /outbound connections are two connections
+   */
+  unsigned int cur_connections;
+
+  /**
+   * Last used unique HTTP connection tag
+   */
+  uint32_t last_tag;
+
+  /**
    * use IPv6
    */
   uint16_t use_ipv6;
@@ -162,10 +248,38 @@
    * cURL Multihandle
    */
   CURLM *curl_multi_handle;
+
+  /**
+   * curl perform task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier client_perform_task;
 };
 
+/**
+ * Encapsulation of all of the state of the plugin.
+ */
+struct HTTP_Client_Plugin *p;
 
 /**
+ * Start session timeout
+ */
+static void
+client_start_session_timeout (struct Session *s);
+
+/**
+ * Increment session timeout due to activity
+ */
+static void
+client_reschedule_session_timeout (struct Session *s);
+
+/**
+ * Cancel timeout
+ */
+static void
+client_stop_session_timeout (struct Session *s);
+
+
+/**
  * Function that can be used by the transport service to transmit
  * a message using the plugin.   Note that in the case of a
  * peer disconnecting, the continuation MUST be called
@@ -206,6 +320,8 @@
   GNUNET_assert (plugin != NULL);
   GNUNET_assert (session != NULL);
 
+  GNUNET_break (0);
+
   /*  struct Plugin *plugin = cls; */
   return bytes_sent;
 }
@@ -225,20 +341,436 @@
 {
   // struct Plugin *plugin = cls;
   // FIXME
+  GNUNET_break (0);
 }
 
+static struct Session *
+client_lookup_session (struct HTTP_Client_Plugin *plugin,
+                       const struct GNUNET_HELLO_Address *address)
+{
+  struct Session *pos;
+
+  for (pos = plugin->head; NULL != pos; pos = pos->next)
+    if ((0 == memcmp (&address->peer, &pos->target, sizeof (struct 
GNUNET_PeerIdentity))) &&
+        (address->address_length == pos->addrlen) &&
+        (0 == memcmp (address->address, pos->addr, pos->addrlen)))
+      return pos;
+  return NULL;
+}
+
+static int
+client_exist_session (struct HTTP_Client_Plugin *plugin, struct Session *s)
+{
+  struct Session * head;
+
+  GNUNET_assert (NULL != plugin);
+  GNUNET_assert (NULL != s);
+
+  for (head = plugin->head; head != NULL; head = head->next)
+  {
+    if (head == s)
+      return GNUNET_YES;
+  }
+  return GNUNET_NO;
+}
+
+/**
+ * Callback method used with libcurl
+ * Method is called when libcurl needs to read data during sending
+ *
+ * @param stream pointer where to write data
+ * @param size size of an individual element
+ * @param nmemb count of elements that can be written to the buffer
+ * @param cls source pointer, passed to the libcurl handle
+ * @return bytes written to stream, returning 0 will terminate connection!
+ */
+static size_t
+client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
+{
+  struct Session *s = cls;
+  struct HTTP_Client_Plugin *plugin = s->plugin;
+  struct HTTP_Message *msg = s->msg_head;
+  size_t len;
+
+  if (GNUNET_YES != client_exist_session (plugin, s))
+  {
+    GNUNET_break (0);
+    return 0;
+  }
+  if (NULL == msg)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Nothing to for session %p send! Suspending PUT 
handle!\n", s);
+    s->client_put_paused = GNUNET_YES;
+    return CURL_READFUNC_PAUSE;
+  }
+  /* data to send */
+  GNUNET_assert (msg->pos < msg->size);
+  /* calculate how much fits in buffer */
+  len = GNUNET_MIN (msg->size - msg->pos,
+                    size * nmemb);
+  memcpy (stream, &msg->buf[msg->pos], len);
+  msg->pos += len;
+  if (msg->pos == msg->size)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Session %p message with %u bytes sent, removing message 
from queue\n",
+                     s, msg->size, msg->pos);
+    /* Calling transmit continuation  */
+    GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
+    if (NULL != msg->transmit_cont)
+      msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
+    GNUNET_free (msg);
+  }
+  client_reschedule_session_timeout (s);
+  return len;
+}
+
+
 static void
-client_stop (struct HTTP_Client_Plugin *plugin)
+client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (NULL != plugin->curl_multi_handle)
+  struct Session *s = cls;
+
+  if (GNUNET_YES != client_exist_session(p, s))
   {
-    curl_multi_cleanup (plugin->curl_multi_handle);
-    plugin->curl_multi_handle = NULL;
+    GNUNET_break (0);
+    return;
   }
-  curl_global_cleanup ();
+  s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+                   "Client: %p Waking up receive handle\n", s->client_get);
+  if (s->client_get != NULL)
+    curl_easy_pause (s->client_get, CURLPAUSE_CONT);
 }
 
+
+
+static int
+client_receive_mst_cb (void *cls, void *client,
+                       const struct GNUNET_MessageHeader *message)
+{
+  struct Session *s = cls;
+  struct HTTP_Client_Plugin *plugin;
+  struct GNUNET_TIME_Relative delay;
+  struct GNUNET_ATS_Information atsi[2];
+
+  if (GNUNET_YES != client_exist_session(p, s))
+  {
+    GNUNET_break (0);
+    return GNUNET_OK;
+  }
+  plugin = s->plugin;
+
+
+  atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
+  atsi[0].value = htonl (1);
+  atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  atsi[1].value = s->ats_address_network_type;
+  GNUNET_break (s->ats_address_network_type != ntohl 
(GNUNET_ATS_NET_UNSPECIFIED));
+
+  delay = s->plugin->env->receive (plugin->env->cls, &s->target, message,
+                                   (const struct GNUNET_ATS_Information *) 
&atsi, 2,
+                                   s, s->addr, s->addrlen);
+  s->next_receive =
+      GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
+
+  if (GNUNET_TIME_absolute_get ().abs_value < s->next_receive.abs_value)
+  {
+
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Client: peer `%s' address `%s' next read delayed for 
%llu ms\n",
+                     GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen),
+                     delay);
+  }
+  client_reschedule_session_timeout (s);
+  return GNUNET_OK;
+}
+
+
+
 /**
+ * Callback method used with libcurl
+ * Method is called when libcurl needs to write data during sending
+ *
+ * @param stream pointer where to write data
+ * @param size size of an individual element
+ * @param nmemb count of elements that can be written to the buffer
+ * @param cls destination pointer, passed to the libcurl handle
+ * @return bytes read from stream
+ */
+static size_t
+client_receive (void *stream, size_t size, size_t nmemb, void *cls)
+{
+  return 0;
+
+  struct Session *s = cls;
+  struct GNUNET_TIME_Absolute now;
+  size_t len = size * nmemb;
+  struct HTTP_Client_Plugin *plugin = s->plugin;
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                   "Received %u bytes from peer `%s'\n", len,
+                   GNUNET_i2s (&s->target));
+  now = GNUNET_TIME_absolute_get ();
+  if (now.abs_value < s->next_receive.abs_value)
+  {
+    struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+    struct GNUNET_TIME_Relative delta =
+        GNUNET_TIME_absolute_get_difference (now, s->next_receive);
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "No inbound bandwidth for session %p available! Next read 
was delayed for %llu ms\n",
+                     s, delta.rel_value);
+    if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
+      s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+    s->recv_wakeup_task =
+        GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s);
+    return CURLPAUSE_ALL;
+  }
+  if (NULL == s->msg_tk)
+    s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);
+  GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
+  return len;
+
+}
+
+/**
+ * Task performing curl operations
+ *
+ * @param cls plugin as closure
+ * @param tc gnunet scheduler task context
+ */
+static void
+client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_break (0);
+#if 0
+  struct HTTP_Client_Plugin *plugin = cls;
+  int running;
+  CURLMcode mret;
+
+  GNUNET_assert (cls != NULL);
+
+  plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    return;
+
+  do
+  {
+    running = 0;
+    mret = curl_multi_perform (plugin->client_mh, &running);
+
+    CURLMsg *msg;
+    int msgs_left;
+
+    while ((msg = curl_multi_info_read (plugin->client_mh, &msgs_left)))
+    {
+      CURL *easy_h = msg->easy_handle;
+      struct Session *s = NULL;
+      char *d = (char *) s;
+
+      if (easy_h == NULL)
+      {
+        GNUNET_break (0);
+        GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                         "Client: connection to ended with reason %i: `%s', %i 
handles running\n",
+                         msg->data.result,
+                         curl_easy_strerror (msg->data.result), running);
+        continue;
+      }
+
+      GNUNET_assert (CURLE_OK ==
+                     curl_easy_getinfo (easy_h, CURLINFO_PRIVATE, &d));
+      s = (struct Session *) d;
+
+      if (GNUNET_YES != exist_session(plugin, s))
+      {
+        GNUNET_break (0);
+        return;
+      }
+
+      GNUNET_assert (s != NULL);
+      if (msg->msg == CURLMSG_DONE)
+      {
+        GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                         "Client: %p connection to '%s'  %s ended with reason 
%i: `%s'\n",
+                         msg->easy_handle, GNUNET_i2s (&s->target),
+                         http_plugin_address_to_string (NULL, s->addr,
+                                                        s->addrlen),
+                         msg->data.result,
+                         curl_easy_strerror (msg->data.result));
+
+        /* Disconnect other transmission direction and tell transport */
+        client_disconnect (s);
+      }
+    }
+  }
+  while (mret == CURLM_CALL_MULTI_PERFORM);
+  client_schedule (plugin, GNUNET_NO);
+#endif
+}
+
+
+static int
+client_connect (struct Session *s)
+{
+
+  struct HTTP_Client_Plugin *plugin = s->plugin;
+  int res = GNUNET_OK;
+  char *url;
+  CURLMcode mret;
+
+  /* create url */
+  if (NULL == http_common_plugin_address_to_string (NULL, s->addr, s->addrlen))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Invalid address peer `%s'\n",
+                     GNUNET_i2s (&s->target));
+    return GNUNET_SYSERR;
+  }
+
+  GNUNET_asprintf (&url, "%s%s;%u",
+      http_common_plugin_address_to_string (plugin, s->addr, s->addrlen),
+                   GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
+                   plugin->last_tag);
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                   "Initiating outbound session peer `%s' using address 
`%s'\n",
+                   GNUNET_i2s (&s->target), url);
+
+  /* create get connection */
+  s->client_get = curl_easy_init ();
+#if VERBOSE_CURL
+  curl_easy_setopt (s->client_get, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt (s->client_get, CURLOPT_DEBUGFUNCTION, &client_log);
+  curl_easy_setopt (s->client_get, CURLOPT_DEBUGDATA, s->client_get);
+#endif
+#if BUILD_HTTPS
+  curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+  curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
+  curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
+#endif
+  curl_easy_setopt (s->client_get, CURLOPT_URL, url);
+  //curl_easy_setopt (s->client_get, CURLOPT_HEADERFUNCTION, 
&curl_get_header_cb);
+  //curl_easy_setopt (s->client_get, CURLOPT_WRITEHEADER, ps);
+  curl_easy_setopt (s->client_get, CURLOPT_READFUNCTION, client_send_cb);
+  curl_easy_setopt (s->client_get, CURLOPT_READDATA, s);
+  curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive);
+  curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s);
+  curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT_MS,
+                    (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+  curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s);
+  curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS,
+                    (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value);
+  curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE,
+                    2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
+#if CURL_TCP_NODELAY
+  curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
+#endif
+
+  /* create put connection */
+  s->client_put = curl_easy_init ();
+#if VERBOSE_CURL
+  curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L);
+  curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log);
+  curl_easy_setopt (s->client_put, CURLOPT_DEBUGDATA, s->client_put);
+#endif
+#if BUILD_HTTPS
+  curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
+  curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
+  curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
+#endif
+  curl_easy_setopt (s->client_put, CURLOPT_URL, url);
+  curl_easy_setopt (s->client_put, CURLOPT_PUT, 1L);
+  //curl_easy_setopt (s->client_put, CURLOPT_HEADERFUNCTION, 
&curl_put_header_cb);
+  //curl_easy_setopt (s->client_put, CURLOPT_WRITEHEADER, ps);
+  curl_easy_setopt (s->client_put, CURLOPT_READFUNCTION, client_send_cb);
+  curl_easy_setopt (s->client_put, CURLOPT_READDATA, s);
+  curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive);
+  curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s);
+  curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT_MS,
+                    (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value);
+  curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s);
+  curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS,
+                    (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value);
+  curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE,
+                    2 * GNUNET_SERVER_MAX_MESSAGE_SIZE);
+#if CURL_TCP_NODELAY
+  curl_easy_setopt (s->client_put, CURLOPT_TCP_NODELAY, 1);
+#endif
+  GNUNET_free (url);
+
+  mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_get);
+  if (mret != CURLM_OK)
+  {
+    curl_easy_cleanup (s->client_get);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+
+  mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_put);
+  if (mret != CURLM_OK)
+  {
+    curl_multi_remove_handle (plugin->curl_multi_handle, s->client_get);
+    curl_easy_cleanup (s->client_get);
+    curl_easy_cleanup (s->client_put);
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+
+  /* Perform connect */
+  plugin->cur_connections += 2;
+  GNUNET_STATISTICS_set (plugin->env->stats,
+      "# HTTP client connections",
+      plugin->cur_connections,
+      GNUNET_NO);
+
+  /* Re-schedule since handles have changed */
+  if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
+    plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  plugin->client_perform_task = GNUNET_SCHEDULER_add_now (client_run, plugin);
+  return res;
+}
+
+void
+client_delete_session (struct Session *s)
+{
+  struct HTTP_Client_Plugin *plugin = s->plugin;
+  struct HTTP_Message *pos = s->msg_head;
+  struct HTTP_Message *next = NULL;
+
+  client_stop_session_timeout (s);
+
+  GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
+
+  while (NULL != (pos = next))
+  {
+    next = pos->next;
+    GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, pos);
+    if (pos->transmit_cont != NULL)
+      pos->transmit_cont (pos->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+    GNUNET_free (pos);
+  }
+
+  if (s->msg_tk != NULL)
+  {
+    GNUNET_SERVER_mst_destroy (s->msg_tk);
+    s->msg_tk = NULL;
+  }
+  GNUNET_free (s->addr);
+  GNUNET_free (s);
+}
+
+
+/**
  * Creates a new outbound session the transport service will use to send data 
to the
  * peer
  *
@@ -252,49 +784,51 @@
 {
   struct HTTP_Client_Plugin *plugin = cls;
   struct Session * s = NULL;
-//  size_t addrlen;
 
   GNUNET_assert (plugin != NULL);
   GNUNET_assert (address != NULL);
   GNUNET_assert (address->address != NULL);
 
-  GNUNET_break (0);
 
   /* find existing session */
-#if 0
-  s = lookup_session (plugin, address);
+  s = client_lookup_session (plugin, address);
   if (s != NULL)
     return s;
 
   if (plugin->max_connections <= plugin->cur_connections)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
-                     "Maximum number of connections reached, "
-                     "cannot connect to peer `%s'\n", GNUNET_i2s 
(&address->peer));
+                     "Maximum number of connections (%u) reached: "
+                     "cannot connect to peer `%s'\n",
+                     plugin->max_connections,
+                     GNUNET_i2s (&address->peer));
     return NULL;
   }
 
-  /* create new session */
-  addrlen = address->address_length;
+  s = GNUNET_malloc (sizeof (struct Session));
+  memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
+  s->plugin = plugin;
+  s->addr = GNUNET_malloc (address->address_length);
+  memcpy (s->addr, address->address, address->address_length);
+  s->addrlen = address->address_length;
+  //s->ats_address_network_type = ats.value;
+  GNUNET_break (0);
 
-  GNUNET_assert (addrlen > sizeof (struct HttpAddress));
+  client_start_session_timeout (s);
 
-  s = create_session (plugin, &address->peer, address->address, 
address->address_length);
-
   /* add new session */
   GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
+
   /* initiate new connection */
   if (GNUNET_SYSERR == client_connect (s))
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
                      "Cannot connect to peer `%s' address `%s''\n",
-                     http_plugin_address_to_string(NULL, s->addr, s->addrlen),
+                     http_common_plugin_address_to_string (NULL, s->addr, 
s->addrlen),
                      GNUNET_i2s (&s->target));
-    GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
-    delete_session (s);
+    client_delete_session (s);
     return NULL;
   }
-#endif
   return s;
 }
 
@@ -314,7 +848,177 @@
   return GNUNET_OK;
 }
 
+static int
+client_disconnect (struct Session *s)
+{
+#if 0
+  int res = GNUNET_OK;
+  CURLMcode mret;
+  struct Plugin *plugin = s->plugin;
+  struct HTTP_Message *msg;
+  struct HTTP_Message *t;
+
+  if (GNUNET_YES != exist_session(plugin, s))
+  {
+    GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
+
+  if (s->client_put != NULL)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Client: %p / %p Deleting outbound PUT session to peer 
`%s'\n",
+                     s, s->client_put, GNUNET_i2s (&s->target));
+
+    /* remove curl handle from multi handle */
+    mret = curl_multi_remove_handle (plugin->client_mh, s->client_put);
+    if (mret != CURLM_OK)
+    {
+      /* clean up easy handle, handle is now invalid and free'd */
+      res = GNUNET_SYSERR;
+      GNUNET_break (0);
+    }
+    curl_easy_cleanup (s->client_put);
+    s->client_put = NULL;
+  }
+
+
+  if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
+    s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  if (s->client_get != NULL)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                     "Client: %p / %p Deleting outbound GET session to peer 
`%s'\n",
+                     s,
+                     s->client_get, GNUNET_i2s (&s->target));
+
+    /* remove curl handle from multi handle */
+    mret = curl_multi_remove_handle (plugin->client_mh, s->client_get);
+    if (mret != CURLM_OK)
+    {
+      /* clean up easy handle, handle is now invalid and free'd */
+      res = GNUNET_SYSERR;
+      GNUNET_break (0);
+    }
+    curl_easy_cleanup (s->client_get);
+    s->client_get = NULL;
+  }
+
+  msg = s->msg_head;
+  while (msg != NULL)
+  {
+    t = msg->next;
+    if (NULL != msg->transmit_cont)
+      msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+    GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
+    GNUNET_free (msg);
+    msg = t;
+  }
+
+  plugin->cur_connections -= 2;
+
+  notify_session_end (plugin, &s->target, s);
+
+  GNUNET_assert (plugin->outbound_sessions > 0);
+  plugin->outbound_sessions --;
+  GNUNET_STATISTICS_set (plugin->env->stats,
+      "# HTTP outbound sessions",
+      plugin->outbound_sessions,
+      GNUNET_NO);
+
+  /* Re-schedule since handles have changed */
+  if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
+    plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  client_schedule (plugin, GNUNET_YES);
+
+  return res;
+#endif
+  GNUNET_break (0);
+  return 0;
+}
+
 /**
+ * Session was idle, so disconnect it
+ */
+static void
+client_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext 
*tc)
+{
+  GNUNET_assert (NULL != cls);
+  struct Session *s = cls;
+
+  s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_log (TIMEOUT_LOG,
+              "Session %p was idle for %llu ms, disconnecting\n",
+              s, (unsigned long long) TIMEOUT.rel_value);
+
+  /* call session destroy function */
+  GNUNET_assert (GNUNET_OK == client_disconnect (s));
+}
+
+/**
+* Start session timeout
+*/
+static void
+client_start_session_timeout (struct Session *s)
+{
+
+ GNUNET_assert (NULL != s);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                  &client_session_timeout,
+                                                  s);
+ GNUNET_log (TIMEOUT_LOG,
+             "Timeout for session %p set to %llu ms\n",
+             s,  (unsigned long long) TIMEOUT.rel_value);
+ GNUNET_break (0);
+}
+
+/**
+* Increment session timeout due to activity
+*/
+static void
+client_reschedule_session_timeout (struct Session *s)
+{
+#if 0
+ GNUNET_assert (NULL != s);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+
+ GNUNET_SCHEDULER_cancel (s->timeout_task);
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+                                                  &server_session_timeout,
+                                                  s);
+ GNUNET_log (TIMEOUT_LOG,
+             "Timeout rescheduled for session %p set to %llu ms\n",
+             s, (unsigned long long) TIMEOUT.rel_value);
+#endif
+ GNUNET_break (0);
+}
+
+/**
+* Cancel timeout
+*/
+static void
+client_stop_session_timeout (struct Session *s)
+{
+ GNUNET_assert (NULL != s);
+
+ if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+ {
+   GNUNET_SCHEDULER_cancel (s->timeout_task);
+   s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+   GNUNET_log (TIMEOUT_LOG, "Timeout stopped for session %p\n", s);
+ }
+}
+
+
+/**
  * Another peer has suggested an address for this
  * peer and transport plugin.  Check that this could be a valid
  * address.  If so, consider adding it to the list
@@ -344,7 +1048,12 @@
   struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
   struct HTTP_Client_Plugin *plugin = api->cls;
 
-  client_stop (plugin);
+  if (NULL != plugin->curl_multi_handle)
+  {
+    curl_multi_cleanup (plugin->curl_multi_handle);
+    plugin->curl_multi_handle = NULL;
+  }
+  curl_global_cleanup ();
 
   GNUNET_free (plugin);
   GNUNET_free (api);
@@ -363,6 +1072,7 @@
   struct HTTP_Client_Plugin *plugin;
 
   plugin = GNUNET_malloc (sizeof (struct HTTP_Client_Plugin));
+  p = plugin;
   plugin->env = env;
   api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
   api->cls = plugin;

Modified: gnunet/src/transport/plugin_transport_http_common.h
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.h 2012-08-24 13:51:06 UTC 
(rev 23407)
+++ gnunet/src/transport/plugin_transport_http_common.h 2012-08-24 14:51:02 UTC 
(rev 23408)
@@ -27,19 +27,16 @@
 #include "platform.h"
 #include "gnunet_common.h"
 
-#if 0
-GNUNET_NETWORK_STRUCT_BEGIN
-/**
- * HTTP addresses including a full URI
- */
-struct HttpAddress
-{
-  /**
-   * Address following
-   */
-  char *address GNUNET_PACKED;
-};
-GNUNET_NETWORK_STRUCT_END
+#define TESTING GNUNET_NO
+
+#if TESTING
+#define TIMEOUT_LOG GNUNET_ERROR_TYPE_ERROR
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
+#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
+#else
+#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
+#define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
+#define TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
 #endif
 
 /**

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-08-24 13:51:06 UTC 
(rev 23407)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-08-24 14:51:02 UTC 
(rev 23408)
@@ -46,18 +46,6 @@
 #define LIBGNUNET_PLUGIN_TRANSPORT_DONE 
libgnunet_plugin_transport_http_server_done
 #endif
 
-#define TESTING GNUNET_NO
-
-#if TESTING
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_ERROR
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
-#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 5)
-#else
-#define HTTP_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
-#define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
-#define TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
-#endif
-
 #define HTTP_ERROR_RESPONSE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 
2.0//EN\"><HTML><HEAD><TITLE>404 Not Found</TITLE></HEAD><BODY><H1>Not 
Found</H1>The requested URL was not found on this 
server.<P><HR><ADDRESS></ADDRESS></BODY></HTML>"
 #define _RECEIVE 0
 #define _SEND 1
@@ -123,7 +111,6 @@
    */
   void *addr;
 
-
   /**
    * Address length
    */
@@ -259,15 +246,6 @@
   struct GNUNET_NAT_Handle *nat;
 
   /**
-   * Server semi connections
-   * A full session consists of 2 semi-connections: send and receive
-   * If not both directions are established the server keeps this sessions here
-   */
-  //struct Session *server_semi_head;
-
-  //struct Session *server_semi_tail;
-
-  /**
    * List of own addresses
    */
 

Modified: gnunet/src/transport/test_transport_api_http_reverse_proxy.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-24 13:51:06 UTC (rev 23407)
+++ gnunet/src/transport/test_transport_api_http_reverse_proxy.conf     
2012-08-24 14:51:02 UTC (rev 23408)
@@ -37,7 +37,8 @@
 [transport]
 #DEBUG = YES
 PORT = 12081
-PLUGINS = http_server
+#PLUGINS = http_server
+PLUGINS = http_client
 # http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock