projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- mem debug
[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 5fb81e1af46353a8ab71d6d3cdb29906ef271f32..1316efe252c47deed6bb47b2beaeb47ee2bf6eb4 100644
(file)
--- a/
src/transport/test_transport_api.c
+++ b/
src/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;
@@
-65,32
+53,29
@@
static char *test_name;
static int ok;
static int s_started;
static int ok;
static int s_started;
+
static int s_connected;
static int s_connected;
+
static int s_sending;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
static GNUNET_SCHEDULER_TaskIdentifier send_task;
static int s_sending;
static GNUNET_SCHEDULER_TaskIdentifier die_task;
static GNUNET_SCHEDULER_TaskIdentifier send_task;
-struct PeerContext *p1;
+st
atic st
ruct PeerContext *p1;
-struct PeerContext *p2;
+st
atic st
ruct PeerContext *p2;
static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
-struct GNUNET_TRANSPORT_TransmitHandle *th;
+st
atic st
ruct GNUNET_TRANSPORT_TransmitHandle *th;
-struct GNUNET_TRANSPORT_TESTING_handle *tth;
+st
atic st
ruct GNUNET_TRANSPORT_TESTING_handle *tth;
-char *cfg_file_p1;
+
static
char *cfg_file_p1;
-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 ()
@@
-135,9
+120,9
@@
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n"));
if (s_started == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not ready to send data\n"));
if (s_started == GNUNET_NO)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were not started n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were not started
\
n"));
else
else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were started n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peers were started
\
n"));
if (s_connected == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not connected\n"));
if (s_connected == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Peer were not connected\n"));
@@
-186,8
+171,8
@@
notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
GNUNET_i2s (&t->id));
GNUNET_free (ps);
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 ();
@@
-220,13
+205,13
@@
notify_ready (void *cls, size_t size, void *buf)
return 0;
}
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));
@@
-236,7
+221,7
@@
notify_ready (void *cls, size_t size, void *buf)
GNUNET_i2s (&p->id));
GNUNET_free (ps);
GNUNET_i2s (&p->id));
GNUNET_free (ps);
- return
M
SIZE;
+ return
TEST_MESSAGE_
SIZE;
}
}
@@
-254,7
+239,7
@@
sendtask (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
p2->no, GNUNET_i2s (&p2->id), p1->no, receiver_s);
GNUNET_free (receiver_s);
s_sending = GNUNET_YES;
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,
M
SIZE, 0,
+ th = GNUNET_TRANSPORT_notify_transmit_ready (p2->th, &p1->id,
TEST_MESSAGE_
SIZE, 0,
TIMEOUT_TRANSMIT, ¬ify_ready,
p1);
}
TIMEOUT_TRANSMIT, ¬ify_ready,
p1);
}
@@
-302,6
+287,7
@@
notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
th = NULL;
}
th = NULL;
}
+
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
static void
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
{
@@
-317,8
+303,7
@@
testing_connect_cb (struct PeerContext *p1, struct PeerContext *p2, void *cls)
}
}
-
-void
+static void
start_cb (struct PeerContext *p, void *cls)
{
static int started;
start_cb (struct PeerContext *p, void *cls)
{
static int started;
@@
-344,6
+329,7
@@
start_cb (struct PeerContext *p, void *cls)
}
}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@
-381,18
+367,12
@@
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;
ok = 1;
send_task = GNUNET_SCHEDULER_NO_TASK;
ok = 1;
@@
-413,13
+393,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);