* C code apparently.
*/
#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_EXTRA_LOGGING
-#define VERBOSE_ARM GNUNET_EXTRA_LOGGING
-
-#define START_ARM GNUNET_YES
-
/**
* How long until we give up on transmitting the message?
*/
static GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
-struct PeerContext *p1;
+static struct PeerContext *p1;
+
+static int p1_connected;
+
+static struct PeerContext *p2;
-struct PeerContext *p2;
+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 ()
th = NULL;
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+ p1 = NULL;
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
+ p2 = NULL;
}
static void
reconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_TRANSPORT_try_connect (p->th, &p2->id);
+ GNUNET_TRANSPORT_try_connect (p->th, &p2->id, NULL, NULL); /*FIXME TRY_CONNECT change */
reconnect_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect, p);
}
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;
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Restarted peers connected, stopping test...\n");
+ "Restarted peers connected and message was sent, stopping test...\n");
ok = 0;
end ();
}
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 *t = NULL;
if (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ p1_connected = GNUNET_YES;
t = p1;
+ }
if (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity)))
+ {
+ p2_connected = GNUNET_YES;
t = p2;
+ }
GNUNET_assert (t != NULL);
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
t->no, GNUNET_i2s (peer));
GNUNET_free (ps);
- if ((restarted == GNUNET_YES) && (c == 4))
+ if ((restarted == GNUNET_YES) && ((p1_connected == GNUNET_YES) && (p2_connected == GNUNET_YES)))
{
+ /* Peer was restarted and we received 3 connect messages (2 from first connect, 1 from reconnect) */
send_task = GNUNET_SCHEDULER_add_now (&sendtask, NULL);
}
}
{
struct PeerContext *p = cls;
-
+ if ( (NULL != p1) &&
+ (0 == memcmp (peer, &p1->id, sizeof (struct GNUNET_PeerIdentity))))
+ {
+ p1_connected = GNUNET_NO;
+ }
+ if ( (NULL != p2) &&
+ (0 == memcmp (peer, &p2->id, sizeof (struct GNUNET_PeerIdentity))))
+ {
+ p2_connected = GNUNET_NO;
+ }
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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
-void
+static void
start_cb (struct PeerContext *p, void *cls)
{
static int started;
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
-
+ p1_connected = GNUNET_NO;
+ p2_connected = GNUNET_NO;
p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
¬ify_receive, ¬ify_connect,
¬ify_disconnect, &start_cb,
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[] = {
GNUNET_GETOPT_OPTION_END
};
-#if WRITECONFIG
- setTransportOptions ("test_transport_api_data.conf");
-#endif
send_task = GNUNET_SCHEDULER_NO_TASK;
ok = 1;
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;
}