Remove stream
authorBart Polot <bart@net.in.tum.de>
Tue, 16 Jul 2013 11:21:06 +0000 (11:21 +0000)
committerBart Polot <bart@net.in.tum.de>
Tue, 16 Jul 2013 11:21:06 +0000 (11:21 +0000)
19 files changed:
configure.ac
src/Makefile.am
src/consensus/Makefile.am
src/fs/test_fs_defaults.conf
src/include/Makefile.am
src/set/Makefile.am
src/stream/Makefile.am [deleted file]
src/stream/README [deleted file]
src/stream/mesh-test.c [deleted file]
src/stream/mesh.supp [deleted file]
src/stream/perf_stream_api.c [deleted file]
src/stream/stream.h [deleted file]
src/stream/stream_api.c [deleted file]
src/stream/test_stream_2peers.c [deleted file]
src/stream/test_stream_2peers_halfclose.c [deleted file]
src/stream/test_stream_big.c [deleted file]
src/stream/test_stream_local.c [deleted file]
src/stream/test_stream_local.conf [deleted file]
src/stream/test_stream_sequence_wraparound.c [deleted file]

index f38a9653e6f63f9d829ee46680f7af7e34d404c9..42de9bde4a7fe228c6f9a5604addd288e8693674 100644 (file)
@@ -1313,7 +1313,6 @@ src/set/Makefile
 src/set/set.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
-src/stream/Makefile
 src/template/Makefile
 src/testbed/Makefile
 src/testbed/testbed.conf
index f97283d0a754848a0f3f683f35ce3fb1ed10ad89..245972b583b58d10d3da05d9bc8857cbb0956f72 100644 (file)
@@ -61,7 +61,6 @@ SUBDIRS = \
   regex \
   mesh \
   lockmanager \
-  stream \
   dns \
   gns \
   set \
index 4b81baa59e8cf34c44842ca46775e9239fe99f49..92c86b6a16353bfbea20112e6b3c65b7605cf88e 100644 (file)
@@ -45,7 +45,6 @@ gnunet_service_consensus_SOURCES = \
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(GN_LIBINTL)
@@ -57,7 +56,6 @@ gnunet_service_evil_consensus_SOURCES = \
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(top_builddir)/src/set/libgnunetset.la \
   $(GN_LIBINTL)
index 1880fb7de0e384385fcf8e8ce619a883d6d8ee09..0067256808917297f1cac2576fc626783f4215f7 100644 (file)
@@ -57,6 +57,7 @@ HOSTNAME = localhost
 CONTENT_CACHING = YES
 CONTENT_PUSHING = YES
 DELAY = YES
+PREFIX = valgrind --leak-check=full
 
 [testing]
 WEAKRANDOM = YES
index 603f48820522e59d44e7def6cf3e1ff936dfb9a2..bdf752382210238dad101fecb0605a47630b4720 100644 (file)
@@ -78,7 +78,6 @@ gnunetinclude_HEADERS = \
   gnunet_signal_lib.h \
   gnunet_signatures.h \
   gnunet_statistics_service.h \
-  gnunet_stream_lib.h \
   gnunet_strings_lib.h \
   gnunet_testbed_service.h \
   gnunet_testbed_logger_service.h \
index f373be20df0c915d5ca23fb09157f93ce5ce39ba..bed44e848a02c8710db90de8c29165110d05f3eb 100644 (file)
@@ -57,7 +57,6 @@ libgnunetset_la_SOURCES = \
   set_api.c
 libgnunetset_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-  $(top_builddir)/src/stream/libgnunetstream.la \
   $(LTLIBINTL)
 libgnunetset_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am
deleted file mode 100644 (file)
index d21f170..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-INCLUDES = -I$(top_srcdir)/src/include
-
-if MINGW
-  WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols
-endif
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-lib_LTLIBRARIES = libgnunetstream.la
-
-libgnunetstream_la_SOURCES = \
-  stream_api.c stream.h
-libgnunetstream_la_LIBADD = \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/lockmanager/libgnunetlockmanager.la \
- $(top_builddir)/src/statistics/libgnunetstatistics.la \
- $(top_builddir)/src/util/libgnunetutil.la $(XLIB)
-libgnunetstream_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS) \
-  -version-info 1:0:0
-
-if HAVE_BENCHMARKS
- STREAM_BENCHMARKS = \
- perf_stream_api
-endif
-
-if HAVE_TESTING
-check_PROGRAMS = \
- test_stream_2peers \
- test_stream_2peers_halfclose \
- test_stream_local \
- test_stream_big \
- test_stream_sequence_wraparound \
- mesh-test \
- $(STREAM_BENCHMARKS)
-endif
-
-EXTRA_DIST = test_stream_local.conf
-
-if ENABLE_TEST_RUN
-TESTS = \
- test_stream_2peers \
- test_stream_2peers_halfclose \
- test_stream_local \
- test_stream_big \
- test_stream_sequence_wraparound \
- $(STREAM_BENCHMARKS)
-endif
-
-test_stream_2peers_SOURCES = \
- test_stream_2peers.c
-test_stream_2peers_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-
-
-test_stream_2peers_halfclose_SOURCES = \
- test_stream_2peers_halfclose.c
-test_stream_2peers_halfclose_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-
-test_stream_local_SOURCES = \
- test_stream_local.c
-test_stream_local_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
-
-test_stream_big_SOURCES = \
- test_stream_big.c
-test_stream_big_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
-
-test_stream_sequence_wraparound_SOURCES = \
- test_stream_sequence_wraparound.c
-test_stream_sequence_wraparound_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
-
-perf_stream_api_SOURCES = \
- perf_stream_api.c
-perf_stream_api_LDADD = \
- $(top_builddir)/src/stream/libgnunetstream.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/testbed/libgnunettestbed.la
-
-mesh_test_SOURCES = mesh-test.c
-mesh_test_LDADD = \
- $(top_builddir)/src/mesh/libgnunetmesh.la \
- $(top_builddir)/src/util/libgnunetutil.la
diff --git a/src/stream/README b/src/stream/README
deleted file mode 100644 (file)
index 977ca2d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-Stream library provides stream connections between peers in GNUnet. This is a
-convenience library which hides the complexity of dividing data stream into
-packets, transmitting them and retransmitting them in case of communication
-errors.
-
-This library's API are similar to unix PIPE API. The user is expected to open a
-stream to a listening target peer. Once the stream is established, the user can
-use it as a pipe. Any data written into the stream at one peer will be readable
-by the other peer and vice versa.
-
-This library uses mesh API for establishing tunnels between peers.
\ No newline at end of file
diff --git a/src/stream/mesh-test.c b/src/stream/mesh-test.c
deleted file mode 100644 (file)
index eb9594a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_mesh_service.h"
-
-static void
-run (void *cls, char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_MESH_Handle *m;
-
-  m =  GNUNET_MESH_connect (cfg, /* the configuration handle */
-                            socket, /* cls */
-                            NULL, /* No inbound tunnel handler */
-                            NULL, /* No in-tunnel cleaner */
-                            NULL,
-                            NULL); /* We don't get inbound tunnels */
-}
-
-int
-main (int argc, char **argv)
-{
-   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
-      GNUNET_GETOPT_OPTION_END
-  };
-   GNUNET_PROGRAM_run (argc, argv, "mesh-test",
-                       "help",
-                       options, &run, NULL);
-  return 0;
-}
diff --git a/src/stream/mesh.supp b/src/stream/mesh.supp
deleted file mode 100644 (file)
index 7107c0b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-   <stream_open_to_mesh>
-   Memcheck:Leak
-   fun:malloc
-   ...
-   fun:GNUNET_PEER_intern
-   fun:GNUNET_MESH_peer_request_connect_add
-   fun:GNUNET_STREAM_open
-   ...
-}
-{
-   <unknown_from_mesh>
-   Memcheck:Leak
-   fun:malloc
-   fun:GNUNET_xmalloc_unchecked_
-   fun:GNUNET_xmalloc_
-   fun:GNUNET_CONTAINER_multihashmap_put
-   fun:GNUNET_PEER_intern
-   fun:process_tunnel_created
-   fun:msg_received
-   fun:receive_task
-   fun:run_ready
-   fun:GNUNET_SCHEDULER_run
-   fun:GNUNET_PROGRAM_run2
-   fun:GNUNET_PROGRAM_run
-}
-{
-   <stream_open_to_mesh_via_request_connect_add>
-   Memcheck:Leak
-   fun:malloc
-   fun:GNUNET_xmalloc_unchecked_
-   fun:GNUNET_xmalloc_
-   fun:GNUNET_CONTAINER_multihashmap_create
-   fun:GNUNET_PEER_intern
-   fun:GNUNET_MESH_peer_request_connect_add
-   fun:GNUNET_STREAM_open
-   fun:stream_ca
-   fun:configuration_receiver
-   fun:handle_peer_config
-   fun:message_handler
-   fun:receive_task
-}
-{
-   <stream_open_to_mesh_via_request_connect_add2>
-   Memcheck:Leak
-   fun:malloc
-   fun:GNUNET_xmalloc_unchecked_
-   fun:GNUNET_xmalloc_
-   fun:GNUNET_xgrow_
-   fun:GNUNET_PEER_intern
-   fun:GNUNET_MESH_peer_request_connect_add
-   fun:GNUNET_STREAM_open
-   fun:stream_ca
-   fun:configuration_receiver
-   fun:handle_peer_config
-   fun:message_handler
-   fun:receive_task
-}
diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c
deleted file mode 100644 (file)
index 502bb7a..0000000
+++ /dev/null
@@ -1,1053 +0,0 @@
- /*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/perf_stream_api.c
- * @brief performance benchmarks for stream api
- * @author Sree Harsha Totakura
- */
-
-#define LOG(kind, ...)                         \
-  GNUNET_log (kind, __VA_ARGS__);
-
-/****************************************************************************************/
-/* Test is setup into the following major steps:                                       */
-/*    1. Measurements over loopback (1 hop). i.e. we use only one peer and open                */
-/*       stream connections over loopback. Messages will go through                    */
-/*       STREAM_API->MESH_API->MESH_SERVICE->MESH_API->STREAM_API.                     */
-/*    2. Measurements over 2 peers (2 hops). We use testbed to create 2 peers,         */
-/*       connect them and then create stream connections. Messages will go through      */
-/*       STREAM_API->MESH_API->MESH_SERVICE->CORE1.....CORE2->MESH_API->STREAM_API      */
-/*    3. Measurements over 3 peers (3 hops). We use testbed to create 3 peers,         */
-/*       connect them in a line topology: peer1->peer2->peer3. Messages will go                */
-/*       through                                                                       */
-/*       STREAM_API->MESH_API->MESH_SERVICE->CORE1..CORE2..CORE3->MESH_API->STREAM_API. */
-/****************************************************************************************/
-
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
-#include "gnunet_stream_lib.h"
-  
-/**
- * Simple struct to keep track of progress, and print a
- * nice little percentage meter for long running tasks.
- */
-struct ProgressMeter
-{
-  unsigned int total;
-
-  unsigned int modnum;
-
-  unsigned int dotnum;
-
-  unsigned int completed;
-
-  int print;
-
-  char *startup_string;
-};
-
-
-/**
- * Steps in testing
- */
-enum TestStep
-{
-  /**
-   * Single hop loopback testing
-   */
-  TEST_STEP_1_HOP,
-
-  /**
-   * Testing with 2 peers
-   */
-  TEST_STEP_2_HOP,
-
-  /**
-   * Testing with 3 peers
-   */
-  TEST_STEP_3_HOP
-};
-
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * The peer handle when we use the testbed servie
-   */
-  struct GNUNET_TESTBED_Peer *peer;
-
-  /**
-   * Handle to peer specific opearations while using testbed service
-   */
-  struct GNUNET_TESTBED_Operation *op;
-
-  /**
-   * The identity of this peer
-   */
-  struct GNUNET_PeerIdentity id;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Bytes the peer has written
-   */
-  size_t bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  size_t bytes_read;
-
-  /**
-   * number of packets sent
-   */
-  unsigned int packets_wrote;
-
-  /**
-   * number of packets read
-   */
-  unsigned int packets_read;
-};
-
-
-/**
- * Enumeration of stages in this testing
- */
-enum TestStage
-{
-  /**
-   * The initial stage
-   */
-  INIT,
-  
-  /**
-   * Uplink testing stage
-   */
-  UPLINK_OK,
-
-  /**
-   * Downlink testing stage
-   */
-  DOWNLINK_OK
-};
-
-
-/**
- * Maximum size of the data which we will transfer during tests
- */
-#define DATA_SIZE 5000000      /* 5mB */
-
-/**
- * Fixed number of packets we send in each direction during each subtest
- */
-#define MAX_PACKETS 1000
-
-/**
- * Listen socket of peer2
- */
-struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
-
-/**
- * Handle to configuration during TEST_STEP_1_HOP
- */
-const struct GNUNET_CONFIGURATION_Handle *config;
-
-/**
- * Handle for the progress meter
- */
-static struct ProgressMeter *meter;
-
-/**
- * Placeholder for peer data
- */
-static struct PeerData peer_data[3];
-
-/**
- * Handle to common operations while using testbed
- */
-static struct GNUNET_TESTBED_Operation *common_op;
-
-/**
- * Task ID for abort task
- */
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-
-/**
- * Task ID for write task
- */
-static GNUNET_SCHEDULER_TaskIdentifier write_task;
-
-/**
- * Task ID for read task
- */
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
-
-/**
- * Absolute time when profiling starts
- */
-static struct GNUNET_TIME_Absolute prof_start_time;
-
-/**
- * Test time taken for sending the data
- */
-static struct GNUNET_TIME_Relative prof_time;
-
-/**
- * Random data block. Should generate data first
- */
-static uint32_t data[DATA_SIZE / 4];
-
-/**
- * Payload sizes to test each major test with
- */
-static uint16_t payload_size[] = 
-{ 20, 500, 2000, 7000, 13000, 25000, 30000};//, 50000, 60000, 63000, 64000 };
-
-/**
- * Current step of testing
- */
-static enum TestStep test_step;
-
-/**
- * Index for choosing payload size
- */
-static unsigned int payload_size_index;
-
-/**
- * Number of peers we want to create while using the testbed service
- */
-static int num_peers;
-
-/**
- * Flag to indicate that the other peer should reset its data read source index
- */
-static int reset_read;
-
-/**
- * Testing result of a major test
- */
-static enum TestStage result;
-
-/**
- * Create a meter to keep track of the progress of some task.
- *
- * @param total the total number of items to complete
- * @param start_string a string to prefix the meter with (if printing)
- * @param print GNUNET_YES to print the meter, GNUNET_NO to count
- *              internally only
- *
- * @return the progress meter
- */
-static struct ProgressMeter *
-create_meter (unsigned int total, char *start_string, int print)
-{
-  struct ProgressMeter *ret;
-
-  ret = GNUNET_malloc (sizeof (struct ProgressMeter));
-  ret->print = print;
-  ret->total = total;
-  ret->modnum = total / 4;
-  if (ret->modnum == 0)         /* Divide by zero check */
-    ret->modnum = 1;
-  ret->dotnum = (total / 50) + 1;
-  if (start_string != NULL)
-    ret->startup_string = GNUNET_strdup (start_string);
-  else
-    ret->startup_string = GNUNET_strdup ("");
-
-  return ret;
-}
-
-
-/**
- * Update progress meter (increment by one).
- *
- * @param meter the meter to update and print info for
- *
- * @return GNUNET_YES if called the total requested,
- *         GNUNET_NO if more items expected
- */
-static int
-update_meter (struct ProgressMeter *meter)
-{
-  if (meter->print == GNUNET_YES)
-  {
-    if (meter->completed % meter->modnum == 0)
-    {
-      if (meter->completed == 0)
-      {
-        FPRINTF (stdout, "%sProgress: [0%%", meter->startup_string);
-      }
-      else
-        FPRINTF (stdout, "%d%%",
-                 (int) (((float) meter->completed / meter->total) * 100));
-    }
-    else if (meter->completed % meter->dotnum == 0)
-      FPRINTF (stdout, "%s",  ".");
-
-    if (meter->completed + 1 == meter->total)
-      FPRINTF (stdout, "%d%%]\n", 100);
-    fflush (stdout);
-  }
-  meter->completed++;
-
-  if (meter->completed == meter->total)
-    return GNUNET_YES;
-  if (meter->completed > meter->total)
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Progress meter overflow!!\n");
-  return GNUNET_NO;
-}
-
-
-/**
- * Reset progress meter.
- *
- * @param meter the meter to reset
- *
- * @return GNUNET_YES if meter reset,
- *         GNUNET_SYSERR on error
- */
-static int
-reset_meter (struct ProgressMeter *meter)
-{
-  if (meter == NULL)
-    return GNUNET_SYSERR;
-
-  meter->completed = 0;
-  return GNUNET_YES;
-}
-
-
-/**
- * Release resources for meter
- *
- * @param meter the meter to free
- */
-static void
-free_meter (struct ProgressMeter *meter)
-{
-  GNUNET_free_non_null (meter->startup_string);
-  GNUNET_free (meter);
-}
-
-
-/**
- * Shutdown nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  switch (test_step)
-  {
-  case TEST_STEP_1_HOP:
-    if (NULL != peer_data[0].socket)
-      GNUNET_STREAM_close (peer_data[0].socket);
-    if (NULL != peer_data[1].socket)
-      GNUNET_STREAM_close (peer_data[1].socket);
-    if (NULL != peer2_listen_socket)
-      GNUNET_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
-    break;
-  case TEST_STEP_2_HOP:
-    if (NULL != peer_data[1].socket)
-      GNUNET_STREAM_close (peer_data[1].socket);
-    if (NULL != peer_data[0].op)
-      GNUNET_TESTBED_operation_done (peer_data[0].op);
-    if (NULL != peer_data[1].op)
-      GNUNET_TESTBED_operation_done (peer_data[1].op);
-    break;
-  case TEST_STEP_3_HOP:
-    GNUNET_break (0);    
-  }  
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (GNUNET_SCHEDULER_NO_TASK != write_task)
-    GNUNET_SCHEDULER_cancel (write_task);
-  GNUNET_SCHEDULER_shutdown (); /* Shutdown this testcase */
-  if (NULL != meter)
-  {
-    free_meter (meter);
-    meter = NULL;
-  }
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: ABORT\n");
-  if (GNUNET_SCHEDULER_NO_TASK != read_task)
-    GNUNET_SCHEDULER_cancel (read_task);
-  result = GNUNET_SYSERR;
-  do_close (cls, tc);
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-static void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  static int shutdowns;
-
-  if (++shutdowns == 1)
-  {
-    peer_data[0].shutdown_handle = NULL;
-    peer_data[1].shutdown_handle = GNUNET_STREAM_shutdown (peer_data[1].socket, SHUT_RDWR,
-                                                           &shutdown_completion, cls);
-    return;
-  }  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-  GNUNET_SCHEDULER_add_now (&do_close, cls);
-}
-
-
-/**
- * Shutdown sockets gracefully
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  peer_data[0].shutdown_handle = GNUNET_STREAM_shutdown (peer_data[0].socket, SHUT_RDWR,
-                                                         &shutdown_completion, cls);
-}
-
-  
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Task for calling STREAM_write with a chunk of random data
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes written
- */
-static void 
-write_completion (void *cls, enum GNUNET_STREAM_Status status, size_t size)
-{
-  struct PeerData *pdata = cls;
-  double throughput;
-  double prof_time_sec;
-  unsigned int packets_wrote;
-
-  if (GNUNET_STREAM_OK != status)
-  {
-    GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return;
-  }
-  GNUNET_assert (size <= DATA_SIZE);
-  packets_wrote = (size + payload_size[payload_size_index] - 1)
-      / payload_size[payload_size_index];
-  pdata->bytes_wrote += size;
-  for (;packets_wrote > 0; packets_wrote--)
-  {    
-    update_meter (meter);
-    pdata->packets_wrote++;
-  }
-  if (pdata->packets_wrote < MAX_PACKETS) /* Have more data to send */
-  {
-    size_t write_amount;
-    
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    {
-      GNUNET_SCHEDULER_cancel (abort_task);
-      abort_task = 
-          GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                        (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
-                                    NULL);
-    }
-    write_amount = (MAX_PACKETS - pdata->packets_wrote) *
-        payload_size[payload_size_index];
-    if (write_amount > DATA_SIZE)
-      write_amount = DATA_SIZE;
-    reset_read = GNUNET_YES;
-    pdata->io_write_handle = GNUNET_STREAM_write (pdata->socket, data,
-                                                  write_amount,
-                                                  GNUNET_TIME_UNIT_FOREVER_REL,
-                                                  &write_completion, pdata);
-    GNUNET_assert (NULL != pdata->io_write_handle);
-  }
-  else
-  {
-    free_meter (meter);
-    meter = NULL;
-    prof_time = GNUNET_TIME_absolute_get_duration (prof_start_time);
-    prof_time_sec = (((double) prof_time.rel_value)/ ((double) 1000));
-    throughput = ((float) pdata->bytes_wrote) / prof_time_sec;
-    PRINTF ("Throughput %.2f kB/sec\n", throughput / 1000.00);
-    switch (result)
-    {
-    case INIT:
-      result = UPLINK_OK;
-      GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == read_task);
-      GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == write_task);
-      pdata->bytes_read = 0;
-      pdata->packets_read = 0;
-      meter = create_meter (MAX_PACKETS, "Testing Downlink\n", GNUNET_YES);
-      read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, &peer_data[0]);
-      write_task = GNUNET_SCHEDULER_add_now (&stream_write_task, &peer_data[1]);
-      break;
-    case UPLINK_OK:
-      result = DOWNLINK_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-      break;
-    case DOWNLINK_OK:
-      GNUNET_assert (0);
-    }
-  }
-}
-
-
-/**
- * Task for calling STREAM_write with a chunk of random data
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *pdata = cls;
-  size_t write_amount;
-
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-  {
-    GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = 
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
-                                    NULL);
-  }
-  write_task = GNUNET_SCHEDULER_NO_TASK;
-  prof_start_time = GNUNET_TIME_absolute_get ();
-  pdata->bytes_wrote = 0;
-  pdata->packets_wrote = 0;
-  write_amount = MAX_PACKETS * payload_size[payload_size_index];
-  if (write_amount > DATA_SIZE)
-    write_amount = DATA_SIZE;
-  reset_read = GNUNET_YES;
-  pdata->io_write_handle = GNUNET_STREAM_write (pdata->socket, data,
-                                                write_amount,
-                                               GNUNET_TIME_UNIT_FOREVER_REL,
-                                               &write_completion, pdata);
-  GNUNET_assert (NULL != pdata->io_write_handle);
-}
-
-
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Input processor
- *
- * @param cls peer2
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls, enum GNUNET_STREAM_Status status,
-                const void *input_data, size_t size)
-{
-  struct PeerData *pdata = cls;
-
-  if (GNUNET_STREAM_OK != status)
-  {
-    GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return 0;
-  }
-  GNUNET_assert (size <= DATA_SIZE);
-  if (GNUNET_YES == reset_read)
-  {
-    pdata->bytes_read = 0;
-    reset_read = GNUNET_NO;
-  }
-  GNUNET_assert ((pdata->bytes_read + size) <= DATA_SIZE);
-  GNUNET_assert (0 == memcmp (((void *)data ) + pdata->bytes_read, 
-                              input_data, size));
-  pdata->bytes_read += size;
-  pdata->packets_read += (size + payload_size[payload_size_index] - 1)
-      / payload_size[payload_size_index];
-  if (pdata->packets_read < MAX_PACKETS)
-  {
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == read_task);
-    read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, pdata);
-  }
-  else 
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Reading finished successfully\n");
-  }
-  return size;
-}
-
-  
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *pdata = cls;
-
-  read_task = GNUNET_SCHEDULER_NO_TASK;
-  pdata->io_read_handle =
-      GNUNET_STREAM_read (pdata->socket, GNUNET_TIME_UNIT_FOREVER_REL,
-                         &input_processor, pdata);
-  GNUNET_assert (NULL != pdata->io_read_handle);
-}
-
-
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the closure from GNUNET_STREAM_listen
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls, struct GNUNET_STREAM_Socket *socket,
-                 const struct GNUNET_PeerIdentity *initiator)
-{
-  struct PeerData *pdata = cls;
-
-  
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (NULL != socket);
-  GNUNET_assert (pdata == &peer_data[1]);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer connected: %s\n",
-             GNUNET_i2s(initiator));
-  pdata->socket = socket;
-  pdata->bytes_read = 0;
-  read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, pdata);
-  return GNUNET_OK;
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *pdata = cls;
-
-  GNUNET_assert (socket == pdata->socket);
-  meter = create_meter (MAX_PACKETS, "Testing Uplink\n", GNUNET_YES);
-  write_task = GNUNET_SCHEDULER_add_now (&stream_write_task, pdata);
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{
-  peer_data[0].socket = 
-      GNUNET_STREAM_open (config, &peer_data[1].id, 10, &stream_open_cb,
-                         &peer_data[0],
-                         GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE,
-                         payload_size[payload_size_index],
-                         GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer_data[0].socket);
-}
-
-
-/**
- * Initialize framework and start test
- *
- * @param cls closure
- * @param cfg configuration of the peer that was started
- * @param peer identity of the peer that was created
- */
-static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_PeerIdentity id;
-
-  GNUNET_TESTING_peer_get_identity (peer, &id);
-  config = cfg;
-  peer2_listen_socket = 
-      GNUNET_STREAM_listen (config, 10, &stream_listen_cb, &peer_data[1],
-                           GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                            &stream_connect,
-                            GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE,
-                            payload_size[payload_size_index],
-                            GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer2_listen_socket);
-  peer_data[0].id = id;
-  peer_data[1].id = id;
-  abort_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort,
-                                    NULL);
-}
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- * 
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- *          GNUNET_TESTBED_operation_done() is called on the operation returned
- *          from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void * 
-stream_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg);
-
-
-/**
- * Adapter function called to destroy a connection to
- * a service.
- * 
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-static void
-stream_da (void *cls, void *op_result)
-{
-  if (&peer_data[1] == cls)
-  {
-    GNUNET_STREAM_listen_close (op_result);
-    return;
-  }
-  else if (&peer_data[0] == cls)
-  {
-    GNUNET_STREAM_close (op_result);
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client. Called from
- * testbed stream_ca
- */
-static void
-stream_connect2 (void)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream listen open successful\n");
-  peer_data[0].op =
-      GNUNET_TESTBED_service_connect (&peer_data[0], peer_data[0].peer,
-                                     "stream", NULL, NULL, stream_ca,
-                                     stream_da, &peer_data[0]);
-}
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- * 
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- *          GNUNET_TESTBED_operation_done() is called on the operation returned
- *          from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void * 
-stream_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct PeerData *pdata = cls;
-
-  if (&peer_data[1] == pdata)
-  {
-    peer2_listen_socket = NULL;
-    peer2_listen_socket =
-       GNUNET_STREAM_listen (cfg, 10, &stream_listen_cb, &peer_data[1],
-                             GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                             &stream_connect2,
-                              GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE,
-                              payload_size[payload_size_index],
-                              GNUNET_STREAM_OPTION_END);
-    GNUNET_assert (NULL != peer2_listen_socket);
-    return peer2_listen_socket;
-  }
-  if (&peer_data[0] == pdata)
-  {
-    pdata->socket =
-       GNUNET_STREAM_open (cfg, &peer_data[1].id, 10, &stream_open_cb,
-                           &peer_data[0],
-                           GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE,
-                           payload_size[payload_size_index],
-                           GNUNET_STREAM_OPTION_END);
-    GNUNET_assert (NULL != pdata->socket);
-    return pdata->socket;
-  }
-  GNUNET_assert (0);
-  return NULL;
-}
-
-
-/**
- * Callback to be called when the requested peer information is available
- *
- * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
- */
-static void 
-peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op,
-            const struct GNUNET_TESTBED_PeerInformation *pinfo,
-            const char *emsg)
-{
-  struct PeerData *pdata = cb_cls;
-
-  GNUNET_assert (NULL == emsg);
-  GNUNET_assert (common_op == op);
-  GNUNET_assert (NULL != pdata);
-  memcpy (&pdata->id, pinfo->result.id, sizeof (struct GNUNET_PeerIdentity));
-  GNUNET_TESTBED_operation_done (op);
-  if (pdata == &peer_data[0])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 1 id: %s\n",
-               GNUNET_i2s (&pdata->id));
-    common_op = GNUNET_TESTBED_peer_get_information (peer_data[1].peer,
-                                                    GNUNET_TESTBED_PIT_IDENTITY,
-                                                    &peerinfo_cb, &peer_data[1]);
-  }
-  else if (pdata == &peer_data[1])
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 2 id: %s\n",
-               GNUNET_i2s (&pdata->id));
-    if (TEST_STEP_2_HOP == test_step)
-      peer_data[1].op = 
-         GNUNET_TESTBED_service_connect (&peer_data[1], peer_data[1].peer,
-                                         "stream", NULL, NULL, stream_ca,
-                                         stream_da, &peer_data[1]);
-    else
-      GNUNET_break (0);                /* FIXME: 3 hop test case here... */
-  }
-}
-
-
-/**
- * Controller event callback
- *
- * @param cls NULL
- * @param event the controller event
- */
-static void
-controller_event_cb (void *cls,
-                     const struct GNUNET_TESTBED_EventInformation *event)
-{
-  switch (event->type)
-  {
-  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-    if (NULL != event->details.operation_finished.emsg)
-    {
-      FPRINTF (stderr, "Error while expecting an operation to succeed:%s \n",
-              event->details.operation_finished.emsg);
-      GNUNET_assert (0);
-    }
-    break;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Signature of a main function for a testcase.
- *
- * @param cls closure
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
- * @param links_succeeded the number of overlay link connection attempts that
- *          succeeded
- * @param links_failed the number of overlay link connection attempts that
- *          failed
- */
-static void
-test_master (void *cls, unsigned int num_peers_,
-             struct GNUNET_TESTBED_Peer **peers,
-             unsigned int links_succeeded,
-             unsigned int links_failed)
-{
-  GNUNET_assert (NULL != peers);
-  GNUNET_assert (NULL != peers[0]);
-  GNUNET_assert (NULL != peers[1]);
-  GNUNET_assert (num_peers_ == num_peers);
-  peer_data[0].peer = peers[0];
-  peer_data[1].peer = peers[1];
-  if (2 == num_peers)
-        /* Get the peer identity and configuration of peers */
-    common_op =
-       GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
-                                            GNUNET_TESTBED_PIT_IDENTITY,
-                                            &peerinfo_cb, &peer_data[0]);
-  else
-    GNUNET_break (0);
-  abort_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                   (GNUNET_TIME_UNIT_SECONDS, 120), &do_abort,
-                                   NULL);
-}
-
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  char *test_name = "perf_stream_api";
-  char *cfg_file = "test_stream_local.conf";
-  uint64_t event_mask;
-  unsigned int count;
-  int ret;
-
-  meter = create_meter ((sizeof (data) / 4), "Generating random data\n", GNUNET_YES);
-  for (count=0; count < (sizeof (data) / 4); count++)
-  {
-    data[count] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                            UINT32_MAX);
-    update_meter (meter);
-  }
-  reset_meter (meter);
-  free_meter (meter);
-  meter = NULL;
-  test_step = TEST_STEP_1_HOP;
-  for (payload_size_index = 0;
-       payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));
-       payload_size_index++)
-  {
-    PRINTF ("\nTesting over loopback with payload size %hu\n",
-           payload_size[payload_size_index]);
-    (void) memset (peer_data, 0, sizeof (peer_data));
-    result = INIT;
-    reset_read = GNUNET_NO;
-    ret = GNUNET_TESTING_peer_run (test_name, cfg_file, &run, NULL);
-    if ((0 != ret) || (DOWNLINK_OK != result))
-      goto return_fail;
-  }
-  test_step = TEST_STEP_2_HOP;
-  num_peers = 2;
-  event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  for (payload_size_index = 0;
-       payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));
-       payload_size_index++)
-  {
-    PRINTF ("\nTesting over 1 hop with payload size %hu\n",
-            payload_size[payload_size_index]);
-    (void) memset (peer_data, 0, sizeof (peer_data));
-    result = INIT;
-    reset_read = GNUNET_NO;
-    (void) GNUNET_TESTBED_test_run (test_name, cfg_file, num_peers, event_mask,
-                                    &controller_event_cb, NULL, &test_master, 
-                                    NULL);
-    if (DOWNLINK_OK != result)
-      goto return_fail;
-  }
-  test_step = TEST_STEP_3_HOP;
-  for (payload_size_index = 0; 
-       payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));
-       payload_size_index++)
-  {
-    /* Initialize testbed here */
-  }
-  return 0;
-
- return_fail:
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test failed\n");
-  return 1;
-}
-
-/* end of perf_stream_api.c */
diff --git a/src/stream/stream.h b/src/stream/stream.h
deleted file mode 100644 (file)
index d9ba09f..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/stream.h
- * @brief P2P protocol for the stream connections
- * @author Sree Harsha Totakura
- */
-
-#ifndef STREAM_H
-#define STREAM_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-#include "gnunet_util_lib.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-
-/**
- * The HELLO message to begin the handshake
- */
-struct GNUNET_STREAM_HelloMessage
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_STREAM_HELLO
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The application port number
-   */
-  uint64_t port GNUNET_PACKED;;
-};
-
-/**
- * The Data message, should be prefixed with stream header with its type set to
- * GNUNET_STREAM_Data 
- */
-struct GNUNET_STREAM_DataMessage
-{
-
-  /**
-   * Type is  GNUNET_MESSAGE_TYPE_STREAM_DATA 
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * Sequence number; starts with a random value.  (Just in case
-   * someone breaks mesh and is able to try to do a Sequence
-   * Prediction Attack on us.)
-   */
-  uint32_t sequence_number GNUNET_PACKED;
-
-  /**
-   * number of milliseconds to the soft deadline for sending acknowledgement
-   * measured from the time this message is received. It is optimal for the
-   * communication to send the ack within the soft deadline
-   */
-  struct GNUNET_TIME_RelativeNBO ack_deadline;
-
-  /**
-   * Offset of the packet in the overall stream, modulo 2^32; allows
-   * the receiver to calculate where in the destination buffer the
-   * message should be placed.  In network byte order.
-   */
-  uint32_t offset GNUNET_PACKED;
-
-  /**
-   * The data should be appended here
-   */
-};
-
-
-/**
- * Number of bits in GNUNET_STREAM_AckBitmap
- */
-#define GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH 64
-
-/**
- * The Selective Acknowledgement Bitmap
- */
-typedef uint64_t GNUNET_STREAM_AckBitmap;
-
-
-/**
- * The Acknowledgment Message to confirm receipt of DATA.
- */
-struct GNUNET_STREAM_AckMessage
-{
-
-  /**
-   * Type is  GNUNET_MESSAGE_TYPE_STREAM_ACK
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The sequence number of the next Data Message receiver is
-   * anticipating. Data messages less than this number are received by receiver
-   */
-  uint32_t base_sequence_number GNUNET_PACKED;
-
-  /**
-   * The Selective Acknowledgement Bitmap. Computed relative to the base_seq
-   * (bit n corresponds to the Data message with sequence number base_seq+n)
-   */
-  GNUNET_STREAM_AckBitmap bitmap GNUNET_PACKED;
-
-  /**
-   * Available buffer space past the last acknowledged buffer (for flow control),
-   * in bytes.
-   */
-  uint32_t receive_window_remaining GNUNET_PACKED;
-};
-
-
-/**
- * Message for Acknowledging HELLO
- */
-struct GNUNET_STREAM_HelloAckMessage
-{
-  /**
-   * The stream message header
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The selected sequence number. Following data tranmissions from the sender
-   * start with this sequence
-   */
-  uint32_t sequence_number GNUNET_PACKED;
-
-  /**
-   * The size(in bytes) of the receive window on the peer sending this message
-   *
-   * FIXME: Remove if not needed
-   */
-  uint32_t receiver_window_size GNUNET_PACKED;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-#if 0                           /** keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* STREAM.H */
-
-/* End of stream.h  */
diff --git a/src/stream/stream_api.c b/src/stream/stream_api.c
deleted file mode 100644 (file)
index 3647ba2..0000000
+++ /dev/null
@@ -1,3806 +0,0 @@
-/*
-  This file is part of GNUnet.
-  (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-  GNUnet is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 3, or (at your
-  option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with GNUnet; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-  Boston, MA 02111-1307, USA.
-*/
-
-/* TODO:
- *
- * Checks for matching the sender and socket->other_peer in server
- * message handlers  
- *
- * Add code for write io timeout
- *
- * Include retransmission for control messages
- **/
-
-/**
- * @file stream/stream_api.c
- * @brief Implementation of the stream library
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_lockmanager_service.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_stream_lib.h"
-#include "stream.h"
-
-#define STREAM_PORT 4242
-
-/**
- * Generic logging shorthand
- */
-#define LOG(kind,...)                                   \
-  GNUNET_log_from (kind, "stream-api", __VA_ARGS__)
-
-/**
- * Debug logging shorthand
- */
-#define LOG_DEBUG(...)                          \
-  LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-
-/**
- * Time in relative seconds shorthand
- */
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * The maximum packet size of a stream packet
- */
-#define DEFAULT_MAX_PAYLOAD_SIZE 64000
-
-/**
- * Receive buffer
- */
-#define RECEIVE_BUFFER_SIZE 4096000
-
-/**
- * states in the Protocol
- */
-enum State
-  {
-    /**
-     * Client initialization state
-     */
-    STATE_INIT,
-
-    /**
-     * Listener initialization state 
-     */
-    STATE_LISTEN,
-
-    /**
-     * Pre-connection establishment state
-     */
-    STATE_HELLO_WAIT,
-
-    /**
-     * State where a connection has been established
-     */
-    STATE_ESTABLISHED,
-
-    /**
-     * State where the socket is closed on our side and waiting to be ACK'ed
-     */
-    STATE_RECEIVE_CLOSE_WAIT,
-
-    /**
-     * State where the socket is closed for reading
-     */
-    STATE_RECEIVE_CLOSED,
-
-    /**
-     * State where the socket is closed on our side and waiting to be ACK'ed
-     */
-    STATE_TRANSMIT_CLOSE_WAIT,
-
-    /**
-     * State where the socket is closed for writing
-     */
-    STATE_TRANSMIT_CLOSED,
-
-    /**
-     * State where the socket is closed on our side and waiting to be ACK'ed
-     */
-    STATE_CLOSE_WAIT,
-
-    /**
-     * State where the socket is closed
-     */
-    STATE_CLOSED 
-  };
-
-
-/**
- * Functions of this type are called when a message is written
- *
- * @param cls the closure from queue_message
- * @param socket the socket the written message was bound to
- */
-typedef void (*SendFinishCallback) (void *cls,
-                                    struct GNUNET_STREAM_Socket *socket);
-
-
-/**
- * The send message queue
- */
-struct MessageQueue
-{
-  /**
-   * The message
-   */
-  struct GNUNET_MessageHeader *message;
-
-  /**
-   * Callback to be called when the message is sent
-   */
-  SendFinishCallback finish_cb;
-
-  /**
-   * The closure for finish_cb
-   */
-  void *finish_cb_cls;
-
-  /**
-   * The next message in queue. Should be NULL in the last message
-   */
-  struct MessageQueue *next;
-
-  /**
-   * The next message in queue. Should be NULL in the first message
-   */
-  struct MessageQueue *prev;
-};
-
-
-/**
- * The STREAM Socket Handler
- */
-struct GNUNET_STREAM_Socket
-{
-  /**
-   * The mesh handle
-   */
-  struct GNUNET_MESH_Handle *mesh;
-
-  /**
-   * Handle to statistics
-   */
-  struct GNUNET_STATISTICS_Handle *stat_handle;
-
-  /**
-   * The mesh tunnel handle
-   */
-  struct GNUNET_MESH_Tunnel *tunnel;
-
-  /**
-   * Stream open closure
-   */
-  void *open_cls;
-
-  /**
-   * Stream open callback
-   */
-  GNUNET_STREAM_OpenCallback open_cb;
-
-  /**
-   * The current transmit handle (if a pending transmit request exists)
-   */
-  struct GNUNET_MESH_TransmitHandle *transmit_handle;
-
-  /**
-   * The current message associated with the transmit handle
-   */
-  struct MessageQueue *queue_head;
-
-  /**
-   * The queue tail, should always point to the last message in queue
-   */
-  struct MessageQueue *queue_tail;
-
-  /**
-   * The write IO_handle associated with this socket
-   */
-  struct GNUNET_STREAM_WriteHandle *write_handle;
-
-  /**
-   * The read IO_handle associated with this socket
-   */
-  struct GNUNET_STREAM_ReadHandle *read_handle;
-
-  /**
-   * The shutdown handle associated with this socket
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Buffer for storing received messages
-   */
-  void *receive_buffer;
-
-  /**
-   * The listen socket from which this socket is derived. Should be NULL if it
-   * is not a derived socket
-   */
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-
-  /**
-   * The peer identity of the peer at the other end of the stream
-   */
-  struct GNUNET_PeerIdentity other_peer;
-
-  /**
-   * The Acknowledgement Bitmap
-   */
-  GNUNET_STREAM_AckBitmap ack_bitmap;
-
-  /**
-   * Task identifier for retransmission task after timeout
-   */
-  GNUNET_SCHEDULER_TaskIdentifier data_retransmission_task_id;
-
-  /**
-   * Task identifier for retransmission of control messages
-   */
-  GNUNET_SCHEDULER_TaskIdentifier control_retransmission_task_id;
-
-  /**
-   * The task for sending timely Acks
-   */
-  GNUNET_SCHEDULER_TaskIdentifier ack_task_id;
-
-  /**
-   * Retransmission timeout
-   */
-  struct GNUNET_TIME_Relative retransmit_timeout;
-
-  /**
-   * Time when the Acknowledgement was queued
-   */
-  struct GNUNET_TIME_Absolute ack_time_registered;
-
-  /**
-   * Queued Acknowledgement deadline
-   */
-  struct GNUNET_TIME_Relative ack_time_deadline;
-
-  /**
-   * Mesh transmit timeout
-   */
-  struct GNUNET_TIME_Relative mesh_retry_timeout;
-
-  /**
-   * Data retransmission timeout
-   */
-  struct GNUNET_TIME_Relative data_retransmit_timeout;
-
-  /**
-   * The state of the protocol associated with this socket
-   */
-  enum State state;
-
-  /**
-   * Whether testing mode is active or not
-   */
-  int testing_active;
-
-  /**
-   * Is receive closed
-   */
-  int receive_closed;
-
-  /**
-   * Is transmission closed
-   */
-  int transmit_closed;
-
-  /**
-   * The application port number
-   */
-  uint32_t port;
-
-  /**
-   * The write sequence number to be set incase of testing
-   */
-  uint32_t testing_set_write_sequence_number_value;
-
-  /**
-   * Write sequence number. Set to random when sending HELLO(client) and
-   * HELLO_ACK(server) 
-   */
-  uint32_t write_sequence_number;
-
-  /**
-   * Read sequence number. This number's value is determined during handshake
-   */
-  uint32_t read_sequence_number;
-
-  /**
-   * The receiver buffer size
-   */
-  uint32_t receive_buffer_size;
-
-  /**
-   * The receiver buffer boundaries
-   */
-  uint32_t receive_buffer_boundaries[GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH];
-
-  /**
-   * receiver's available buffer after the last acknowledged packet
-   */
-  uint32_t receiver_window_available;
-
-  /**
-   * The offset pointer used during write operation
-   */
-  uint32_t write_offset;
-
-  /**
-   * The offset after which we are expecting data
-   */
-  uint32_t read_offset;
-
-  /**
-   * The offset upto which user has read from the received buffer
-   */
-  uint32_t copy_offset;
-
-  /**
-   * The maximum size of the data message payload this stream handle can send
-   */
-  uint16_t max_payload_size;
-};
-
-
-/**
- * A socket for listening
- */
-struct GNUNET_STREAM_ListenSocket
-{
-  /**
-   * The mesh handle
-   */
-  struct GNUNET_MESH_Handle *mesh;
-
-  /**
-   * Handle to statistics
-   */
-  struct GNUNET_STATISTICS_Handle *stat_handle;
-
-  /**
-   * Our configuration
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Handle to the lock manager service
-   */
-  struct GNUNET_LOCKMANAGER_Handle *lockmanager;
-
-  /**
-   * The active LockingRequest from lockmanager
-   */
-  struct GNUNET_LOCKMANAGER_LockingRequest *locking_request;
-
-  /**
-   * Callback to call after acquring a lock and listening
-   */
-  GNUNET_STREAM_ListenSuccessCallback listen_ok_cb;
-
-  /**
-   * The callback function which is called after successful opening socket
-   */
-  GNUNET_STREAM_ListenCallback listen_cb;
-
-  /**
-   * The call back closure
-   */
-  void *listen_cb_cls;
-
-  /**
-   * The service port
-   */
-  uint32_t port;
-  
-  /**
-   * The id of the lockmanager timeout task
-   */
-  GNUNET_SCHEDULER_TaskIdentifier lockmanager_acquire_timeout_task;
-
-  /**
-   * The retransmit timeout
-   */
-  struct GNUNET_TIME_Relative retransmit_timeout;
-  
-  /**
-   * Listen enabled?
-   */
-  int listening;
-
-  /**
-   * Whether testing mode is active or not
-   */
-  int testing_active;
-
-  /**
-   * The write sequence number to be set incase of testing
-   */
-  uint32_t testing_set_write_sequence_number_value;
-
-  /**
-   * The maximum size of the data message payload this stream handle can send
-   */
-  uint16_t max_payload_size;
-
-};
-
-
-/**
- * The IO Write Handle
- */
-struct GNUNET_STREAM_WriteHandle
-{
-  /**
-   * The socket to which this write handle is associated
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * The write continuation callback
-   */
-  GNUNET_STREAM_CompletionContinuation write_cont;
-
-  /**
-   * Write continuation closure
-   */
-  void *write_cont_cls;
-
-  /**
-   * The packet_buffers associated with this Handle
-   */
-  struct GNUNET_STREAM_DataMessage *messages[GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH];
-
-  /**
-   * The bitmap of this IOHandle; Corresponding bit for a message is set when
-   * it has been acknowledged by the receiver
-   */
-  GNUNET_STREAM_AckBitmap ack_bitmap;
-
-  /**
-   * Number of bytes in this write handle
-   */
-  size_t size;
-
-  /**
-   * Number of packets already transmitted from this IO handle. Retransmitted
-   * packets are not taken into account here. This is used to determine which
-   * packets account for retransmission and which packets occupy buffer space at
-   * the receiver.
-   */
-  unsigned int packets_sent;
-
-  /**
-   * The maximum of the base numbers of the received acks
-   */
-  uint32_t max_ack_base_num;
-
-};
-
-
-/**
- * The IO Read Handle
- */
-struct GNUNET_STREAM_ReadHandle
-{
-  /**
-   * The socket to which this read handle is associated
-   */
-  struct GNUNET_STREAM_Socket *socket;
-  
-  /**
-   * Callback for the read processor
-   */
-  GNUNET_STREAM_DataProcessor proc;
-
-  /**
-   * The closure pointer for the read processor callback
-   */
-  void *proc_cls;
-
-  /**
-   * Task identifier for the read io timeout task
-   */
-  GNUNET_SCHEDULER_TaskIdentifier read_io_timeout_task_id;
-
-  /**
-   * Task scheduled to continue a read operation.
-   */
-  GNUNET_SCHEDULER_TaskIdentifier read_task_id;
-
-  /**
-   * Task scheduled from GNUNET_STREAM_read() to lookup the ACK bitmap and call
-   * the read processor task
-   */
-  GNUNET_SCHEDULER_TaskIdentifier probe_data_availability_task_id;
-};
-
-
-/**
- * Handle for Shutdown
- */
-struct GNUNET_STREAM_ShutdownHandle
-{
-  /**
-   * The socket associated with this shutdown handle
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Shutdown completion callback
-   */
-  GNUNET_STREAM_ShutdownCompletion completion_cb;
-
-  /**
-   * Closure for completion callback
-   */
-  void *completion_cls;
-
-  /**
-   * Close message retransmission task id
-   */
-  GNUNET_SCHEDULER_TaskIdentifier close_msg_retransmission_task_id;
-
-  /**
-   * Task scheduled to call the shutdown continuation callback
-   */
-  GNUNET_SCHEDULER_TaskIdentifier call_cont_task_id;
-
-  /**
-   * Which operation to shutdown? SHUT_RD, SHUT_WR or SHUT_RDWR
-   */
-  int operation;  
-};
-
-
-/**
- * Collection of the state necessary to read and write gnunet messages 
- * to a stream socket. Should be used as closure for stream_data_processor.
- */
-struct MQStreamState
-{
-  /**
-   * Message stream tokenizer for the data received from the
-   * stream socket.
-   */
-  struct GNUNET_SERVER_MessageStreamTokenizer *mst;
-
-  /**
-   * The stream socket to use for receiving and transmitting
-   * messages with the message queue.
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Current read handle, NULL if no read active.
-   */
-  struct GNUNET_STREAM_ReadHandle *rh;
-
-  /**
-   * Current write handle, NULL if no write active.
-   */
-  struct GNUNET_STREAM_WriteHandle *wh;
-};
-
-
-
-/**
- * Default value in seconds for various timeouts
- */
-static const unsigned int default_timeout = 10;
-
-/**
- * The domain name for locks we use here
- */
-static const char *locking_domain = "GNUNET_STREAM_APPLOCK";
-
-/**
- * Callback function for sending queued message
- *
- * @param cls closure the socket
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
- */
-static size_t
-send_message_notify (void *cls, size_t size, void *buf)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  struct MessageQueue *head;
-  size_t ret;
-
-  socket->transmit_handle = NULL; /* Remove the transmit handle */
-  head = socket->queue_head;
-  if (NULL == head)
-    return 0; /* just to be safe */
-  if (0 == size)                /* request timed out */
-  {
-    socket->mesh_retry_timeout = GNUNET_TIME_STD_BACKOFF
-        (socket->mesh_retry_timeout);    
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Message sending to MESH timed out. Retrying in %s \n",
-         GNUNET_i2s (&socket->other_peer),
-         GNUNET_STRINGS_relative_time_to_string (socket->mesh_retry_timeout,
-                                                 GNUNET_YES));
-    socket->transmit_handle = 
-        GNUNET_MESH_notify_transmit_ready (socket->tunnel,
-                                           GNUNET_NO, /* Corking */
-                                           socket->mesh_retry_timeout,
-                                           ntohs (head->message->size),
-                                           &send_message_notify,
-                                           socket);
-    return 0;
-  }
-  ret = ntohs (head->message->size);
-  GNUNET_assert (size >= ret);
-  memcpy (buf, head->message, ret);
-  if (NULL != head->finish_cb)
-  {
-    head->finish_cb (head->finish_cb_cls, socket);
-  }
-  GNUNET_CONTAINER_DLL_remove (socket->queue_head,
-                              socket->queue_tail,
-                              head);
-  GNUNET_free (head->message);
-  GNUNET_free (head);
-  if (NULL != socket->transmit_handle)
-    return ret; /* 'finish_cb' might have triggered message already! */
-  head = socket->queue_head;
-  if (NULL != head)    /* more pending messages to send */
-  {
-    socket->mesh_retry_timeout = GNUNET_TIME_UNIT_ZERO;
-    socket->transmit_handle = 
-        GNUNET_MESH_notify_transmit_ready (socket->tunnel,
-                                           GNUNET_NO, /* Corking */
-                                           socket->mesh_retry_timeout,
-                                           ntohs (head->message->size),
-                                           &send_message_notify,
-                                           socket);
-  }
-  return ret;
-}
-
-
-/**
- * Queues a message for sending using the mesh connection of a socket
- *
- * @param socket the socket whose mesh connection is used
- * @param message the message to be sent
- * @param finish_cb the callback to be called when the message is sent
- * @param finish_cb_cls the closure for the callback
- * @param urgent set to GNUNET_YES to add the message to the beginning of the
- *          queue; GNUNET_NO to add at the tail
- */
-static void
-queue_message (struct GNUNET_STREAM_Socket *socket,
-               struct GNUNET_MessageHeader *message,
-               SendFinishCallback finish_cb,
-               void *finish_cb_cls,
-               int urgent)
-{
-  struct MessageQueue *queue_entity;
-
-  GNUNET_assert ((ntohs (message->type) >= GNUNET_MESSAGE_TYPE_STREAM_DATA)
-                 && (ntohs (message->type)
-                     <= GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK));
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Queueing message of type %d and size %d\n",
-       GNUNET_i2s (&socket->other_peer),
-       ntohs (message->type),ntohs (message->size));
-  GNUNET_assert (NULL != message);
-  queue_entity = GNUNET_malloc (sizeof (struct MessageQueue));
-  queue_entity->message = message;
-  queue_entity->finish_cb = finish_cb;
-  queue_entity->finish_cb_cls = finish_cb_cls;
-  if (GNUNET_YES == urgent)
-  {
-    GNUNET_CONTAINER_DLL_insert (socket->queue_head, socket->queue_tail,
-                                 queue_entity);
-    if (NULL != socket->transmit_handle)
-    {
-      GNUNET_MESH_notify_transmit_ready_cancel (socket->transmit_handle);
-      socket->transmit_handle = NULL;
-    }
-  }
-  else
-    GNUNET_CONTAINER_DLL_insert_tail (socket->queue_head,
-                                      socket->queue_tail,
-                                      queue_entity);
-  if (NULL == socket->transmit_handle)
-  {
-    socket->mesh_retry_timeout = GNUNET_TIME_UNIT_ZERO;
-    socket->transmit_handle = 
-       GNUNET_MESH_notify_transmit_ready (socket->tunnel,
-                                          GNUNET_NO, /* Corking */
-                                           socket->mesh_retry_timeout,
-                                          ntohs (message->size),
-                                          &send_message_notify,
-                                          socket);
-  }
-}
-
-
-/**
- * Copies a message and queues it for sending using the mesh connection of
- * given socket 
- *
- * @param socket the socket whose mesh connection is used
- * @param message the message to be sent
- * @param finish_cb the callback to be called when the message is sent
- * @param finish_cb_cls the closure for the callback
- */
-static void
-copy_and_queue_message (struct GNUNET_STREAM_Socket *socket,
-                        const struct GNUNET_MessageHeader *message,
-                        SendFinishCallback finish_cb,
-                        void *finish_cb_cls)
-{
-  struct GNUNET_MessageHeader *msg_copy;
-  uint16_t size;
-  
-  size = ntohs (message->size);
-  msg_copy = GNUNET_malloc (size);
-  memcpy (msg_copy, message, size);
-  queue_message (socket, msg_copy, finish_cb, finish_cb_cls, GNUNET_NO);
-}
-
-
-/**
- * Writes data using the given socket. The amount of data written is limited by
- * the receiver_window_size
- *
- * @param socket the socket to use
- */
-static void 
-write_data (struct GNUNET_STREAM_Socket *socket);
-
-
-/**
- * Task for retransmitting data messages if they aren't ACK before their ack
- * deadline 
- *
- * @param cls the socket
- * @param tc the Task context
- */
-static void
-data_retransmission_task (void *cls,
-                          const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  
-  socket->data_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
-    return;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Retransmitting DATA...\n", GNUNET_i2s (&socket->other_peer));
-  write_data (socket);
-}
-
-
-/**
- * Task for sending ACK message
- *
- * @param cls the socket
- * @param tc the Task context
- */
-static void
-ack_task (void *cls,
-          const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  struct GNUNET_STREAM_AckMessage *ack_msg;
-
-  socket->ack_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
-    return;
-  /* Create the ACK Message */
-  ack_msg = GNUNET_malloc (sizeof (struct GNUNET_STREAM_AckMessage));
-  ack_msg->header.size = htons (sizeof (struct 
-                                               GNUNET_STREAM_AckMessage));
-  ack_msg->header.type = htons (GNUNET_MESSAGE_TYPE_STREAM_ACK);
-  ack_msg->bitmap = GNUNET_htonll (socket->ack_bitmap);
-  ack_msg->base_sequence_number = htonl (socket->read_sequence_number);
-  ack_msg->receive_window_remaining = 
-    htonl (RECEIVE_BUFFER_SIZE - socket->receive_buffer_size);
-  /* Queue up ACK for immediate sending */
-  queue_message (socket, &ack_msg->header, NULL, NULL, GNUNET_YES);
-}
-
-
-/**
- * Retransmission task for shutdown messages
- *
- * @param cls the shutdown handle
- * @param tc the Task Context
- */
-static void
-close_msg_retransmission_task (void *cls,
-                               const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle = cls;
-  struct GNUNET_MessageHeader *msg;
-  struct GNUNET_STREAM_Socket *socket;
-
-  shutdown_handle->close_msg_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_assert (NULL != shutdown_handle);
-  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
-    return;
-  socket = shutdown_handle->socket;
-  msg = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  switch (shutdown_handle->operation)
-  {
-  case SHUT_RDWR:
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_CLOSE);
-    break;
-  case SHUT_RD:
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE);
-    break;
-  case SHUT_WR:
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE);
-    break;
-  default:
-    GNUNET_free (msg);
-    shutdown_handle->close_msg_retransmission_task_id = 
-      GNUNET_SCHEDULER_NO_TASK;
-    return;
-  }
-  queue_message (socket, msg, NULL, NULL, GNUNET_NO);
-  shutdown_handle->close_msg_retransmission_task_id =
-    GNUNET_SCHEDULER_add_delayed (socket->retransmit_timeout,
-                                  &close_msg_retransmission_task,
-                                  shutdown_handle);
-}
-
-
-/**
- * Function to modify a bit in GNUNET_STREAM_AckBitmap
- *
- * @param bitmap the bitmap to modify
- * @param bit the bit number to modify
- * @param value GNUNET_YES to on, GNUNET_NO to off
- */
-static void
-ackbitmap_modify_bit (GNUNET_STREAM_AckBitmap *bitmap,
-                     unsigned int bit, 
-                     int value)
-{
-  GNUNET_assert (bit < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH);
-  if (GNUNET_YES == value)
-    *bitmap |= (1LL << bit);
-  else
-    *bitmap &= ~(1LL << bit);
-}
-
-
-/**
- * Function to check if a bit is set in the GNUNET_STREAM_AckBitmap
- *
- * @param bitmap address of the bitmap that has to be checked
- * @param bit the bit number to check
- * @return GNUNET_YES if the bit is set; GNUNET_NO if not
- */
-static uint8_t
-ackbitmap_is_bit_set (const GNUNET_STREAM_AckBitmap *bitmap,
-                      unsigned int bit)
-{
-  GNUNET_assert (bit < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH);
-  return 0 != (*bitmap & (1LL << bit));
-}
-
-
-/**
- * Writes data using the given socket. The amount of data written is limited by
- * the receiver_window_size
- *
- * @param socket the socket to use
- */
-static void 
-write_data (struct GNUNET_STREAM_Socket *socket)
-{
-  struct GNUNET_STREAM_WriteHandle *io_handle = socket->write_handle;
-  unsigned int packet;
-  
-  for (packet=0; packet < io_handle->packets_sent; packet++)
-  {
-    if (GNUNET_NO == ackbitmap_is_bit_set (&io_handle->ack_bitmap,
-                                          packet))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-          "%s: Retransmitting DATA message with sequence %u\n",
-          GNUNET_i2s (&socket->other_peer),
-          ntohl (io_handle->messages[packet]->sequence_number));
-      copy_and_queue_message (socket,
-                             &io_handle->messages[packet]->header,
-                             NULL,
-                             NULL);
-    }
-  }
-  /* Now send new packets if there is enough buffer space */
-  while ((packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH) &&
-         (NULL != io_handle->messages[packet]) &&
-         (socket->receiver_window_available 
-          >= ntohs (io_handle->messages[packet]->header.size)))
-  {
-    socket->receiver_window_available -= 
-      ntohs (io_handle->messages[packet]->header.size);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Placing DATA message with sequence %u in send queue\n",
-         GNUNET_i2s (&socket->other_peer),
-         ntohl (io_handle->messages[packet]->sequence_number));
-    copy_and_queue_message (socket,
-                            &io_handle->messages[packet]->header,
-                            NULL,
-                            NULL);
-    packet++;
-  }
-  io_handle->packets_sent = packet;
-  if (GNUNET_SCHEDULER_NO_TASK == socket->data_retransmission_task_id)
-  {
-    socket->data_retransmit_timeout = GNUNET_TIME_STD_BACKOFF
-        (socket->data_retransmit_timeout);
-    socket->data_retransmission_task_id = 
-        GNUNET_SCHEDULER_add_delayed (socket->data_retransmit_timeout,
-                                      &data_retransmission_task,
-                                      socket);
-  }
-}
-
-
-/**
- * Cleansup the sockets read handle
- *
- * @param socket the socket whose read handle has to be cleanedup
- */
-static void
-cleanup_read_handle (struct GNUNET_STREAM_Socket *socket)
-{
-  struct GNUNET_STREAM_ReadHandle *read_handle;
-
-  read_handle = socket->read_handle;
-  /* Read io time task should be there; if it is already executed then this
-  read handle is not valid; However upon scheduler shutdown the read io task
-  may be executed before */
-  if (GNUNET_SCHEDULER_NO_TASK != read_handle->read_io_timeout_task_id)
-    GNUNET_SCHEDULER_cancel (read_handle->read_io_timeout_task_id);
-  /* reading task may be present; if so we have to stop it */
-  if (GNUNET_SCHEDULER_NO_TASK != read_handle->read_task_id)
-    GNUNET_SCHEDULER_cancel (read_handle->read_task_id);
-  if (GNUNET_SCHEDULER_NO_TASK != read_handle->probe_data_availability_task_id)
-    GNUNET_SCHEDULER_cancel (read_handle->probe_data_availability_task_id);
-  GNUNET_free (read_handle);
-  socket->read_handle = NULL;
-}
-
-
-/**
- * Task for calling the read processor
- *
- * @param cls the socket
- * @param tc the task context
- */
-static void
-call_read_processor (void *cls,
-                     const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  struct GNUNET_STREAM_ReadHandle *read_handle;
-  GNUNET_STREAM_DataProcessor proc;
-  void *proc_cls;
-  size_t read_size;
-  size_t valid_read_size;
-  unsigned int packet;
-  uint32_t sequence_increase;
-  uint32_t offset_increase;
-
-  read_handle = socket->read_handle;
-  GNUNET_assert (NULL != read_handle);
-  read_handle->read_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
-  if (NULL == socket->receive_buffer) 
-    return;
-  GNUNET_assert (NULL != read_handle->proc);
-  /* Check the bitmap for any holes */
-  for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-  {
-    if (GNUNET_NO == ackbitmap_is_bit_set (&socket->ack_bitmap,
-                                           packet))
-      break;
-  }
-  /* We only call read processor if we have the first packet */
-  GNUNET_assert (0 < packet);
-  valid_read_size = 
-    socket->receive_buffer_boundaries[packet-1] - socket->copy_offset;
-  GNUNET_assert (0 != valid_read_size);
-  proc = read_handle->proc;
-  proc_cls = read_handle->proc_cls;
-  cleanup_read_handle (socket);
-  /* Call the data processor */
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Calling read processor\n",
-       GNUNET_i2s (&socket->other_peer));
-  read_size = proc (proc_cls, GNUNET_STREAM_OK,
-                    socket->receive_buffer + socket->copy_offset,
-                    valid_read_size);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Read processor read %d bytes\n",
-       GNUNET_i2s (&socket->other_peer), read_size);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Read processor completed successfully\n",
-       GNUNET_i2s (&socket->other_peer));
-  GNUNET_assert (read_size <= valid_read_size);
-  socket->copy_offset += read_size;
-  /* Determine upto which packet we can remove from the buffer */
-  for (packet = 0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-  {
-    if (socket->copy_offset == socket->receive_buffer_boundaries[packet])
-    { 
-      packet++; 
-      break;
-    }
-    if (socket->copy_offset < socket->receive_buffer_boundaries[packet])
-      break;
-  }
-  /* If no packets can be removed we can't move the buffer */
-  if (0 == packet) 
-    return;
-  sequence_increase = packet;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Sequence increase after read processor completion: %u\n",
-       GNUNET_i2s (&socket->other_peer), sequence_increase);
-  /* Shift the data in the receive buffer */
-  socket->receive_buffer = 
-    memmove (socket->receive_buffer,
-            socket->receive_buffer 
-            + socket->receive_buffer_boundaries[sequence_increase-1],
-            socket->receive_buffer_size
-            - socket->receive_buffer_boundaries[sequence_increase-1]);
-  /* Shift the bitmap */
-  socket->ack_bitmap = socket->ack_bitmap >> sequence_increase;
-  /* Set read_sequence_number */
-  socket->read_sequence_number += sequence_increase;
-  /* Set read_offset */
-  offset_increase = socket->receive_buffer_boundaries[sequence_increase-1];
-  socket->read_offset += offset_increase;
-  /* Fix copy_offset */
-  GNUNET_assert (offset_increase <= socket->copy_offset);
-  socket->copy_offset -= offset_increase;
-  /* Fix relative boundaries */
-  for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-  {
-    if (packet < (GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH - sequence_increase))
-    {
-      uint32_t ahead_buffer_boundary;
-
-      ahead_buffer_boundary = 
-       socket->receive_buffer_boundaries[packet + sequence_increase];
-      if (0 == ahead_buffer_boundary)
-       socket->receive_buffer_boundaries[packet] = 0;
-      else
-      {
-       GNUNET_assert (offset_increase < ahead_buffer_boundary);
-       socket->receive_buffer_boundaries[packet] = 
-         ahead_buffer_boundary - offset_increase;
-      }
-    }
-    else
-      socket->receive_buffer_boundaries[packet] = 0;
-  }
-}
-
-
-/**
- * Cancels the existing read io handle
- *
- * @param cls the closure from the SCHEDULER call
- * @param tc the task context
- */
-static void
-read_io_timeout (void *cls,
-                 const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  struct GNUNET_STREAM_ReadHandle *read_handle;
-  GNUNET_STREAM_DataProcessor proc;
-  void *proc_cls;
-
-  read_handle = socket->read_handle;
-  GNUNET_assert (NULL != read_handle);
-  read_handle->read_io_timeout_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
-    return;
-  if (read_handle->read_task_id != GNUNET_SCHEDULER_NO_TASK)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Read task timedout - Cancelling it\n",
-         GNUNET_i2s (&socket->other_peer));
-    GNUNET_SCHEDULER_cancel (read_handle->read_task_id);
-    read_handle->read_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }
-  proc = read_handle->proc;
-  proc_cls = read_handle->proc_cls;
-  GNUNET_free (read_handle);
-  socket->read_handle = NULL;
-  /* Call the read processor to signal timeout */
-  proc (proc_cls,
-        GNUNET_STREAM_TIMEOUT,
-        NULL,
-        0);
-}
-
-
-/**
- * Handler for DATA messages; Same for both client and server
- *
- * @param socket the socket through which the ack was received
- * @param tunnel connection to the other end
- * @param msg the data message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_data (struct GNUNET_STREAM_Socket *socket,
-             struct GNUNET_MESH_Tunnel *tunnel,
-             const struct GNUNET_STREAM_DataMessage *msg)
-{
-  const void *payload;
-  struct GNUNET_TIME_Relative ack_deadline_rel;
-  uint32_t bytes_needed;
-  uint32_t relative_offset;
-  uint32_t relative_sequence_number;
-  uint16_t size;
-
-  size = htons (msg->header.size);
-  if (size < sizeof (struct GNUNET_STREAM_DataMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_SYSERR;
-  }
-  switch (socket->state)
-  {
-  case STATE_ESTABLISHED:
-  case STATE_TRANSMIT_CLOSED:
-  case STATE_TRANSMIT_CLOSE_WAIT:      
-    /* check if the message's sequence number is in the range we are
-       expecting */
-    relative_sequence_number = 
-      ntohl (msg->sequence_number) - socket->read_sequence_number;
-    if ( relative_sequence_number >= GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Ignoring received message with sequence number %u\n",
-           GNUNET_i2s (&socket->other_peer),
-           ntohl (msg->sequence_number));
-      /* Start ACK sending task if one is not already present */
-      if (GNUNET_SCHEDULER_NO_TASK == socket->ack_task_id)
-      {
-        socket->ack_task_id = 
-          GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_ntoh
-                                        (msg->ack_deadline),
-                                        &ack_task,
-                                        socket);
-      }
-      return GNUNET_YES;
-    }      
-    /* Check if we have already seen this message */
-    if (GNUNET_YES == ackbitmap_is_bit_set (&socket->ack_bitmap,
-                                            relative_sequence_number))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Ignoring already received message with sequence number %u\n",
-           GNUNET_i2s (&socket->other_peer),
-           ntohl (msg->sequence_number));
-      /* Start ACK sending task if one is not already present */
-      if (GNUNET_SCHEDULER_NO_TASK == socket->ack_task_id)
-      {
-        socket->ack_task_id = 
-          GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_ntoh
-                                        (msg->ack_deadline), &ack_task, socket);
-      }
-      return GNUNET_YES;
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%1$s: Receiving DATA with sequence number: %2$u and size: %3$d from "
-         "%1$s\n", GNUNET_i2s (&socket->other_peer),
-         ntohl (msg->sequence_number), ntohs (msg->header.size));
-    /* Check if we have to allocate the buffer */
-    size -= sizeof (struct GNUNET_STREAM_DataMessage);
-    relative_offset = ntohl (msg->offset) - socket->read_offset;
-    bytes_needed = relative_offset + size;
-    if (bytes_needed > socket->receive_buffer_size)
-    {
-      if (bytes_needed <= RECEIVE_BUFFER_SIZE)
-      {
-        socket->receive_buffer = GNUNET_realloc (socket->receive_buffer,
-                                                 bytes_needed);
-        socket->receive_buffer_size = bytes_needed;
-      }
-      else
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "%s: Cannot accommodate packet %d as buffer is full\n",
-             GNUNET_i2s (&socket->other_peer), ntohl (msg->sequence_number));
-        return GNUNET_YES;
-      }
-    }
-    /* Copy Data to buffer */
-    payload = &msg[1];
-    GNUNET_assert (relative_offset + size <= socket->receive_buffer_size);
-    memcpy (socket->receive_buffer + relative_offset, payload, size);
-    socket->receive_buffer_boundaries[relative_sequence_number] = 
-       relative_offset + size;
-    /* Modify the ACK bitmap */
-    ackbitmap_modify_bit (&socket->ack_bitmap, relative_sequence_number,
-                         GNUNET_YES);
-    /* Start ACK sending task if one is not already present */
-    ack_deadline_rel = GNUNET_TIME_relative_ntoh (msg->ack_deadline);
-    if (GNUNET_SCHEDULER_NO_TASK == socket->ack_task_id)
-    {
-      ack_deadline_rel = 
-         GNUNET_TIME_relative_min (ack_deadline_rel,
-                                   GNUNET_TIME_relative_multiply
-                                   (GNUNET_TIME_UNIT_SECONDS, 300));
-      socket->ack_task_id = 
-         GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_ntoh 
-                                       (msg->ack_deadline), &ack_task, socket);
-      socket->ack_time_registered = GNUNET_TIME_absolute_get ();
-      socket->ack_time_deadline = ack_deadline_rel;
-    }
-    else
-    {
-      struct GNUNET_TIME_Relative ack_time_past;
-      struct GNUNET_TIME_Relative ack_time_remaining;
-      struct GNUNET_TIME_Relative ack_time_min;
-      ack_time_past = 
-         GNUNET_TIME_absolute_get_duration (socket->ack_time_registered);
-      ack_time_remaining = GNUNET_TIME_relative_subtract
-         (socket->ack_time_deadline, ack_time_past);
-      ack_time_min = GNUNET_TIME_relative_min (ack_time_remaining,
-                                              ack_deadline_rel);
-      if (0 == memcmp(&ack_deadline_rel, &ack_time_min,
-                     sizeof (struct GNUNET_TIME_Relative)))
-      {
-       ack_deadline_rel = ack_time_min;
-       GNUNET_SCHEDULER_cancel (socket->ack_task_id);
-       socket->ack_task_id = GNUNET_SCHEDULER_add_delayed (ack_deadline_rel,
-                                                           &ack_task, socket);
-       socket->ack_time_registered = GNUNET_TIME_absolute_get ();
-       socket->ack_time_deadline = ack_deadline_rel;
-      }
-    }
-    if ((NULL != socket->read_handle) /* A read handle is waiting */
-        /* There is no current read task */
-        && (GNUNET_SCHEDULER_NO_TASK == socket->read_handle->read_task_id)
-        /* We have the first packet */
-        && (GNUNET_YES == ackbitmap_is_bit_set(&socket->ack_bitmap, 0)))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Scheduling read processor\n",
-          GNUNET_i2s (&socket->other_peer));
-      socket->read_handle->read_task_id =
-         GNUNET_SCHEDULER_add_now (&call_read_processor, socket);
-    }
-    break;
-  default:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Received data message when it cannot be handled\n",
-         GNUNET_i2s (&socket->other_peer));
-    break;
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Client's message Handler for GNUNET_MESSAGE_TYPE_STREAM_DATA
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx place to store local state associated with the tunnel
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_data (void *cls,
-                    struct GNUNET_MESH_Tunnel *tunnel,
-                    void **tunnel_ctx,
-                    const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return handle_data (socket, tunnel, 
-                      (const struct GNUNET_STREAM_DataMessage *) message);
-}
-
-
-/**
- * Callback to set state to ESTABLISHED
- *
- * @param cls the closure NULL;
- * @param socket the socket to requiring state change
- */
-static void
-set_state_established (void *cls,
-                       struct GNUNET_STREAM_Socket *socket)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG, 
-       "%s: Attaining ESTABLISHED state\n",
-       GNUNET_i2s (&socket->other_peer));
-  socket->write_offset = 0;
-  socket->read_offset = 0;
-  socket->state = STATE_ESTABLISHED;
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK !=
-                 socket->control_retransmission_task_id);
-  GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
-  socket->control_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != socket->lsocket)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Calling listen callback\n",
-         GNUNET_i2s (&socket->other_peer));
-    if (GNUNET_SYSERR == 
-        socket->lsocket->listen_cb (socket->lsocket->listen_cb_cls,
-                                    socket,
-                                    &socket->other_peer))
-    {
-      socket->state = STATE_CLOSED;
-      /* FIXME: We should close in a decent way (send RST) */
-      GNUNET_MESH_tunnel_destroy (socket->tunnel); /* Destroy the tunnel */
-      GNUNET_free (socket);
-    }
-  }
-  else
-    socket->open_cb (socket->open_cls, socket);
-}
-
-
-/**
- * Callback to set state to HELLO_WAIT
- *
- * @param cls the closure from queue_message
- * @param socket the socket to requiring state change
- */
-static void
-set_state_hello_wait (void *cls,
-                      struct GNUNET_STREAM_Socket *socket)
-{
-  GNUNET_assert (STATE_INIT == socket->state);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Attaining HELLO_WAIT state\n",
-       GNUNET_i2s (&socket->other_peer));
-  socket->state = STATE_HELLO_WAIT;
-}
-
-
-/**
- * Callback to set state to CLOSE_WAIT
- *
- * @param cls the closure from queue_message
- * @param socket the socket requiring state change
- */
-static void
-set_state_close_wait (void *cls,
-                      struct GNUNET_STREAM_Socket *socket)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Attaing CLOSE_WAIT state\n",
-       GNUNET_i2s (&socket->other_peer));
-  socket->state = STATE_CLOSE_WAIT;
-  GNUNET_free_non_null (socket->receive_buffer); /* Free the receive buffer */
-  socket->receive_buffer = NULL;
-  socket->receive_buffer_size = 0;
-}
-
-
-/**
- * Callback to set state to RECEIVE_CLOSE_WAIT
- *
- * @param cls the closure from queue_message
- * @param socket the socket requiring state change
- */
-static void
-set_state_receive_close_wait (void *cls,
-                              struct GNUNET_STREAM_Socket *socket)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Attaing RECEIVE_CLOSE_WAIT state\n",
-       GNUNET_i2s (&socket->other_peer));
-  socket->state = STATE_RECEIVE_CLOSE_WAIT;
-  GNUNET_free_non_null (socket->receive_buffer); /* Free the receive buffer */
-  socket->receive_buffer = NULL;
-  socket->receive_buffer_size = 0;
-}
-
-
-/**
- * Callback to set state to TRANSMIT_CLOSE_WAIT
- *
- * @param cls the closure from queue_message
- * @param socket the socket requiring state change
- */
-static void
-set_state_transmit_close_wait (void *cls,
-                               struct GNUNET_STREAM_Socket *socket)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Attaing TRANSMIT_CLOSE_WAIT state\n",
-       GNUNET_i2s (&socket->other_peer));
-  socket->state = STATE_TRANSMIT_CLOSE_WAIT;
-}
-
-
-/**
- * Callback to set state to CLOSED
- *
- * @param cls the closure from queue_message
- * @param socket the socket requiring state change
- */
-static void
-set_state_closed (void *cls,
-                  struct GNUNET_STREAM_Socket *socket)
-{
-  socket->state = STATE_CLOSED;
-}
-
-
-/**
- * Returns GNUNET_MESSAGE_TYPE_STREAM_HELLO
- *
- * @return the generate hello message
- */
-static struct GNUNET_MessageHeader *
-generate_hello (struct GNUNET_STREAM_Socket *socket)
-{
-  struct GNUNET_STREAM_HelloMessage *msg;
-
-  msg = GNUNET_malloc (sizeof (struct GNUNET_STREAM_HelloMessage));
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_STREAM_HELLO);
-  msg->header.size = htons (sizeof (struct GNUNET_STREAM_HelloMessage));
-  msg->port = GNUNET_htonll ((uint64_t) socket->port);
-  return &msg->header;
-}
-
-
-/**
- * Returns a new HelloAckMessage. Also sets the write sequence number for the
- * socket
- *
- * @param socket the socket for which this HelloAckMessage has to be generated
- * @param generate_seq GNUNET_YES to generate the write sequence number,
- *          GNUNET_NO to use the existing sequence number
- * @return the HelloAckMessage
- */
-static struct GNUNET_STREAM_HelloAckMessage *
-generate_hello_ack (struct GNUNET_STREAM_Socket *socket,
-                    int generate_seq)
-{
-  struct GNUNET_STREAM_HelloAckMessage *msg;
-
-  if (GNUNET_YES == generate_seq)
-  {
-    if (GNUNET_YES == socket->testing_active)
-      socket->write_sequence_number =
-        socket->testing_set_write_sequence_number_value;
-    else
-      socket->write_sequence_number = 
-        GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
-    LOG_DEBUG ("%s: write sequence number %u\n",
-               GNUNET_i2s (&socket->other_peer),
-               (unsigned int) socket->write_sequence_number);
-  }
-  msg = GNUNET_malloc (sizeof (struct GNUNET_STREAM_HelloAckMessage));
-  msg->header.size = 
-    htons (sizeof (struct GNUNET_STREAM_HelloAckMessage));
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK);
-  msg->sequence_number = htonl (socket->write_sequence_number);
-  msg->receiver_window_size = htonl (RECEIVE_BUFFER_SIZE);
-  return msg;
-}
-
-
-/**
- * Task for retransmitting control messages if they aren't ACK'ed before a
- * deadline
- *
- * @param cls the socket
- * @param tc the Task context
- */
-static void
-control_retransmission_task (void *cls,
-                             const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-    
-  socket->control_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
-    return;
-  LOG_DEBUG ("%s: Retransmitting a control message\n",
-                 GNUNET_i2s (&socket->other_peer));
-  switch (socket->state)
-  {
-  case STATE_INIT:    
-    GNUNET_break (0);
-    break;
-  case STATE_LISTEN:
-    GNUNET_break (0);
-    break;
-  case STATE_HELLO_WAIT:
-    if (NULL == socket->lsocket) /* We are client */
-      queue_message (socket, generate_hello (socket), NULL, NULL, GNUNET_NO);
-    else
-      queue_message (socket,
-                     (struct GNUNET_MessageHeader *)
-                     generate_hello_ack (socket, GNUNET_NO), NULL, NULL,
-                     GNUNET_NO);
-    socket->control_retransmission_task_id =
-    GNUNET_SCHEDULER_add_delayed (socket->retransmit_timeout,
-                                  &control_retransmission_task, socket);
-    break;
-  case STATE_ESTABLISHED:
-    if (NULL == socket->lsocket)
-      queue_message (socket,
-                     (struct GNUNET_MessageHeader *)
-                     generate_hello_ack (socket, GNUNET_NO), NULL, NULL,
-                     GNUNET_NO);
-    else
-      GNUNET_break (0);
-    break;
-  default:
-    GNUNET_break (0);
-  }  
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_hello_ack (void *cls,
-                         struct GNUNET_MESH_Tunnel *tunnel,
-                         void **tunnel_ctx,
-                         const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  const struct GNUNET_STREAM_HelloAckMessage *ack_msg;
-  struct GNUNET_STREAM_HelloAckMessage *reply;
-
-  ack_msg = (const struct GNUNET_STREAM_HelloAckMessage *) message;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received HELLO_ACK from %s\n",
-       GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-  GNUNET_assert (socket->tunnel == tunnel);
-  switch (socket->state)
-  {
-  case STATE_HELLO_WAIT:
-    socket->read_sequence_number = ntohl (ack_msg->sequence_number);
-    LOG_DEBUG ("%s: Read sequence number %u\n", 
-               GNUNET_i2s (&socket->other_peer), socket->read_sequence_number);
-    socket->receiver_window_available = ntohl (ack_msg->receiver_window_size);
-    reply = generate_hello_ack (socket, GNUNET_YES);
-    queue_message (socket, &reply->header, &set_state_established,
-                   NULL, GNUNET_NO);    
-    return GNUNET_OK;
-  case STATE_ESTABLISHED:
-    // call statistics (# ACKs ignored++)
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK ==
-                   socket->control_retransmission_task_id);
-    socket->control_retransmission_task_id =
-      GNUNET_SCHEDULER_add_now (&control_retransmission_task, socket);
-    return GNUNET_OK;
-  default:
-    LOG_DEBUG ("%1$s: Server %1$s sent HELLO_ACK when in state %2$d\n", 
-              GNUNET_i2s (&socket->other_peer), socket->state);
-    socket->state = STATE_CLOSED; // introduce STATE_ERROR?
-    return GNUNET_SYSERR;
-  }
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_RESET
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_reset (void *cls,
-                     struct GNUNET_MESH_Tunnel *tunnel,
-                     void **tunnel_ctx,
-                     const struct GNUNET_MessageHeader *message)
-{
-  // struct GNUNET_STREAM_Socket *socket = cls;
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Frees the socket's receive buffers, marks the socket as receive closed and
- * calls the DataProcessor with GNUNET_STREAM_SHUTDOWN status if a read handle
- * is present
- *
- * @param socket the socket
- */
-static void
-do_receive_shutdown (struct GNUNET_STREAM_Socket *socket)
-{
-  socket->receive_closed = GNUNET_YES;  
-  GNUNET_free_non_null (socket->receive_buffer); /* Free the receive buffer */
-  socket->receive_buffer = NULL;
-  socket->receive_buffer_size = 0;
-  if (NULL != socket->read_handle)
-  {
-    GNUNET_STREAM_DataProcessor proc;
-    void *proc_cls;
-
-    proc = socket->read_handle->proc;
-    proc_cls = socket->read_handle->proc_cls;
-    GNUNET_STREAM_read_cancel (socket->read_handle);
-    socket->read_handle = NULL;
-    if (NULL != proc)
-      proc (proc_cls, GNUNET_STREAM_SHUTDOWN, NULL, 0);
-  }
-}
-
-
-/**
- * Marks the socket as transmit closed and calls the CompletionContinuation with
- * GNUNET_STREAM_SHUTDOWN status if a write handle is present
- *
- * @param socket the socket
- */
-static void
-do_transmit_shutdown (struct GNUNET_STREAM_Socket *socket)
-{
-  socket->transmit_closed = GNUNET_YES;
-  /* If write handle is present call it with GNUNET_STREAM_SHUTDOWN to signal
-     that that stream has been shutdown */
-  if (NULL != socket->write_handle)
-  {
-    GNUNET_STREAM_CompletionContinuation wc;
-    void *wc_cls;
-
-    wc = socket->write_handle->write_cont;
-    wc_cls = socket->write_handle->write_cont_cls;
-    GNUNET_STREAM_write_cancel (socket->write_handle);
-    socket->write_handle = NULL;
-    if (NULL != wc)
-      wc (wc_cls,
-         GNUNET_STREAM_SHUTDOWN, 0);
-  }
-}
-
-
-/**
- * Common message handler for handling TRANSMIT_CLOSE messages
- *
- * @param socket the socket through which the ack was received
- * @param tunnel connection to the other end
- * @param msg the transmit close message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_transmit_close (struct GNUNET_STREAM_Socket *socket,
-                       struct GNUNET_MESH_Tunnel *tunnel,
-                       const struct GNUNET_MessageHeader *msg)
-{
-  struct GNUNET_MessageHeader *reply;
-
-  switch (socket->state)
-  {
-  case STATE_INIT:
-  case STATE_LISTEN:
-  case STATE_HELLO_WAIT:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Ignoring RECEIVE_CLOSE as it cannot be handled now\n",
-         GNUNET_i2s (&socket->other_peer));
-    return GNUNET_OK;
-  default:
-    break;
-  }
-  /* Send TRANSMIT_CLOSE_ACK */
-  reply = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  reply->type = htons (GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK);
-  reply->size = htons (sizeof (struct GNUNET_MessageHeader));
-  queue_message (socket, reply, NULL, NULL, GNUNET_NO);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%1$s: Received TRANSMIT_CLOSE from %1$s\n",
-       GNUNET_i2s (&socket->other_peer));
-  switch(socket->state)
-  {
-  case STATE_RECEIVE_CLOSED:
-  case STATE_RECEIVE_CLOSE_WAIT:
-  case STATE_CLOSE_WAIT:
-  case STATE_CLOSED:
-    return GNUNET_OK;
-  default:
-    break;
-  }
-  do_receive_shutdown (socket);
-  if (GNUNET_YES == socket->transmit_closed)
-    socket->state = STATE_CLOSED;
-  else
-    socket->state = STATE_RECEIVE_CLOSED;
-  return GNUNET_OK;
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_transmit_close (void *cls,
-                              struct GNUNET_MESH_Tunnel *tunnel,
-                              void **tunnel_ctx,
-                              const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  
-  return handle_transmit_close (socket,
-                                tunnel,
-                                (struct GNUNET_MessageHeader *)message);
-}
-
-
-/**
- * Task for calling the shutdown continuation callback
- *
- * @param cls the socket
- * @param tc the scheduler task context
- */
-static void
-call_cont_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  
-  GNUNET_assert (NULL != socket->shutdown_handle);
-  socket->shutdown_handle->call_cont_task_id = GNUNET_SCHEDULER_NO_TASK;
-  if (NULL != socket->shutdown_handle->completion_cb)
-    socket->shutdown_handle->completion_cb
-        (socket->shutdown_handle->completion_cls,
-         socket->shutdown_handle->operation);
-  GNUNET_free (socket->shutdown_handle);
-  socket->shutdown_handle = NULL;
-}
-
-
-/**
- * Generic handler for GNUNET_MESSAGE_TYPE_STREAM_*_CLOSE_ACK messages
- *
- * @param socket the socket
- * @param tunnel connection to the other end
- * @param message the actual message
- * @param operation the close operation which is being ACK'ed
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_generic_close_ack (struct GNUNET_STREAM_Socket *socket,
-                          struct GNUNET_MESH_Tunnel *tunnel,
-                          const struct GNUNET_MessageHeader *message,
-                          int operation)
-{
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  shutdown_handle = socket->shutdown_handle;
-  if (NULL == shutdown_handle)
-  {
-    /* This may happen when the shudown handle is cancelled */
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Received CLOSE_ACK when shutdown handle is NULL\n",
-         GNUNET_i2s (&socket->other_peer));
-    return GNUNET_OK;
-  }
-  switch (operation)
-  {
-  case SHUT_RDWR:
-    switch (socket->state)
-    {
-    case STATE_CLOSE_WAIT:
-      if (SHUT_RDWR != shutdown_handle->operation)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "%s: Received CLOSE_ACK when shutdown handle is not for "
-             "SHUT_RDWR\n", GNUNET_i2s (&socket->other_peer));
-        return GNUNET_OK;
-      }
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received CLOSE_ACK from %s\n",
-           GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-      socket->state = STATE_CLOSED;
-      break;
-    default:
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Received CLOSE_ACK when it is not expected\n",
-           GNUNET_i2s (&socket->other_peer));
-      return GNUNET_OK;
-    }
-    break;
-  case SHUT_RD:
-    switch (socket->state)
-    {
-    case STATE_RECEIVE_CLOSE_WAIT:
-      if (SHUT_RD != shutdown_handle->operation)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "%s: Received RECEIVE_CLOSE_ACK when shutdown handle "
-             "is not for SHUT_RD\n", GNUNET_i2s (&socket->other_peer));
-        return GNUNET_OK;
-      }
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received RECEIVE_CLOSE_ACK from %s\n",
-           GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-      socket->state = STATE_RECEIVE_CLOSED;
-      break;
-    default:
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Received RECEIVE_CLOSE_ACK when it is not expected\n",
-           GNUNET_i2s (&socket->other_peer));
-      return GNUNET_OK;
-    }
-    break;
-  case SHUT_WR:
-    switch (socket->state)
-    {
-    case STATE_TRANSMIT_CLOSE_WAIT:
-      if (SHUT_WR != shutdown_handle->operation)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "%s: Received TRANSMIT_CLOSE_ACK when shutdown handle "
-             "is not for SHUT_WR\n",
-             GNUNET_i2s (&socket->other_peer));
-        return GNUNET_OK;
-      }
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received TRANSMIT_CLOSE_ACK from %s\n",
-           GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-      socket->state = STATE_TRANSMIT_CLOSED;
-      break;
-    default:
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Received TRANSMIT_CLOSE_ACK when it is not expected\n",
-           GNUNET_i2s (&socket->other_peer));          
-      return GNUNET_OK;
-    }
-    break;
-  default:
-    GNUNET_assert (0);
-  }
-  shutdown_handle->call_cont_task_id = GNUNET_SCHEDULER_add_now
-      (&call_cont_task, socket);
-  if (GNUNET_SCHEDULER_NO_TASK
-      != shutdown_handle->close_msg_retransmission_task_id)
-  {
-    GNUNET_SCHEDULER_cancel
-      (shutdown_handle->close_msg_retransmission_task_id);
-    shutdown_handle->close_msg_retransmission_task_id =
-       GNUNET_SCHEDULER_NO_TASK;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_transmit_close_ack (void *cls,
-                                  struct GNUNET_MESH_Tunnel *tunnel,
-                                  void **tunnel_ctx,
-                                  const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return handle_generic_close_ack (socket,
-                                   tunnel,
-                                   (const struct GNUNET_MessageHeader *)
-                                   message,
-                                   SHUT_WR);
-}
-
-
-/**
- * Generic handler for GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE
- *
- * @param socket the socket
- * @param tunnel connection to the other end
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_receive_close (struct GNUNET_STREAM_Socket *socket,
-                      struct GNUNET_MESH_Tunnel *tunnel,
-                      const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_MessageHeader *receive_close_ack;
-
-  switch (socket->state)
-  {
-  case STATE_INIT:
-  case STATE_LISTEN:
-  case STATE_HELLO_WAIT:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Ignoring RECEIVE_CLOSE as it cannot be handled now\n",
-         GNUNET_i2s (&socket->other_peer));
-    return GNUNET_OK;
-  default:
-    break;
-  }  
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received RECEIVE_CLOSE from %s\n",
-       GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));  
-  receive_close_ack = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  receive_close_ack->size = htons (sizeof (struct GNUNET_MessageHeader));
-  receive_close_ack->type =
-      htons (GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK);
-  queue_message (socket, receive_close_ack, NULL, NULL, GNUNET_NO);
-  switch (socket->state)
-  {
-  case STATE_TRANSMIT_CLOSED:
-  case STATE_TRANSMIT_CLOSE_WAIT:
-  case STATE_CLOSED:
-  case STATE_CLOSE_WAIT:
-    return GNUNET_OK;
-  default:
-    break;
-  }
-  do_transmit_shutdown (socket);
-  if (GNUNET_YES == socket->receive_closed)
-    socket->state = STATE_CLOSED;
-  else
-    socket->state = STATE_TRANSMIT_CLOSED;
-  return GNUNET_OK;
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_receive_close (void *cls,
-                             struct GNUNET_MESH_Tunnel *tunnel,
-                             void **tunnel_ctx,
-                             const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return
-    handle_receive_close (socket,
-                          tunnel,
-                          (const struct GNUNET_MessageHeader *) message);
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_receive_close_ack (void *cls,
-                                 struct GNUNET_MESH_Tunnel *tunnel,
-                                 void **tunnel_ctx,
-                                 const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return handle_generic_close_ack (socket,
-                                   tunnel,
-                                   (const struct GNUNET_MessageHeader *)
-                                   message,
-                                   SHUT_RD);
-}
-
-
-/**
- * Generic handler for GNUNET_MESSAGE_TYPE_STREAM_CLOSE
- *
- * @param socket the socket
- * @param tunnel connection to the other end
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_close (struct GNUNET_STREAM_Socket *socket,
-              struct GNUNET_MESH_Tunnel *tunnel,
-              const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_MessageHeader *close_ack;
-
-  switch (socket->state)
-  {
-  case STATE_INIT:
-  case STATE_LISTEN:
-  case STATE_HELLO_WAIT:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Ignoring RECEIVE_CLOSE as it cannot be handled now\n",
-         GNUNET_i2s (&socket->other_peer));
-    return GNUNET_OK;
-  default:
-    break;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received CLOSE from %s\n",
-       GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-  close_ack = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  close_ack->size = htons (sizeof (struct GNUNET_MessageHeader));
-  close_ack->type = htons (GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK);
-  queue_message (socket, close_ack, &set_state_closed, NULL, GNUNET_NO);
-  if ((STATE_CLOSED == socket->state) || (STATE_CLOSE_WAIT == socket->state))
-    return GNUNET_OK;
-  if (GNUNET_NO == socket->transmit_closed)
-    do_transmit_shutdown (socket);
-  if (GNUNET_NO == socket->receive_closed)
-    do_receive_shutdown (socket);
-  return GNUNET_OK;
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_CLOSE
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_close (void *cls,
-                     struct GNUNET_MESH_Tunnel *tunnel,
-                     void **tunnel_ctx,
-                     const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return handle_close (socket,
-                       tunnel,
-                       (const struct GNUNET_MessageHeader *) message);
-}
-
-
-/**
- * Client's message handler for GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK
- *
- * @param cls the socket (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end
- * @param tunnel_ctx this is NULL
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_close_ack (void *cls,
-                         struct GNUNET_MESH_Tunnel *tunnel,
-                         void **tunnel_ctx,
-                         const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  return handle_generic_close_ack (socket,
-                                   tunnel,
-                                   (const struct GNUNET_MessageHeader *) 
-                                   message,
-                                   SHUT_RDWR);
-}
-
-/*****************************/
-/* Server's Message Handlers */
-/*****************************/
-
-/**
- * Server's message Handler for GNUNET_MESSAGE_TYPE_STREAM_DATA
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_data (void *cls,
-                    struct GNUNET_MESH_Tunnel *tunnel,
-                    void **tunnel_ctx,
-                    const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_data (socket,
-                      tunnel,
-                      (const struct GNUNET_STREAM_DataMessage *)message);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_HELLO
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_hello (void *cls,
-                     struct GNUNET_MESH_Tunnel *tunnel,
-                     void **tunnel_ctx,
-                     const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-  const struct GNUNET_STREAM_HelloMessage *hello;
-  struct GNUNET_STREAM_HelloAckMessage *reply;
-  uint32_t port;
-
-  hello = (const struct GNUNET_STREAM_HelloMessage *) message;
-  GNUNET_assert (GNUNET_MESSAGE_TYPE_STREAM_HELLO == ntohs (message->type));
-  GNUNET_assert (socket->tunnel == tunnel);
-  LOG_DEBUG ("%1$s: Received HELLO from %1$s\n", 
-             GNUNET_i2s (&socket->other_peer));
-  port = (uint32_t) GNUNET_ntohll (hello->port);
-  switch (socket->state)
-  {
-  case STATE_INIT:
-    if (port != socket->port)
-    {
-      LOG_DEBUG ("Ignoring HELLO for port %u\n", port);
-      GNUNET_MESH_tunnel_destroy (tunnel);
-      GNUNET_free (socket);
-      return GNUNET_OK;
-    }
-    reply = generate_hello_ack (socket, GNUNET_YES);
-    queue_message (socket, &reply->header, &set_state_hello_wait, NULL,
-                   GNUNET_NO);
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK ==
-                   socket->control_retransmission_task_id);
-    socket->control_retransmission_task_id =
-      GNUNET_SCHEDULER_add_delayed (socket->retransmit_timeout,
-                                    &control_retransmission_task, socket);
-    break;
-  case STATE_HELLO_WAIT:
-    /* Perhaps our HELLO_ACK was lost */
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != 
-                   socket->control_retransmission_task_id);
-    GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
-    socket->control_retransmission_task_id =
-      GNUNET_SCHEDULER_add_now (&control_retransmission_task, socket);
-    break;
-  default:
-    LOG_DEBUG( "%s: Client sent HELLO when in state %d\n",
-               GNUNET_i2s (&socket->other_peer), socket->state);
-    /* FIXME: Send RESET? */
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_hello_ack (void *cls,
-                         struct GNUNET_MESH_Tunnel *tunnel,
-                         void **tunnel_ctx,
-                         const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-  const struct GNUNET_STREAM_HelloAckMessage *ack_message;
-
-  GNUNET_assert (GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK ==
-                 ntohs (message->type));
-  GNUNET_assert (socket->tunnel == tunnel);
-  ack_message = (struct GNUNET_STREAM_HelloAckMessage *) message;
-  switch (socket->state)  
-  {
-  case STATE_HELLO_WAIT:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Received HELLO_ACK from %s\n",
-         GNUNET_i2s (&socket->other_peer),
-         GNUNET_i2s (&socket->other_peer));
-    socket->read_sequence_number = ntohl (ack_message->sequence_number);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Read sequence number %u\n",
-         GNUNET_i2s (&socket->other_peer),
-         (unsigned int) socket->read_sequence_number);
-    socket->receiver_window_available = 
-      ntohl (ack_message->receiver_window_size);
-    set_state_established (NULL, socket);
-    break;
-  default:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Client sent HELLO_ACK when in state %d\n", socket->state);    
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_RESET
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_reset (void *cls,
-                     struct GNUNET_MESH_Tunnel *tunnel,
-                     void **tunnel_ctx,
-                     const struct GNUNET_MessageHeader *message)
-{
-  // struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-  /* FIXME */
-  return GNUNET_OK;
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_transmit_close (void *cls,
-                              struct GNUNET_MESH_Tunnel *tunnel,
-                              void **tunnel_ctx,
-                              const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_transmit_close (socket, tunnel, message);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_transmit_close_ack (void *cls,
-                                  struct GNUNET_MESH_Tunnel *tunnel,
-                                  void **tunnel_ctx,
-                                  const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_generic_close_ack (socket, tunnel, message, SHUT_WR);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_receive_close (void *cls,
-                             struct GNUNET_MESH_Tunnel *tunnel,
-                             void **tunnel_ctx,
-                             const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_receive_close (socket, tunnel, message);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_receive_close_ack (void *cls,
-                                 struct GNUNET_MESH_Tunnel *tunnel,
-                                 void **tunnel_ctx,
-                                 const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_generic_close_ack (socket, tunnel, message, SHUT_RD);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_CLOSE
- *
- * @param cls the listen socket (from GNUNET_MESH_connect in
- *          GNUNET_STREAM_listen) 
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_close (void *cls,
-                     struct GNUNET_MESH_Tunnel *tunnel,
-                     void **tunnel_ctx,
-                     const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-  
-  return handle_close (socket, tunnel, message);
-}
-
-
-/**
- * Server's message handler for GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK
- *
- * @param cls the closure
- * @param tunnel connection to the other end
- * @param tunnel_ctx the socket
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_close_ack (void *cls,
-                         struct GNUNET_MESH_Tunnel *tunnel,
-                         void **tunnel_ctx,
-                         const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-
-  return handle_generic_close_ack (socket, tunnel, message, SHUT_RDWR);
-}
-
-
-/**
- * Handler for DATA_ACK messages
- *
- * @param socket the socket through which the ack was received
- * @param tunnel connection to the other end
- * @param ack the acknowledgment message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_ack (struct GNUNET_STREAM_Socket *socket,
-           struct GNUNET_MESH_Tunnel *tunnel,
-           const struct GNUNET_STREAM_AckMessage *ack)
-{
-  struct GNUNET_STREAM_WriteHandle *write_handle;
-  uint64_t ack_bitmap;
-  unsigned int packet;
-  int need_retransmission;
-  uint32_t sequence_difference;
-
-  switch (socket->state)
-  {
-  case (STATE_ESTABLISHED):
-  case (STATE_RECEIVE_CLOSED):
-  case (STATE_RECEIVE_CLOSE_WAIT):
-    if (NULL == socket->write_handle)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Received DATA_ACK when write_handle is NULL\n",
-           GNUNET_i2s (&socket->other_peer));
-      return GNUNET_OK;
-    }
-    sequence_difference = 
-       socket->write_sequence_number - ntohl (ack->base_sequence_number);
-    if (!(sequence_difference <= GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Received DATA_ACK with unexpected base sequence number\n",
-           GNUNET_i2s (&socket->other_peer));
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "%s: Current write sequence: %u; Ack's base sequence: %u\n",
-           GNUNET_i2s (&socket->other_peer),
-           socket->write_sequence_number,
-           ntohl (ack->base_sequence_number));
-      return GNUNET_OK;
-    }
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: Received DATA_ACK from %s\n",
-         GNUNET_i2s (&socket->other_peer), GNUNET_i2s (&socket->other_peer));
-    /* Cancel the retransmission task */
-    if (GNUNET_SCHEDULER_NO_TASK != socket->data_retransmission_task_id)
-    {
-      GNUNET_SCHEDULER_cancel (socket->data_retransmission_task_id);
-      socket->data_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-      socket->data_retransmit_timeout = GNUNET_TIME_UNIT_SECONDS;
-    }
-    for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-    {
-      if (NULL == socket->write_handle->messages[packet])
-        break;
-      /* BS: Base sequence from ack; PS: sequence num of current packet */
-      sequence_difference = ntohl (ack->base_sequence_number)
-        - ntohl (socket->write_handle->messages[packet]->sequence_number);
-      if (0 == sequence_difference)
-       break; /* The message in our handle is not yet received */
-      /* case where BS = PS + GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH */
-      /* sequence_difference <= GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH */
-      ackbitmap_modify_bit (&socket->write_handle->ack_bitmap,
-                           packet, GNUNET_YES);
-    }
-    if (((ntohl (ack->base_sequence_number)
-         - (socket->write_handle->max_ack_base_num))
-          <= GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH))
-    {
-      socket->write_handle->max_ack_base_num = ntohl (ack->base_sequence_number);
-      socket->receiver_window_available = 
-          ntohl (ack->receive_window_remaining);
-    }
-    else
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Ignoring to modify receive window available as base: %u, max_ack_base: %u\n",
-                  ntohl (ack->base_sequence_number),
-                   socket->write_handle->max_ack_base_num);
-    if ((packet == GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH)
-        || ((packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH)
-            && (NULL == socket->write_handle->messages[packet])))
-      goto call_write_cont_cb;
-    GNUNET_assert (ntohl
-                   (socket->write_handle->messages[packet]->sequence_number)
-                   == ntohl (ack->base_sequence_number));
-    /* Update our bitmap */
-    ack_bitmap = GNUNET_ntohll (ack->bitmap);
-    for (; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-    {
-      if (NULL == socket->write_handle->messages[packet]) break;
-      if (ackbitmap_is_bit_set (&ack_bitmap, ntohl
-                                (socket->write_handle->messages[packet]->sequence_number)
-                                - ntohl (ack->base_sequence_number)))
-        ackbitmap_modify_bit (&socket->write_handle->ack_bitmap, packet, GNUNET_YES);
-    }
-    /* Check if we have received all acknowledgements */
-    need_retransmission = GNUNET_NO;
-    for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-    {
-      if (NULL == socket->write_handle->messages[packet]) break;
-      if (GNUNET_YES != ackbitmap_is_bit_set 
-          (&socket->write_handle->ack_bitmap,packet))
-      {
-        need_retransmission = GNUNET_YES;
-        break;
-      }
-    }
-    if (GNUNET_YES == need_retransmission)
-    {
-      write_data (socket);
-      return GNUNET_OK;
-    }
-
-  call_write_cont_cb:
-    /* Free the packets */
-    for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-    {
-      GNUNET_free_non_null (socket->write_handle->messages[packet]);
-    }
-    write_handle = socket->write_handle;
-    socket->write_handle = NULL;
-    if (NULL != write_handle->write_cont)
-      write_handle->write_cont (write_handle->write_cont_cls,
-                                GNUNET_STREAM_OK,
-                                write_handle->size);
-    /* We are done with the write handle - Freeing it */
-    GNUNET_free (write_handle);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: Write completion callback completed\n",
-         GNUNET_i2s (&socket->other_peer));      
-    break;
-  default:
-    break;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Handler for DATA_ACK messages
- *
- * @param cls the 'struct GNUNET_STREAM_Socket'
- * @param tunnel connection to the other end
- * @param tunnel_ctx unused
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-client_handle_ack (void *cls,
-                  struct GNUNET_MESH_Tunnel *tunnel,
-                  void **tunnel_ctx,
-                  const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  const struct GNUNET_STREAM_AckMessage *ack;
-
-  ack = (const struct GNUNET_STREAM_AckMessage *) message; 
-  return handle_ack (socket, tunnel, ack);
-}
-
-
-/**
- * Handler for DATA_ACK messages
- *
- * @param cls the server's listen socket
- * @param tunnel connection to the other end
- * @param tunnel_ctx pointer to the 'struct GNUNET_STREAM_Socket*'
- * @param message the actual message
- * @return GNUNET_OK to keep the connection open,
- *         GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-server_handle_ack (void *cls,
-                  struct GNUNET_MESH_Tunnel *tunnel,
-                  void **tunnel_ctx,
-                  const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_STREAM_Socket *socket = *tunnel_ctx;
-  const struct GNUNET_STREAM_AckMessage *ack = (const struct GNUNET_STREAM_AckMessage *) message;
-  return handle_ack (socket, tunnel, ack);
-}
-
-
-/**
- * For client message handlers, the stream socket is in the
- * closure argument.
- */
-static struct GNUNET_MESH_MessageHandler client_message_handlers[] = {
-  {&client_handle_data, GNUNET_MESSAGE_TYPE_STREAM_DATA, 0},
-  {&client_handle_ack, GNUNET_MESSAGE_TYPE_STREAM_ACK, 
-   sizeof (struct GNUNET_STREAM_AckMessage) },
-  {&client_handle_hello_ack, GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK,
-   sizeof (struct GNUNET_STREAM_HelloAckMessage)},
-  {&client_handle_reset, GNUNET_MESSAGE_TYPE_STREAM_RESET,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_transmit_close, GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_transmit_close_ack, GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_receive_close, GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_receive_close_ack, GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_close, GNUNET_MESSAGE_TYPE_STREAM_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&client_handle_close_ack, GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {NULL, 0, 0}
-};
-
-
-/**
- * For server message handlers, the stream socket is in the
- * tunnel context, and the listen socket in the closure argument.
- */
-static struct GNUNET_MESH_MessageHandler server_message_handlers[] = {
-  {&server_handle_data, GNUNET_MESSAGE_TYPE_STREAM_DATA, 0},
-  {&server_handle_ack, GNUNET_MESSAGE_TYPE_STREAM_ACK, 
-   sizeof (struct GNUNET_STREAM_AckMessage) },
-  {&server_handle_hello, GNUNET_MESSAGE_TYPE_STREAM_HELLO, 
-   sizeof (struct GNUNET_STREAM_HelloMessage)},
-  {&server_handle_hello_ack, GNUNET_MESSAGE_TYPE_STREAM_HELLO_ACK,
-   sizeof (struct GNUNET_STREAM_HelloAckMessage)},
-  {&server_handle_reset, GNUNET_MESSAGE_TYPE_STREAM_RESET,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_transmit_close, GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_transmit_close_ack, GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_receive_close, GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_receive_close_ack, GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_close, GNUNET_MESSAGE_TYPE_STREAM_CLOSE,
-   sizeof (struct GNUNET_MessageHeader)},
-  {&server_handle_close_ack, GNUNET_MESSAGE_TYPE_STREAM_CLOSE_ACK,
-   sizeof (struct GNUNET_MessageHeader)},
-  {NULL, 0, 0}
-};
-
-
-/**
- * Function called when our target peer is connected to our tunnel
- *
- * @param cls the socket for which this tunnel is created
- * @param peer the peer identity of the target
- * @param atsi performance data for the connection
- * 
- * FIXME static
- */
-void
-mesh_peer_connect_callback (void *cls,
-                            const struct GNUNET_PeerIdentity *peer,
-                            const struct GNUNET_ATS_Information * atsi)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-  struct GNUNET_MessageHeader *message;
-  
-  if (0 != memcmp (peer,
-                   &socket->other_peer,
-                   sizeof (struct GNUNET_PeerIdentity)))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: A peer which is not our target has connected to our tunnel\n",
-         GNUNET_i2s(peer));
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Target peer %s connected\n",
-       GNUNET_i2s (&socket->other_peer),
-       GNUNET_i2s (&socket->other_peer));
-  /* Set state to INIT */
-  socket->state = STATE_INIT;
-  /* Send HELLO message */
-  message = generate_hello (socket);
-  queue_message (socket, message, &set_state_hello_wait, NULL, GNUNET_NO);
-  if (GNUNET_SCHEDULER_NO_TASK != socket->control_retransmission_task_id)
-    GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
-  socket->control_retransmission_task_id =
-    GNUNET_SCHEDULER_add_delayed (socket->retransmit_timeout,
-                                  &control_retransmission_task, socket);
-}
-
-
-/**
- * Function called when our target peer is disconnected from our tunnel
- *
- * @param cls the socket associated which this tunnel
- * @param peer the peer identity of the target
- * 
- * FIXME static
- */
-void
-mesh_peer_disconnect_callback (void *cls,
-                               const struct GNUNET_PeerIdentity *peer)
-{
-  struct GNUNET_STREAM_Socket *socket=cls;
-  
-  /* If the state is SHUTDOWN its ok; else set the state of the socket to SYSERR */
-  LOG_DEBUG ("%1$s: Other peer %1$s disconnected \n",
-             GNUNET_i2s (&socket->other_peer));
-}
-
-
-/**
- * Method called whenever a peer creates a tunnel to us
- *
- * @param cls closure
- * @param tunnel new handle to the tunnel
- * @param initiator peer that started the tunnel
- * @param port incoming port
- * @return initial tunnel context for the tunnel
- *         (can be NULL -- that's not an error)
- */
-static void *
-new_tunnel_notify (void *cls,
-                   struct GNUNET_MESH_Tunnel *tunnel,
-                   const struct GNUNET_PeerIdentity *initiator,
-                   uint32_t port)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket = cls;
-  struct GNUNET_STREAM_Socket *socket;
-
-  /* FIXME: If a tunnel is already created, we should not accept new tunnels
-     from the same peer again until the socket is closed */
-  if (GNUNET_NO == lsocket->listening)
-  {
-    GNUNET_MESH_tunnel_destroy (tunnel);
-    return NULL;
-  }
-  socket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_Socket));
-  socket->other_peer = *initiator;
-  socket->tunnel = tunnel;
-  socket->state = STATE_INIT;
-  socket->lsocket = lsocket;
-  socket->port = lsocket->port;
-  socket->stat_handle = lsocket->stat_handle;
-  socket->retransmit_timeout = lsocket->retransmit_timeout;
-  socket->testing_active = lsocket->testing_active;
-  socket->testing_set_write_sequence_number_value =
-      lsocket->testing_set_write_sequence_number_value;
-  socket->max_payload_size = lsocket->max_payload_size;
-  LOG_DEBUG ("%1$s: Peer %1$s initiated tunnel to us\n",
-             GNUNET_i2s (&socket->other_peer));
-  if (NULL != socket->stat_handle)
-  {
-    GNUNET_STATISTICS_update (socket->stat_handle,
-                              "total inbound connections received",
-                              1, GNUNET_NO);
-    GNUNET_STATISTICS_update (socket->stat_handle,
-                              "inbound connections", 1, GNUNET_NO);
-  }
-  return socket;
-}
-
-
-/**
- * Function called whenever an inbound tunnel is destroyed.  Should clean up
- * any associated state.  This function is NOT called if the client has
- * explicitly asked for the tunnel to be destroyed using
- * GNUNET_MESH_tunnel_destroy. It must NOT call GNUNET_MESH_tunnel_destroy on
- * the tunnel.
- *
- * @param cls closure (set from GNUNET_MESH_connect)
- * @param tunnel connection to the other end (henceforth invalid)
- * @param tunnel_ctx place where local state associated
- *                   with the tunnel is stored
- */
-static void 
-tunnel_cleaner (void *cls,
-                const struct GNUNET_MESH_Tunnel *tunnel,
-                void *tunnel_ctx)
-{
-  struct GNUNET_STREAM_Socket *socket = tunnel_ctx;
-  struct MessageQueue *head;
-
-  GNUNET_assert (tunnel == socket->tunnel);
-  GNUNET_break_op(0);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: Peer %s has terminated connection abruptly\n",
-       GNUNET_i2s (&socket->other_peer),
-       GNUNET_i2s (&socket->other_peer));
-  if (NULL != socket->stat_handle)
-  {
-    GNUNET_STATISTICS_update (socket->stat_handle,
-                              "connections terminated abruptly", 1, GNUNET_NO);
-    GNUNET_STATISTICS_update (socket->stat_handle,
-                              "inbound connections", -1, GNUNET_NO);
-  }
-  /* Clear Transmit handles */
-  if (NULL != socket->transmit_handle)
-  {
-    GNUNET_MESH_notify_transmit_ready_cancel (socket->transmit_handle);
-    socket->transmit_handle = NULL;
-  }
-  /* Stop Tasks using socket->tunnel */
-  if (GNUNET_SCHEDULER_NO_TASK != socket->ack_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (socket->ack_task_id);
-    socket->ack_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }
-  if (GNUNET_SCHEDULER_NO_TASK != socket->data_retransmission_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (socket->data_retransmission_task_id);
-    socket->data_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }  
-  /* Terminate the control retransmission tasks */
-  if (GNUNET_SCHEDULER_NO_TASK != socket->control_retransmission_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
-    socket->control_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }
-  /* Clear existing message queue */
-  while (NULL != (head = socket->queue_head)) {
-    GNUNET_CONTAINER_DLL_remove (socket->queue_head,
-                                socket->queue_tail,
-                                head);
-    GNUNET_free (head->message);
-    GNUNET_free (head);
-  }
-  socket->tunnel = NULL;
-}
-
-
-/**
- * Callback to signal timeout on lockmanager lock acquire
- *
- * @param cls the ListenSocket
- * @param tc the scheduler task context
- */
-static void
-lockmanager_acquire_timeout (void *cls, 
-                             const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket = cls;
-  GNUNET_STREAM_ListenCallback listen_cb;
-  void *listen_cb_cls;
-
-  lsocket->lockmanager_acquire_timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  listen_cb = lsocket->listen_cb;
-  listen_cb_cls = lsocket->listen_cb_cls;
-  if (NULL != listen_cb)
-    listen_cb (listen_cb_cls, NULL, NULL);
-}
-
-
-/**
- * Callback to notify us on the status changes on app_port lock
- *
- * @param cls the ListenSocket
- * @param domain the domain name of the lock
- * @param lock the app_port
- * @param status the current status of the lock
- */
-static void
-lock_status_change_cb (void *cls, const char *domain, uint32_t lock,
-                       enum GNUNET_LOCKMANAGER_Status status)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket = cls;
-
-  GNUNET_assert (lock == (uint32_t) lsocket->port);
-  if (GNUNET_LOCKMANAGER_SUCCESS == status)
-  {
-    lsocket->listening = GNUNET_YES;
-    if (GNUNET_SCHEDULER_NO_TASK != lsocket->lockmanager_acquire_timeout_task)
-    {
-      GNUNET_SCHEDULER_cancel (lsocket->lockmanager_acquire_timeout_task);
-      lsocket->lockmanager_acquire_timeout_task = GNUNET_SCHEDULER_NO_TASK;
-    }
-    if (NULL == lsocket->mesh)
-    {
-      uint32_t ports[] = {lsocket->port, 0};
-
-      lsocket->mesh = GNUNET_MESH_connect (lsocket->cfg,
-                                           lsocket, /* Closure */
-                                           &new_tunnel_notify,
-                                           &tunnel_cleaner,
-                                           server_message_handlers,
-                                           ports);
-      GNUNET_assert (NULL != lsocket->mesh);
-      if (NULL != lsocket->listen_ok_cb)
-      {
-        (void) lsocket->listen_ok_cb ();
-      }
-    }
-  }
-  if (GNUNET_LOCKMANAGER_RELEASE == status)
-    lsocket->listening = GNUNET_NO;
-}
-
-
-/*****************/
-/* API functions */
-/*****************/
-
-
-/**
- * Tries to open a stream to the target peer
- *
- * @param cfg configuration to use
- * @param target the target peer to which the stream has to be opened
- * @param app_port the application port number which uniquely identifies this
- *            stream
- * @param open_cb this function will be called after stream has be established;
- *          cannot be NULL
- * @param open_cb_cls the closure for open_cb
- * @param ... options to the stream, terminated by GNUNET_STREAM_OPTION_END
- * @return if successful it returns the stream socket; NULL if stream cannot be
- *         opened 
- */
-struct GNUNET_STREAM_Socket *
-GNUNET_STREAM_open (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    const struct GNUNET_PeerIdentity *target,
-                    uint32_t app_port,
-                    GNUNET_STREAM_OpenCallback open_cb,
-                    void *open_cb_cls,
-                    ...)
-{
-  struct GNUNET_STREAM_Socket *socket;
-  enum GNUNET_STREAM_Option option;
-  va_list vargs;
-  uint16_t payload_size;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s\n", __func__);
-  GNUNET_assert (NULL != open_cb);
-  socket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_Socket));
-  socket->other_peer = *target;
-  socket->open_cb = open_cb;
-  socket->open_cls = open_cb_cls;
-  socket->port = app_port;
-  /* Set defaults */
-  socket->retransmit_timeout = TIME_REL_SECS (default_timeout);
-  socket->testing_active = GNUNET_NO;
-  socket->max_payload_size = DEFAULT_MAX_PAYLOAD_SIZE;
-  va_start (vargs, open_cb_cls); /* Parse variable args */
-  do {
-    option = va_arg (vargs, enum GNUNET_STREAM_Option);
-    switch (option)
-    {
-    case GNUNET_STREAM_OPTION_INITIAL_RETRANSMIT_TIMEOUT:
-      /* Expect struct GNUNET_TIME_Relative */
-      socket->retransmit_timeout = va_arg (vargs,
-                                           struct GNUNET_TIME_Relative);
-      break;
-    case GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER:
-      socket->testing_active = GNUNET_YES;
-      socket->testing_set_write_sequence_number_value = va_arg (vargs,
-                                                                uint32_t);
-      break;
-    case GNUNET_STREAM_OPTION_LISTEN_TIMEOUT:
-      GNUNET_break (0);          /* Option irrelevant in STREAM_open */
-      break;
-    case GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS:
-      GNUNET_break (0);          /* Option irrelevant in STREAM_open */
-      break;
-    case GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE:
-      payload_size = (uint16_t) va_arg (vargs, unsigned int);
-      GNUNET_assert (0 != payload_size);
-      if (payload_size < socket->max_payload_size)
-       socket->max_payload_size = payload_size;
-      break;
-    case GNUNET_STREAM_OPTION_END:
-      break;
-    }
-  } while (GNUNET_STREAM_OPTION_END != option);
-  va_end (vargs);               /* End of variable args parsing */
-  socket->mesh = GNUNET_MESH_connect (cfg, /* the configuration handle */
-                                      socket, /* cls */
-                                      NULL, /* No inbound tunnel handler */
-                                      NULL, /* No in-tunnel cleaner */
-                                      client_message_handlers,
-                                      NULL); /* We don't get inbound tunnels */
-  if (NULL == socket->mesh)   /* Fail if we cannot connect to mesh */
-  {
-    GNUNET_free (socket);
-    return NULL;
-  }
-  /* Now create the mesh tunnel to target */
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Creating MESH Tunnel\n");
-  socket->tunnel = GNUNET_MESH_tunnel_create (socket->mesh,
-                                              socket, /* Tunnel context */
-                                              &socket->other_peer,
-                                              STREAM_PORT, 1, 0);
-  GNUNET_assert (NULL != socket->tunnel);
-  socket->stat_handle = GNUNET_STATISTICS_create ("stream", cfg);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s() END\n", __func__);
-  return socket;
-}
-
-
-/**
- * Shutdown the stream for reading or writing (similar to man 2 shutdown).
- *
- * @param socket the stream socket
- * @param operation SHUT_RD, SHUT_WR or SHUT_RDWR
- * @param completion_cb the callback that will be called upon successful
- *          shutdown of given operation
- * @param completion_cls the closure for the completion callback
- * @return the shutdown handle
- */
-struct GNUNET_STREAM_ShutdownHandle *
-GNUNET_STREAM_shutdown (struct GNUNET_STREAM_Socket *socket,
-                       int operation,
-                        GNUNET_STREAM_ShutdownCompletion completion_cb,
-                        void *completion_cls)
-{
-  struct GNUNET_STREAM_ShutdownHandle *handle;
-  struct GNUNET_MessageHeader *msg;
-  
-  GNUNET_assert (NULL == socket->shutdown_handle);
-  handle = GNUNET_malloc (sizeof (struct GNUNET_STREAM_ShutdownHandle));
-  handle->socket = socket;
-  handle->completion_cb = completion_cb;
-  handle->completion_cls = completion_cls;
-  socket->shutdown_handle = handle;
-  if ( ((GNUNET_YES == socket->receive_closed) && (SHUT_RD == operation))
-       || ((GNUNET_YES == socket->transmit_closed) && (SHUT_WR == operation))
-       || ((GNUNET_YES == socket->transmit_closed) 
-           && (GNUNET_YES == socket->receive_closed)
-           && (SHUT_RDWR == operation)) )
-  {
-    handle->operation = operation;
-    handle->call_cont_task_id = GNUNET_SCHEDULER_add_now (&call_cont_task,
-                                                          socket);
-    return handle;
-  }
-  msg = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader));
-  msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  switch (operation)
-  {
-  case SHUT_RD:
-    handle->operation = SHUT_RD;
-    if (NULL != socket->read_handle)
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Existing read handle should be cancelled before shutting"
-           " down reading\n");
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_RECEIVE_CLOSE);
-    queue_message (socket, msg, &set_state_receive_close_wait, NULL,
-                   GNUNET_NO);
-    socket->receive_closed = GNUNET_YES;
-    break;
-  case SHUT_WR:
-    handle->operation = SHUT_WR;
-    if (NULL != socket->write_handle)
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Existing write handle should be cancelled before shutting"
-           " down writing\n");
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_TRANSMIT_CLOSE);
-    queue_message (socket, msg, &set_state_transmit_close_wait, NULL,
-                   GNUNET_NO);
-    socket->transmit_closed = GNUNET_YES;
-    break;
-  case SHUT_RDWR:
-    handle->operation = SHUT_RDWR;
-    if (NULL != socket->write_handle)
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Existing write handle should be cancelled before shutting"
-           " down writing\n");
-    if (NULL != socket->read_handle)
-      LOG (GNUNET_ERROR_TYPE_WARNING,
-           "Existing read handle should be cancelled before shutting"
-           " down reading\n");
-    msg->type = htons (GNUNET_MESSAGE_TYPE_STREAM_CLOSE);
-    queue_message (socket, msg, &set_state_close_wait, NULL, GNUNET_NO);
-    socket->transmit_closed = GNUNET_YES;
-    socket->receive_closed = GNUNET_YES;
-    break;
-  default:
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "GNUNET_STREAM_shutdown called with invalid value for "
-         "parameter operation -- Ignoring\n");
-    GNUNET_free (msg);
-    GNUNET_free (handle);
-    return NULL;
-  }
-  handle->close_msg_retransmission_task_id =
-    GNUNET_SCHEDULER_add_delayed (socket->retransmit_timeout,
-                                  &close_msg_retransmission_task,
-                                  handle);
-  return handle;
-}
-
-
-/**
- * Cancels a pending shutdown. Note that the shutdown messages may already be
- * sent and the stream is shutdown already for the operation given to
- * GNUNET_STREAM_shutdown(). This function only clears up any retranmissions of
- * shutdown messages and frees the shutdown handle.
- *
- * @param handle the shutdown handle returned from GNUNET_STREAM_shutdown
- */
-void
-GNUNET_STREAM_shutdown_cancel (struct GNUNET_STREAM_ShutdownHandle *handle)
-{
-  if (GNUNET_SCHEDULER_NO_TASK != handle->close_msg_retransmission_task_id)
-    GNUNET_SCHEDULER_cancel (handle->close_msg_retransmission_task_id);
-  if (GNUNET_SCHEDULER_NO_TASK != handle->call_cont_task_id)
-    GNUNET_SCHEDULER_cancel (handle->call_cont_task_id);
-  handle->socket->shutdown_handle = NULL;
-  GNUNET_free (handle);
-}
-
-
-/**
- * Closes the stream
- *
- * @param socket the stream socket
- */
-void
-GNUNET_STREAM_close (struct GNUNET_STREAM_Socket *socket)
-{
-  struct MessageQueue *head;
-
-  if (NULL != socket->read_handle)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Closing STREAM socket when a read handle is pending\n");
-    GNUNET_STREAM_read_cancel (socket->read_handle);
-  }
-  if (NULL != socket->write_handle)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-        "Closing STREAM socket when a write handle is pending\n");
-    GNUNET_STREAM_write_cancel (socket->write_handle);
-    //socket->write_handle = NULL;
-  }
-  /* Terminate the ack'ing task if they are still present */
-  if (socket->ack_task_id != GNUNET_SCHEDULER_NO_TASK)
-  {
-    GNUNET_SCHEDULER_cancel (socket->ack_task_id);
-    socket->ack_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }
-  /* Terminate the control retransmission tasks */
-  if (GNUNET_SCHEDULER_NO_TASK != socket->control_retransmission_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (socket->control_retransmission_task_id);
-  }
-  /* Clear Transmit handles */
-  if (NULL != socket->transmit_handle)
-  {
-    GNUNET_MESH_notify_transmit_ready_cancel (socket->transmit_handle);
-    socket->transmit_handle = NULL;
-  }
-  /* Clear existing message queue */
-  while (NULL != (head = socket->queue_head)) {
-    GNUNET_CONTAINER_DLL_remove (socket->queue_head,
-                                socket->queue_tail,
-                                head);
-    GNUNET_free (head->message);
-    GNUNET_free (head);
-  }
-  /* Close associated tunnel */
-  if (NULL != socket->tunnel)
-  {
-    GNUNET_MESH_tunnel_destroy (socket->tunnel);
-    socket->tunnel = NULL;
-  }
-  /* Close mesh connection */
-  if ((NULL != socket->mesh) && (NULL == socket->lsocket))
-  {
-    GNUNET_MESH_disconnect (socket->mesh);
-    socket->mesh = NULL;
-  }
-  /* Close statistics connection */
-  if ( (NULL != socket->stat_handle) && (NULL == socket->lsocket) )
-    GNUNET_STATISTICS_destroy (socket->stat_handle, GNUNET_YES);
-  /* Release receive buffer */
-  if (NULL != socket->receive_buffer)
-  {
-    GNUNET_free (socket->receive_buffer);
-  }
-  GNUNET_free (socket);
-}
-
-
-/**
- * Listens for stream connections for a specific application ports
- *
- * @param cfg the configuration to use
- * @param app_port the application port for which new streams will be accepted
- * @param listen_cb this function will be called when a peer tries to establish
- *            a stream with us
- * @param listen_cb_cls closure for listen_cb
- * @param ... options to the stream, terminated by GNUNET_STREAM_OPTION_END
- * @return listen socket, NULL for any error
- */
-struct GNUNET_STREAM_ListenSocket *
-GNUNET_STREAM_listen (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                      uint32_t app_port,
-                      GNUNET_STREAM_ListenCallback listen_cb,
-                      void *listen_cb_cls,
-                      ...)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-  struct GNUNET_TIME_Relative listen_timeout;
-  enum GNUNET_STREAM_Option option;
-  va_list vargs;
-  uint16_t payload_size;
-
-  GNUNET_assert (NULL != listen_cb);
-  lsocket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_ListenSocket));
-  lsocket->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  lsocket->lockmanager = GNUNET_LOCKMANAGER_connect (lsocket->cfg);
-  if (NULL == lsocket->lockmanager)
-  {
-    GNUNET_CONFIGURATION_destroy (lsocket->cfg);
-    GNUNET_free (lsocket);
-    return NULL;
-  }
-  lsocket->listening = GNUNET_NO;/* We listen when we get a lock on app_port */  
-  /* Set defaults */
-  lsocket->retransmit_timeout = TIME_REL_SECS (default_timeout);
-  lsocket->testing_active = GNUNET_NO;
-  lsocket->listen_ok_cb = NULL;
-  lsocket->max_payload_size = DEFAULT_MAX_PAYLOAD_SIZE;
-  listen_timeout = TIME_REL_SECS (60); /* A minute for listen timeout */  
-  va_start (vargs, listen_cb_cls);
-  do {
-    option = va_arg (vargs, enum GNUNET_STREAM_Option);
-    switch (option)
-    {
-    case GNUNET_STREAM_OPTION_INITIAL_RETRANSMIT_TIMEOUT:
-      lsocket->retransmit_timeout = va_arg (vargs,
-                                            struct GNUNET_TIME_Relative);
-      break;
-    case GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER:
-      lsocket->testing_active = GNUNET_YES;
-      lsocket->testing_set_write_sequence_number_value = va_arg (vargs,
-                                                                 uint32_t);
-      break;
-    case GNUNET_STREAM_OPTION_LISTEN_TIMEOUT:
-      listen_timeout = GNUNET_TIME_relative_multiply
-        (GNUNET_TIME_UNIT_MILLISECONDS, va_arg (vargs, uint32_t));
-      break;
-    case GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS:
-      lsocket->listen_ok_cb = va_arg (vargs,
-                                      GNUNET_STREAM_ListenSuccessCallback);
-      break;
-    case GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE:
-      payload_size = (uint16_t) va_arg (vargs, unsigned int);
-      GNUNET_assert (0 != payload_size);
-      if (payload_size < lsocket->max_payload_size)
-       lsocket->max_payload_size = payload_size;
-      break;
-    case GNUNET_STREAM_OPTION_END:
-      break;
-    }
-  } while (GNUNET_STREAM_OPTION_END != option);
-  va_end (vargs);
-  lsocket->port = app_port;
-  lsocket->listen_cb = listen_cb;
-  lsocket->listen_cb_cls = listen_cb_cls;
-  lsocket->locking_request = 
-    GNUNET_LOCKMANAGER_acquire_lock (lsocket->lockmanager, locking_domain,
-                                     (uint32_t) lsocket->port,
-                                     &lock_status_change_cb, lsocket);
-  lsocket->lockmanager_acquire_timeout_task =
-    GNUNET_SCHEDULER_add_delayed (listen_timeout,
-                                  &lockmanager_acquire_timeout, lsocket);
-  lsocket->stat_handle = GNUNET_STATISTICS_create ("stream",
-                                                   lsocket->cfg);
-  return lsocket;
-}
-
-
-/**
- * Closes the listen socket
- *
- * @param lsocket the listen socket
- */
-void
-GNUNET_STREAM_listen_close (struct GNUNET_STREAM_ListenSocket *lsocket)
-{
-  /* Close MESH connection */
-  if (NULL != lsocket->mesh)
-    GNUNET_MESH_disconnect (lsocket->mesh);
-  if (NULL != lsocket->stat_handle)
-    GNUNET_STATISTICS_destroy (lsocket->stat_handle, GNUNET_YES);
-  GNUNET_CONFIGURATION_destroy (lsocket->cfg);
-  if (GNUNET_SCHEDULER_NO_TASK != lsocket->lockmanager_acquire_timeout_task)
-    GNUNET_SCHEDULER_cancel (lsocket->lockmanager_acquire_timeout_task);
-  if (NULL != lsocket->locking_request)
-    GNUNET_LOCKMANAGER_cancel_request (lsocket->locking_request);
-  if (NULL != lsocket->lockmanager)
-    GNUNET_LOCKMANAGER_disconnect (lsocket->lockmanager);
-  GNUNET_free (lsocket);
-}
-
-
-/**
- * Tries to write the given data to the stream. The maximum size of data that
- * can be written per a write operation is ~ 4MB (64 * (64000 - sizeof (struct
- * GNUNET_STREAM_DataMessage))). If size is greater than this it is not an API
- * violation, however only the said number of maximum bytes will be written.
- *
- * @param socket the socket representing a stream
- * @param data the data buffer from where the data is written into the stream
- * @param size the number of bytes to be written from the data buffer
- * @param timeout the timeout period
- * @param write_cont the function to call upon writing some bytes into the
- *          stream 
- * @param write_cont_cls the closure
- *
- * @return handle to cancel the operation; if a previous write is pending NULL
- *           is returned. If the stream has been shutdown for this operation or
- *           is broken then write_cont is immediately called and NULL is
- *           returned.
- */
-struct GNUNET_STREAM_WriteHandle *
-GNUNET_STREAM_write (struct GNUNET_STREAM_Socket *socket,
-                     const void *data,
-                     size_t size,
-                     struct GNUNET_TIME_Relative timeout,
-                     GNUNET_STREAM_CompletionContinuation write_cont,
-                     void *write_cont_cls)
-{
-  struct GNUNET_STREAM_WriteHandle *io_handle;
-  struct GNUNET_STREAM_DataMessage *dmsg;
-  const void *sweep;
-  struct GNUNET_TIME_Relative ack_deadline;
-  unsigned int num_needed_packets;
-  unsigned int cnt;
-  uint32_t packet_size;
-  uint32_t payload_size;
-  uint16_t max_data_packet_size;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s\n", __func__);
-  if (NULL != socket->write_handle)
-  {
-    GNUNET_break (0);
-    return NULL;
-  }
-  if (NULL == socket->tunnel)
-  {
-    if (NULL != write_cont)
-      write_cont (write_cont_cls, GNUNET_STREAM_SYSERR, 0);
-    return NULL;
-  }
-  switch (socket->state)
-  {
-  case STATE_TRANSMIT_CLOSED:
-  case STATE_TRANSMIT_CLOSE_WAIT:
-  case STATE_CLOSED:
-  case STATE_CLOSE_WAIT:
-    if (NULL != write_cont)
-      write_cont (write_cont_cls, GNUNET_STREAM_SHUTDOWN, 0);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s() END\n", __func__);
-    return NULL;
-  case STATE_INIT:
-  case STATE_LISTEN:
-  case STATE_HELLO_WAIT:
-    if (NULL != write_cont)
-      write_cont (write_cont_cls, GNUNET_STREAM_SYSERR, 0);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s() END\n", __func__);
-    return NULL;
-  case STATE_ESTABLISHED:
-  case STATE_RECEIVE_CLOSED:
-  case STATE_RECEIVE_CLOSE_WAIT:
-    break;
-  }
-  if (GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH * socket->max_payload_size < size)
-    size = GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH  * socket->max_payload_size;
-  num_needed_packets =
-      (size + (socket->max_payload_size - 1)) / socket->max_payload_size;
-  io_handle = GNUNET_malloc (sizeof (struct GNUNET_STREAM_WriteHandle));
-  io_handle->socket = socket;
-  io_handle->write_cont = write_cont;
-  io_handle->write_cont_cls = write_cont_cls;
-  io_handle->size = size;
-  io_handle->packets_sent = 0;
-  sweep = data;
-  /* FIXME: Remove the fixed delay for ack deadline; Set it to the value
-     determined from RTT */
-  ack_deadline = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5);
-  /* Divide the given buffer into packets for sending */
-  max_data_packet_size =
-      socket->max_payload_size + sizeof (struct GNUNET_STREAM_DataMessage);
-  io_handle->max_ack_base_num = socket->write_sequence_number;
-  for (cnt=0; cnt < num_needed_packets; cnt++)
-  {
-    if ((cnt + 1) * socket->max_payload_size < size) 
-    {
-      payload_size = socket->max_payload_size;
-      packet_size = max_data_packet_size;
-    }
-    else 
-    {
-      payload_size = size - (cnt * socket->max_payload_size);
-      packet_size = payload_size + sizeof (struct GNUNET_STREAM_DataMessage);
-    }
-    dmsg = GNUNET_malloc (packet_size);    
-    dmsg->header.size = htons (packet_size);
-    dmsg->header.type = htons (GNUNET_MESSAGE_TYPE_STREAM_DATA);
-    dmsg->sequence_number = htonl (socket->write_sequence_number++);
-    dmsg->offset = htonl (socket->write_offset);
-    /* FIXME: Remove the fixed delay for ack deadline; Set it to the value
-       determined from RTT */
-    dmsg->ack_deadline = GNUNET_TIME_relative_hton (ack_deadline);
-    /* Copy data from given buffer to the packet */
-    memcpy (&dmsg[1], sweep, payload_size);
-    io_handle->messages[cnt] = dmsg;
-    sweep += payload_size;
-    socket->write_offset += payload_size;
-  }
-  /* ack the last data message. FIXME: remove when we figure out how to do this
-     using RTT */
-  io_handle->messages[num_needed_packets - 1]->ack_deadline = 
-      GNUNET_TIME_relative_hton (GNUNET_TIME_UNIT_ZERO);
-  socket->data_retransmit_timeout = GNUNET_TIME_UNIT_SECONDS;
-  socket->write_handle = io_handle;
-  write_data (socket);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s() END\n", __func__);
-  return io_handle;
-}
-
-
-/**
- * Function to check the ACK bitmap for any received messages and call the data processor
- *
- * @param cls the socket
- * @param tc the scheduler task context
- */
-static void
-probe_data_availability (void *cls,
-                         const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct GNUNET_STREAM_Socket *socket = cls;
-
-  GNUNET_assert (NULL != socket->read_handle);
-  socket->read_handle->probe_data_availability_task_id =
-      GNUNET_SCHEDULER_NO_TASK;
-  if (GNUNET_SCHEDULER_NO_TASK != socket->read_handle->read_task_id)
-    return;     /* A task to call read processor is present */
-  if (GNUNET_YES == ackbitmap_is_bit_set (&socket->ack_bitmap,
-                                          0))
-    socket->read_handle->read_task_id 
-        = GNUNET_SCHEDULER_add_now (&call_read_processor, socket);
-}
-
-
-/**
- * Tries to read data from the stream. Should not be called when another read
- * handle is present; the existing read handle should be canceled with
- * GNUNET_STREAM_read_cancel(). Only one read handle per socket is present at
- * any time
- *
- * @param socket the socket representing a stream
- * @param timeout the timeout period
- * @param proc function to call with data (once only)
- * @param proc_cls the closure for proc
- * @return handle to cancel the operation; NULL is returned if the stream has
- *           been shutdown for this type of opeartion (the DataProcessor is
- *           immediately called with GNUNET_STREAM_SHUTDOWN as status)
- */
-struct GNUNET_STREAM_ReadHandle *
-GNUNET_STREAM_read (struct GNUNET_STREAM_Socket *socket,
-                    struct GNUNET_TIME_Relative timeout,
-                   GNUNET_STREAM_DataProcessor proc,
-                   void *proc_cls)
-{
-  struct GNUNET_STREAM_ReadHandle *read_handle;
-  
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%s: %s()\n", 
-       GNUNET_i2s (&socket->other_peer),
-       __func__);
-  /* Only one read handle is permitted at any time; cancel the existing or wait
-     for it to complete */
-  GNUNET_assert (NULL == socket->read_handle);
-  GNUNET_assert (NULL != proc);
-  if (GNUNET_YES == socket->receive_closed)
-    return NULL;
-  switch (socket->state)
-  {
-  case STATE_RECEIVE_CLOSED:
-  case STATE_RECEIVE_CLOSE_WAIT:
-  case STATE_CLOSED:
-  case STATE_CLOSE_WAIT:
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s: %s() END\n",
-         GNUNET_i2s (&socket->other_peer),
-         __func__);
-    proc (proc_cls, GNUNET_STREAM_SHUTDOWN, NULL, 0);
-    return NULL;
-  default:
-    break;
-  }
-  read_handle = GNUNET_malloc (sizeof (struct GNUNET_STREAM_ReadHandle));
-  read_handle->proc = proc;
-  read_handle->proc_cls = proc_cls;
-  read_handle->socket = socket;
-  socket->read_handle = read_handle;
-  read_handle->probe_data_availability_task_id =
-      GNUNET_SCHEDULER_add_now (&probe_data_availability, socket);
-  read_handle->read_io_timeout_task_id =
-      GNUNET_SCHEDULER_add_delayed (timeout, &read_io_timeout, socket);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "%s: %s() END\n",
-       GNUNET_i2s (&socket->other_peer), __func__);
-  return read_handle;
-}
-
-
-/**
- * Cancels pending write operation. Also cancels packet retransmissions which
- * may have resulted otherwise.
- *
- * CAUTION: Normally a write operation is considered successful if the data
- * given to it is sent and acknowledged by the receiver. As data is divided
- * into packets, it is possible that not all packets are received by the
- * receiver. Any missing packets are then retransmitted till the receiver
- * acknowledges all packets or until a timeout . During this scenario if the
- * write operation is cancelled all such retransmissions are also
- * cancelled. This may leave the receiver's receive buffer incompletely filled
- * as some missing packets are never retransmitted. So this operation should be
- * used before shutting down transmission from our side or before closing the
- * socket.
- *
- * @param wh write operation handle to cancel
- */
-void
-GNUNET_STREAM_write_cancel (struct GNUNET_STREAM_WriteHandle *wh)
-{
-  struct GNUNET_STREAM_Socket *socket = wh->socket;
-  unsigned int packet;
-
-  GNUNET_assert (NULL != socket->write_handle);
-  GNUNET_assert (socket->write_handle == wh);
-  if (GNUNET_SCHEDULER_NO_TASK != socket->data_retransmission_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (socket->data_retransmission_task_id);
-    socket->data_retransmission_task_id = GNUNET_SCHEDULER_NO_TASK;
-  }
-  for (packet=0; packet < GNUNET_STREAM_ACK_BITMAP_BIT_LENGTH; packet++)
-  {
-    if (NULL == wh->messages[packet]) break;
-    GNUNET_free (wh->messages[packet]);
-  }      
-  GNUNET_free (socket->write_handle);
-  socket->write_handle = NULL;
-}
-
-
-/**
- * Cancel pending read operation.
- *
- * @param rh read operation handle to cancel
- */
-void
-GNUNET_STREAM_read_cancel (struct GNUNET_STREAM_ReadHandle *rh)
-{
-  struct GNUNET_STREAM_Socket *socket;
-  
-  socket = rh->socket;
-  GNUNET_assert (NULL != socket->read_handle);
-  GNUNET_assert (rh == socket->read_handle);
-  cleanup_read_handle (socket);
-}
-
-
-/**
- * Functions of this signature are called whenever writing operations
- * on a stream are executed
- *
- * @param cls the closure from GNUNET_STREAM_write
- * @param status the status of the stream at the time this function is called;
- *          GNUNET_STREAM_OK if writing to stream was completed successfully;
- *          GNUNET_STREAM_TIMEOUT if the given data is not sent successfully
- *          (this doesn't mean that the data is never sent, the receiver may
- *          have read the data but its ACKs may have been lost);
- *          GNUNET_STREAM_SHUTDOWN if the stream is shutdown for writing in the
- *          mean time; GNUNET_STREAM_SYSERR if the stream is broken and cannot
- *          be processed.
- * @param size the number of bytes written
- */
-static void 
-mq_stream_write_queued (void *cls, enum GNUNET_STREAM_Status status,
-                        size_t size)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-  struct MQStreamState *mss = GNUNET_MQ_impl_state (mq);
-
-  switch (status)
-  {
-    case GNUNET_STREAM_OK:
-      break;
-    case GNUNET_STREAM_SHUTDOWN:
-      /* FIXME: call shutdown handler */
-      return;
-    case GNUNET_STREAM_TIMEOUT:
-      GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_TIMEOUT);
-      return;
-    case GNUNET_STREAM_SYSERR:
-      GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_WRITE);
-      return;
-    default:
-      GNUNET_assert (0);
-      return;
-  }
-
-  mss->wh = NULL;
-
-  GNUNET_MQ_impl_send_continue (mq);
-}
-
-
-static void
-mq_stream_send_impl (struct GNUNET_MQ_Handle *mq,
-                     const struct GNUNET_MessageHeader *msg, void *impl_state)
-{
-  struct MQStreamState *mss = impl_state;
-
-  /* no way to cancel sending now */
-  GNUNET_MQ_impl_send_commit (mq);
-
-  mss->wh = GNUNET_STREAM_write (mss->socket, msg, ntohs (msg->size),
-                                 GNUNET_TIME_UNIT_FOREVER_REL,
-                                 mq_stream_write_queued, mq);
-}
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call GNUNET_SERVER_mst_destroy in callback
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- *
- * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
- */
-static int
-mq_stream_mst_callback (void *cls, void *client,
-                        const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-
-  GNUNET_assert (NULL != message);
-  GNUNET_MQ_inject_message (mq, message);
-  return GNUNET_OK;
-}
-
-
-/**
- * Functions of this signature are called whenever data is available from the
- * stream.
- *
- * @param cls the closure from GNUNET_STREAM_read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read; will be 0 on timeout 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-mq_stream_data_processor (void *cls,
-                          enum GNUNET_STREAM_Status status,
-                          const void *data,
-                          size_t size)
-{
-  struct GNUNET_MQ_Handle *mq = cls;
-  struct MQStreamState *mss = GNUNET_MQ_impl_state (mq);
-  int ret;
-
-  switch (status)
-  {
-    case GNUNET_STREAM_OK:
-      break;
-    case GNUNET_STREAM_SHUTDOWN:
-      /* FIXME: call shutdown handler */
-      return 0;
-    case GNUNET_STREAM_TIMEOUT:
-      GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_TIMEOUT);
-      return 0;
-    case GNUNET_STREAM_SYSERR:
-      GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_READ);
-      return 0;
-    default:
-      GNUNET_assert (0);
-      return 0;
-  }
-  
-  ret = GNUNET_SERVER_mst_receive (mss->mst, NULL, data, size, GNUNET_NO, GNUNET_NO);
-  if (GNUNET_OK != ret)
-  {
-    GNUNET_MQ_inject_error (mq, GNUNET_MQ_ERROR_READ);
-    return 0;
-  }
-  mss->rh = GNUNET_STREAM_read (mss->socket, GNUNET_TIME_UNIT_FOREVER_REL, 
-                                mq_stream_data_processor, mq);
-  /* we always read all data */
-  return size;
-}
-
-
-static void
-mq_stream_destroy_impl (struct GNUNET_MQ_Handle *mq, void *impl_state)
-{
-  struct MQStreamState *mss = impl_state;
-
-  if (NULL != mss->rh)
-  {
-    GNUNET_STREAM_read_cancel (mss->rh);
-    mss->rh = NULL;
-  }
-
-  if (NULL != mss->wh)
-  {
-    GNUNET_STREAM_write_cancel (mss->wh);
-    mss->wh = NULL;
-  }
-
-  if (NULL != mss->mst)
-  {
-    GNUNET_SERVER_mst_destroy (mss->mst);
-    mss->mst = NULL;
-  }
-
-  GNUNET_free (mss);
-}
-
-
-
-/**
- * Create a message queue for a stream socket.
- *
- * @param socket the socket to read/write in the message queue
- * @param msg_handlers message handler array
- * @param error_handler callback for errors
- * @param cls closure for message handlers and error handler
- * @return the message queue for the socket
- */
-struct GNUNET_MQ_Handle *
-GNUNET_STREAM_mq_create (struct GNUNET_STREAM_Socket *socket, 
-                         const struct GNUNET_MQ_MessageHandler *msg_handlers,
-                         GNUNET_MQ_ErrorHandler error_handler,
-                         void *cls)
-{
-  struct GNUNET_MQ_Handle *mq;
-  struct MQStreamState *mss;
-
-  mss = GNUNET_new (struct MQStreamState);
-  mss->socket = socket;
-  mq = GNUNET_MQ_queue_for_callbacks (mq_stream_send_impl,
-                                      mq_stream_destroy_impl, 
-                                      NULL,
-                                      mss, msg_handlers, error_handler, cls);
-  if (NULL != msg_handlers)
-  {
-    mss->mst = GNUNET_SERVER_mst_create (mq_stream_mst_callback, mq);
-    mss->rh = GNUNET_STREAM_read (socket, GNUNET_TIME_UNIT_FOREVER_REL, 
-                                  mq_stream_data_processor, mq);
-  }
-  return mq;
-}
-
-/* end of stream_api.c */
diff --git a/src/stream/test_stream_2peers.c b/src/stream/test_stream_2peers.c
deleted file mode 100644 (file)
index 8d2e3ab..0000000
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/test_stream_2peers.c
- * @brief Stream API testing between 2 peers using testing API
- * @author Sree Harsha Totakura
- */
-
-#include <string.h>
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_mesh_service.h"
-#include "gnunet_stream_lib.h"
-#include "gnunet_testbed_service.h"
-
-/**
- * Number of peers; Do NOT change this
- */
-#define NUM_PEERS 2
-
-/**
- * Shorthand for Relative time in seconds
- */
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * Handle to testbed peer
-   */
-  struct GNUNET_TESTBED_Peer *peer;
-
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * The service connect operation to stream
-   */
-  struct GNUNET_TESTBED_Operation *op;
-
-  /**
-   * Our Peer id
-   */
-  struct GNUNET_PeerIdentity our_id;
-
-  /**
-   * Bytes the peer has written
-   */
-  unsigned int bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  unsigned int bytes_read;
-};
-
-
-/**
- * Different states in test setup
- */
-enum SetupState
-{
-  /**
-   * Get the identity of peer 1
-   */
-  PEER1_GET_IDENTITY,
-
-  /**
-   * Get the identity of peer 2
-   */
-  PEER2_GET_IDENTITY,
-  
-  /**
-   * Connect to stream service of peer 1
-   */
-  PEER1_STREAM_CONNECT,
-
-  /**
-   * Connect to stream service of peer 2
-   */
-  PEER2_STREAM_CONNECT
-
-};
-
-/**
- * Various states during test setup
- */
-static enum SetupState setup_state;
-
-/**
- * Data context for peer 1
- */
-static struct PeerData peer1;
-
-/**
- * Data context for peer 2
- */
-static struct PeerData peer2;
-
-/**
- * Testbed operation handle
- */
-static struct GNUNET_TESTBED_Operation *op;
-
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-
-static char *data = "ABCD";
-static int result;
-
-static int writing_success;
-static int reading_success;
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size);
-
-/**
- * Task for calling STREAM_read
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_read_task (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_read_handle = GNUNET_STREAM_read (peer->socket,
-                                             GNUNET_TIME_relative_multiply
-                                             (GNUNET_TIME_UNIT_SECONDS, 5),
-                                             &input_processor,
-                                             peer);
-  GNUNET_assert (NULL != peer->io_read_handle);
-}
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size);
-
-
-/**
- * Task for calling STREAM_write
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_write_handle = 
-    GNUNET_STREAM_write (peer->socket,
-                         (void *) data,
-                         strlen(data) - peer->bytes_wrote,
-                         GNUNET_TIME_relative_multiply
-                         (GNUNET_TIME_UNIT_SECONDS, 5),
-                         &write_completion,
-                         peer);
-  GNUNET_assert (NULL != peer->io_write_handle);
- }
-
-
-/**
- * Close sockets and stop testing deamons nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (NULL != peer1.socket)
-    GNUNET_STREAM_close (peer1.socket);
-  if (NULL != peer1.op)
-    GNUNET_TESTBED_operation_done (peer1.op);
-  else
-    GNUNET_SCHEDULER_shutdown (); /* For shutting down testbed */
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-static void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  static int shutdowns;
-
-  if (++shutdowns == 1)
-  {
-    peer1.shutdown_handle = NULL;
-    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
-                                                    &shutdown_completion, cls);
-    return;
-  }  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-  GNUNET_SCHEDULER_add_now (&do_close, cls);
-}
-
-
-/**
- * Shutdown sockets gracefully
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  result = GNUNET_OK;
-  peer1.shutdown_handle = GNUNET_STREAM_shutdown (peer1.socket, SHUT_RDWR,
-                                                  &shutdown_completion, cls);
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  result = GNUNET_SYSERR;
-  abort_task = 0;
-  do_close (cls, tc);  
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size)
-{
-  struct PeerData *peer=cls;
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= strlen (data));
-  peer->bytes_wrote += size;
-
-  if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
-    {
-      GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-    }
-  else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Writing completed\n");
-
-      if (&peer2 == peer)   /* Peer1 has finished writing; should read now */
-        {
-          peer->bytes_read = 0;
-          GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-        }
-      else
-        {
-          writing_success = GNUNET_YES;
-          if (GNUNET_YES == reading_success)
-            GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-        }
-    }
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *peer=cls;
-  
-  GNUNET_assert (&peer2 == peer);
-  GNUNET_assert (socket == peer2.socket);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Stream established from peer2\n",
-              GNUNET_i2s (&peer1.our_id));
-  peer->bytes_wrote = 0;
-  GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-}
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size)
-{
-  struct PeerData *peer;
-
-  peer = (struct PeerData *) cls;
-
-  if (GNUNET_STREAM_TIMEOUT == status)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Read operation timedout - reading again!\n");
-      GNUNET_assert (0 == size);
-      GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-      return 0;
-    }
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= strlen (data));
-  GNUNET_assert (0 == strncmp ((const char *) data + peer->bytes_read, 
-                               (const char *) input_data,
-                               size));
-  peer->bytes_read += size;
-  
-  if (peer->bytes_read < strlen (data))
-    {
-      GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-    }
-  else 
-    {
-      if (&peer1 == peer)    /* Peer2 has completed reading; should write */
-        {
-          peer->bytes_wrote = 0;
-          GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-        }
-      else                      /* Peer1 has completed reading. End of tests */
-        {
-          reading_success = GNUNET_YES;
-          if (GNUNET_YES == writing_success)
-            GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-        }
-    }
-  return size;
-}
-
-  
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the closure from GNUNET_STREAM_listen
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls,
-                  struct GNUNET_STREAM_Socket *socket,
-                  const struct GNUNET_PeerIdentity *initiator)
-{
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (NULL != initiator);
-  GNUNET_assert (socket != peer2.socket);
-  GNUNET_assert (0 == memcmp (initiator, &peer2.our_id, 
-                              sizeof (struct GNUNET_PeerIdentity)));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s: Peer connected: %s\n",
-              GNUNET_i2s (&peer1.our_id), GNUNET_i2s (initiator));  
-  peer1.socket = socket;
-  peer1.bytes_read = 0;
-  GNUNET_SCHEDULER_add_now (&stream_read_task, &peer1);
-  return GNUNET_OK;
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void stream_connect (void);
-
-
-/**
- * Adapter function called to destroy a connection to
- * a service.
- * 
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-static void
-stream_da (void *cls, void *op_result)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-  struct GNUNET_STREAM_Socket *socket;
-
-  if (&peer1 == cls)
-  {
-    lsocket = op_result;
-    GNUNET_STREAM_listen_close (lsocket);
-    if (NULL != peer2.op)
-      GNUNET_TESTBED_operation_done (peer2.op);
-    else
-      GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (&peer2 == cls)
-  {
-    socket = op_result;
-    GNUNET_STREAM_close (socket);
-    GNUNET_SCHEDULER_shutdown (); /* Exit point of the test */
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- * 
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- *          GNUNET_TESTBED_operation_done() is called on the operation returned
- *          from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void * 
-stream_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{  
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-  
-  switch (setup_state)
-  {
-  case PEER1_STREAM_CONNECT:
-    lsocket = GNUNET_STREAM_listen (cfg, 10, &stream_listen_cb, NULL,
-                                    GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                                    &stream_connect, GNUNET_STREAM_OPTION_END);
-    return lsocket;
-  case PEER2_STREAM_CONNECT:
-    peer2.socket = GNUNET_STREAM_open (cfg, &peer1.our_id, 10, &stream_open_cb,
-                                       &peer2, GNUNET_STREAM_OPTION_END);
-    return peer2.socket;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{ 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream listen open successful\n");
-  peer2.op = GNUNET_TESTBED_service_connect (&peer2, peer2.peer, "stream",
-                                            NULL, NULL,
-                                             stream_ca, stream_da, &peer2);
-  setup_state = PEER2_STREAM_CONNECT;
-}
-
-
-/**
- * Callback to be called when the requested peer information is available
- *
- * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
- */
-static void 
-peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
-            const struct GNUNET_TESTBED_PeerInformation *pinfo,
-            const char *emsg)
-{
-  GNUNET_assert (NULL == emsg);
-  GNUNET_assert (op == op_);
-  switch (setup_state)
-    {
-    case PEER1_GET_IDENTITY:
-      memcpy (&peer1.our_id, pinfo->result.id, 
-             sizeof (struct GNUNET_PeerIdentity));
-      GNUNET_TESTBED_operation_done (op);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 1 id: %s\n", GNUNET_i2s
-                  (&peer1.our_id));
-      op = GNUNET_TESTBED_peer_get_information (peer2.peer,
-                                                GNUNET_TESTBED_PIT_IDENTITY,
-                                               &peerinfo_cb, NULL);
-      setup_state = PEER2_GET_IDENTITY;
-      break;
-    case PEER2_GET_IDENTITY:
-      memcpy (&peer2.our_id, pinfo->result.id,
-              sizeof (struct GNUNET_PeerIdentity));
-      GNUNET_TESTBED_operation_done (op);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 2 id: %s\n", GNUNET_i2s
-                  (&peer2.our_id));
-      peer1.op = GNUNET_TESTBED_service_connect (&peer1, peer1.peer, "stream",
-                                                NULL, NULL, stream_ca,
-                                                stream_da, &peer1);
-      setup_state = PEER1_STREAM_CONNECT;
-      break;
-    default:
-      GNUNET_assert (0);
-    }
-}
-
-
-/**
- * Controller event callback
- *
- * @param cls NULL
- * @param event the controller event
- */
-static void
-controller_event_cb (void *cls,
-                     const struct GNUNET_TESTBED_EventInformation *event)
-{
-  switch (event->type)
-  {
-  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-    switch (setup_state)
-    {    
-    case PEER1_STREAM_CONNECT:
-    case PEER2_STREAM_CONNECT:
-      GNUNET_assert (NULL == event->details.operation_finished.emsg);
-      break;
-    default:
-      GNUNET_assert (0);
-    }
-    break;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Signature of a main function for a testcase.
- *
- * @param cls closure
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
- * @param links_succeeded the number of overlay link connection attempts that
- *          succeeded
- * @param links_failed the number of overlay link connection attempts that
- *          failed
- */
-static void
-test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers,
-             unsigned int links_succeeded,
-             unsigned int links_failed)
-{
-  GNUNET_assert (NULL != peers);
-  GNUNET_assert (NULL != peers[0]);
-  GNUNET_assert (NULL != peers[1]);
-  peer1.peer = peers[0];
-  peer2.peer = peers[1];
-  /* Get the peer identity and configuration of peers */
-  op = GNUNET_TESTBED_peer_get_information (peer1.peer,
-                                            GNUNET_TESTBED_PIT_IDENTITY,
-                                            &peerinfo_cb, NULL);
-  setup_state = PEER1_GET_IDENTITY;
-  abort_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 40), &do_abort,
-                                  NULL);
-}
-
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  uint64_t event_mask;  
-
-  result = GNUNET_NO;
-  event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  (void) GNUNET_TESTBED_test_run ("test_stream_2peers",
-                                  "test_stream_local.conf",
-                                  NUM_PEERS, event_mask, &controller_event_cb,
-                                  NULL,
-                                  &test_master, NULL);
-  if (GNUNET_SYSERR == result)
-    return 1;
-  return 0;
-}
diff --git a/src/stream/test_stream_2peers_halfclose.c b/src/stream/test_stream_2peers_halfclose.c
deleted file mode 100644 (file)
index 74fae30..0000000
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/test_stream_2peers_halfclose.c
- * @brief Testcases for Stream API halfclosed connections between 2 peers
- * @author Sree Harsha Totakura
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testbed_service.h"
-#include "gnunet_mesh_service.h"
-#include "gnunet_stream_lib.h"
-
-/**
- * Number of peers
- */
-#define NUM_PEERS 2
-
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * The testbed peer handle corresponding to this peer
-   */
-  struct GNUNET_TESTBED_Peer *peer;
-
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Testbed operation handle specific for this peer
-   */
-  struct GNUNET_TESTBED_Operation *op;
-
-  /**
-   * Our Peer id
-   */
-  struct GNUNET_PeerIdentity our_id;
-
-  /**
-   * Bytes the peer has written
-   */
-  unsigned int bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  unsigned int bytes_read;
-
-  /**
-   * GNUNET_YES if the peer has successfully completed the current test
-   */
-  unsigned int test_ok;
-
-  /**
-   * The shutdown operation that has to be used by the stream_shutdown_task
-   */
-  int shutdown_operation;
-};
-
-
-/**
- * Enumeration for various tests that are to be passed in the same order as
- * below
- */
-enum Test
-{
-  /**
-   * Peer1 writing; Peer2 reading
-   */
-  PEER1_WRITE,
-
-  /**
-   * Peer1 write shutdown; Peer2 should get an error when it tries to read;
-   */
-  PEER1_WRITE_SHUTDOWN,
-
-  /**
-   * Peer1 reads; Peer2 writes (connection is halfclosed)
-   */
-  PEER1_HALFCLOSE_READ,
-
-  /**
-   * Peer1 attempts to write; Should fail with stream already shutdown error
-   */
-  PEER1_HALFCLOSE_WRITE_FAIL,
-
-  /**
-   * Peer1 read shutdown; Peer2 should get stream shutdown error during write
-   */
-  PEER1_READ_SHUTDOWN,
-
-  /**
-   * All tests successfully finished
-   */
-  SUCCESS
-};
-
-
-/**
- * Different states in test setup
- */
-enum SetupState
-{
-  /**
-   * Get the identity of peer 1
-   */
-  PEER1_GET_IDENTITY,
-
-  /**
-   * Get the identity of peer 2
-   */
-  PEER2_GET_IDENTITY,
-
-  /**
-   * Connect to stream service of peer 2
-   */
-  PEER2_STREAM_CONNECT,
-  
-  /**
-   * Connect to stream service of peer 1
-   */
-  PEER1_STREAM_CONNECT
-
-};
-
-
-/**
- * Peer1 writes first and then calls for SHUT_WR
- * Peer2 reads first and then calls for SHUT_RD
- * Attempt to write again by Peer1 should be rejected
- * Attempt to read again by Peer2 should be rejected
- * Peer1 then reads from Peer2 which writes
- */
-static struct PeerData peer1;
-static struct PeerData peer2;
-
-/**
- * Task for aborting the test case if it takes too long
- */
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-
-/**
- * Task for reading from stream
- */
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
-
-static char *data = "ABCD";
-
-/**
- * Handle to testbed operation
- */
-struct GNUNET_TESTBED_Operation *op;
-
-/**
- * Final testing result
- */
-static int result;
-
-/**
- * Current running test
- */
-enum Test current_test;
-
-/**
- * State is test setup
- */
-enum SetupState setup_state;
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size);
-
-
-/**
- * The transition function; responsible for the transitions among tests
- */
-static void
-transition();
-
-
-/**
- * Task for calling STREAM_read
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_read_task (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_read_handle = GNUNET_STREAM_read (peer->socket,
-                                             GNUNET_TIME_relative_multiply
-                                             (GNUNET_TIME_UNIT_SECONDS, 5),
-                                             &input_processor,
-                                             cls);
-  switch (current_test)
-    {
-    case PEER1_WRITE_SHUTDOWN:
-      GNUNET_assert (&peer2 == peer);
-      GNUNET_assert (NULL == peer->io_read_handle);
-      peer2.test_ok = GNUNET_YES;
-      transition ();            /* to PEER1_HALFCLOSE_READ */
-      break;
-    default:
-      GNUNET_assert (NULL != peer->io_read_handle);
-    }
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size);
-
-
-/**
- * Task for calling STREAM_write
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_write_handle = 
-    GNUNET_STREAM_write (peer->socket,
-                         (void *) data,
-                         strlen(data) - peer->bytes_wrote,
-                         GNUNET_TIME_relative_multiply
-                         (GNUNET_TIME_UNIT_SECONDS, 5),
-                         &write_completion,
-                         peer);
-  switch (current_test)
-    {
-    case PEER1_HALFCLOSE_WRITE_FAIL:
-      GNUNET_assert (&peer1 == peer);
-      GNUNET_assert (NULL == peer->io_write_handle);
-      transition();             /* To PEER1_READ_SHUTDOWN */
-      break;
-    case PEER1_READ_SHUTDOWN:
-      GNUNET_assert (&peer2 == peer);
-      GNUNET_assert (NULL == peer->io_write_handle);
-      transition ();            /* To SUCCESS */
-      break;
-    default:
-        GNUNET_assert (NULL != peer->io_write_handle);
-    }
-}
-
-
-/**
- * Close sockets and stop testing deamons nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  if (NULL != peer2.socket)
-    GNUNET_STREAM_close (peer2.socket);
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (NULL != peer2.op)
-    GNUNET_TESTBED_operation_done (peer2.op);
-  else
-    GNUNET_SCHEDULER_shutdown (); /* For shutting down testbed */
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  switch (current_test)
-    {
-    case PEER1_WRITE:
-      GNUNET_assert (0);
-    case PEER1_WRITE_SHUTDOWN:
-      GNUNET_assert (cls == &peer1);
-      GNUNET_assert (SHUT_WR == operation);
-      peer1.test_ok = GNUNET_YES;
-      /* Peer2 should read with error */
-      peer2.bytes_read = 0;
-      GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-      break;
-    case PEER1_READ_SHUTDOWN:
-      peer1.test_ok = GNUNET_YES;
-      peer2.bytes_wrote = 0;
-      GNUNET_SCHEDULER_add_now (&stream_write_task, &peer2);
-      break;
-    case PEER1_HALFCLOSE_READ:
-    case PEER1_HALFCLOSE_WRITE_FAIL:
-    case SUCCESS:
-      GNUNET_assert (0);        /* We shouldn't reach here */
-    }
-}
-
-
-/**
- * Task for calling STREAM_shutdown
- *
- * @param cls the peer entity
- * @param tc the TaskContext
- */
-static void
-stream_shutdown_task (void *cls,
-                      const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-
-  peer->shutdown_handle = GNUNET_STREAM_shutdown (peer->socket,
-                                                  peer->shutdown_operation,
-                                                  &shutdown_completion,
-                                                  peer);
-  GNUNET_assert (NULL != peer->shutdown_handle);
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  if (0 != read_task)
-    {
-      GNUNET_SCHEDULER_cancel (read_task);
-    }
-  result = GNUNET_SYSERR;
-  abort_task = 0;
-  do_close (cls, tc);  
-}
-
-
-/**
- * The transition function; responsible for the transitions among tests
- */
-static void
-transition()
-{
-  if ((GNUNET_YES == peer1.test_ok) && (GNUNET_YES == peer2.test_ok))
-    {
-      peer1.test_ok = GNUNET_NO;
-      peer2.test_ok = GNUNET_NO;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "TEST %d SUCCESSFULL\n", current_test);
-      switch (current_test)
-        {
-        case PEER1_WRITE:
-          current_test = PEER1_WRITE_SHUTDOWN;
-          /* Peer1 should shutdown writing */
-          peer1.shutdown_operation = SHUT_WR;
-          GNUNET_SCHEDULER_add_now (&stream_shutdown_task, &peer1);
-          break;
-        case PEER1_WRITE_SHUTDOWN:
-          current_test = PEER1_HALFCLOSE_READ;
-          /* Peer2 should be able to write successfully */
-          peer2.bytes_wrote = 0;
-          GNUNET_SCHEDULER_add_now (&stream_write_task, &peer2);
-          
-          /* Peer1 should be able to read successfully */
-          peer1.bytes_read = 0;
-          GNUNET_SCHEDULER_add_now (&stream_read_task, &peer1);
-          break;
-        case PEER1_HALFCLOSE_READ:
-          current_test = PEER1_HALFCLOSE_WRITE_FAIL;
-          peer1.bytes_wrote = 0;
-          peer2.bytes_read = 0;
-          peer2.test_ok = GNUNET_YES;
-          GNUNET_SCHEDULER_add_now (&stream_write_task, &peer1);
-          break;
-        case PEER1_HALFCLOSE_WRITE_FAIL:
-          current_test = PEER1_READ_SHUTDOWN;
-          peer1.shutdown_operation = SHUT_RD;
-          GNUNET_SCHEDULER_add_now (&stream_shutdown_task, &peer1);
-          break;
-        case PEER1_READ_SHUTDOWN:
-          current_test = SUCCESS;
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "All tests successful\n");
-          GNUNET_SCHEDULER_add_now (&do_close, NULL);
-          break;
-        case SUCCESS:
-          GNUNET_assert (0);    /* We shouldn't reach here */
-          
-        }
-    }
-}
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size)
-{
-  struct PeerData *peer = cls;
-
-  switch (current_test)
-    {
-    case PEER1_WRITE:
-    case PEER1_HALFCLOSE_READ:
-
-    GNUNET_assert (GNUNET_STREAM_OK == status);
-    GNUNET_assert (size <= strlen (data));
-    peer->bytes_wrote += size;
-
-    if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
-      {
-        GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-      }
-    else
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "Writing completed\n");
-
-        if (&peer1 == peer)
-          {
-            peer1.test_ok = GNUNET_YES;
-            transition ();       /* to PEER1_WRITE_SHUTDOWN */
-          }
-        else            /* This will happen during PEER1_HALFCLOSE_READ */
-          {
-            peer2.test_ok = GNUNET_YES;
-            transition ();      /* to PEER1_HALFCLOSE_WRITE_FAIL */
-          }
-      }
-    break;
-    case PEER1_HALFCLOSE_WRITE_FAIL:
-      GNUNET_assert (peer == &peer1);
-      GNUNET_assert (GNUNET_STREAM_SHUTDOWN == status);
-      GNUNET_assert (0 == size);
-      peer1.test_ok = GNUNET_YES;
-      break;
-    case PEER1_READ_SHUTDOWN:
-      GNUNET_assert (peer == &peer2);
-      GNUNET_assert (GNUNET_STREAM_SHUTDOWN == status);
-      GNUNET_assert (0 == size);
-      peer2.test_ok = GNUNET_YES;
-      break;
-    case PEER1_WRITE_SHUTDOWN:
-    case SUCCESS:
-      GNUNET_assert (0);        /* We shouldn't reach here */
-    } 
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *peer;
-
-  GNUNET_assert (socket == peer1.socket);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s: Stream established from peer1\n",
-              GNUNET_i2s (&peer1.our_id));
-  peer = (struct PeerData *) cls;
-  peer->bytes_wrote = 0;
-  GNUNET_assert (socket == peer1.socket);
-  GNUNET_assert (socket == peer->socket);
-  peer1.test_ok = GNUNET_NO;
-  peer2.test_ok = GNUNET_NO;
-  current_test = PEER1_WRITE;
-  GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-}
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size)
-{
-  struct PeerData *peer;
-
-  peer = (struct PeerData *) cls;
-
-  switch (current_test)
-    {
-    case PEER1_WRITE:
-    case PEER1_HALFCLOSE_READ:
-      if (GNUNET_STREAM_TIMEOUT == status)
-        {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Read operation timedout - reading again!\n");
-          GNUNET_assert (0 == size);
-          GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-          return 0;
-        }
-
-      GNUNET_assert (GNUNET_STREAM_OK == status);
-      GNUNET_assert (size <= strlen (data));
-      GNUNET_assert (0 == strncmp ((const char *) data + peer->bytes_read,
-                                   (const char *) input_data,
-                                   size));
-      peer->bytes_read += size;
-  
-      if (peer->bytes_read < strlen (data))
-        {
-          GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-        }
-      else  
-        {
-          if (&peer2 == peer) /* Peer2 has completed reading; should write */
-            {
-              peer2.test_ok = GNUNET_YES;
-              transition ();    /* Transition to PEER1_WRITE_SHUTDOWN */
-            }
-          else         /* Peer1 has completed reading. End of tests */
-            {
-              peer1.test_ok = GNUNET_YES;
-              transition ();    /* to PEER1_HALFCLOSE_WRITE_FAIL */
-            }
-        }
-      break;
-    case PEER1_WRITE_SHUTDOWN:
-      GNUNET_assert (0);        /* This callback will not be called when stream
-                                   is shutdown */
-      break;
-    case PEER1_HALFCLOSE_WRITE_FAIL:
-    case PEER1_READ_SHUTDOWN:
-    case SUCCESS:
-      GNUNET_assert (0);        /* We shouldn't reach here */
-    }
-  
-  return size;
-}
-
-  
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  read_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_assert (NULL != cls);
-  peer2.bytes_read = 0;
-  GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-}
-
-
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the closure from GNUNET_STREAM_listen
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls,
-                  struct GNUNET_STREAM_Socket *socket,
-                  const struct GNUNET_PeerIdentity *initiator)
-{
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (socket != peer1.socket);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "%s: Peer connected: %s\n",
-              GNUNET_i2s (&peer2.our_id),
-              GNUNET_i2s(initiator));
-  peer2.socket = socket;
-  /* FIXME: reading should be done right now instead of a scheduled call */
-  read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
-  return GNUNET_OK;
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void);
-
-
-/**
- * Adapter function called to destroy a connection to
- * a service.
- * 
- * @param cls closure
- * @param op_result service handle returned from the connect adapter
- */
-static void
-stream_da (void *cls, void *op_result)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-
-  if (&peer2 == cls)
-  {
-    lsocket = op_result;
-    GNUNET_STREAM_listen_close (lsocket);
-    if (NULL != peer1.op)
-      GNUNET_TESTBED_operation_done (peer1.op);
-    else
-      GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (&peer1 == cls)
-  {
-    GNUNET_assert (op_result == peer1.socket);
-    GNUNET_STREAM_close (peer1.socket);
-    GNUNET_SCHEDULER_shutdown (); /* Exit point of the test */
-    return;
-  }
-  GNUNET_assert (0);
-}
-
-
-/**
- * Adapter function called to establish a connection to
- * a service.
- * 
- * @param cls closure
- * @param cfg configuration of the peer to connect to; will be available until
- *          GNUNET_TESTBED_operation_done() is called on the operation returned
- *          from GNUNET_TESTBED_service_connect()
- * @return service handle to return in 'op_result', NULL on error
- */
-static void * 
-stream_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_STREAM_ListenSocket *lsocket;
-  
-  switch (setup_state)
-  {
-  case PEER2_STREAM_CONNECT:
-    lsocket = GNUNET_STREAM_listen (cfg, 10, &stream_listen_cb, NULL,
-                                    GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                                    &stream_connect, GNUNET_STREAM_OPTION_END);
-    GNUNET_assert (NULL != lsocket);
-    return lsocket;
-  case PEER1_STREAM_CONNECT:
-    peer1.socket = GNUNET_STREAM_open (cfg, &peer2.our_id, 10, &stream_open_cb,
-                                       &peer1, GNUNET_STREAM_OPTION_END);
-    GNUNET_assert (NULL != peer1.socket);
-    return peer1.socket;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{ 
-  GNUNET_assert (PEER2_STREAM_CONNECT == setup_state);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream listen open successful\n");  
-  peer1.op = GNUNET_TESTBED_service_connect (&peer1, peer1.peer, "stream",
-                                            NULL, NULL,
-                                             stream_ca, stream_da, &peer1);
-  setup_state = PEER1_STREAM_CONNECT;
-}
-
-
-/**
- * Callback to be called when the requested peer information is available
- *
- * @param cb_cls the closure from GNUNET_TETSBED_peer_get_information()
- * @param op the operation this callback corresponds to
- * @param pinfo the result; will be NULL if the operation has failed
- * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
- */
-static void 
-peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
-            const struct GNUNET_TESTBED_PeerInformation *pinfo,
-            const char *emsg)
-{
-  GNUNET_assert (NULL == emsg);
-  GNUNET_assert (op == op_);
-  switch (setup_state)
-  {
-  case PEER1_GET_IDENTITY:
-    memcpy (&peer1.our_id, pinfo->result.id, 
-            sizeof (struct GNUNET_PeerIdentity));
-    GNUNET_TESTBED_operation_done (op);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 1 id: %s\n", GNUNET_i2s
-                (&peer1.our_id));
-    op = GNUNET_TESTBED_peer_get_information (peer2.peer,
-                                              GNUNET_TESTBED_PIT_IDENTITY,
-                                              &peerinfo_cb, NULL);
-    setup_state = PEER2_GET_IDENTITY;
-    break;
-  case PEER2_GET_IDENTITY:
-    memcpy (&peer2.our_id, pinfo->result.id,
-            sizeof (struct GNUNET_PeerIdentity));
-    GNUNET_TESTBED_operation_done (op);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer 2 id: %s\n", GNUNET_i2s
-                (&peer2.our_id));
-    peer2.op = GNUNET_TESTBED_service_connect (&peer2, peer2.peer, "stream",
-                                               NULL, NULL,
-                                               stream_ca, stream_da, &peer2);
-    setup_state = PEER2_STREAM_CONNECT;
-    break;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Controller event callback
- *
- * @param cls NULL
- * @param event the controller event
- */
-static void 
-controller_event_cb (void *cls,
-                     const struct GNUNET_TESTBED_EventInformation *event)
-{
-  switch (event->type)
-  {
-  case GNUNET_TESTBED_ET_OPERATION_FINISHED:
-    switch (setup_state)
-    {
-    case PEER1_STREAM_CONNECT:
-    case PEER2_STREAM_CONNECT:
-      GNUNET_assert (NULL == event->details.operation_finished.emsg);
-      break;
-    default:
-      GNUNET_assert (0);
-    }
-    break;
-  default:
-    GNUNET_assert (0);
-  }
-}
-
-
-/**
- * Signature of a main function for a testcase.
- *
- * @param cls closure
- * @param num_peers number of peers in 'peers'
- * @param peers handle to peers run in the testbed
- * @param links_succeeded the number of overlay link connection attempts that
- *          succeeded
- * @param links_failed the number of overlay link connection attempts that
- *          failed
- */
-static void
-test_master (void *cls, unsigned int num_peers,
-             struct GNUNET_TESTBED_Peer **peers,
-             unsigned int links_succeeded,
-             unsigned int links_failed)
-{
-  GNUNET_assert (NULL != peers);
-  GNUNET_assert (NULL != peers[0]);
-  GNUNET_assert (NULL != peers[1]);
-  peer1.peer = peers[0];
-  peer2.peer = peers[1];
-  op = GNUNET_TESTBED_peer_get_information (peer1.peer,
-                                            GNUNET_TESTBED_PIT_IDENTITY,
-                                            &peerinfo_cb, NULL);
-  setup_state = PEER1_GET_IDENTITY;
-  abort_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 1000), &do_abort,
-                                  NULL);
-}
-
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  uint64_t event_mask;  
-
-  result = GNUNET_NO;
-  event_mask = 0;
-  event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
-  (void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
-                                  "test_stream_local.conf", NUM_PEERS,
-                                  event_mask,
-                                  &controller_event_cb, NULL, &test_master,
-                                  NULL);
-  if (GNUNET_SYSERR == result)
-    return 1;
-  return 0;
-}
diff --git a/src/stream/test_stream_big.c b/src/stream/test_stream_big.c
deleted file mode 100644 (file)
index a60d2ce..0000000
+++ /dev/null
@@ -1,429 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/test_stream_big.c
- * @brief large data transfer using stream API between local peers
- * @author Sree Harsha Totakura
- */
-
-#include <string.h>
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib.h"
-
-#define LOG(kind, ...)                         \
-  GNUNET_log (kind, __VA_ARGS__);
-
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  struct GNUNET_PeerIdentity self;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Bytes the peer has written
-   */
-  unsigned int bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  unsigned int bytes_read;
-};
-
-static struct PeerData peer1;
-static struct PeerData peer2;
-static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
-static const struct GNUNET_CONFIGURATION_Handle *config;
-
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
-static GNUNET_SCHEDULER_TaskIdentifier write_task;
-
-#define DATA_SIZE 65536      /* 64KB */
-static uint32_t data[DATA_SIZE / 4];     /* 64KB array */
-static int result;
-
-/**
- * Shutdown nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (NULL != peer1.socket)
-    GNUNET_STREAM_close (peer1.socket);
-  if (NULL != peer2.socket)
-    GNUNET_STREAM_close (peer2.socket);
-  if (NULL != peer2_listen_socket)
-    GNUNET_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  if (GNUNET_SCHEDULER_NO_TASK != read_task)
-      GNUNET_SCHEDULER_cancel (read_task);
-  result = GNUNET_SYSERR;
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
-  do_close (cls, tc);
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-static void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  static int shutdowns;
-
-  if (++shutdowns == 1)
-  {
-    peer1.shutdown_handle = NULL;
-    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
-                                                    &shutdown_completion, cls);
-    return;
-  }  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-  GNUNET_SCHEDULER_add_now (&do_close, cls);
-}
-
-
-/**
- * Shutdown sockets gracefully
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  result = GNUNET_OK;
-  peer1.shutdown_handle = GNUNET_STREAM_shutdown (peer1.socket, SHUT_RDWR,
-                                                  &shutdown_completion, cls);
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size)
-{
-  struct PeerData *peer;
-
-  peer = (struct PeerData *) cls;
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= DATA_SIZE);
-  peer->bytes_wrote += size;
-
-  if (peer->bytes_wrote < DATA_SIZE) /* Have more data to send */
-    {
-      peer->io_write_handle =
-        GNUNET_STREAM_write (peer->socket,
-                             ((void *) data) + peer->bytes_wrote,
-                            sizeof (data) - peer->bytes_wrote,
-                             GNUNET_TIME_relative_multiply
-                             (GNUNET_TIME_UNIT_SECONDS, 5),
-                             &write_completion,
-                             cls);
-      GNUNET_assert (NULL != peer->io_write_handle);
-    }
-  else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing successfully finished\n");
-      result = GNUNET_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-    }
-}
-
-
-/**
- * Task for calling STREAM_write with a chunk of random data
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer=cls;
-  unsigned int count;
-
-  write_task = GNUNET_SCHEDULER_NO_TASK;
-  for (count=0; count < DATA_SIZE / 4; count++)
-    {
-      data[count]=GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                            UINT32_MAX);
-    }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Generation of random data complete\n");
-  peer->io_write_handle = GNUNET_STREAM_write (peer->socket,
-                                               data,
-                                               sizeof (data),
-                                               GNUNET_TIME_relative_multiply
-                                               (GNUNET_TIME_UNIT_SECONDS, 10),
-                                               &write_completion,
-                                               peer);
-  GNUNET_assert (NULL != peer->io_write_handle);
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *peer;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream established from peer1\n");
-  peer = (struct PeerData *) cls;
-  peer->bytes_wrote = 0;
-  GNUNET_assert (socket == peer1.socket);
-  GNUNET_assert (socket == peer->socket);
-  write_task = GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-}
-
-
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Input processor
- *
- * @param cls peer2
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size)
-{
-  struct PeerData *peer = cls;
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (&peer2 == peer);
-  GNUNET_assert (size < DATA_SIZE);
-  GNUNET_assert (0 == memcmp (((void *)data ) + peer->bytes_read, 
-                             input_data, size));
-  peer->bytes_read += size;
-  
-  if (peer->bytes_read < DATA_SIZE)
-  {
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == read_task);
-    read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-    /* peer->io_read_handle = GNUNET_STREAM_read ((struct GNUNET_STREAM_Socket *) */
-    /*                                            peer->socket, */
-    /*                                            GNUNET_TIME_relative_multiply */
-    /*                                            (GNUNET_TIME_UNIT_SECONDS, 5), */
-    /*                                            &input_processor, */
-    /*                                            cls); */
-    /* GNUNET_assert (NULL != peer->io_read_handle); */
-  }
-  else 
-  {
-    /* Peer2 has completed reading*/
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Reading finished successfully\n");
-  } 
-  return size;
-}
-
-  
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-
-  read_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_assert (&peer2 == peer);  
-  peer->io_read_handle =
-    GNUNET_STREAM_read (peer->socket,
-                        GNUNET_TIME_relative_multiply
-                        (GNUNET_TIME_UNIT_SECONDS, 10),
-                        &input_processor,
-                        peer);
-  GNUNET_assert (NULL != peer->io_read_handle);
-}
-
-
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the closure from GNUNET_STREAM_listen
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls,
-                 struct GNUNET_STREAM_Socket *socket,
-                 const struct GNUNET_PeerIdentity *initiator)
-{
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (NULL != socket);
-  GNUNET_assert (socket != peer1.socket);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer connected: %s\n", GNUNET_i2s(initiator));
-
-  peer2.socket = socket;
-  peer2.bytes_read = 0;
-  read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-  return GNUNET_OK;
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{
-  struct PeerData *peer = &peer1;
-
-  /* Connect to stream */
-  peer->socket = GNUNET_STREAM_open (config,
-                                     &peer2.self,         /* Null for local peer? */
-                                     10,           /* App port */
-                                     &stream_open_cb, &peer1,
-                                    GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE, 500,
-                                    GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer->socket);
-}
-
-
-/**
- * Initialize framework and start test
- *
- * @param cls closure
- * @param cfg configuration of the peer that was started
- * @param peer identity of the peer that was created
- */
-static void
-run (void *cls, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  struct GNUNET_PeerIdentity self;
-  
-  GNUNET_TESTING_peer_get_identity (peer, &self);
-  config = cfg;  
-  peer2_listen_socket = 
-    GNUNET_STREAM_listen (config,
-                          10, /* App port */
-                          &stream_listen_cb,
-                          NULL,
-                          GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                          &stream_connect,
-                          GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer2_listen_socket);
-  peer1.self = self;
-  peer2.self = self;
-  abort_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort,
-                                  NULL);
-}
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  if (0 != GNUNET_TESTING_peer_run ("test_stream_big",
-                                   "test_stream_local.conf",
-                                   &run, NULL))
-    return 1;
-  return (GNUNET_SYSERR == result) ? 1 : 0;
-}
-
-/* end of test_stream_big.c */
diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c
deleted file mode 100644 (file)
index cb23cd5..0000000
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/test_stream_local.c
- * @brief Stream API testing between local peers
- * @author Sree Harsha Totakura
- */
-
-#include <string.h>
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_mesh_service.h"
-#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib.h"
-
-/**
- * Relative seconds shorthand
- */
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Bytes the peer has written
-   */
-  unsigned int bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  unsigned int bytes_read;
-};
-
-static struct PeerData peer1;
-static struct PeerData peer2;
-static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
-static const struct GNUNET_CONFIGURATION_Handle *config;
-static struct GNUNET_TESTING_Peer *self;
-static struct GNUNET_PeerIdentity self_id;
-
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-
-static char *data = "ABCD";
-static int result;
-
-static int writing_success;
-static int reading_success;
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size);
-
-/**
- * Task for calling STREAM_read
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_read_task (void *cls,
-                  const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_read_handle = GNUNET_STREAM_read (peer->socket,
-                                             GNUNET_TIME_relative_multiply
-                                             (GNUNET_TIME_UNIT_SECONDS, 5),
-                                             &input_processor,
-                                             peer);
-  GNUNET_assert (NULL != peer->io_read_handle);
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size);
-
-
-/**
- * Task for calling STREAM_write
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-  
-  peer->io_write_handle = 
-    GNUNET_STREAM_write (peer->socket,
-                         (void *) data,
-                         strlen(data) - peer->bytes_wrote,
-                         GNUNET_TIME_relative_multiply
-                         (GNUNET_TIME_UNIT_SECONDS, 5),
-                         &write_completion,
-                         peer);
-  GNUNET_assert (NULL != peer->io_write_handle);
- }
-
-
-/**
- * Shutdown nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (NULL != peer1.socket)
-    GNUNET_STREAM_close (peer1.socket);
-  if (NULL != peer2.socket)
-    GNUNET_STREAM_close (peer2.socket);
-  if (NULL != peer2_listen_socket)
-    GNUNET_STREAM_listen_close (peer2_listen_socket);
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  result = GNUNET_SYSERR;
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
-  do_close (cls, tc);
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-static void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  static int shutdowns;
-
-  if (++shutdowns == 1)
-  {
-    peer1.shutdown_handle = NULL;
-    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
-                                                    &shutdown_completion, cls);
-    return;
-  }  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-  GNUNET_SCHEDULER_add_now (&do_close, cls);
-}
-
-
-/**
- * Shutdown sockets gracefully
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  result = GNUNET_OK;
-  peer1.shutdown_handle = GNUNET_STREAM_shutdown (peer1.socket, SHUT_RDWR,
-                                                  &shutdown_completion, cls);
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size)
-{
-  struct PeerData *peer=cls;
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= strlen (data));
-  peer->bytes_wrote += size;
-  if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
-    {
-      GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-    }
-  else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Writing completed\n");
-      if (&peer1 == peer)  /* Peer1 has finished writing; should read now */
-        {
-          peer->bytes_read = 0;
-          GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-        }
-      else
-        {
-          writing_success = GNUNET_YES;
-          if (GNUNET_YES == reading_success)
-            GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-        }
-    }
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *peer=cls;
-
-  GNUNET_assert (&peer1 == peer);
-  GNUNET_assert (socket == peer1.socket);
-  GNUNET_assert (socket == peer->socket);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream established from peer1\n");
-  peer->bytes_wrote = 0;
-  GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-}
-
-
-/**
- * Input processor
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size)
-{
-  struct PeerData *peer = cls;
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= strlen (data));
-  GNUNET_assert (0 == strncmp ((const char *) data + peer->bytes_read, 
-                               (const char *) input_data,
-                               size));
-  peer->bytes_read += size;  
-  if (peer->bytes_read < strlen (data))
-    {
-      GNUNET_SCHEDULER_add_now (&stream_read_task, peer);
-    }
-  else 
-    {
-      if (&peer2 == peer)    /* Peer2 has completed reading; should write */
-        {
-          peer->bytes_wrote = 0;
-          GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-        }
-      else                      /* Peer1 has completed reading. End of tests */
-        {
-          reading_success = GNUNET_YES;
-          if (GNUNET_YES == writing_success)
-            GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-        }
-    } 
-  return size;
-}
-
-  
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the PeerData of peer2
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls,
-           struct GNUNET_STREAM_Socket *socket,
-           const struct GNUNET_PeerIdentity *initiator)
-{
-  struct PeerData *peer=cls;
-
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (NULL != socket);
-  GNUNET_assert (socket != peer1.socket);
-  GNUNET_assert (&peer2 == peer);
-  GNUNET_assert (0 == memcmp (&self_id,
-                              initiator,
-                              sizeof (struct GNUNET_PeerIdentity)));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer connected: %s\n", GNUNET_i2s(initiator));
-  peer->socket = socket;
-  peer->bytes_read = 0;
-  GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-  return GNUNET_OK;
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{
-  peer1.socket = GNUNET_STREAM_open (config,
-                                     &self_id,
-                                     10,           /* App port */
-                                     &stream_open_cb,
-                                     &peer1,
-                                    GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer1.socket);
-}
-
-
-/**
- * Initialize framework and start test
- */
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  config = cfg;
-  self = peer;
-  GNUNET_TESTING_peer_get_identity (peer, &self_id);
-  peer2_listen_socket = 
-    GNUNET_STREAM_listen (config,
-                          10, /* App port */
-                          &stream_listen_cb,
-                          &peer2,
-                          GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                          &stream_connect,
-                          GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer2_listen_socket);
-  abort_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 30), &do_abort,
-                                  NULL);
-}
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  if (0 != GNUNET_TESTING_peer_run ("test_stream_local",
-                                   "test_stream_local.conf",
-                                   &run, NULL))
-    return 1;
-  return (GNUNET_SYSERR == result) ? 1 : 0;
-}
-
-/* end of test_stream_local.c */
diff --git a/src/stream/test_stream_local.conf b/src/stream/test_stream_local.conf
deleted file mode 100644 (file)
index dc4929a..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-[lockmanager]
-AUTOSTART = NO
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12101
-
-[statistics]
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1;
-PORT = 12102
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = YES
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 10700
-# PREFIX = valgrind --leak-check=full
-# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-
-[dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = sqlite
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-
-[arm]
-DEFAULTSERVICES = core lockmanager
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[testbed]
-OVERLAY_TOPOLOGY = LINE
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-SERVICEHOME = /tmp/test-stream/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[consensus]
-AUTOSTART = NO
-
diff --git a/src/stream/test_stream_sequence_wraparound.c b/src/stream/test_stream_sequence_wraparound.c
deleted file mode 100644 (file)
index 4c2329d..0000000
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2008--2013 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file stream/test_stream_sequence_wraparound.c
- * @brief test cases for sequence wrap around situations during data transfer
- * @author Sree Harsha Totakura
- */
-
-#include <string.h>
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_stream_lib.h"
-#include "gnunet_testing_lib.h"
-
-/**
- * Generic logging shorthand
- */
-#define LOG(kind, ...)                         \
-  GNUNET_log (kind, __VA_ARGS__);
-
-/**
- * Relative seconds shorthand
- */
-#define TIME_REL_SECS(sec) \
-  GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
-
-/**
- * Structure for holding peer's sockets and IO Handles
- */
-struct PeerData
-{
-  /**
-   * Peer's stream socket
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Peer's io write handle
-   */
-  struct GNUNET_STREAM_WriteHandle *io_write_handle;
-
-  /**
-   * Peer's io read handle
-   */
-  struct GNUNET_STREAM_ReadHandle *io_read_handle;
-
-  /**
-   * Peer's shutdown handle
-   */
-  struct GNUNET_STREAM_ShutdownHandle *shutdown_handle;
-
-  /**
-   * Bytes the peer has written
-   */
-  unsigned int bytes_wrote;
-
-  /**
-   * Byte the peer has read
-   */
-  unsigned int bytes_read;
-};
-
-static struct PeerData peer1;
-static struct PeerData peer2;
-static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
-static const struct GNUNET_CONFIGURATION_Handle *config;
-static struct GNUNET_TESTING_Peer *self;
-static struct GNUNET_PeerIdentity self_id;
-
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
-static GNUNET_SCHEDULER_TaskIdentifier write_task;
-
-#define DATA_SIZE 65536      /* 64KB */
-static uint32_t data[DATA_SIZE / 4];     /* 64KB array */
-static int result;
-
-/**
- * Shutdown nicely
- */
-static void
-do_close (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-    GNUNET_SCHEDULER_cancel (abort_task);
-  if (NULL != peer1.socket)
-    GNUNET_STREAM_close (peer1.socket);
-  if (NULL != peer2.socket)
-    GNUNET_STREAM_close (peer2.socket);
-  if (NULL != peer2_listen_socket)
-    GNUNET_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
-}
-
-
-/**
- * Something went wrong and timed out. Kill everything and set error flag
- */
-static void
-do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n");
-  if (GNUNET_SCHEDULER_NO_TASK != read_task)
-    {
-      GNUNET_SCHEDULER_cancel (read_task);
-    }
-  result = GNUNET_SYSERR;
-  abort_task = GNUNET_SCHEDULER_NO_TASK;
-  do_close (cls, tc);
-}
-
-
-/**
- * Completion callback for shutdown
- *
- * @param cls the closure from GNUNET_STREAM_shutdown call
- * @param operation the operation that was shutdown (SHUT_RD, SHUT_WR,
- *          SHUT_RDWR) 
- */
-static void 
-shutdown_completion (void *cls,
-                     int operation)
-{
-  static int shutdowns;
-
-  if (++shutdowns == 1)
-  {
-    peer1.shutdown_handle = NULL;
-    peer2.shutdown_handle = GNUNET_STREAM_shutdown (peer2.socket, SHUT_RDWR,
-                                                    &shutdown_completion, cls);
-    return;
-  }  
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "STREAM shutdown successful\n");
-  GNUNET_SCHEDULER_add_now (&do_close, cls);
-}
-
-
-/**
- * Shutdown sockets gracefully
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  result = GNUNET_OK;
-  peer1.shutdown_handle = GNUNET_STREAM_shutdown (peer1.socket, SHUT_RDWR,
-                                                  &shutdown_completion, cls);
-}
-
-
-/**
- * The write completion function; called upon writing some data to stream or
- * upon error
- *
- * @param cls the closure from GNUNET_STREAM_write/read
- * @param status the status of the stream at the time this function is called
- * @param size the number of bytes read or written
- */
-static void 
-write_completion (void *cls,
-                  enum GNUNET_STREAM_Status status,
-                  size_t size)
-{
-  struct PeerData *peer;
-
-  peer = (struct PeerData *) cls;
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (size <= DATA_SIZE);
-  peer->bytes_wrote += size;
-
-  if (peer->bytes_wrote < DATA_SIZE) /* Have more data to send */
-    {
-      peer->io_write_handle =
-        GNUNET_STREAM_write (peer->socket,
-                             ((void *) data) + peer->bytes_wrote,
-                             DATA_SIZE - peer->bytes_wrote,
-                             GNUNET_TIME_relative_multiply
-                             (GNUNET_TIME_UNIT_SECONDS, 5),
-                             &write_completion,
-                             cls);
-      GNUNET_assert (NULL != peer->io_write_handle);
-    }
-  else
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG, "Writing successfully finished\n");
-      result = GNUNET_OK;
-      GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-    }
-}
-
-
-/**
- * Task for calling STREAM_write with a chunk of random data
- *
- * @param cls the peer data entity
- * @param tc the task context
- */
-static void
-stream_write_task (void *cls,
-                   const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer=cls;
-  unsigned int count;
-
-  write_task = GNUNET_SCHEDULER_NO_TASK;
-  for (count=0; count < DATA_SIZE / 4; count++)
-    {
-      data[count]=GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                            UINT32_MAX);
-    }
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Generation of random data complete\n");
-  peer->io_write_handle = GNUNET_STREAM_write (peer->socket,
-                                               data,
-                                               DATA_SIZE,
-                                               GNUNET_TIME_relative_multiply
-                                               (GNUNET_TIME_UNIT_SECONDS, 10),
-                                               &write_completion,
-                                               peer);
-  GNUNET_assert (NULL != peer->io_write_handle);
-}
-
-
-/**
- * Function executed after stream has been established
- *
- * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
- */
-static void 
-stream_open_cb (void *cls,
-                struct GNUNET_STREAM_Socket *socket)
-{
-  struct PeerData *peer;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream established from peer1\n");
-  peer = (struct PeerData *) cls;
-  peer->bytes_wrote = 0;
-  GNUNET_assert (socket == peer1.socket);
-  GNUNET_assert (socket == peer->socket);
-  write_task = GNUNET_SCHEDULER_add_now (&stream_write_task, peer);
-}
-
-
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Input processor
- *
- * @param cls peer2
- * @param status the status of the stream at the time this function is called
- * @param data traffic from the other side
- * @param size the number of bytes available in data read 
- * @return number of bytes of processed from 'data' (any data remaining should be
- *         given to the next time the read processor is called).
- */
-static size_t
-input_processor (void *cls,
-                 enum GNUNET_STREAM_Status status,
-                 const void *input_data,
-                 size_t size)
-{
-  struct PeerData *peer = cls;
-
-  GNUNET_assert (GNUNET_STREAM_OK == status);
-  GNUNET_assert (&peer2 == peer);
-  GNUNET_assert (size < DATA_SIZE);
-  GNUNET_assert (0 == memcmp (((void *)data ) + peer->bytes_read, 
-                             input_data, size));
-  peer->bytes_read += size;
-  
-  if (peer->bytes_read < DATA_SIZE)
-  {
-    GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == read_task);
-    read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-  }
-  else 
-  {
-    /* Peer2 has completed reading*/
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Reading finished successfully\n");
-  } 
-  return size;
-}
-
-  
-/**
- * Scheduler call back; to be executed when a new stream is connected
- * Called from listen connect for peer2
- */
-static void
-stream_read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct PeerData *peer = cls;
-
-  read_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_assert (&peer2 == peer);  
-  peer->io_read_handle =
-    GNUNET_STREAM_read (peer->socket,
-                        GNUNET_TIME_relative_multiply
-                        (GNUNET_TIME_UNIT_SECONDS, 10),
-                        &input_processor,
-                        peer);
-  GNUNET_assert (NULL != peer->io_read_handle);
-}
-
-
-/**
- * Functions of this type are called upon new stream connection from other peers
- *
- * @param cls the closure from GNUNET_STREAM_listen
- * @param socket the socket representing the stream
- * @param initiator the identity of the peer who wants to establish a stream
- *            with us
- * @return GNUNET_OK to keep the socket open, GNUNET_SYSERR to close the
- *             stream (the socket will be invalid after the call)
- */
-static int
-stream_listen_cb (void *cls,
-           struct GNUNET_STREAM_Socket *socket,
-           const struct GNUNET_PeerIdentity *initiator)
-{
-  if ((NULL == socket) || (NULL == initiator))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Binding error\n");
-    if (GNUNET_SCHEDULER_NO_TASK != abort_task)
-      GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
-    return GNUNET_OK;
-  }
-  GNUNET_assert (NULL != socket);
-  GNUNET_assert (socket != peer1.socket);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Peer connected: %s\n", GNUNET_i2s(initiator));
-  peer2.socket = socket;
-  peer2.bytes_read = 0;
-  read_task = GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2);
-  return GNUNET_OK;
-}
-
-
-/**
- * Listen success callback; connects a peer to stream as client
- */
-static void
-stream_connect (void)
-{
-  peer1.socket = 
-    GNUNET_STREAM_open (config,
-                        &self_id,         /* Null for local peer? */
-                        10,           /* App port */
-                        &stream_open_cb,
-                        &peer1,
-                        GNUNET_STREAM_OPTION_TESTING_SET_WRITE_SEQUENCE_NUMBER,
-                        UINT32_MAX - GNUNET_CRYPTO_random_u32
-                        (GNUNET_CRYPTO_QUALITY_WEAK, 64),
-                       GNUNET_STREAM_OPTION_MAX_PAYLOAD_SIZE, 500,
-                        GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer1.socket);
-}
-
-
-/**
- * Initialize framework and start test
- */
-static void
-run (void *cls,
-     const struct GNUNET_CONFIGURATION_Handle *cfg,
-     struct GNUNET_TESTING_Peer *peer)
-{
-  config = cfg;
-  self = peer;
-  (void) GNUNET_TESTING_peer_get_identity (peer, &self_id);
-  peer2_listen_socket = 
-    GNUNET_STREAM_listen (config,
-                          10, /* App port */
-                          &stream_listen_cb,
-                          NULL,
-                          GNUNET_STREAM_OPTION_LISTEN_TIMEOUT,
-                          60 * 1000,
-                          GNUNET_STREAM_OPTION_SIGNAL_LISTEN_SUCCESS,
-                          &stream_connect,
-                          GNUNET_STREAM_OPTION_END);
-  GNUNET_assert (NULL != peer2_listen_socket);
-  abort_task =
-    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 100), &do_abort,
-                                  NULL);
-}
-
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
-  if (0 != GNUNET_TESTING_peer_run ("test_stream_sequence_wraparound",
-                                   "test_stream_local.conf",
-                                   &run, NULL))
-    return 1;
-  return (GNUNET_SYSERR == result) ? 1 : 0;
-}
-
-/* end of test_stream_sequence_wraparound.c */