projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix
[oweals/gnunet.git]
/
src
/
transport
/
test_transport_api.c
diff --git
a/src/transport/test_transport_api.c
b/src/transport/test_transport_api.c
index 566d892b11eb6e6442bec22d1ab3d226612d3524..30f4bbbabe632aa93776dc02def02291b2a61e4b 100644
(file)
--- a/
src/transport/test_transport_api.c
+++ b/
src/transport/test_transport_api.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009, 2010 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file transport/test_transport_api.c
*/
/**
* @file transport/test_transport_api.c
@@
-27,21
+27,9
@@
* C code apparently.
*/
#include "platform.h"
* 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 "gnunet_transport_service.h"
-#include "transport.h"
#include "transport-testing.h"
#include "transport-testing.h"
-#define VERBOSE GNUNET_NO
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
/**
* How long until we give up on transmitting the message?
*/
/**
* How long until we give up on transmitting the message?
*/
@@
-52,9
+40,9
@@
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
*/
#define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define
M
SIZE 2600
+#define
TEST_MESSAGE_
SIZE 2600
-#define
M
TYPE 12345
+#define
TEST_MESSAGE_
TYPE 12345
static char *test_source;
static char *test_source;
@@
-70,9
+58,9
@@
static int s_connected;
static int s_sending;
static int s_sending;
-static
GNUNET_SCHEDULER_TaskIdentifier
die_task;
+static
struct GNUNET_SCHEDULER_Task *
die_task;
-static
GNUNET_SCHEDULER_TaskIdentifier
send_task;
+static
struct GNUNET_SCHEDULER_Task *
send_task;
static struct PeerContext *p1;
static struct PeerContext *p1;
@@
-88,21
+76,16
@@
static char *cfg_file_p1;
static char *cfg_file_p2;
static char *cfg_file_p2;
-#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 ()
{
static void
end ()
{
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
, "Stopping peers\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
, "Stopping peers\n");
- if (send_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (send_task !=
NULL
)
GNUNET_SCHEDULER_cancel (send_task);
GNUNET_SCHEDULER_cancel (send_task);
- if (die_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (die_task !=
NULL
)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
GNUNET_SCHEDULER_cancel (die_task);
if (th != NULL)
@@
-116,12
+99,12
@@
end ()
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- die_task =
GNUNET_SCHEDULER_NO_TASK
;
+ die_task =
NULL
;
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
, "Fail! Stopping peers\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
, "Fail! Stopping peers\n");
- if (send_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (send_task !=
NULL
)
GNUNET_SCHEDULER_cancel (send_task);
if (cc != NULL)
GNUNET_SCHEDULER_cancel (send_task);
if (cc != NULL)
@@
-168,8
+151,7
@@
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
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;
{
struct PeerContext *p = cls;
struct PeerContext *t = NULL;
@@
-182,14
+164,14
@@
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
GNUNET_i2s (&t->id));
GNUNET_free (ps);
"Peer %u (`%4s') received message of type %d and size %u size from peer %u (`%4s')!\n",
p->no, ps, ntohs (message->type), ntohs (message->size), t->no,
GNUNET_i2s (&t->id));
GNUNET_free (ps);
- if ((
M
TYPE == ntohs (message->type)) &&
- (
M
SIZE == ntohs (message->size)))
+ if ((
TEST_MESSAGE_
TYPE == ntohs (message->type)) &&
+ (
TEST_MESSAGE_
SIZE == ntohs (message->size)))
{
ok = 0;
end ();
{
ok = 0;
end ();
@@
-215,56
+197,55
@@
notify_ready (void *cls, size_t size, void *buf)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Timeout occurred while waiting for transmit_ready\n");
- if (
GNUNET_SCHEDULER_NO_TASK
!= die_task)
+ if (
NULL
!= die_task)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
ok = 42;
return 0;
}
GNUNET_SCHEDULER_cancel (die_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)
{
if (buf != NULL)
{
+ memset (buf, '\0', TEST_MESSAGE_SIZE);
hdr = buf;
hdr = buf;
- hdr->size = htons (
M
SIZE);
- hdr->type = htons (
M
TYPE);
+ hdr->size = htons (
TEST_MESSAGE_
SIZE);
+ hdr->type = htons (
TEST_MESSAGE_
TYPE);
}
char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
}
char *ps = GNUNET_strdup (GNUNET_i2s (&p2->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n",
p2->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
GNUNET_i2s (&p->id));
GNUNET_free (ps);
"Peer %u (`%4s') sending message with type %u and size %u bytes to peer %u (`%4s')\n",
p2->no, ps, ntohs (hdr->type), ntohs (hdr->size), p->no,
GNUNET_i2s (&p->id));
GNUNET_free (ps);
- return
M
SIZE;
+ return
TEST_MESSAGE_
SIZE;
}
static void
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
}
static void
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- send_task =
GNUNET_SCHEDULER_NO_TASK
;
+ send_task =
NULL
;
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id));
if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
return;
char *receiver_s = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
s_sending = GNUNET_YES;
"Sending message from peer %u (`%4s') -> peer %u (`%s') !\n",
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
s_sending = GNUNET_YES;
- 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
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;
{
static int c;
@@
-280,7
+261,7
@@
notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Peer %u (`%4s'): peer %u (`%s') connected to me!\n", p->no, ps,
t->no, GNUNET_i2s (peer));
GNUNET_free (ps);
"Peer %u (`%4s'): peer %u (`%s') connected to me!\n", p->no, ps,
t->no, GNUNET_i2s (peer));
GNUNET_free (ps);
@@
-293,7
+274,7
@@
notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
struct PeerContext *p = cls;
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
struct PeerContext *p = cls;
char *ps = GNUNET_strdup (GNUNET_i2s (&p->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps,
GNUNET_i2s (peer));
"Peer %u (`%4s'): peer (`%s') disconnected from me!\n", p->no, ps,
GNUNET_i2s (peer));
@@
-311,7
+292,7
@@
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
cc = NULL;
char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
cc = NULL;
char *p1_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
, "Peers connected: %u (%s) <-> %u (%s)\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
, "Peers connected: %u (%s) <-> %u (%s)\n",
p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
p1->no, p1_c, p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (p1_c);
@@
-327,7
+308,7
@@
start_cb (struct PeerContext *p, void *cls)
started++;
started++;
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
, "Peer %u (`%s') started\n", p->no,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
, "Peer %u (`%s') started\n", p->no,
GNUNET_i2s (&p->id));
if (started != 2)
GNUNET_i2s (&p->id));
if (started != 2)
@@
-336,7
+317,7
@@
start_cb (struct PeerContext *p, void *cls)
s_started = GNUNET_YES;
char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
s_started = GNUNET_YES;
char *sender_c = GNUNET_strdup (GNUNET_i2s (&p1->id));
- GNUNET_log (GNUNET_ERROR_TYPE_
DEBUG
,
+ GNUNET_log (GNUNET_ERROR_TYPE_
INFO
,
"Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (sender_c);
"Test tries to connect peer %u (`%s') -> peer %u (`%s')\n",
p1->no, sender_c, p2->no, GNUNET_i2s (&p2->id));
GNUNET_free (sender_c);
@@
-370,7
+351,7
@@
run (void *cls, char *const *args, const char *cfgfile,
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
if ((p1 == NULL) || (p2 == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
- if (die_task !=
GNUNET_SCHEDULER_NO_TASK
)
+ if (die_task !=
NULL
)
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
return;
@@
-384,19
+365,13
@@
check ()
static char *const argv[] = { "test-transport-api",
"-c",
"test_transport_api_data.conf",
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
};
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;
+ send_task = NULL;
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
ok = 1;
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, test_name,
@@
-416,13
+391,8
@@
main (int argc, char *argv[])
&test_plugin);
GNUNET_log_setup (test_name,
&test_plugin);
GNUNET_log_setup (test_name,
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
NULL);
-
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);
tth = GNUNET_TRANSPORT_TESTING_init ();
GNUNET_TRANSPORT_TESTING_get_config_name (argv[0], &cfg_file_p1, 1);