gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r21593 - in gnunet/src: include testing


From: gnunet
Subject: [GNUnet-SVN] r21593 - in gnunet/src: include testing
Date: Sun, 27 May 2012 21:16:54 +0200

Author: grothoff
Date: 2012-05-27 21:16:54 +0200 (Sun, 27 May 2012)
New Revision: 21593

Modified:
   gnunet/src/include/gnunet_testing_lib-new.h
   gnunet/src/testing/test_testing_new_portreservation.c
   gnunet/src/testing/testing_new.c
Log:
-fixing testing testcase build issues

Modified: gnunet/src/include/gnunet_testing_lib-new.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib-new.h 2012-05-27 17:45:31 UTC (rev 
21592)
+++ gnunet/src/include/gnunet_testing_lib-new.h 2012-05-27 19:16:54 UTC (rev 
21593)
@@ -73,6 +73,7 @@
                              const char *controller);
 
 
+
 /**
  * Free system resources.
  *
@@ -109,8 +110,33 @@
                            struct GNUNET_PeerIdentity *id);
 
 
+/**
+ * Reserve a TCP or UDP port for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @return 0 if no free port was available
+ */
+uint16_t 
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+                            int is_tcp);
 
+
 /**
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during GNUNET_TESTING_peer_destroy).
+ *
+ * @param system system to use for reservation tracking
+ * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
+ * @param port reserved port to release
+ */
+void
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+                            int is_tcp,
+                            uint16_t port);
+
+
+/**
  * Create a new configuration using the given configuration
  * as a template; ports and paths will be modified to select
  * available ports on the local system.  If we run

Modified: gnunet/src/testing/test_testing_new_portreservation.c
===================================================================
--- gnunet/src/testing/test_testing_new_portreservation.c       2012-05-27 
17:45:31 UTC (rev 21592)
+++ gnunet/src/testing/test_testing_new_portreservation.c       2012-05-27 
19:16:54 UTC (rev 21593)
@@ -47,26 +47,26 @@
   system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
                                          "localhost");
   GNUNET_assert (NULL != system);
-  new_port1 = reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_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);
+  new_port2 = GNUNET_TESTING_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);
-  release_port (system, GNUNET_YES, new_port1);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
   old_port1 = new_port1;
   new_port1 = 0;
-  new_port1 = reserve_port (system, GNUNET_YES);
+  new_port1 = GNUNET_TESTING_reserve_port (system, GNUNET_YES);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port1);
   GNUNET_assert (0 != new_port1);
   GNUNET_assert (old_port1 == new_port1);
-  release_port (system, GNUNET_YES, new_port1);
-  release_port (system, GNUNET_YES, new_port2);
-  release_port (system, GNUNET_YES, new_port2 + 1); /* OK to get error :) */
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port1);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2);
+  GNUNET_TESTING_release_port (system, GNUNET_YES, new_port2 + 1); /* OK to 
get error :) */
   GNUNET_TESTING_system_destroy (system, GNUNET_NO);
 }
 

Modified: gnunet/src/testing/testing_new.c
===================================================================
--- gnunet/src/testing/testing_new.c    2012-05-27 17:45:31 UTC (rev 21592)
+++ gnunet/src/testing/testing_new.c    2012-05-27 19:16:54 UTC (rev 21593)
@@ -204,10 +204,9 @@
  * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
  * @return 0 if no free port was available
  */
-// static 
 uint16_t 
-reserve_port (struct GNUNET_TESTING_System *system,
-             int is_tcp)
+GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system,
+                            int is_tcp)
 {
   struct GNUNET_NETWORK_Handle *socket;
   struct addrinfo hint;
@@ -277,11 +276,10 @@
  * @param is_tcp GNUNET_YES for TCP ports, GNUNET_NO for UDP
  * @param port reserved port to release
  */
-// static 
 void
-release_port (struct GNUNET_TESTING_System *system,
-             int is_tcp,
-             uint16_t port)
+GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
+                            int is_tcp,
+                            uint16_t port)
 {
   uint32_t *port_buckets;
   uint16_t bucket;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]