sending and receiving implemented

1 files changed, 60 insertions, 32 deletions

diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 98fbfda1c..0c2ab54cf 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -37,7 +37,7 @@ server_log (void *arg, const char *fmt, va_list ap)
 
   vsnprintf (text, sizeof (text), fmt, ap);
   va_end (ap);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "server: %s\n", text);
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Server: %s\n", text);
 }
 
 struct ServerConnection
@@ -70,7 +70,7 @@ server_accept_cb (void *cls, const struct sockaddr *addr, socklen_t addr_len)
     return MHD_YES;
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "server: Cannot accept new connections\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Server: Cannot accept new connections\n");
     return MHD_NO;
   }
 }
@@ -267,12 +267,12 @@ server_receive_mst_cb (void *cls, void *client,
  * @return bytes written to buffer
  */
 static ssize_t
-mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
+server_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
 {
   struct Session *s = cls;
   struct HTTP_Message *msg;
   int bytes_read = 0;
-
+  //static int c = 0;
   msg = s->msg_head;
   if (msg != NULL)
   {
@@ -299,7 +299,8 @@ mhd_send_callback (void *cls, uint64_t pos, char *buf, size_t max)
       GNUNET_free (msg);
     }
   }
-#if DEBUG_CONNECTIONS
+
+#if VERBOSE_CLIENT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection %X: MHD has sent %u bytes\n",
               s, bytes_read);
 #endif
@@ -371,7 +372,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
     plugin->cur_connections++;
 
 #if VERBOSE_SERVER
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: New inbound connection from %s with tag %u\n", GNUNET_h2s_full(&(target.hashPubKey)), tag);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: New inbound connection from %s with tag %u\n", GNUNET_i2s(&target), tag);
 #endif
     /* find duplicate session */
 
@@ -388,7 +389,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
     if (t != NULL)
     {
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Duplicate session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Duplicate session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
 #endif
       goto error;
     }
@@ -411,13 +412,13 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
       goto create;
 
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Found existing semi-session for `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Found existing semi-session for `%s'\n", GNUNET_i2s (&target));
 #endif
 
     if ((direction == _SEND) && (t->server_send != NULL))
     {
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Duplicate GET session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Duplicate GET session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
 #endif
       goto error;
     }
@@ -427,7 +428,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
       GNUNET_CONTAINER_DLL_remove(plugin->server_semi_head, plugin->server_semi_tail, s);
       GNUNET_CONTAINER_DLL_insert(plugin->head, plugin->tail, s);
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Found matching semi-session, merging session for peer `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Found matching semi-session, merging session for peer `%s'\n", GNUNET_i2s (&target));
 #endif
 
       goto found;
@@ -435,7 +436,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
     if ((direction == _RECEIVE) && (t->server_recv != NULL))
     {
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Duplicate PUT session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Duplicate PUT session, dismissing new connection from peer `%s'\n", GNUNET_i2s (&target));
 #endif
       goto error;
     }
@@ -445,7 +446,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
       GNUNET_CONTAINER_DLL_remove(plugin->server_semi_head, plugin->server_semi_tail, s);
       GNUNET_CONTAINER_DLL_insert(plugin->head, plugin->tail, s);
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Found matching semi-session, merging session for peer `%s'\n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Found matching semi-session, merging session for peer `%s'\n", GNUNET_i2s (&target));
 #endif
       goto found;
     }
@@ -453,7 +454,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
 create:
 /* create new session */
 #if VERBOSE_SERVER
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server: Creating new session for peer `%s' \n", GNUNET_i2s (&target));
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Server: Creating new session for peer `%s' \n", GNUNET_i2s (&target));
 #endif
 
     s = create_session(plugin,
@@ -473,7 +474,7 @@ create:
 
     goto found;
 error:
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "server: Invalid connection request\n");
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Server: Invalid connection request\n");
         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);
@@ -488,6 +489,10 @@ found:
     if (direction == _RECEIVE)
       s->server_recv = sc;
 
+    int to = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value / 1000);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Server: Setting Timeout to %u\n", to);
+    //MHD_set_connection_option (mhd_connection, MHD_CONNECTION_OPTION_TIMEOUT, to);
+
     (*httpSessionCache) = sc;
   }
 
@@ -512,8 +517,7 @@ found:
   GNUNET_assert (s != NULL);
   if (sc->direction == _SEND)
   {
-    response =
-        MHD_create_response_from_callback (-1, 32 * 1024, &mhd_send_callback,
+    response = MHD_create_response_from_callback (-1, 32 * 1024, &server_send_callback,
                                            s, NULL);
     res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
@@ -536,8 +540,8 @@ found:
     {
 #if VERBOSE_SERVER
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "Server: peer `%s' PUT on address `%s' received %u bytes\n",
-                   GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen));
+                   "Server: peer `%s' PUT on address `%s' received %Zu bytes\n",
+                   GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen), *upload_data_size);
 #endif
       if ((GNUNET_TIME_absolute_get().abs_value < s->delay.abs_value))
       {
@@ -551,7 +555,7 @@ found:
         }
         res = GNUNET_SERVER_mst_receive (s->msg_tk, s, upload_data, *upload_data_size, GNUNET_NO, GNUNET_NO);
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Server: Received %u bytes\n",
+                    "Server: Received %Zu bytes\n",
                     *upload_data_size);
         (*upload_data_size) = 0;
       }
@@ -573,6 +577,16 @@ found:
   return res;
 }
 
+/**
+ * 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
+server_schedule (struct Plugin *plugin, struct MHD_Daemon *daemon_handle);
+
 static void
 server_disconnect_cb (void *cls, struct MHD_Connection *connection,
                       void **httpSessionCache)
@@ -592,33 +606,37 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection,
   {
 #if VERBOSE_SERVER
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "Server: peer `%s' PUT on address `%s' disconnected\n",
+                   "Server: peer `%s' GET on address `%s' disconnected\n",
                    GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen));
 #endif
     s->server_send = NULL;
-    /* FIXME miminimize timeout here */
+
     if (s->server_recv != NULL)
     {
       tc = s->server_recv;
       tc->disconnect = GNUNET_YES;
+      MHD_set_connection_option (sc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT, 1);
     }
   }
   if (sc->direction == _RECEIVE)
   {
 #if VERBOSE_SERVER
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "Server: peer `%s' GET on address `%s' disconnected\n",
+                   "Server: peer `%s' PUT on address `%s' disconnected\n",
                    GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen));
 #endif
     s->server_recv = NULL;
-    //MHD_
     if (s->server_send != NULL)
     {
       tc = s->server_send;
       tc->disconnect = GNUNET_YES;
+      MHD_set_connection_option (sc->mhd_conn, MHD_CONNECTION_OPTION_TIMEOUT, 1);
     }
     if (s->msg_tk != NULL)
+    {
        GNUNET_SERVER_mst_destroy(s->msg_tk);
+       s->msg_tk = NULL;
+    }
   }
   GNUNET_free (sc);
 
@@ -635,6 +653,19 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection,
   }
   plugin->cur_connections--;
 
+  if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+  {
+    GNUNET_SCHEDULER_cancel(plugin->server_v4_task);
+    plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  plugin->server_v4_task = server_schedule (plugin, plugin->server_v4);
+
+  if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+   {
+     GNUNET_SCHEDULER_cancel(plugin->server_v6_task);
+     plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+   }
+   plugin->server_v6_task = server_schedule (plugin, plugin->server_v6);
 
   if ((s->server_send == NULL) && (s->server_recv == NULL))
   {
@@ -643,6 +674,11 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection,
                    "Server: peer `%s' on address `%s' disconnected\n",
                    GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen));
 #endif
+    if (s->msg_tk != NULL)
+    {
+       GNUNET_SERVER_mst_destroy(s->msg_tk);
+       s->msg_tk = NULL;
+    }
 
     notify_session_end(s->plugin, &s->target, s);
   }
@@ -681,15 +717,7 @@ server_send (struct Session *s, struct HTTP_Message * msg)
   return GNUNET_OK;
 }
 
-/**
- * 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
-server_schedule (struct Plugin *plugin, struct MHD_Daemon *daemon_handle);
+
 
 /**
  * Call MHD IPv4 to process pending requests and then go back