*
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
#include "gnunet_transport_service.h"
-#include "transport.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
+static struct PeerContext *p1;
-#define START_ARM GNUNET_YES
-
-
-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;
/**
* How long until we give up on transmitting the message?
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-#define MSIZE 2600
+#define TEST_MESSAGE_SIZE 2600
-#define MTYPE 12345
+#define TEST_MESSAGE_TYPE 12345
static int ok;
+static int connected;
+static int blacklist_request_p1;
+static int blacklist_request_p2;
-struct GNUNET_TRANSPORT_Blacklist * blacklist_p1;
+static struct GNUNET_TRANSPORT_Blacklist * blacklist_p1;
-struct GNUNET_TRANSPORT_Blacklist * blacklist_p2;
+static struct GNUNET_TRANSPORT_Blacklist * blacklist_p2;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
static GNUNET_SCHEDULER_TaskIdentifier send_task;
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
#if VERBOSE
#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
#else
static void
-end ()
+end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping\n");
GNUNET_SCHEDULER_cancel (send_task);
if (die_task != GNUNET_SCHEDULER_NO_TASK)
+ {
GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (cc != NULL)
+ {
+ GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+ cc = NULL;
+ }
if (th != NULL)
GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
th = NULL;
- GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1);
+ if (blacklist_p1 != NULL)
+ {
+ GNUNET_TRANSPORT_blacklist_cancel (blacklist_p1);
+ blacklist_p1 = NULL;
+ }
- GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2);
+ if (blacklist_p2 != NULL)
+ {
+ GNUNET_TRANSPORT_blacklist_cancel (blacklist_p2);
+ blacklist_p2 = NULL;
+ }
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
- GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ if (p1 != NULL)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ p1 = NULL;
+ }
+ if (p2 != NULL)
+ {
+ GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ p2 = NULL;
+ }
- ok = 0;
+ if ((blacklist_request_p1 == GNUNET_YES) &&
+ (blacklist_request_p2 == GNUNET_YES) &&
+ (connected == GNUNET_NO))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Peers were not connected, success\n"));
+ ok = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Peers were not connected, fail\n"));
+ ok = 1;
+ }
}
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (send_task != GNUNET_SCHEDULER_NO_TASK)
+ {
GNUNET_SCHEDULER_cancel (send_task);
+ send_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ if (shutdown_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (shutdown_task);
+ shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+ }
if (cc != NULL)
{
static void
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
struct PeerContext *t = NULL;
GNUNET_i2s (&t->id));
GNUNET_free (ps);
- if ((MTYPE == ntohs (message->type)) &&
- (MSIZE == ntohs (message->size)))
+ if ((TEST_MESSAGE_TYPE == ntohs (message->type)) &&
+ (TEST_MESSAGE_SIZE == ntohs (message->size)))
{
ok = 0;
- end ();
+ shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
}
else
{
GNUNET_break (0);
ok = 1;
- end ();
+ shutdown_task = GNUNET_SCHEDULER_add_now(&end, NULL);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ {
GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
return 0;
}
- GNUNET_assert (size >= MSIZE);
+ GNUNET_assert (size >= TEST_MESSAGE_SIZE);
if (buf != NULL)
{
hdr = buf;
- hdr->size = htons (MSIZE);
- hdr->type = htons (MTYPE);
+ hdr->size = htons (TEST_MESSAGE_SIZE);
+ hdr->type = htons (TEST_MESSAGE_TYPE);
}
char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
GNUNET_i2s (&p->id));
GNUNET_free (ps);
- return MSIZE;
+ return TEST_MESSAGE_SIZE;
}
static void
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
- th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id, MSIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id,
+ TEST_MESSAGE_SIZE,
TIMEOUT_TRANSMIT, ¬ify_ready,
p1);
}
+
static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
{
static int c;
struct PeerContext *p = cls;
struct PeerContext *t = NULL;
+ connected = GNUNET_YES;
if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
t = p1;
if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
th = NULL;
}
+
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
cc = NULL;
char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
+ connected = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers connected: %u (%s) <-> %u (%s)\n",
p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
+
+
send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL);
}
-int blacklist_cb (void *cls,
- const struct
- GNUNET_PeerIdentity * pid)
+static int
+blacklist_cb (void *cls,
+ const struct
+ GNUNET_PeerIdentity * pid)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Blacklist request\n", GNUNET_i2s (pid));
- return GNUNET_YES;
+ struct PeerContext * p = cls;
+ int res = GNUNET_SYSERR;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %u : Blacklist request for peer `%s'\n",
+ p->no,
+ GNUNET_i2s (pid));
+
+ if (p == p1)
+ {
+ blacklist_request_p1 = GNUNET_YES;
+ res = GNUNET_OK;
+ }
+ else if (p == p2)
+ {
+ blacklist_request_p2 = GNUNET_YES;
+ res = GNUNET_SYSERR;
+ }
+
+ if (((blacklist_request_p2 == GNUNET_YES) && (blacklist_request_p1 == GNUNET_YES)) && (shutdown_task == GNUNET_SCHEDULER_NO_TASK))
+ {
+ shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &end, NULL);
+ }
+
+ return res;
}
void
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+ connected = GNUNET_NO;
+ blacklist_request_p1 = GNUNET_NO;
+ blacklist_request_p2 = GNUNET_NO;
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, "test_transport_api_tcp_peer1.conf", 1,
¬ify_receive, ¬ify_connect,
&blacklist_cb,
p1);
- blacklist_p2 = GNUNET_TRANSPORT_blacklist (p1->cfg,
+ blacklist_p2 = GNUNET_TRANSPORT_blacklist (p2->cfg,
&blacklist_cb,
p2);
static char *const argv[] = { "test-transport-api-blacklisting",
"-c",
"test_transport_api_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
static struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
-#if WRITECONFIG
- setTransportOptions ("test_transport_api_data.conf");
-#endif
-
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, "test-transport-api-blacklisting",
"nohelp", options, &run, &ok);
int ret;
GNUNET_log_setup ("test-transport-api-blacklisting",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
tth = GNUNET_TRANSPORT_TESTING_init ();
projects / oweals / gnunet.git / blobdiff