projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rps.conf is generated from rps.conf.in
[oweals/gnunet.git]
/
src
/
util
/
test_connection_transmit_cancel.c
diff --git
a/src/util/test_connection_transmit_cancel.c
b/src/util/test_connection_transmit_cancel.c
index 642ea0d4c0410e1e3cf064f6e44d4c0956f78b31..9ef0720edc867fccd0239d06a1830a11508fe8dd 100644
(file)
--- a/
src/util/test_connection_transmit_cancel.c
+++ b/
src/util/test_connection_transmit_cancel.c
@@
-1,10
+1,10
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009 GNUnet e.V.
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
- 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
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
@@
-14,23
+14,20
@@
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 util/test_connection_transmit_cancel.c
* @brief tests for connection.c
*/
#include "platform.h"
*/
/**
* @file util/test_connection_transmit_cancel.c
* @brief tests for connection.c
*/
#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 12435
#define PORT 12435
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
static size_t
not_run (void *cls, size_t size, void *buf)
static size_t
not_run (void *cls, size_t size, void *buf)
@@
-41,57
+38,39
@@
not_run (void *cls, size_t size, void *buf)
static void
static void
-task_transmit_cancel (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+task_transmit_cancel (void *cls)
{
int *ok = cls;
struct GNUNET_CONNECTION_TransmitHandle *th;
struct GNUNET_CONNECTION_Handle *csock;
{
int *ok = cls;
struct GNUNET_CONNECTION_TransmitHandle *th;
struct GNUNET_CONNECTION_Handle *csock;
- csock = GNUNET_CONNECTION_create_from_connect (tc->sched,
- "localhost", PORT, 1024);
+ csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT);
GNUNET_assert (csock != NULL);
GNUNET_assert (csock != NULL);
- th = GNUNET_CONNECTION_notify_transmit_ready (csock,
-
12
,
- GNUNET_TIME_UNIT_MINUTES,
-
¬_run, cls
);
+ th = GNUNET_CONNECTION_notify_transmit_ready (csock,
12,
+
GNUNET_TIME_UNIT_MINUTES
,
+ ¬_run, cls);
+
GNUNET_assert (NULL != th
);
GNUNET_CONNECTION_notify_transmit_ready_cancel (th);
GNUNET_CONNECTION_destroy (csock);
*ok = 0;
}
GNUNET_CONNECTION_notify_transmit_ready_cancel (th);
GNUNET_CONNECTION_destroy (csock);
*ok = 0;
}
-
-
-/**
- * Main method, starts scheduler with task_timeout.
- */
-static int
-check_transmit_cancel ()
-{
- int ok;
-
- ok = 1;
- GNUNET_SCHEDULER_run (&task_transmit_cancel, &ok);
- return ok;
-}
-
-
int
main (int argc, char *argv[])
{
int
main (int argc, char *argv[])
{
- int
ret = 0
;
+ int
ok
;
GNUNET_log_setup ("test_connection_transmit_cancel",
GNUNET_log_setup ("test_connection_transmit_cancel",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
NULL);
- ret += check_transmit_cancel ();
-
- return ret;
+ ok = 1;
+ cfg = GNUNET_CONFIGURATION_create ();
+ GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
+ "localhost");
+ GNUNET_SCHEDULER_run (&task_transmit_cancel, &ok);
+ GNUNET_CONFIGURATION_destroy (cfg);
+ return ok;
}
/* end of test_connection_transmit_cancel.c */
}
/* end of test_connection_transmit_cancel.c */