[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20298 - gnunet/src/stream
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r20298 - gnunet/src/stream |
|
Date: |
Tue, 6 Mar 2012 06:45:34 +0100 |
Author: harsha
Date: 2012-03-06 06:45:34 +0100 (Tue, 06 Mar 2012)
New Revision: 20298
Added:
gnunet/src/stream/test_stream_api.c
gnunet/src/stream/test_stream_local.c
Removed:
gnunet/src/stream/test_stream_local.c
Modified:
gnunet/src/stream/Makefile.am
gnunet/src/stream/stream_api.c
gnunet/src/stream/test_stream_local.conf
Log:
-bugfixes and testcases
Modified: gnunet/src/stream/Makefile.am
===================================================================
--- gnunet/src/stream/Makefile.am 2012-03-05 23:28:29 UTC (rev 20297)
+++ gnunet/src/stream/Makefile.am 2012-03-06 05:45:34 UTC (rev 20298)
@@ -20,7 +20,8 @@
$(GN_LIB_LDFLAGS)
check_PROGRAMS = \
- test_stream_local
+ test_stream_local \
+ test_stream_api
# test_stream_halfclose
EXTRA_DIST = test_stream_local.conf
@@ -34,8 +35,15 @@
test_stream_local_LDADD = \
$(top_builddir)/src/stream/libgnunetstream.la \
$(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing/libgnunettesting.la
+ $(top_builddir)/src/testing/libgnunettesting.la
+test_stream_api_SOURCES = \
+ test_stream_api.c
+test_stream_api_LDADD = \
+ $(top_builddir)/src/stream/libgnunetstream.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la
+
#test_stream_halfclose_SOURCES = \
# test_stream_halfclose.c
#test_stream_halfclose_LDADD = \
Modified: gnunet/src/stream/stream_api.c
===================================================================
--- gnunet/src/stream/stream_api.c 2012-03-05 23:28:29 UTC (rev 20297)
+++ gnunet/src/stream/stream_api.c 2012-03-06 05:45:34 UTC (rev 20298)
@@ -19,6 +19,8 @@
*/
/* TODO:
+ * Copy MESH handle from lsocket to socket
+ *
* Checks for matching the sender and socket->other_peer in server
* message handlers */
@@ -434,7 +436,7 @@
memcpy (buf, head->message, ret);
if (NULL != head->finish_cb)
{
- head->finish_cb (socket, head->finish_cb_cls);
+ head->finish_cb (head->finish_cb_cls, socket);
}
GNUNET_CONTAINER_DLL_remove (socket->queue_head,
socket->queue_tail,
@@ -476,6 +478,10 @@
{
struct MessageQueue *queue_entity;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Queueing message of type %d and size %d\n",
+ ntohs (message->header.type),
+ ntohs (message->header.size));
queue_entity = GNUNET_malloc (sizeof (struct MessageQueue));
queue_entity->message = message;
queue_entity->finish_cb = finish_cb;
@@ -959,6 +965,8 @@
socket->write_offset = 0;
socket->read_offset = 0;
socket->state = STATE_ESTABLISHED;
+ if (socket->open_cb)
+ socket->open_cb (socket->open_cls, socket);
}
@@ -1324,6 +1332,8 @@
struct GNUNET_STREAM_HelloAckMessage *reply;
GNUNET_assert (socket->tunnel == tunnel);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received HELLO from %s\n", GNUNET_i2s(sender));
/* Catch possible protocol breaks */
GNUNET_break_op (0 != memcmp (&socket->other_peer,
@@ -1786,10 +1796,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"STREAM_open callback is NULL\n");
}
- else
- {
- socket->open_cb (socket->open_cls, socket);
- }
}
@@ -1826,11 +1832,14 @@
struct GNUNET_STREAM_ListenSocket *lsocket = cls;
struct GNUNET_STREAM_Socket *socket;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %s initiated tunnel to us\n", GNUNET_i2s (initiator));
socket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_Socket));
socket->tunnel = tunnel;
socket->session_id = 0; /* FIXME */
socket->other_peer = *initiator;
socket->state = STATE_INIT;
+ /* FIXME: Copy MESH handle from lsocket to socket */
if (GNUNET_SYSERR == lsocket->listen_cb (lsocket->listen_cb_cls,
socket,
@@ -1908,8 +1917,10 @@
struct GNUNET_STREAM_Socket *socket;
enum GNUNET_STREAM_Option option;
va_list vargs; /* Variable arguments */
- GNUNET_MESH_ApplicationType no_port;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s\n", __func__);
+
socket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_Socket));
socket->other_peer = *target;
socket->open_cb = open_cb;
@@ -1934,14 +1945,13 @@
}
} while (GNUNET_STREAM_OPTION_END != option);
va_end (vargs); /* End of variable args parsing */
- no_port = 0;
socket->mesh = GNUNET_MESH_connect (cfg, /* the configuration handle */
- 1, /* QUEUE size as parameter? */
+ 10, /* QUEUE size as parameter? */
socket, /* cls */
NULL, /* No inbound tunnel handler */
- NULL, /* No inbound tunnel cleaner */
+ &tunnel_cleaner,
client_message_handlers,
- &no_port); /* We don't get inbound
tunnels */
+ &app_port); /* We don't get inbound
tunnels */
if (NULL == socket->mesh) /* Fail if we cannot connect to mesh */
{
GNUNET_free (socket);
@@ -1949,13 +1959,19 @@
}
/* Now create the mesh tunnel to target */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating MESH Tunnel\n");
socket->tunnel = GNUNET_MESH_tunnel_create (socket->mesh,
NULL, /* Tunnel context */
&mesh_peer_connect_callback,
&mesh_peer_disconnect_callback,
socket);
- // FIXME: if (NULL == socket->tunnel) ...
-
+ GNUNET_assert (NULL != socket->tunnel);
+ GNUNET_MESH_peer_request_connect_add (socket->tunnel,
+ target);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%s() END\n", __func__);
return socket;
}
@@ -2050,10 +2066,7 @@
{
/* FIXME: Add variable args for passing configration options? */
struct GNUNET_STREAM_ListenSocket *lsocket;
- GNUNET_MESH_ApplicationType app_types[2];
- app_types[0] = app_port;
- app_types[1] = 0;
lsocket = GNUNET_malloc (sizeof (struct GNUNET_STREAM_ListenSocket));
lsocket->port = app_port;
lsocket->listen_cb = listen_cb;
@@ -2064,7 +2077,8 @@
&new_tunnel_notify,
&tunnel_cleaner,
server_message_handlers,
- app_types);
+ &app_port);
+ GNUNET_assert (NULL != lsocket->mesh);
return lsocket;
}
Copied: gnunet/src/stream/test_stream_api.c (from rev 20265,
gnunet/src/stream/test_stream_local.c)
===================================================================
--- gnunet/src/stream/test_stream_api.c (rev 0)
+++ gnunet/src/stream/test_stream_api.c 2012-03-06 05:45:34 UTC (rev 20298)
@@ -0,0 +1,432 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 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"
+
+#define VERBOSE 1
+
+/**
+ * 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_IOWriteHandle *io_write_handle;
+
+ /**
+ * Peer's io read handle
+ */
+ struct GNUNET_STREAM_IOReadHandle *io_read_handle;
+
+ /**
+ * Bytes the peer has written
+ */
+ unsigned int bytes_wrote;
+
+ /**
+ * Byte the peer has read
+ */
+ unsigned int bytes_read;
+};
+
+static struct GNUNET_OS_Process *arm_pid;
+static struct PeerData peer1;
+static struct PeerData peer2;
+static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
+static struct GNUNET_CONFIGURATION_Handle *config;
+
+static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static GNUNET_SCHEDULER_TaskIdentifier test_task;
+static GNUNET_SCHEDULER_TaskIdentifier read_task;
+
+static char *data = "ABCD";
+static int result;
+
+/**
+ * Shutdown nicely
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_STREAM_close (peer1.socket);
+ if (NULL != peer2.socket)
+ GNUNET_STREAM_close (peer2.socket);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n");
+ if (0 != abort_task)
+ {
+ GNUNET_SCHEDULER_cancel (abort_task);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n");
+ if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
+ {
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n");
+ /* Free the duplicated configuration */
+ GNUNET_CONFIGURATION_destroy (config);
+ GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
+ GNUNET_OS_process_close (arm_pid);
+}
+
+
+/**
+ * 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 != test_task)
+ {
+ GNUNET_SCHEDULER_cancel (test_task);
+ }
+ if (0 != read_task)
+ {
+ GNUNET_SCHEDULER_cancel (read_task);
+ }
+ result = GNUNET_SYSERR;
+ abort_task = 0;
+ do_shutdown (cls, tc);
+}
+
+/**
+ * Signature for 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 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 < strlen (data));
+ peer->bytes_wrote += size;
+
+ if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
+ {
+ 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,
+ cls);
+ GNUNET_assert (NULL != peer->io_write_handle);
+ }
+ else
+ {
+ if (&peer1 == peer) /* Peer1 has finished writing; should read now */
+ {
+ 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);
+ }
+ }
+}
+
+
+/**
+ * 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);
+ peer->io_write_handle = GNUNET_STREAM_write (peer->socket, /* socket */
+ (void *) data, /* data */
+ strlen(data),
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &write_completion,
+ cls);
+ GNUNET_assert (NULL != peer->io_write_handle);
+}
+
+
+/**
+ * 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;
+
+ GNUNET_assert (GNUNET_STREAM_OK == status);
+ GNUNET_assert (size < strlen (data));
+ GNUNET_assert (strncmp ((const char *) data + peer->bytes_read,
+ (const char *) input_data,
+ size));
+ peer->bytes_read += size;
+
+ if (peer->bytes_read < strlen (data))
+ {
+ 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
+ {
+ if (&peer2 == peer) /* Peer2 has completed reading; should write */
+ {
+ peer->bytes_wrote = 0;
+ peer->io_write_handle =
+ GNUNET_STREAM_write ((struct GNUNET_STREAM_Socket *)
+ peer->socket,
+ (void *) data,
+ strlen(data),
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &write_completion,
+ cls);
+ }
+ else /* Peer1 has completed reading. End of tests */
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
+ }
+ 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_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
+ peer2.io_read_handle =
+ GNUNET_STREAM_read ((struct GNUNET_STREAM_Socket *) cls,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &input_processor,
+ (void *) &peer2);
+ GNUNET_assert (NULL != peer2.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)
+{
+ GNUNET_assert (NULL != socket);
+ GNUNET_assert (NULL == initiator); /* Local peer=NULL? */
+ GNUNET_assert (socket != peer1.socket);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer connected: %s\n", GNUNET_i2s(initiator));
+
+ peer2.socket = socket;
+ read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Testing function
+ *
+ * @param cls NULL
+ * @param tc the task context
+ */
+static void
+test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_PeerIdentity self;
+
+ test_task = GNUNET_SCHEDULER_NO_TASK;
+ /* Get our identity */
+ GNUNET_assert (GNUNET_OK == GNUNET_TESTING_get_peer_identity (config,
+ &self));
+
+ peer2_listen_socket = GNUNET_STREAM_listen (config,
+ 10, /* App port */
+ &stream_listen_cb,
+ NULL);
+ GNUNET_assert (NULL != peer2_listen_socket);
+
+ /* Connect to stream library */
+ peer1.socket = GNUNET_STREAM_open (config,
+ &self, /* Null for local peer? */
+ 10, /* App port */
+ &stream_open_cb,
+ (void *) &peer1);
+ GNUNET_assert (NULL != peer1.socket);
+}
+
+/**
+ * Initialize framework and start test
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ GNUNET_log_setup ("test_stream_local",
+#if VERBOSE
+ "DEBUG",
+#else
+ "WARNING",
+#endif
+ NULL);
+ /* Duplicate the configuration */
+ config = GNUNET_CONFIGURATION_dup (cfg);
+ arm_pid =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
+#if VERBOSE_ARM
+ "-L", "DEBUG",
+#endif
+ "-c", "test_stream_local.conf", NULL);
+
+ abort_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
+ NULL);
+
+ test_task = GNUNET_SCHEDULER_add_now (&test, NULL);
+
+}
+
+/**
+ * Main function
+ */
+int main (int argc, char **argv)
+{
+ int ret;
+
+ char *const argv2[] = { "test-stream-local",
+ "-c", "test_stream_local.conf",
+#if VERBOSE
+ "-L", "DEBUG",
+#endif
+ NULL
+ };
+
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ ret =
+ GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+ "test-stream-local", "nohelp", options, &run, NULL);
+
+ if (GNUNET_OK != ret)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n",
+ ret);
+ return 1;
+ }
+ if (GNUNET_SYSERR == result)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
+ return 1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
+ return 0;
+}
Deleted: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c 2012-03-05 23:28:29 UTC (rev
20297)
+++ gnunet/src/stream/test_stream_local.c 2012-03-06 05:45:34 UTC (rev
20298)
@@ -1,432 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2011, 2012 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"
-
-#define VERBOSE 1
-
-/**
- * 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_IOWriteHandle *io_write_handle;
-
- /**
- * Peer's io read handle
- */
- struct GNUNET_STREAM_IOReadHandle *io_read_handle;
-
- /**
- * Bytes the peer has written
- */
- unsigned int bytes_wrote;
-
- /**
- * Byte the peer has read
- */
- unsigned int bytes_read;
-};
-
-static struct GNUNET_OS_Process *arm_pid;
-static struct PeerData peer1;
-static struct PeerData peer2;
-static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
-static struct GNUNET_CONFIGURATION_Handle *config;
-
-static GNUNET_SCHEDULER_TaskIdentifier abort_task;
-static GNUNET_SCHEDULER_TaskIdentifier test_task;
-static GNUNET_SCHEDULER_TaskIdentifier read_task;
-
-static char *data = "ABCD";
-static int result;
-
-/**
- * Shutdown nicely
- */
-static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_STREAM_close (peer1.socket);
- if (NULL != peer2.socket)
- GNUNET_STREAM_close (peer2.socket);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n");
- if (0 != abort_task)
- {
- GNUNET_SCHEDULER_cancel (abort_task);
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n");
- if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n");
- /* Free the duplicated configuration */
- GNUNET_CONFIGURATION_destroy (config);
- GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
- GNUNET_OS_process_close (arm_pid);
-}
-
-
-/**
- * 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 != test_task)
- {
- GNUNET_SCHEDULER_cancel (test_task);
- }
- if (0 != read_task)
- {
- GNUNET_SCHEDULER_cancel (read_task);
- }
- result = GNUNET_SYSERR;
- abort_task = 0;
- do_shutdown (cls, tc);
-}
-
-/**
- * Signature for 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 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 < strlen (data));
- peer->bytes_wrote += size;
-
- if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
- {
- 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,
- cls);
- GNUNET_assert (NULL != peer->io_write_handle);
- }
- else
- {
- if (&peer1 == peer) /* Peer1 has finished writing; should read now */
- {
- 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);
- }
- }
-}
-
-
-/**
- * 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);
- peer->io_write_handle = GNUNET_STREAM_write (peer->socket, /* socket */
- (void *) data, /* data */
- strlen(data),
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 5),
- &write_completion,
- cls);
- GNUNET_assert (NULL != peer->io_write_handle);
-}
-
-
-/**
- * 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;
-
- GNUNET_assert (GNUNET_STREAM_OK == status);
- GNUNET_assert (size < strlen (data));
- GNUNET_assert (strncmp ((const char *) data + peer->bytes_read,
- (const char *) input_data,
- size));
- peer->bytes_read += size;
-
- if (peer->bytes_read < strlen (data))
- {
- 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
- {
- if (&peer2 == peer) /* Peer2 has completed reading; should write */
- {
- peer->bytes_wrote = 0;
- peer->io_write_handle =
- GNUNET_STREAM_write ((struct GNUNET_STREAM_Socket *)
- peer->socket,
- (void *) data,
- strlen(data),
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 5),
- &write_completion,
- cls);
- }
- else /* Peer1 has completed reading. End of tests */
- {
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
- }
- }
- 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_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
- peer2.io_read_handle =
- GNUNET_STREAM_read ((struct GNUNET_STREAM_Socket *) cls,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 5),
- &input_processor,
- (void *) &peer2);
- GNUNET_assert (NULL != peer2.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)
-{
- GNUNET_assert (NULL != socket);
- GNUNET_assert (NULL == initiator); /* Local peer=NULL? */
- GNUNET_assert (socket != peer1.socket);
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer connected: %s\n", GNUNET_i2s(initiator));
-
- peer2.socket = socket;
- read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
- return GNUNET_OK;
-}
-
-
-/**
- * Testing function
- *
- * @param cls NULL
- * @param tc the task context
- */
-static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_PeerIdentity self;
-
- test_task = GNUNET_SCHEDULER_NO_TASK;
- /* Get our identity */
- GNUNET_assert (GNUNET_OK == GNUNET_TESTING_get_peer_identity (config,
- &self));
-
- peer2_listen_socket = GNUNET_STREAM_listen (config,
- 10, /* App port */
- &stream_listen_cb,
- NULL);
- GNUNET_assert (NULL != peer2_listen_socket);
-
- /* Connect to stream library */
- peer1.socket = GNUNET_STREAM_open (config,
- &self, /* Null for local peer? */
- 10, /* App port */
- &stream_open_cb,
- (void *) &peer1);
- GNUNET_assert (NULL != peer1.socket);
-}
-
-/**
- * Initialize framework and start test
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- GNUNET_log_setup ("test_stream_local",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- /* Duplicate the configuration */
- config = GNUNET_CONFIGURATION_dup (cfg);
- arm_pid =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE_ARM
- "-L", "DEBUG",
-#endif
- "-c", "test_stream_local.conf", NULL);
-
- abort_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
- NULL);
-
- test_task = GNUNET_SCHEDULER_add_now (&test, NULL);
-
-}
-
-/**
- * Main function
- */
-int main (int argc, char **argv)
-{
- int ret;
-
- char *const argv2[] = { "test-stream-local",
- "-c", "test_stream_local.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
-
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test-stream-local", "nohelp", options, &run, NULL);
-
- if (GNUNET_OK != ret)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n",
- ret);
- return 1;
- }
- if (GNUNET_SYSERR == result)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
- return 1;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
- return 0;
-}
Added: gnunet/src/stream/test_stream_local.c
===================================================================
--- gnunet/src/stream/test_stream_local.c (rev 0)
+++ gnunet/src/stream/test_stream_local.c 2012-03-06 05:45:34 UTC (rev
20298)
@@ -0,0 +1,480 @@
+/*
+ This file is part of GNUnet.
+ (C) 2011, 2012 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"
+
+#define VERBOSE 1
+
+/**
+ * Number of peers
+ */
+#define NUM_PEERS 2
+
+/**
+ * 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_IOWriteHandle *io_write_handle;
+
+ /**
+ * Peer's io read handle
+ */
+ struct GNUNET_STREAM_IOReadHandle *io_read_handle;
+
+ /**
+ * Bytes the peer has written
+ */
+ unsigned int bytes_wrote;
+
+ /**
+ * Byte the peer has read
+ */
+ unsigned int bytes_read;
+};
+
+/**
+ * The current peer group
+ */
+static struct GNUNET_TESTING_PeerGroup *pg;
+
+/**
+ * Peer 1 daemon
+ */
+static struct GNUNET_TESTING_Daemon *d1;
+
+/**
+ * Peer 2 daemon
+ */
+static struct GNUNET_TESTING_Daemon *d2;
+
+static struct PeerData peer1;
+static struct PeerData peer2;
+static struct GNUNET_STREAM_ListenSocket *peer2_listen_socket;
+static struct GNUNET_CONFIGURATION_Handle *config;
+
+static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static GNUNET_SCHEDULER_TaskIdentifier read_task;
+
+static char *data = "ABCD";
+static int result;
+
+
+/**
+ * Check whether peers successfully shut down.
+ */
+static void
+shutdown_callback (void *cls, const char *emsg)
+{
+ if (emsg != NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Shutdown of peers failed!\n");
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "All peers successfully shut down!\n");
+ }
+ GNUNET_CONFIGURATION_destroy (config);
+}
+
+
+/**
+ * Shutdown nicely
+ */
+static void
+do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ 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);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: shutdown\n");
+ if (0 != abort_task)
+ {
+ GNUNET_SCHEDULER_cancel (abort_task);
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n");
+
+ GNUNET_TESTING_daemons_stop (pg,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &shutdown_callback,
+ 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)
+{
+ 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_shutdown (cls, tc);
+}
+
+/**
+ * Signature for 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 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 < strlen (data));
+ peer->bytes_wrote += size;
+
+ if (peer->bytes_wrote < strlen(data)) /* Have more data to send */
+ {
+ 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,
+ cls);
+ GNUNET_assert (NULL != peer->io_write_handle);
+ }
+ else
+ {
+ if (&peer1 == peer) /* Peer1 has finished writing; should read now */
+ {
+ 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);
+ }
+ }
+}
+
+
+/**
+ * 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);
+ peer->io_write_handle = GNUNET_STREAM_write (peer->socket, /* socket */
+ (void *) data, /* data */
+ strlen(data),
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &write_completion,
+ cls);
+ GNUNET_assert (NULL != peer->io_write_handle);
+}
+
+
+/**
+ * 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;
+
+ GNUNET_assert (GNUNET_STREAM_OK == status);
+ GNUNET_assert (size < strlen (data));
+ GNUNET_assert (strncmp ((const char *) data + peer->bytes_read,
+ (const char *) input_data,
+ size));
+ peer->bytes_read += size;
+
+ if (peer->bytes_read < strlen (data))
+ {
+ 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
+ {
+ if (&peer2 == peer) /* Peer2 has completed reading; should write */
+ {
+ peer->bytes_wrote = 0;
+ peer->io_write_handle =
+ GNUNET_STREAM_write ((struct GNUNET_STREAM_Socket *)
+ peer->socket,
+ (void *) data,
+ strlen(data),
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &write_completion,
+ cls);
+ }
+ else /* Peer1 has completed reading. End of tests */
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
+ }
+ 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_STREAM_listen_close (peer2_listen_socket); /* Close listen socket */
+ peer2.io_read_handle =
+ GNUNET_STREAM_read ((struct GNUNET_STREAM_Socket *) cls,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 5),
+ &input_processor,
+ (void *) &peer2);
+ GNUNET_assert (NULL != peer2.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)
+{
+ GNUNET_assert (NULL != socket);
+ GNUNET_assert (NULL != initiator);
+ GNUNET_assert (socket != peer1.socket);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer connected: %s\n", GNUNET_i2s(initiator));
+
+ peer2.socket = socket;
+ read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Callback to be called when testing peer group is ready
+ *
+ * @param cls NULL
+ * @param emsg NULL on success
+ */
+void
+peergroup_ready (void *cls, const char *emsg)
+{
+ if (NULL != emsg)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Starting peer group failed: %s\n", emsg);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer group is now read \n");
+
+ GNUNET_assert (2 == GNUNET_TESTING_daemons_running (pg));
+
+ d1 = GNUNET_TESTING_daemon_get (pg, 0);
+ GNUNET_assert (NULL != d1);
+
+ d2 = GNUNET_TESTING_daemon_get (pg, 1);
+ GNUNET_assert (NULL != d2);
+
+ peer2_listen_socket = GNUNET_STREAM_listen (d2->cfg,
+ 10, /* App port */
+ &stream_listen_cb,
+ NULL);
+ GNUNET_assert (NULL != peer2_listen_socket);
+
+ /* Connect to stream library */
+ peer1.socket = GNUNET_STREAM_open (d1->cfg,
+ &d2->id, /* Null for local peer?
*/
+ 10, /* App port */
+ &stream_open_cb,
+ &peer1);
+ GNUNET_assert (NULL != peer1.socket);
+}
+
+
+/**
+ * Initialize framework and start test
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ struct GNUNET_TESTING_Host *hosts; /* FIXME: free hosts (DLL) */
+
+ /* GNUNET_log_setup ("test_stream_local", */
+ /* "DEBUG", */
+ /* NULL); */
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting test\n");
+ /* Duplicate the configuration */
+ config = GNUNET_CONFIGURATION_dup (cfg);
+
+ hosts = GNUNET_TESTING_hosts_load (config);
+
+ pg = GNUNET_TESTING_peergroup_start (config,
+ 2,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 3),
+ NULL,
+ &peergroup_ready,
+ NULL,
+ hosts);
+ GNUNET_assert (NULL != pg);
+
+ 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)
+{
+ int ret;
+
+ char *argv2[] = { "test-stream-local",
+ "-L", "DEBUG",
+ "-c", "test_stream_local.conf",
+ NULL};
+
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ ret =
+ GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
+ "test-stream-local", "nohelp", options, &run, NULL);
+
+ if (GNUNET_OK != ret)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n",
+ ret);
+ return 1;
+ }
+ if (GNUNET_SYSERR == result)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
+ return 1;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test ok\n");
+ return 0;
+}
Modified: gnunet/src/stream/test_stream_local.conf
===================================================================
--- gnunet/src/stream/test_stream_local.conf 2012-03-05 23:28:29 UTC (rev
20297)
+++ gnunet/src/stream/test_stream_local.conf 2012-03-06 05:45:34 UTC (rev
20298)
@@ -53,7 +53,13 @@
PORT = 12368
[TESTING]
+NUM_PEERS = 5
WEAKRANDOM = YES
+DEBUG = YES
+HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+MAX_CONCURRENT_SSH = 10
+USE_PROGRESSBARS = YES
+PEERGROUP_TIMEOUT = 2400 s
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20298 - gnunet/src/stream,
gnunet <=