From cabc8ba699f76cab751b97014d9375ec74612448 Mon Sep 17 00:00:00 2001
From: Nils Durner <durner@gnunet.org>
Date: Sat, 29 Aug 2009 22:06:43 +0000
Subject: [PATCH] naming

---
 src/include/gnunet_connection_lib.h       |  4 +--
 src/include/gnunet_network_lib.h          | 40 ++++++++++-----------
 src/include/gnunet_scheduler_lib.h        |  4 +--
 src/transport/plugin_transport_udp.c      |  6 ++--
 src/upnp/upnp.c                           |  4 +--
 src/upnp/upnp_init.c                      |  2 +-
 src/util/connection.c                     | 12 +++----
 src/util/network.c                        | 44 +++++++++++------------
 src/util/scheduler.c                      |  4 +--
 src/util/server.c                         |  8 ++---
 src/util/service.c                        |  2 +-
 src/util/test_connection.c                |  6 ++--
 src/util/test_connection_addressing.c     |  6 ++--
 src/util/test_connection_receive_cancel.c |  6 ++--
 src/util/test_connection_timeout.c        |  6 ++--
 src/util/test_service.c                   |  2 +-
 16 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h
index 9a0d1cfbe..1a3ef4b54 100644
--- a/src/include/gnunet_connection_lib.h
+++ b/src/include/gnunet_connection_lib.h
@@ -99,7 +99,7 @@ struct GNUNET_CONNECTION_Handle
                                                    GNUNET_SCHEDULER_Handle
                                                    *sched,
                                                    struct
-                                                   GNUNET_NETWORK_Descriptor
+                                                   GNUNET_NETWORK_Handle
                                                    *osSocket, size_t maxbuf);
 
 
@@ -122,7 +122,7 @@ struct GNUNET_CONNECTION_Handle
                                                  GNUNET_CONNECTION_AccessCheck
                                                  access, void *access_cls,
                                                  struct
-                                                 GNUNET_NETWORK_Descriptor
+                                                 GNUNET_NETWORK_Handle
                                                  *lsock, size_t maxbuf);
 
 
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index 726114758..b475ff4f0 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -40,7 +40,7 @@ extern "C"
 /**
  * @brief handle to a socket
  */
-struct GNUNET_NETWORK_Descriptor;
+struct GNUNET_NETWORK_Handle;
 
 /**
  * @brief collection of IO descriptors
@@ -52,33 +52,33 @@ struct GNUNET_NETWORK_FDSet;
 #include "gnunet_time_lib.h"
 
 
-struct GNUNET_NETWORK_Descriptor *
-GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc,
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
 			      struct sockaddr *address,
 			      socklen_t *address_len);
 
 int
-GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor
+GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle
                                        *desc);
 
 
-int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc,
+int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                     const struct sockaddr *address, socklen_t address_len);
 
-int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc);
+int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc);
 
-int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc,
+int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
                        const struct sockaddr *address, socklen_t address_len);
 
-int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Descriptor *desc, int level, int optname,
+int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Handle *desc, int level, int optname,
        void *optval, socklen_t *optlen);
 
-int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc, int backlog);
+int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, int backlog);
 
-ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Descriptor *desc, void *buf,
+ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Handle *desc, void *buf,
                         size_t nbyte);
 
-ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor *desc, void *buffer,
+ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc, void *buffer,
                         size_t length, int flags);
 
 int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
@@ -90,34 +90,34 @@ int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
  *
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
-int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd, int doBlock);
+int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock);
 
-ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor *desc,
+ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
                         const void *buffer, size_t length, int flags);
 
-ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor *desc,
+ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc,
                           const void *message, size_t length, int flags,
                           const struct sockaddr *dest_addr,
                           socklen_t dest_len);
 
-int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Descriptor *fd, int level, int option_name,
+int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Handle *fd, int level, int option_name,
        const void *option_value, socklen_t option_len);
 
-int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc, int how);
+int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how);
 
-struct GNUNET_NETWORK_Descriptor *GNUNET_NETWORK_socket_socket (int domain, int type, int protocol);
+struct GNUNET_NETWORK_Handle *GNUNET_NETWORK_socket_socket (int domain, int type, int protocol);
 
-ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Descriptor *desc,
+ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Handle *desc,
                          const void *buf, size_t nbyte);
 
 
 void GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds);
 
 void GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds,
-    const struct GNUNET_NETWORK_Descriptor *desc);
+    const struct GNUNET_NETWORK_Handle *desc);
 
 int GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds,
-    const struct GNUNET_NETWORK_Descriptor *desc);
+    const struct GNUNET_NETWORK_Handle *desc);
 
 void GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
     const struct GNUNET_NETWORK_FDSet *src);
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index 0ace207ec..4390a8277 100644
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -350,7 +350,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle *sched,
                            enum GNUNET_SCHEDULER_Priority prio,
                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                            struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_NETWORK_Descriptor *rfd, GNUNET_SCHEDULER_Task main, void *cls);
+                           struct GNUNET_NETWORK_Handle *rfd, GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
@@ -383,7 +383,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle *sched,
                             enum GNUNET_SCHEDULER_Priority prio,
                             GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                             struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_NETWORK_Descriptor *wfd, GNUNET_SCHEDULER_Task main, void *cls);
+                            struct GNUNET_NETWORK_Handle *wfd, GNUNET_SCHEDULER_Task main, void *cls);
 
 
 /**
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index c84b2bae7..ce8a2f89c 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -267,10 +267,10 @@ udp_test_would_try (GNUNET_TSession * tsession, unsigned int size,
  * Create a UDP socket.  If possible, use IPv6, otherwise
  * try IPv4.  Update available_protocols accordingly.
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 udp_create_socket ()
 {
-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;
 
   available_protocols = VERSION_AVAILABLE_NONE;
   desc = NULL;
@@ -416,7 +416,7 @@ udp_transport_server_start ()
   struct sockaddr_in6 serverAddrv6;
   struct sockaddr *serverAddr;
   socklen_t addrlen;
-  GNUNET_NETWORK_Descriptor *desc;
+  GNUNET_NETWORK_Handle *desc;
   const int on = 1;
   unsigned short port;
 
diff --git a/src/upnp/upnp.c b/src/upnp/upnp.c
index afc815b1f..8b4937cea 100644
--- a/src/upnp/upnp.c
+++ b/src/upnp/upnp.c
@@ -104,7 +104,7 @@ typedef struct
   char *full_url;
   char *buf;
   unsigned int buf_len;
-  struct GNUNET_NETWORK_Descriptor *sock;
+  struct GNUNET_NETWORK_Handle *sock;
 } UPnPDiscoveryData;
 
 static GaimUPnPControlInfo control_info = {
@@ -543,7 +543,7 @@ gaim_upnp_parse_description (char *proxy, UPnPDiscoveryData * dd)
 }
 
 int
-gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_NETWORK_Descriptor *sock)
+gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_NETWORK_Handle *sock)
 {
   char *proxy;
   socklen_t avail;
diff --git a/src/upnp/upnp_init.c b/src/upnp/upnp_init.c
index 8390494e5..b0eb77c32 100644
--- a/src/upnp/upnp_init.c
+++ b/src/upnp/upnp_init.c
@@ -50,7 +50,7 @@ static unsigned int maps_size;
 
 static struct GNUNET_ThreadHandle *discovery;
 
-static struct GNUNET_NETWORK_Descriptor *discovery_socket;
+static struct GNUNET_NETWORK_Handle *discovery_socket;
 
 /**
  * Obtain the public/external IP address.
diff --git a/src/util/connection.c b/src/util/connection.c
index eeb99f03c..9ae72b2dc 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -174,7 +174,7 @@ struct GNUNET_CONNECTION_Handle
   /**
    * Underlying OS's socket, set to NULL after fatal errors.
    */
-  struct GNUNET_NETWORK_Descriptor *sock;
+  struct GNUNET_NETWORK_Handle *sock;
 
   /**
    * Port to connect to.
@@ -219,7 +219,7 @@ struct GNUNET_CONNECTION_Handle
  */
 struct GNUNET_CONNECTION_Handle *
 GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle
-                                            *sched, struct GNUNET_NETWORK_Descriptor *osSocket,
+                                            *sched, struct GNUNET_NETWORK_Handle *osSocket,
                                             size_t maxbuf)
 {
   struct GNUNET_CONNECTION_Handle *ret;
@@ -248,13 +248,13 @@ struct GNUNET_CONNECTION_Handle *
 GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle
                                           *sched,
                                           GNUNET_CONNECTION_AccessCheck access,
-                                          void *access_cls, struct GNUNET_NETWORK_Descriptor *lsock,
+                                          void *access_cls, struct GNUNET_NETWORK_Handle *lsock,
                                           size_t maxbuf)
 {
   struct GNUNET_CONNECTION_Handle *ret;
   char addr[32];
   socklen_t addrlen;
-  struct GNUNET_NETWORK_Descriptor *sock;
+  struct GNUNET_NETWORK_Handle *sock;
   int aret;
   struct sockaddr_in *v4;
   struct sockaddr_in6 *v6;
@@ -389,7 +389,7 @@ try_lookup (struct GNUNET_CONNECTION_Handle *sock)
 static int
 try_connect (struct GNUNET_CONNECTION_Handle *sock)
 {
-  struct GNUNET_NETWORK_Descriptor *s;
+  struct GNUNET_NETWORK_Handle *s;
 
   if (sock->addr != NULL)
     {
@@ -598,7 +598,7 @@ GNUNET_CONNECTION_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle
                                             const struct sockaddr *serv_addr,
                                             socklen_t addrlen, size_t maxbuf)
 {
-  struct GNUNET_NETWORK_Descriptor *s;
+  struct GNUNET_NETWORK_Handle *s;
   struct GNUNET_CONNECTION_Handle *ret;
 
   s = GNUNET_NETWORK_socket_socket (af_family, SOCK_STREAM, 0);
diff --git a/src/util/network.c b/src/util/network.c
index 9c50d6fcd..ebf329102 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -31,7 +31,7 @@
 
 #define DEBUG_SOCK GNUNET_NO
 
-struct GNUNET_NETWORK_Descriptor
+struct GNUNET_NETWORK_Handle
 {
   int fd;
 };
@@ -51,14 +51,14 @@ struct GNUNET_NETWORK_FDSet
 #define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
 #endif
 
-struct GNUNET_NETWORK_Descriptor *
-GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc,
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
                               struct sockaddr *address,
                               socklen_t * address_len)
 {
-  struct GNUNET_NETWORK_Descriptor *ret;
+  struct GNUNET_NETWORK_Handle *ret;
 
-  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor));
+  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
   ret->fd = accept (desc->fd, address, address_len);
 #ifdef MINGW
   if (INVALID_SOCKET == ret->fd)
@@ -68,7 +68,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc,
 }
 
 int
-GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                             const struct sockaddr *address,
                             socklen_t address_len)
 {
@@ -88,7 +88,7 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc,
  * @return GNUNET_OK on success, GNUNET_SYSERR on error
  */
 int
-GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd,
+GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
                                     int doBlock)
 {
 #if MINGW
@@ -124,7 +124,7 @@ GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd,
 }
 
 int
-GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc)
+GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 {
   int ret;
 #ifdef MINGW
@@ -145,7 +145,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc)
 }
 
 int
-GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
                                const struct sockaddr *address,
                                socklen_t address_len)
 {
@@ -160,7 +160,7 @@ GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc,
 }
 
 int
-GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
                                   int level, int optname, void *optval,
                                   socklen_t * optlen)
 {
@@ -177,7 +177,7 @@ GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Descriptor *desc,
 }
 
 int
-GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
                               int backlog)
 {
   int ret;
@@ -192,7 +192,7 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc,
 }
 
 ssize_t
-GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,
                             void *buffer, size_t length, int flags)
 {
   int ret;
@@ -207,7 +207,7 @@ GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor * desc,
 }
 
 ssize_t
-GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,
                             const void *buffer, size_t length, int flags)
 {
   int ret;
@@ -222,7 +222,7 @@ GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor * desc,
 }
 
 ssize_t
-GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
                               const void *message, size_t length, int flags,
                               const struct sockaddr * dest_addr,
                               socklen_t dest_len)
@@ -239,7 +239,7 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor * desc,
 }
 
 int
-GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Descriptor *fd,
+GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
                                   int level, int option_name,
                                   const void *option_value,
                                   socklen_t option_len)
@@ -255,12 +255,12 @@ GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Descriptor *fd,
   return ret;
 }
 
-struct GNUNET_NETWORK_Descriptor *
+struct GNUNET_NETWORK_Handle *
 GNUNET_NETWORK_socket_socket (int domain, int type, int protocol)
 {
-  struct GNUNET_NETWORK_Descriptor *ret;
+  struct GNUNET_NETWORK_Handle *ret;
 
-  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor));
+  ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
   ret->fd = socket (domain, type, protocol);
 #ifdef MINGW
   if (INVALID_SOCKET == ret->fd)
@@ -277,7 +277,7 @@ GNUNET_NETWORK_socket_socket (int domain, int type, int protocol)
 }
 
 int
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
                                 int how)
 {
   int ret;
@@ -292,7 +292,7 @@ GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc,
 }
 
 int
-GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor
+GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle
                                        *desc)
 {
 #ifdef MINGW
@@ -320,7 +320,7 @@ GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds)
 
 void
 GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
-                          const struct GNUNET_NETWORK_Descriptor *desc)
+                          const struct GNUNET_NETWORK_Handle *desc)
 {
   FD_SET (desc->fd, &fds->sds);
 
@@ -330,7 +330,7 @@ GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
 
 int
 GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
-                            const struct GNUNET_NETWORK_Descriptor *desc)
+                            const struct GNUNET_NETWORK_Handle *desc)
 {
   return FD_ISSET (desc->fd, &fds->sds);
 }
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 69a5a83e1..5643a25d0 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -739,7 +739,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle * sched,
                            enum GNUNET_SCHEDULER_Priority prio,
                            GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                            struct GNUNET_TIME_Relative delay,
-                           struct GNUNET_NETWORK_Descriptor *rfd, GNUNET_SCHEDULER_Task main, void *cls)
+                           struct GNUNET_NETWORK_Handle *rfd, GNUNET_SCHEDULER_Task main, void *cls)
 {
   struct GNUNET_NETWORK_FDSet *rs;
   GNUNET_SCHEDULER_TaskIdentifier ret;
@@ -785,7 +785,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle * sched,
                             enum GNUNET_SCHEDULER_Priority prio,
                             GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
                             struct GNUNET_TIME_Relative delay,
-                            struct GNUNET_NETWORK_Descriptor *wfd, GNUNET_SCHEDULER_Task main, void *cls)
+                            struct GNUNET_NETWORK_Handle *wfd, GNUNET_SCHEDULER_Task main, void *cls)
 {
   struct GNUNET_NETWORK_FDSet *ws;
   GNUNET_SCHEDULER_TaskIdentifier ret;
diff --git a/src/util/server.c b/src/util/server.c
index c05247a63..ca084e622 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -131,7 +131,7 @@ struct GNUNET_SERVER_Handle
    * Socket used to listen for new connections.  Set to
    * "-1" by GNUNET_SERVER_destroy to initiate shutdown.
    */
-  struct GNUNET_NETWORK_Descriptor *listen_socket;
+  struct GNUNET_NETWORK_Handle *listen_socket;
 
   /**
    * Set to GNUNET_YES if we are shutting down.
@@ -368,11 +368,11 @@ process_listen_socket (void *cls,
  *
  * @return NULL on error, otherwise the listen socket
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
 {
   const static int on = 1;
-  struct GNUNET_NETWORK_Descriptor *sock;
+  struct GNUNET_NETWORK_Handle *sock;
   uint16_t port;
 
   switch (serverAddr->sa_family)
@@ -454,7 +454,7 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched,
                       idle_timeout, int require_found)
 {
   struct GNUNET_SERVER_Handle *ret;
-  struct GNUNET_NETWORK_Descriptor *lsock;
+  struct GNUNET_NETWORK_Handle *lsock;
   struct GNUNET_NETWORK_FDSet *r;
 
   lsock = NULL;
diff --git a/src/util/service.c b/src/util/service.c
index 782c70fe9..1f363788e 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -813,7 +813,7 @@ setup_service (struct GNUNET_SERVICE_Context *sctx)
 
   if (!disablev6)
     {
-      struct GNUNET_NETWORK_Descriptor *desc;
+      struct GNUNET_NETWORK_Handle *desc;
 
       /* probe IPv6 support */
       desc = GNUNET_NETWORK_socket_socket (PF_INET6, SOCK_STREAM, 0);
diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index 770b34e8c..dfa6d70b4 100644
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -40,7 +40,7 @@ static struct GNUNET_CONNECTION_Handle *lsock;
 
 static size_t sofar;
 
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
 
 
 
@@ -49,12 +49,12 @@ static struct GNUNET_NETWORK_Descriptor *ls;
  *
  * @return -1 on error, otherwise the listen socket
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;
-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;
 
   memset (&sa, 0, sizeof (sa));
   sa.sin_port = htons (PORT);
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index de11560d3..17ef4d11a 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -40,7 +40,7 @@ static struct GNUNET_CONNECTION_Handle *lsock;
 
 static size_t sofar;
 
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
 
 
 
@@ -49,12 +49,12 @@ static struct GNUNET_NETWORK_Descriptor *ls;
  *
  * @return NULL on error, otherwise the listen socket
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;
-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;
 
   memset (&sa, 0, sizeof (sa));
   sa.sin_port = htons (PORT);
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index eb9d906ff..aa1340e02 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -38,7 +38,7 @@ static struct GNUNET_CONNECTION_Handle *asock;
 
 static struct GNUNET_CONNECTION_Handle *lsock;
 
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
 
 static GNUNET_SCHEDULER_TaskIdentifier receive_task;
 
@@ -50,12 +50,12 @@ static GNUNET_SCHEDULER_TaskIdentifier receive_task;
  *
  * @return NULL on error, otherwise the listen socket
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;
-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;
 
   memset (&sa, 0, sizeof (sa));
   sa.sin_port = htons (PORT);
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 289bb102a..2580ae30a 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -35,7 +35,7 @@ static struct GNUNET_CONNECTION_Handle *csock;
 
 static struct GNUNET_CONNECTION_Handle *lsock;
 
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
 
 
 /**
@@ -43,12 +43,12 @@ static struct GNUNET_NETWORK_Descriptor *ls;
  *
  * @return NULL on error, otherwise the listen socket
  */
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;
-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;
 
   memset (&sa, 0, sizeof (sa));
   sa.sin_port = htons (PORT);
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 8e351deb3..e0cfe28ac 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -300,7 +300,7 @@ int
 main (int argc, char *argv[])
 {
   int ret = 0;
-  struct GNUNET_NETWORK_Descriptor *s;
+  struct GNUNET_NETWORK_Handle *s;
 
   GNUNET_log_setup ("test-service",
 #if VERBOSE
-- 
2.25.1