projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't shadow the system() function
[oweals/gnunet.git]
/
src
/
util
/
test_connection_timeout_no_connect.c
diff --git
a/src/util/test_connection_timeout_no_connect.c
b/src/util/test_connection_timeout_no_connect.c
index 2e8f9be2eb415c3f12798d49c024000244b1a011..8e9a717ba91b804e0a1448bf2fe03b5e4b7c3a21 100644
(file)
--- a/
src/util/test_connection_timeout_no_connect.c
+++ b/
src/util/test_connection_timeout_no_connect.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009 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
@@
-22,12
+22,7
@@
* @brief tests for connection.c, doing timeout which connect failure
*/
#include "platform.h"
* @brief tests for connection.c, doing timeout which connect failure
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
-
-#define VERBOSE GNUNET_NO
+#include "gnunet_util_lib.h"
#define PORT 13425
#define PORT 13425
@@
-40,10
+35,7
@@
handle_timeout (void *cls, size_t size, void *buf)
{
int *ok = cls;
{
int *ok = cls;
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received timeout signal.\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received timeout signal.\n");
-#endif
-
GNUNET_assert (size == 0);
GNUNET_assert (buf == NULL);
*ok = 0;
GNUNET_assert (size == 0);
GNUNET_assert (buf == NULL);
*ok = 0;
@@
-64,15
+56,14
@@
task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
}
}
-
-/**
- * Main method, starts scheduler with task_timeout.
- */
-static int
-check_timeout ()
+int
+main (int argc, char *argv[])
{
int ok;
{
int ok;
+ GNUNET_log_setup ("test_connection_timeout_no_connect",
+ "WARNING",
+ NULL);
ok = 1;
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
ok = 1;
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
@@
-82,20
+73,4
@@
check_timeout ()
return ok;
}
return ok;
}
-int
-main (int argc, char *argv[])
-{
- int ret = 0;
-
- GNUNET_log_setup ("test_connection_timeout_no_connect",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret += check_timeout ();
- return ret;
-}
-
/* end of test_connection_timeout_no_connect.c */
/* end of test_connection_timeout_no_connect.c */