X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fstream%2Ftest_stream_local.c;h=af1b8ff84de1f0ba5dff62d14e7b70a51732be63;hb=32566458738aa4d91d02616ef4f38c2614acf301;hp=9289f9863029c8b3fe72140e9e77a7a3bf0fc018;hpb=3375c4e198484859e2c59d42aacdec7ab79645fc;p=oweals%2Fgnunet.git diff --git a/src/stream/test_stream_local.c b/src/stream/test_stream_local.c index 9289f9863..af1b8ff84 100644 --- a/src/stream/test_stream_local.c +++ b/src/stream/test_stream_local.c @@ -30,9 +30,14 @@ #include "gnunet_util_lib.h" #include "gnunet_mesh_service.h" #include "gnunet_stream_lib.h" -#include "gnunet_testing_lib.h" +#include "gnunet_testing_lib-new.h" + +/** + * Relative seconds shorthand + */ +#define TIME_REL_SECS(sec) \ + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec) -#define VERBOSE 1 /** * Structure for holding peer's sockets and IO Handles @@ -65,19 +70,22 @@ struct PeerData 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 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 test_task; -static GNUNET_SCHEDULER_TaskIdentifier read_task; static char *data = "ABCD"; static int result; +static int writing_success; +static int reading_success; + + /** * Input processor * @@ -114,6 +122,7 @@ stream_read_task (void *cls, GNUNET_assert (NULL != peer->io_read_handle); } + /** * The write completion function; called upon writing some data to stream or * upon error @@ -152,6 +161,7 @@ stream_write_task (void *cls, GNUNET_assert (NULL != peer->io_write_handle); } + /** * Shutdown nicely */ @@ -168,16 +178,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { 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); } @@ -188,35 +188,11 @@ 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 @@ -231,23 +207,30 @@ write_completion (void *cls, enum GNUNET_STREAM_Status status, size_t size) { - struct PeerData *peer=cls;; + struct PeerData *peer=cls; GNUNET_assert (GNUNET_STREAM_OK == status); - GNUNET_assert (size < strlen (data)); + 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 { - if (&peer1 == peer) /* Peer1 has finished writing; should read now */ + 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); + } } } @@ -264,10 +247,11 @@ stream_open_cb (void *cls, { struct PeerData *peer=cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stream established from peer1\n"); - peer->bytes_wrote = 0; + 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); } @@ -291,12 +275,11 @@ input_processor (void *cls, struct PeerData *peer = 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; - + 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); @@ -310,31 +293,19 @@ input_processor (void *cls, } else /* Peer1 has completed reading. End of tests */ { - GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); + reading_success = GNUNET_YES; + if (GNUNET_YES == writing_success) + 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_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 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 @@ -346,89 +317,63 @@ stream_listen_cb (void *cls, struct GNUNET_STREAM_Socket *socket, const struct GNUNET_PeerIdentity *initiator) { - struct GNUNET_PeerIdentity self; + struct PeerData *peer=cls; GNUNET_assert (NULL != socket); GNUNET_assert (socket != peer1.socket); - - /* Get our identity */ - GNUNET_assert (GNUNET_OK == GNUNET_TESTING_get_peer_identity (config, - &self)); - GNUNET_assert (0 == memcmp (&self, + 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)); - - peer2.socket = socket; - read_task = GNUNET_SCHEDULER_add_now (&stream_read, (void *) socket); + peer->socket = socket; + peer->bytes_read = 0; + GNUNET_SCHEDULER_add_now (&stream_read_task, &peer2); return GNUNET_OK; } /** - * Testing function - * - * @param cls NULL - * @param tc the task context + * Listen success callback; connects a peer to stream as client */ static void -test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +stream_connect (void) { - 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? */ + &self_id, 10, /* App port */ &stream_open_cb, - (void *) &peer1); - GNUNET_assert (NULL != peer1.socket); + &peer1, + GNUNET_STREAM_OPTION_END); + 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) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - 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, 60), &do_abort, - NULL); - - test_task = GNUNET_SCHEDULER_add_now (&test, NULL); - + 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); } /** @@ -436,35 +381,11 @@ run (void *cls, char *const *args, const char *cfgfile, */ 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"); + if (0 != GNUNET_TESTING_peer_run ("test_stream_local", + "test_stream_local.conf", + &run, NULL)) return 1; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); - return 0; + return (GNUNET_SYSERR == result) ? 1 : 0; } + +/* end of test_stream_local.c */