rename NETWORK_socket API to NETWORK_connection (to make room for the new actual NET API)

1 files changed, 13 insertions, 13 deletions

diff --git a/src/util/test_network.c b/src/util/test_network.c
index 02555c299..cb0656921 100644
--- a/src/util/test_network.c
+++ b/src/util/test_network.c
@@ -32,11 +32,11 @@
 #define PORT 12435
 
 
-static struct GNUNET_NETWORK_SocketHandle *csock;
+static struct GNUNET_NETWORK_ConnectionHandle *csock;
 
-static struct GNUNET_NETWORK_SocketHandle *asock;
+static struct GNUNET_NETWORK_ConnectionHandle *asock;
 
-static struct GNUNET_NETWORK_SocketHandle *lsock;
+static struct GNUNET_NETWORK_ConnectionHandle *lsock;
 
 static size_t sofar;
 
@@ -88,7 +88,7 @@ receive_check (void *cls,
 #if VERBOSE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive needs more data\n");
 #endif
-      GNUNET_NETWORK_receive (asock,
+      GNUNET_NETWORK_connection_receive (asock,
                               1024,
                               GNUNET_TIME_relative_multiply
                               (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
@@ -101,7 +101,7 @@ receive_check (void *cls,
                   "Receive closes accepted socket\n");
 #endif
       *ok = 0;
-      GNUNET_NETWORK_socket_destroy (asock);
+      GNUNET_NETWORK_connection_destroy (asock);
     }
 }
 
@@ -112,19 +112,19 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n");
 #endif
-  asock = GNUNET_NETWORK_socket_create_from_accept (tc->sched,
+  asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched,
                                                     NULL, NULL, ls, 1024);
   GNUNET_assert (asock != NULL);
-  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_socket_check (asock));
+  GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock));
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys listen socket\n");
 #endif
-  GNUNET_NETWORK_socket_destroy (lsock);
+  GNUNET_NETWORK_connection_destroy (lsock);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Test asks to receive on accepted socket\n");
 #endif
-  GNUNET_NETWORK_receive (asock,
+  GNUNET_NETWORK_connection_receive (asock,
                           1024,
                           GNUNET_TIME_relative_multiply
                           (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls);
@@ -146,23 +146,23 @@ static void
 task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ls = open_listen_socket ();
-  lsock = GNUNET_NETWORK_socket_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0);
   GNUNET_assert (lsock != NULL);
-  csock = GNUNET_NETWORK_socket_create_from_connect (tc->sched,
+  csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched,
                                                      "localhost", PORT, 1024);
   GNUNET_assert (csock != NULL);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks for write notification\n");
 #endif
   GNUNET_assert (NULL !=
-                 GNUNET_NETWORK_notify_transmit_ready (csock,
+                 GNUNET_NETWORK_connection_notify_transmit_ready (csock,
                                                        12,
                                                        GNUNET_TIME_UNIT_SECONDS,
                                                        &make_hello, NULL));
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys client socket\n");
 #endif
-  GNUNET_NETWORK_socket_destroy (csock);
+  GNUNET_NETWORK_connection_destroy (csock);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test prepares to accept\n");
 #endif