X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_connection_transmit_cancel.c;h=9ef0720edc867fccd0239d06a1830a11508fe8dd;hb=225ea594e86e56160b0f89b5cace24291cc6184b;hp=50308a2d08e45138931243631cc58ebe36171383;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c index 50308a2d0..9ef0720ed 100644 --- a/src/util/test_connection_transmit_cancel.c +++ b/src/util/test_connection_transmit_cancel.c @@ -1,6 +1,6 @@ /* 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 @@ -14,20 +14,15 @@ 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** * @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_EXTRA_LOGGING +#include "gnunet_util_lib.h" #define PORT 12435 @@ -43,7 +38,7 @@ not_run (void *cls, size_t size, void *buf) 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; @@ -56,21 +51,19 @@ task_transmit_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) ¬_run, cls); GNUNET_assert (NULL != th); GNUNET_CONNECTION_notify_transmit_ready_cancel (th); - GNUNET_CONNECTION_destroy (csock, GNUNET_YES); + GNUNET_CONNECTION_destroy (csock); *ok = 0; } - - -/** - * Main method, starts scheduler with task_timeout. - */ -static int -check_transmit_cancel () +int +main (int argc, char *argv[]) { int ok; + GNUNET_log_setup ("test_connection_transmit_cancel", + "WARNING", + NULL); ok = 1; cfg = GNUNET_CONFIGURATION_create (); GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", @@ -80,22 +73,4 @@ check_transmit_cancel () return ok; } - -int -main (int argc, char *argv[]) -{ - int ret = 0; - - GNUNET_log_setup ("test_connection_transmit_cancel", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - ret += check_transmit_cancel (); - - return ret; -} - /* end of test_connection_transmit_cancel.c */