[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16648 - gnunet/src/transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r16648 - gnunet/src/transport |
|
Date: |
Tue, 30 Aug 2011 17:28:30 +0200 |
Author: wachs
Date: 2011-08-30 17:28:30 +0200 (Tue, 30 Aug 2011)
New Revision: 16648
Added:
gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
Modified:
gnunet/src/transport/test_transport_api_reliability.c
gnunet/src/transport/test_transport_api_unreliability.c
Log:
ported unreliability to transport testing
Modified: gnunet/src/transport/test_transport_api_reliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_reliability.c 2011-08-30
14:48:16 UTC (rev 16647)
+++ gnunet/src/transport/test_transport_api_reliability.c 2011-08-30
15:28:30 UTC (rev 16648)
@@ -378,7 +378,7 @@
static int
check ()
{
- static char *const argv[] = { "test-transport-api",
+ static char *const argv[] = { "test-transport-api-reliability",
"-c",
"test_transport_api_data.conf",
#if VERBOSE
@@ -395,7 +395,7 @@
#endif
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-transport-api", "nohelp", options, &run, &ok);
+ "test-transport-api-reliability", "nohelp", options,
&run, &ok);
return ok;
}
@@ -406,7 +406,7 @@
int ret;
int nat_res;
- GNUNET_log_setup ("test-transport-api",
+ GNUNET_log_setup ("test-transport-api-reliability",
#if VERBOSE
"DEBUG",
#else
Modified: gnunet/src/transport/test_transport_api_unreliability.c
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability.c 2011-08-30
14:48:16 UTC (rev 16647)
+++ gnunet/src/transport/test_transport_api_unreliability.c 2011-08-30
15:28:30 UTC (rev 16648)
@@ -46,311 +46,185 @@
#define START_ARM GNUNET_YES
/**
- * Note that this value must not significantly exceed
- * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
- * messages may be dropped even for a reliable transport.
- */
-#define TOTAL_MSGS (1024 * 3) /* Total messages should be divisible by 8, so
we can make a nice bitmap */
-
-/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1500)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
-#define UNRELIABLE_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1)
-
-#define MTYPE 12345
-
-static struct PeerContext p1;
-
-static struct PeerContext p2;
-
static int ok;
-static int is_tcp;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
-static int is_tcp_nat;
+struct PeerContext *p1;
-static int is_http;
+struct PeerContext *p2;
-static int is_https;
+struct GNUNET_TRANSPORT_TransmitHandle *th;
-static int is_udp;
+char *cfg_file_p1;
-static int is_unix;
+char *cfg_file_p2;
-static int is_wlan;
+/*
+ * Testcase specific declarations
+ */
-static int connected;
+/**
+ * Note that this value must not significantly exceed
+ * 'MAX_PENDING' in 'gnunet-service-transport.c', otherwise
+ * messages may be dropped even for a reliable transport.
+ */
+#define TOTAL_MSGS (1024 * 3)
-static unsigned long long total_bytes;
+#define MTYPE 12345
-static struct GNUNET_TIME_Absolute start_time;
+struct TestMessage
+{
+ struct GNUNET_MessageHeader header;
+ uint32_t num;
+};
-static GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static GNUNET_SCHEDULER_TaskIdentifier tct;
-
-struct GNUNET_TRANSPORT_TransmitHandle *th_p2;
-
-static char *key_file_p1;
-static char *cert_file_p1;
-
-static char *key_file_p2;
-static char *cert_file_p2;
-
static char *test_name;
-static char bitmap[TOTAL_MSGS / 8];
-
static int msg_scheduled;
static int msg_sent;
static int msg_recv_expected;
static int msg_recv;
-static int p1_hello_canceled;
-static int p2_hello_canceled;
-
static int test_failed;
-/**
- * Sets a bit active in the bitmap.
- *
- * @param bitIdx which bit to set
- */
-static void
-set_bit (unsigned int bitIdx)
-{
- size_t arraySlot;
- unsigned int targetBit;
+static unsigned long long total_bytes;
- if (bitIdx >= sizeof (bitmap) * 8)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "tried to set bit %d of %d(!?!?)\n",
- bitIdx, sizeof (bitmap) * 8);
- return;
- }
- arraySlot = bitIdx / 8;
- targetBit = (1L << (bitIdx % 8));
- bitmap[arraySlot] |= targetBit;
-}
+static struct GNUNET_TIME_Absolute start_time;
-/**
- * Obtain a bit from bitmap.
- * @param map the bitmap
- * @param bit index from bitmap
- *
- * @return Bit \a bit from hashcode \a code
+static char bitmap[TOTAL_MSGS / 8];
+
+/*
+ * END Testcase specific declarations
*/
+
+#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
+
int
-get_bit (const char *map, unsigned int bit)
-{
- if (bit >= TOTAL_MSGS)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "get bit %d of %d(!?!?)\n", bit,
- sizeof (bitmap) * 8);
- return 0;
- }
- return ((map)[bit >> 3] & (1 << (bit & 7))) > 0;
-}
+get_bit (const char *map, unsigned int bit);
static void
end ()
{
unsigned long long delta;
- int i;
- int result;
+
char *value_name;
- result = 0;
- for (i = 0; i < TOTAL_MSGS; i++)
- {
- if (get_bit (bitmap, i) == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Did not receive message %d\n",
i);
- result = -1;
- }
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n");
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
- GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
-#endif
- if (th_p2 != NULL)
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th_p2);
- th_p2 = NULL;
-
- GNUNET_TRANSPORT_disconnect (p1.th);
- GNUNET_TRANSPORT_disconnect (p2.th);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transports disconnected, returning success!\n");
-#endif
delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
- GNUNET_asprintf (&value_name, "unreliable_%s", test_name);
- GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta),
- "kb/s");
- GNUNET_free (value_name);
fprintf (stderr, "\nThroughput was %llu kb/s\n",
total_bytes * 1000 / 1024 / delta);
- ok = result;
+ GNUNET_asprintf(&value_name, "unreliable_%s", test_name);
+ GAUGER ("TRANSPORT", value_name, (int)(total_bytes * 1000 / 1024 /delta),
"kb/s");
+ GNUNET_free(value_name);
-}
+ if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (die_task);
-static void
-end_unreliably ()
-{
- unsigned long long delta;
- int i;
- int num_failed;
- char *value_name;
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
- num_failed = 0;
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
+
+ ok = 0;
+
+ int i;
for (i = 0; i < TOTAL_MSGS; i++)
{
if (get_bit (bitmap, i) == 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Did not receive message %d\n", i);
- num_failed++;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Did not receive message %d\n",
i);
+ ok = -1;
}
}
-
- die_task = GNUNET_SCHEDULER_NO_TASK;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from transports!\n");
-#endif
- if (th_p2 != NULL)
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th_p2);
-
- GNUNET_TRANSPORT_disconnect (p1.th);
- GNUNET_TRANSPORT_disconnect (p2.th);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transports disconnected, returning success!\n");
-#endif
- delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value;
- fprintf (stderr, "\nThroughput was %llu kb/s\n",
- total_bytes * 1000 / 1024 / delta);
- GNUNET_asprintf (&value_name, "unreliable_%s", test_name);
- GAUGER ("TRANSPORT", value_name, (int) (total_bytes * 1000 / 1024 / delta),
- "kb/s");
- GNUNET_free (value_name);
- GNUNET_asprintf (&value_name, "unreliable_failed_%s", test_name);
- GAUGER ("TRANSPORT", value_name, (int) num_failed, "msgs");
- GNUNET_free (value_name);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Had %d failed messages!\n",
- num_failed);
- ok = 0;
-
}
-
-
static void
-stop_arm (struct PeerContext *p)
+end_badly ()
{
-#if START_ARM
- if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- GNUNET_OS_process_wait (p->arm_proc);
- GNUNET_OS_process_close (p->arm_proc);
- p->arm_proc = NULL;
-#endif
- GNUNET_CONFIGURATION_destroy (p->cfg);
-}
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+ if (test_failed == GNUNET_NO)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timeout\n");
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Reliability failed: Last message sent %u, Next message
scheduled %u, Last message received %u, Message expected %u\n",
+ msg_sent, msg_scheduled, msg_recv, msg_recv_expected);
+ if (th != NULL)
+ GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
+ th = NULL;
-static void
-exchange_hello_last (void *cls, const struct GNUNET_MessageHeader *message)
-{
- struct PeerContext *me = cls;
+ if (p1 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (p1);
+ if (p2 != NULL)
+ GNUNET_TRANSPORT_TESTING_stop_peer (p2);
- GNUNET_assert (message != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Exchanging HELLO of size %d with peer (%s)!\n",
- (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *)
- message), GNUNET_i2s (&me->id));
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &me->id));
- GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
+ ok = GNUNET_SYSERR;
}
-
-static void
-exchange_hello (void *cls, const struct GNUNET_MessageHeader *message)
+static unsigned int
+get_size (unsigned int iter)
{
- struct PeerContext *me = cls;
+ unsigned int ret;
- GNUNET_assert (message != NULL);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
- message, &me->id));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Exchanging HELLO of size %d from peer %s!\n",
- (int) GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *)
- message), GNUNET_i2s (&me->id));
- GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
+ ret = (iter * iter * iter);
+ return sizeof (struct TestMessage) + (ret % 60000);
}
-
+/**
+ * Sets a bit active in the bitmap.
+ *
+ * @param bitIdx which bit to set
+ */
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+set_bit (unsigned int bitIdx)
{
- if (test_failed == GNUNET_NO)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timeout\n");
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Reliability failed: Last message sent %u, Next message
scheduled %u, Last message received %u, Message expected %u\n",
- msg_sent, msg_scheduled, msg_recv, msg_recv_expected);
+ size_t arraySlot;
+ unsigned int targetBit;
- GNUNET_break (0);
- if (th_p2 != NULL)
+ if (bitIdx >= sizeof (bitmap) * 8)
{
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th_p2);
- th_p2 = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "tried to set bit %d of %d(!?!?)\n",
+ bitIdx, sizeof (bitmap) * 8);
+ return;
}
- if (p2_hello_canceled == GNUNET_NO)
- {
- GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2);
- p2_hello_canceled = GNUNET_YES;
- }
- if (p1_hello_canceled == GNUNET_NO)
- {
- GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1);
- p1_hello_canceled = GNUNET_YES;
- }
- GNUNET_TRANSPORT_disconnect (p1.th);
- GNUNET_TRANSPORT_disconnect (p2.th);
- if (GNUNET_SCHEDULER_NO_TASK != tct)
- {
- GNUNET_SCHEDULER_cancel (tct);
- tct = GNUNET_SCHEDULER_NO_TASK;
- }
- ok = 1;
+ arraySlot = bitIdx / 8;
+ targetBit = (1L << (bitIdx % 8));
+ bitmap[arraySlot] |= targetBit;
}
-
-
-struct TestMessage
+/**
+ * Obtain a bit from bitmap.
+ * @param map the bitmap
+ * @param bit index from bitmap
+ *
+ * @return Bit \a bit from hashcode \a code
+ */
+int
+get_bit (const char *map, unsigned int bit)
{
- struct GNUNET_MessageHeader header;
- uint32_t num;
-};
-
-
-static unsigned int
-get_size (unsigned int iter)
-{
- unsigned int ret;
-
- ret = (iter * iter * iter);
- return sizeof (struct TestMessage) + (ret % 60000);
+ if (bit >= TOTAL_MSGS)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "get bit %d of %d(!?!?)\n", bit,
+ sizeof (bitmap) * 8);
+ return 0;
+ }
+ return ((map)[bit >> 3] & (1 << (bit & 7))) > 0;
}
@@ -361,6 +235,7 @@
uint32_t ats_count)
{
static int n;
+
unsigned int s;
char cbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
const struct TestMessage *hdr;
@@ -428,7 +303,7 @@
unsigned int s;
unsigned int ret;
- th_p2 = NULL;
+ th = NULL;
if (buf == NULL)
{
@@ -457,6 +332,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending message %u of size %u\n",
n,
s);
}
+
#endif
n++;
s = get_size (n);
@@ -466,8 +342,8 @@
while (size - ret >= s);
if (n < TOTAL_MSGS)
{
- th_p2 =
- GNUNET_TRANSPORT_notify_transmit_ready (p2.th, &p1.id, s, 0, TIMEOUT,
+ th =
+ GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, s, 0, TIMEOUT,
¬ify_ready, NULL);
msg_scheduled = n;
}
@@ -478,7 +354,7 @@
if (GNUNET_SCHEDULER_NO_TASK != die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task =
- GNUNET_SCHEDULER_add_delayed (UNRELIABLE_TIMEOUT, &end_unreliably,
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
NULL);
}
if (n % 5000 == 0)
@@ -491,182 +367,82 @@
}
-
static void
-notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
-{
- connected--;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' disconnected (%p)!\n",
- GNUNET_i2s (peer), cls);
-#endif
- if (th_p2 != NULL)
- {
- GNUNET_TRANSPORT_notify_transmit_ready_cancel (th_p2);
- th_p2 = NULL;
- }
-}
-
-
-
-static void
notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_TRANSPORT_ATS_Information *ats,
uint32_t ats_count)
{
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' connected to us (%p)!\n",
GNUNET_i2s (peer), cls);
- if (cls == &p1)
+
+ if (cls == p1)
{
- GNUNET_TRANSPORT_set_quota (p1.th, &p2.id,
+ GNUNET_TRANSPORT_set_quota (p1->th, &p2->id,
GNUNET_BANDWIDTH_value_init (1024 * 1024 *
1024),
GNUNET_BANDWIDTH_value_init (1024 * 1024 *
1024));
- start_time = GNUNET_TIME_absolute_get ();
- connected++;
}
- else
+ else if (cls == p2)
{
- GNUNET_TRANSPORT_set_quota (p2.th, &p1.id,
+ GNUNET_TRANSPORT_set_quota (p2->th, &p1->id,
GNUNET_BANDWIDTH_value_init (1024 * 1024 *
1024),
GNUNET_BANDWIDTH_value_init (1024 * 1024 *
1024));
- connected++;
}
- if (2 == connected)
- {
- if (GNUNET_SCHEDULER_NO_TASK != die_task)
- {
- GNUNET_SCHEDULER_cancel (die_task);
- }
- if (GNUNET_SCHEDULER_NO_TASK != tct)
- {
- GNUNET_SCHEDULER_cancel (tct);
- tct = GNUNET_SCHEDULER_NO_TASK;
- }
- if (p2_hello_canceled == GNUNET_NO)
- {
- GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, &p2);
- p2_hello_canceled = GNUNET_YES;
- }
- if (p1_hello_canceled == GNUNET_NO)
- {
- GNUNET_TRANSPORT_get_hello_cancel (p1.th, &exchange_hello, &p1);
- p1_hello_canceled = GNUNET_YES;
- }
-
- die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
- GNUNET_TRANSPORT_notify_transmit_ready (p2.th, &p1.id, get_size (0), 0,
- TIMEOUT, ¬ify_ready, NULL);
-
- }
}
static void
-setup_peer (struct PeerContext *p, const char *cfgname)
+notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
- memset (p, 0, sizeof (*p));
- p->cfg = GNUNET_CONFIGURATION_create ();
-
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
- {
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS",
- "SERVICEHOME",
- &p->servicehome));
- GNUNET_DISK_directory_remove (p->servicehome);
- }
-
-
-#if START_ARM
- p->arm_proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE_ARM
- "-L", "DEBUG",
-#endif
- "-c", cfgname, NULL);
-#endif
-
- p->th =
- GNUNET_TRANSPORT_connect (p->cfg, NULL, p, ¬ify_receive,
- ¬ify_connect, ¬ify_disconnect);
- GNUNET_assert (p->th != NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%4s' disconnected (%p)!\n",
+ GNUNET_i2s (peer), cls);
}
static void
-try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+sendtask ()
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking peers to connect...\n");
- GNUNET_TRANSPORT_try_connect (p2.th, &p1.id);
- GNUNET_TRANSPORT_try_connect (p1.th, &p2.id);
- tct =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect,
- NULL);
+ start_time = GNUNET_TIME_absolute_get ();
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, get_size (0),
0,
+ TIMEOUT, ¬ify_ready, NULL);
}
+static void
+testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
+{
+ char *p1_c = strdup (GNUNET_i2s (&p1->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %s <-> %s\n", p1_c,
+ GNUNET_i2s (&p2->id));
+ GNUNET_free (p1_c);
+ // FIXME: THIS IS REQUIRED! SEEMS TO BE A BUG!
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &sendtask, NULL);
+}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
- if (is_tcp)
- {
- setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
- setup_peer (&p2, "test_transport_api_tcp_peer2.conf");
- }
- else if (is_http)
- {
- setup_peer (&p1, "test_transport_api_rel_http_peer1.conf");
- setup_peer (&p2, "test_transport_api_rel_http_peer2.conf");
- }
- else if (is_https)
- {
- setup_peer (&p1, "test_transport_api_rel_https_peer1.conf");
- setup_peer (&p2, "test_transport_api_rel_https_peer2.conf");
- }
- else if (is_udp)
- {
- setup_peer (&p1, "test_transport_api_udp_peer1.conf");
- setup_peer (&p2, "test_transport_api_udp_peer2.conf");
- }
- else if (is_unix)
- {
- setup_peer (&p1, "test_transport_api_unix_peer1.conf");
- setup_peer (&p2, "test_transport_api_unix_peer2.conf");
- }
- else if (is_tcp_nat)
- {
- setup_peer (&p1, "test_transport_api_tcp_nat_peer1.conf");
- setup_peer (&p2, "test_transport_api_tcp_nat_peer2.conf");
- }
- else if (is_wlan)
- {
- setup_peer (&p1, "test_transport_api_wlan_peer1.conf");
- setup_peer (&p2, "test_transport_api_wlan_peer2.conf");
- }
- else
- GNUNET_assert (0);
- GNUNET_assert (p1.th != NULL);
- GNUNET_assert (p2.th != NULL);
- GNUNET_TRANSPORT_get_hello (p1.th, &exchange_hello, &p1);
- p1_hello_canceled = GNUNET_NO;
- GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
- p2_hello_canceled = GNUNET_NO;
- tct = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
-}
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p1, ¬ify_receive,
+ ¬ify_connect,
¬ify_disconnect,
+ NULL);
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (cfg_file_p2, ¬ify_receive,
+ ¬ify_connect,
¬ify_disconnect,
+ NULL);
+ GNUNET_TRANSPORT_TESTING_connect_peers (p1, p2, &testing_connect_cb, NULL);
+}
+
static int
check ()
{
- char *const argv[] = { "test-transport-api-unreliability",
+ static char *const argv[] = { "test-transport-api-unreliability",
"-c",
"test_transport_api_data.conf",
#if VERBOSE
@@ -674,133 +450,27 @@
#endif
NULL
};
- struct GNUNET_GETOPT_CommandLineOption options[] = {
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
#if WRITECONFIG
setTransportOptions ("test_transport_api_data.conf");
#endif
- ok = 1;
+ ok = GNUNET_SYSERR;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-transport-api-unreliability", "nohelp", options,
- &run, &ok);
- stop_arm (&p1);
- stop_arm (&p2);
+ "test-transport-api-unreliability", "nohelp", options,
&run, &ok);
- if (is_https)
- {
- struct stat sbuf;
-
- if (0 == stat (cert_file_p1, &sbuf))
- {
- if (0 == remove (cert_file_p1))
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully removed existing certificate file `%s'\n",
- cert_file_p1);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile
`%s'\n",
- cert_file_p1);
- }
-
- if (0 == stat (key_file_p1, &sbuf))
- {
- if (0 == remove (key_file_p1))
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully removed private key file `%s'\n",
- key_file_p1);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to private key file `%s'\n", key_file_p1);
- }
-
- if (0 == stat (cert_file_p2, &sbuf))
- {
- if (0 == remove (cert_file_p2))
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully removed existing certificate file `%s'\n",
- cert_file_p2);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to remove certfile
`%s'\n",
- cert_file_p2);
- }
-
- if (0 == stat (key_file_p2, &sbuf))
- {
- if (0 == remove (key_file_p2))
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully removed private key file `%s'\n",
- key_file_p2);
- else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to private key file `%s'\n", key_file_p2);
- }
- GNUNET_free (key_file_p1);
- GNUNET_free (key_file_p2);
- GNUNET_free (cert_file_p1);
- GNUNET_free (cert_file_p2);
- }
-
- if (p1.servicehome != NULL)
- {
- GNUNET_DISK_directory_remove (p1.servicehome);
- GNUNET_free (p1.servicehome);
- }
- if (p2.servicehome != NULL)
- {
- GNUNET_DISK_directory_remove (p2.servicehome);
- GNUNET_free (p2.servicehome);
- }
return ok;
}
-
int
main (int argc, char *argv[])
{
int ret;
int nat_res;
- test_failed = GNUNET_NO;
-
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
- GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
-
- if (strstr (argv[0], "tcp_nat") != NULL)
- {
- is_tcp_nat = GNUNET_YES;
- GNUNET_asprintf (&test_name, "tcp_nat");
- }
- else if (strstr (argv[0], "tcp") != NULL)
- {
- is_tcp = GNUNET_YES;
- GNUNET_asprintf (&test_name, "tcp");
- }
- else if (strstr (argv[0], "https") != NULL)
- {
- is_https = GNUNET_YES;
- GNUNET_asprintf (&test_name, "https");
- }
- else if (strstr (argv[0], "http") != NULL)
- {
- is_http = GNUNET_YES;
- GNUNET_asprintf (&test_name, "http");
- }
- else if (strstr (argv[0], "udp") != NULL)
- {
- is_udp = GNUNET_YES;
- GNUNET_asprintf (&test_name, "udp");
- }
- else if (strstr (argv[0], "unix") != NULL)
- {
- is_unix = GNUNET_YES;
- GNUNET_asprintf (&test_name, "unix");
- }
- else if (strstr (argv[0], "wlan") != NULL)
- {
- is_wlan = GNUNET_YES;
- }
GNUNET_log_setup ("test-transport-api-unreliability",
#if VERBOSE
"DEBUG",
@@ -809,7 +479,42 @@
#endif
NULL);
+ char *pch = strdup (argv[0]);
+ char *backup = pch;
+ char *filename = NULL;
+ char *dotexe;
+ char *src_name = strdup (__FILE__);
+ char *split = NULL;
+ /* get executable filename */
+ pch = strtok (pch, "/");
+ while (pch != NULL)
+ {
+ pch = strtok (NULL, "/");
+ if (pch != NULL)
+ filename = pch;
+ }
+ /* remove "lt-" */
+ filename = strstr (filename, "tes");
+ if (NULL != (dotexe = strstr (filename, ".exe")))
+ dotexe[0] = '\0';
+
+ /* create cfg filename */
+ GNUNET_asprintf (&cfg_file_p1, "%s_peer1.conf", filename);
+ GNUNET_asprintf (&cfg_file_p2, "%s_peer2.conf", filename);
+
+ split = strstr (src_name, ".");
+ if (split != NULL)
+ {
+ split[0] = '\0';
+ test_name = strdup(&filename[strlen(src_name)+1]);
+ }
+ else
+ test_name = NULL;
+
+ GNUNET_free (src_name);
+ GNUNET_free (backup);
+
if ((strstr (argv[0], "tcp_nat") != NULL) || (strstr (argv[0], "udp_nat") !=
NULL))
{
nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
@@ -830,10 +535,12 @@
return 0;
}
}
-
ret = check ();
+ GNUNET_free (cfg_file_p1);
+ GNUNET_free (cfg_file_p2);
GNUNET_free_non_null (test_name);
+
return ret;
}
Added: gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,31 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-udp-p1/
+DEFAULTCONFIG = test_transport_api_udp_peer1.conf
+
+[transport-udp]
+PORT = 12040
+MAX_BPS = 50000000
+
+[arm]
+PORT = 12045
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12044
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12043
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12042
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12041
+PLUGINS = udp
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
+
Added: gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,31 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-udp-p2/
+DEFAULTCONFIG = test_transport_api_udp_peer2.conf
+
+[transport-udp]
+PORT = 12050
+MAX_BPS = 50000000
+
+[arm]
+PORT = 12055
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12054
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12053
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12052
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 12051
+PLUGINS = udp
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
+
Added: gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,29 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-unix-p1/
+DEFAULTCONFIG = test_transport_api_unix_peer1.conf
+
+[arm]
+PORT = 12125
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12124
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12123
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12122
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12121
+PLUGINS = unix
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
+[transport-unix]
+PORT = 12120
+
Added: gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,29 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-unix-p2/
+DEFAULTCONFIG = test_transport_api_unix_peer2.conf
+
+[arm]
+PORT = 12135
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12134
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12133
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12132
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 12131
+PLUGINS = unix
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
+[transport-unix]
+PORT = 12131
+
Added: gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,30 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-wlan-p1/
+DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
+
+[transport-wlan]
+TESTMODE = 1
+
+[arm]
+PORT = 12164
+UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+
+[statistics]
+PORT = 12163
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+
+[resolver]
+PORT = 12162
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+
+[peerinfo]
+PORT = 12161
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12160
+PLUGINS = wlan
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
+
Added: gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
(rev 0)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2011-08-30 15:28:30 UTC (rev 16648)
@@ -0,0 +1,30 @@
address@hidden@ test_transport_defaults.conf
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-wlan-p2/
+DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
+
+[transport-wlan]
+INTERFACE = mon1
+TESTMODE = 2
+
+[arm]
+PORT = 12174
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+
+[statistics]
+PORT = 12173
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+
+[resolver]
+PORT = 12172
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+
+[peerinfo]
+PORT = 12171
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+
+[transport]
+PORT = 12170
+PLUGINS = wlan
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16648 - gnunet/src/transport,
gnunet <=