[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21585 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21585 - gnunet/src/testing |
Date: |
Sat, 26 May 2012 16:04:59 +0200 |
Author: harsha
Date: 2012-05-26 16:04:59 +0200 (Sat, 26 May 2012)
New Revision: 21585
Added:
gnunet/src/testing/test_testing_new_portreservation.c
Modified:
gnunet/src/testing/
gnunet/src/testing/Makefile.am
gnunet/src/testing/testing_new.c
Log:
port reservation and test cases
Property changes on: gnunet/src/testing
___________________________________________________________________
Modified: svn:ignore
- gnunet-testing
topology_clique.dot
testing_topo_initial
test_testing_peergroup
test_testing_reconnect
final_topology.dot
test_testing_topology_stability
topology_clique.do
test_testing_2dtorus
test_testing_topology_none
test_testing_topology_small_world_torus
test_testing_topology_small_world_ring
test_testing_topology_scale_free
test_testing_topology_ring
test_testing_topology_line
test_testing_topology_internat
test_testing_topology_erdos_renyi
test_testing_topology_clique_random
test_testing_topology_clique_minimum
test_testing_topology_clique_dfs
test_testing_topology_churn
test_testing_topology_blacklist
test_testing_topology_2d_torus
test_testing_group_remote
topology.dot
test_testing_topology_clique
test_testing_group.gcno
test_testing_group.gcda
test_testing_connect.gcno
test_testing_connect.gcda
test_testing_group
test_testing_connect
testing_testbed.gcno
testing_testbed.gcda
testing_group.gcno
testing_group.gcda
testing.gcno
testing.gcda
test_testing.gcno
test_testing.gcda
test_testing
Makefile.in
Makefile
.deps
+ gnunet-testing
topology_clique.dot
testing_topo_initial
test_testing_peergroup
test_testing_reconnect
final_topology.dot
test_testing_topology_stability
topology_clique.do
test_testing_2dtorus
test_testing_topology_none
test_testing_topology_small_world_torus
test_testing_topology_small_world_ring
test_testing_topology_scale_free
test_testing_topology_ring
test_testing_topology_line
test_testing_topology_internat
test_testing_topology_erdos_renyi
test_testing_topology_clique_random
test_testing_topology_clique_minimum
test_testing_topology_clique_dfs
test_testing_topology_churn
test_testing_topology_blacklist
test_testing_topology_2d_torus
test_testing_group_remote
topology.dot
test_testing_topology_clique
test_testing_group.gcno
test_testing_group.gcda
test_testing_connect.gcno
test_testing_connect.gcda
test_testing_group
test_testing_connect
test_testing_new_portreservation
testing_testbed.gcno
testing_testbed.gcda
testing_group.gcno
testing_group.gcda
testing.gcno
testing.gcda
test_testing.gcno
test_testing.gcda
test_testing
Makefile.in
Makefile
.deps
Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am 2012-05-26 10:54:09 UTC (rev 21584)
+++ gnunet/src/testing/Makefile.am 2012-05-26 14:04:59 UTC (rev 21585)
@@ -89,7 +89,8 @@
test_testing_topology_erdos_renyi \
test_testing_topology_internat \
test_testing_topology_none \
- test_testing_topology_scale_free
+ test_testing_topology_scale_free \
+ test_testing_new_portreservation
if ENABLE_TEST_RUN
TESTS = \
@@ -97,7 +98,8 @@
test_testing_connect \
test_testing_reconnect \
test_testing_group \
- test_testing_peergroup
+ test_testing_peergroup \
+ test_testing_new_portreservation
endif
gnunet_testing_SOURCES = \
@@ -263,7 +265,13 @@
$(top_builddir)/src/core/libgnunetcore.la \
$(top_builddir)/src/util/libgnunetutil.la
+test_testing_new_portreservation_SOURCES = \
+ test_testing_new_portreservation.c
+test_testing_new_portreservation_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting_new.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+
EXTRA_DIST = \
test_testing_defaults.conf \
test_testing_data.conf \
Added: gnunet/src/testing/test_testing_new_portreservation.c
===================================================================
--- gnunet/src/testing/test_testing_new_portreservation.c
(rev 0)
+++ gnunet/src/testing/test_testing_new_portreservation.c 2012-05-26
14:04:59 UTC (rev 21585)
@@ -0,0 +1,78 @@
+/*
+ This file is part of GNUnet
+ (C) 2008, 2009, 2012 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
+ 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
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ 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.
+ */
+
+/**
+ * @file testing/test_testing_new_portreservation.c
+ * @brief test case for testing port reservation routines from the new testing
+ * library API
+ * @author Sree Harsha Totakura
+ */
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+#define LOG(kind,...) \
+ GNUNET_log (kind, __VA_ARGS__)
+
+/**
+ * Main point of test execution
+ */
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ uint16_t new_port1, new_port2;
+ struct GNUNET_TESTING_System *system;
+
+ system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
+ "localhost");
+ GNUNET_assert (NULL != system);
+ new_port1 = reserve_port (system, GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved TCP port %u\n", new_port1);
+ GNUNET_assert (0 != new_port1);
+ new_port2 = reserve_port (system, GNUNET_YES);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved TCP port %u\n", new_port2);
+ GNUNET_assert (0 != new_port2);
+ GNUNET_assert (new_port1 != new_port2);
+ GNUNET_TESTING_system_destroy (system, GNUNET_NO);
+}
+
+int main (int argc, char *argv[])
+{
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ if (GNUNET_OK !=
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "test_testing_new_portreservation",
+ "test case for testing port reservation routines"
+ " from the new testing library API",
+ options,
+ &run,
+ NULL))
+ {
+ return 1;
+ }
+ return 0;
+}
Modified: gnunet/src/testing/testing_new.c
===================================================================
--- gnunet/src/testing/testing_new.c 2012-05-26 10:54:09 UTC (rev 21584)
+++ gnunet/src/testing/testing_new.c 2012-05-26 14:04:59 UTC (rev 21585)
@@ -210,11 +210,11 @@
struct addrinfo *ret;
uint32_t *port_buckets;
char *open_port_str;
- int pos;
int bind_status;
uint32_t xor_image;
uint16_t index;
uint16_t open_port;
+ uint16_t pos;
hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
hint.ai_socktype = (GNUNET_YES == is_tcp)? SOCK_STREAM : SOCK_DGRAM;
@@ -244,7 +244,7 @@
ret = NULL;
GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
GNUNET_free (open_port_str);
- socket = GNUNET_NETWORK_socket_create (AF_UNSPEC,
+ socket = GNUNET_NETWORK_socket_create (ret->ai_family,
(GNUNET_YES == is_tcp) ?
SOCK_STREAM : SOCK_DGRAM,
0);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21585 - gnunet/src/testing,
gnunet <=