[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21527 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21527 - gnunet/src/transport |
Date: |
Wed, 16 May 2012 15:22:52 +0200 |
Author: grothoff
Date: 2012-05-16 15:22:52 +0200 (Wed, 16 May 2012)
New Revision: 21527
Modified:
gnunet/src/transport/test_transport_api_restart_1peer.c
gnunet/src/transport/test_transport_api_restart_2peers.c
Log:
-fixing testcases, cleanup
Modified: gnunet/src/transport/test_transport_api_restart_1peer.c
===================================================================
--- gnunet/src/transport/test_transport_api_restart_1peer.c 2012-05-16
13:22:42 UTC (rev 21526)
+++ gnunet/src/transport/test_transport_api_restart_1peer.c 2012-05-16
13:22:52 UTC (rev 21527)
@@ -36,8 +36,6 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_NO
#define START_ARM GNUNET_YES
@@ -63,33 +61,27 @@
static GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
-struct PeerContext *p1;
+static struct PeerContext *p1;
-int p1_connected;
+static int p1_connected;
-struct PeerContext *p2;
+static struct PeerContext *p2;
-int p2_connected;
+static int p2_connected;
static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
-char *cfg_file_p1;
+static char *cfg_file_p1;
-char *cfg_file_p2;
+static char *cfg_file_p2;
static int restarted;
-#if VERBOSE
-#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok,
__FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
-
static void
end ()
{
@@ -350,8 +342,6 @@
{
p2_connected = GNUNET_NO;
}
-
-
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -362,6 +352,9 @@
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (GNUNET_SCHEDULER_NO_TASK != send_task)
+ GNUNET_SCHEDULER_cancel (send_task);
+ send_task = GNUNET_SCHEDULER_NO_TASK;
}
static void
@@ -379,7 +372,7 @@
-void
+static void
start_cb (struct PeerContext *p, void *cls)
{
static int started;
@@ -438,9 +431,6 @@
static char *const argv[] = { "test-transport-api",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
static struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -465,30 +455,17 @@
int ret;
GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
-
-
GNUNET_log_setup (test_name,
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
-
tth = GNUNET_TRANSPORT_TESTING_init ();
-
GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf");
GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf");
-
ret = check ();
-
GNUNET_free (cfg_file_p1);
GNUNET_free (cfg_file_p2);
-
GNUNET_free (test_name);
-
GNUNET_TRANSPORT_TESTING_done (tth);
-
return ret;
}
Modified: gnunet/src/transport/test_transport_api_restart_2peers.c
===================================================================
--- gnunet/src/transport/test_transport_api_restart_2peers.c 2012-05-16
13:22:42 UTC (rev 21526)
+++ gnunet/src/transport/test_transport_api_restart_2peers.c 2012-05-16
13:22:52 UTC (rev 21527)
@@ -36,9 +36,6 @@
#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_NO
-
#define START_ARM GNUNET_YES
/**
@@ -63,29 +60,23 @@
static GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
-struct PeerContext *p1;
+static struct PeerContext *p1;
-struct PeerContext *p2;
+static struct PeerContext *p2;
static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+static struct GNUNET_TRANSPORT_TransmitHandle *th;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+static struct GNUNET_TRANSPORT_TESTING_handle *tth;
-char *cfg_file_p1;
+static char *cfg_file_p1;
-char *cfg_file_p2;
+static char *cfg_file_p2;
static int restarted;
-#if VERBOSE
-#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok,
__FILE__, __LINE__); } while (0)
-#else
-#define OKPP do { ok++; } while (0)
-#endif
-
static void
end ()
{
@@ -345,8 +336,12 @@
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
+ if (GNUNET_SCHEDULER_NO_TASK != send_task)
+ GNUNET_SCHEDULER_cancel (send_task);
+ send_task = GNUNET_SCHEDULER_NO_TASK;
}
+
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
@@ -362,7 +357,7 @@
-void
+static void
start_cb (struct PeerContext *p, void *cls)
{
static int started;
@@ -420,9 +415,6 @@
static char *const argv[] = { "test-transport-api",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
static struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -447,30 +439,17 @@
int ret;
GNUNET_TRANSPORT_TESTING_get_test_name (argv[0], &test_name);
-
-
GNUNET_log_setup (test_name,
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
-
tth = GNUNET_TRANSPORT_TESTING_init ();
-
GNUNET_asprintf (&cfg_file_p1, "test_transport_api_tcp_peer1.conf");
GNUNET_asprintf (&cfg_file_p2, "test_transport_api_tcp_peer2.conf");
-
ret = check ();
-
GNUNET_free (cfg_file_p1);
GNUNET_free (cfg_file_p2);
-
GNUNET_free (test_name);
-
GNUNET_TRANSPORT_TESTING_done (tth);
-
return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21527 - gnunet/src/transport,
gnunet <=