low level network API

2 files changed, 8 insertions, 8 deletions

diff --git a/src/upnp/upnp.c b/src/upnp/upnp.c
index 6dc4338a0..afc815b1f 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;
-  int sock;
+  struct GNUNET_NETWORK_Descriptor *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, int sock)
+gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_NETWORK_Descriptor *sock)
 {
   char *proxy;
   socklen_t avail;
@@ -613,7 +613,7 @@ gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, int sock)
   /* try to read response */
   do
     {
-      buf_len = recv (dd.sock, buf, sizeof (buf) - 1, 0);
+      buf_len = GNUNET_IO_recv (dd.sock, buf, sizeof (buf) - 1, 0);
       if (buf_len > 0)
         {
           buf[buf_len] = '\0';
diff --git a/src/upnp/upnp_init.c b/src/upnp/upnp_init.c
index 3dc0d2b7c..8390494e5 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 int discovery_socket;
+static struct GNUNET_NETWORK_Descriptor *discovery_socket;
 
 /**
  * Obtain the public/external IP address.
@@ -84,8 +84,8 @@ kill_discovery ()
 
   if (discovery != NULL)
     {
-      SHUTDOWN (discovery_socket, SHUT_RDWR);
-      CLOSE (discovery_socket);
+      GNUNET_IO_shutdown (discovery_socket, SHUT_RDWR);
+      GNUNET_IO_close (&discovery_socket);
       GNUNET_thread_join (discovery, &unused);
       discovery = NULL;
     }
@@ -105,8 +105,8 @@ static void
 discover (void *unused)
 {
   kill_discovery ();
-  discovery_socket = SOCKET (PF_INET, SOCK_DGRAM, 0);
-  if (discovery_socket == -1)
+  discovery_socket = GNUNET_IO_socket (PF_INET, SOCK_DGRAM, 0);
+  if (NULL == discovery_socket)
     return;
   discovery = GNUNET_thread_create (&discover_thread, NULL, 1024 * 128);
 }