GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
#define VERBOSE_ARM GNUNET_NO
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 50)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
#define MTYPE 12345
static int is_tcp;
+static int is_tcp_nat;
+
static int is_udp;
static int is_udp_nat;
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static int is_http;
+
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
#if VERBOSE
#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
static void
end_badly ()
{
- /* do work here */
-#if VERBOSE
- fprintf(stderr, "Ending on an unhappy note.\n");
-#endif
-
+ GNUNET_break (0);
GNUNET_TRANSPORT_disconnect (p1.th);
GNUNET_TRANSPORT_disconnect (p2.th);
-
ok = 1;
- return;
}
static void
{
if (cls == &p1)
{
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (sched,
+ TIMEOUT_TRANSMIT,
+ &end_badly, NULL);
+
GNUNET_TRANSPORT_notify_transmit_ready (p1.th,
&p2.id,
256, 0, TIMEOUT, ¬ify_ready,
struct PeerContext *me = cls;
GNUNET_TRANSPORT_get_hello_cancel (p2.th, &exchange_hello_last, me);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Exchanging HELLO with peer (%p)!\n", cls);
GNUNET_assert (ok >= 3);
GNUNET_assert (GNUNET_OK ==
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
message, &me->id));
-
- /* Can't we get away with only offering one hello? */
- /* GNUNET_TRANSPORT_offer_hello (p1.th, message); */
-
- /*sleep(1);*/ /* Make sure we are not falling prey to the "favorable timing" bug... */
-
- /* both HELLOs exchanged, get ready to test transmission! */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished exchanging HELLOs, now waiting for transmission!\n");
}
"Received HELLO size %d\n", GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *)message));
GNUNET_TRANSPORT_offer_hello (p2.th, message);
-
GNUNET_TRANSPORT_get_hello (p2.th, &exchange_hello_last, &p2);
}
sched = s;
die_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 1), &end_badly, NULL);
+ TIMEOUT,
+ &end_badly, NULL);
if (is_udp)
{
setup_peer (&p1, "test_transport_api_tcp_peer1.conf");
setup_peer (&p2, "test_transport_api_tcp_peer2.conf");
}
- if (is_udp_nat)
+ 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_udp_nat)
{
setup_peer (&p1, "test_transport_api_udp_nat_peer1.conf");
setup_peer (&p2, "test_transport_api_udp_nat_peer2.conf");
}
+ else if (is_http)
+ {
+ setup_peer (&p1, "test_transport_api_http_peer1.conf");
+ setup_peer (&p2, "test_transport_api_http_peer2.conf");
+ }
GNUNET_assert(p1.th != NULL);
GNUNET_assert(p2.th != NULL);
sprintf (buf, "%s/%s", pos, "gnunet-nat-server");
if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
{
- pos = GNUNET_strdup (buf);
- GNUNET_free (buf);
GNUNET_free (path);
- return pos;
+ return buf;
}
pos = end + 1;
}
sprintf (buf, "%s/%s", pos, "gnunet-nat-server");
if (GNUNET_DISK_file_test (buf) == GNUNET_YES)
{
- pos = GNUNET_strdup (buf);
- GNUNET_free (buf);
GNUNET_free (path);
- return pos;
+ return buf;
}
GNUNET_free (buf);
GNUNET_free (path);
}
-static int check_gnunet_nat_server()
+static int
+check_gnunet_nat_server()
{
struct stat statbuf;
+ char *p;
- stat(get_path_from_PATH(), &statbuf);
- if ((statbuf.st_mode & S_ISUID) && (statbuf.st_uid == 0))
- {
- return GNUNET_YES;
- }
- else
+ p = get_path_from_PATH ();
+ if (p == NULL)
+ return GNUNET_NO;
+ if (0 != STAT (p, &statbuf))
{
- return GNUNET_NO;
+ GNUNET_free (p);
+ return GNUNET_SYSERR;
}
+ GNUNET_free (p);
+ if ( (0 != (statbuf.st_mode & S_ISUID)) &&
+ (statbuf.st_uid == 0) )
+ return GNUNET_YES;
+ return GNUNET_NO;
}
int
#ifdef MINGW
return GNUNET_SYSERR;
#endif
- if (strstr(argv[0], "tcp") != NULL)
+ if (strstr(argv[0], "tcp_nat") != NULL)
+ {
+ is_tcp_nat = GNUNET_YES;
+ if (check_gnunet_nat_server() != GNUNET_OK)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "`%s' not properly installed, cannot run NAT test!\n",
+ "gnunet-nat-server");
+ return 0;
+ }
+ }
+ else if (strstr(argv[0], "tcp") != NULL)
{
is_tcp = GNUNET_YES;
}
else if (strstr(argv[0], "udp_nat") != NULL)
{
is_udp_nat = GNUNET_YES;
- if (check_gnunet_nat_server() == GNUNET_NO)
+ if (check_gnunet_nat_server() != GNUNET_OK)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "gnunet-nat-server not installed as root, but not failing!\n");
+ "`%s' not properly installed, cannot run NAT test!\n",
+ "gnunet-nat-server");
return 0;
}
}
{
is_udp = GNUNET_YES;
}
-
+ else if (strstr(argv[0], "http") != NULL)
+ {
+ is_http = GNUNET_YES;
+ }
GNUNET_log_setup ("test-transport-api",
#if VERBOSE
projects / oweals / gnunet.git / blobdiff