Changeset 7389 for code/branches/ipv6/src/external/enet/host.c

Timestamp:

Sep 9, 2010, 1:09:09 AM (14 years ago)

Author:

adrfried

Message:

fix some stuff

File:

• code/branches/ipv6/src/external/enet/host.c (modified) (3 diffs)

code/branches/ipv6/src/external/enet/host.c

@@ -7 +7 @@
 #include <time.h>
 #include "enet/enet.h"
+
+static ENetSocket
+enet_socket_create_bind (const ENetAddress * address, ENetAddressFamily family)
+{
+    ENetSocket socket = enet_socket_create (ENET_SOCKET_TYPE_DATAGRAM, family);
+    if (socket == ENET_SOCKET_NULL)
+        return ENET_SOCKET_NULL;
+
+    if (address != NULL && enet_socket_bind (socket, address, family) < 0)
+    {
+        enet_socket_destroy (socket);
+        return ENET_SOCKET_NULL;
+    }
+
+    enet_socket_set_option (socket, ENET_SOCKOPT_NONBLOCK, 1);
+    enet_socket_set_option (socket, ENET_SOCKOPT_BROADCAST, 1);
+    enet_socket_set_option (socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
+    enet_socket_set_option (socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
+
+    return socket;
+}
 
 /** @defgroup host ENet host functions
@@ -49 +70 @@
     memset (host -> peers, 0, peerCount * sizeof (ENetPeer));
 
-
-    // FIXME: check address for ANY_ADRESS if not only bind to specific protocol
-    // FIXME: allow to fail one of the two protocols
-    /* IPv4 */
-    host -> socket4 = enet_socket_create (ENET_SOCKET_TYPE_DATAGRAM, ENET_IPV4);
-    if (host -> socket4 == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind (host -> socket4, address, ENET_IPV4) < 0))
-    {
-       if (host -> socket4 != ENET_SOCKET_NULL)
-         enet_socket_destroy (host -> socket4);
-
-       enet_free (host -> peers);
-       enet_free (host);
-
-       return NULL;
-    }
-
-    enet_socket_set_option (host -> socket4, ENET_SOCKOPT_NONBLOCK, 1);
-    enet_socket_set_option (host -> socket4, ENET_SOCKOPT_BROADCAST, 1);
-    enet_socket_set_option (host -> socket4, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
-    enet_socket_set_option (host -> socket4, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
-
-    /* IPv6 */
-    host -> socket6 = enet_socket_create (ENET_SOCKET_TYPE_DATAGRAM, ENET_IPV6);
-    if (host -> socket6 == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind (host -> socket6, address, ENET_IPV6) < 0))
-    {
-       if (host -> socket6 != ENET_SOCKET_NULL)
-       {
-           enet_socket_destroy (host -> socket4);
-           enet_socket_destroy (host -> socket6);
-       }
-
-       enet_free (host -> peers);
-       enet_free (host);
-
-       return NULL;
-    }
-
-    enet_socket_set_option (host -> socket6, ENET_SOCKOPT_NONBLOCK, 1);
-    enet_socket_set_option (host -> socket6, ENET_SOCKOPT_BROADCAST, 1);
-    enet_socket_set_option (host -> socket6, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
-    enet_socket_set_option (host -> socket6, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
-
+    int family = (address == NULL || !memcmp (& address -> host, & ENET_HOST_ANY, sizeof (ENetHostAddress))) ?
+        ENET_IPV4 | ENET_IPV6 :
+        enet_get_address_family (address);
+
+    host -> socket4 = (family & ENET_IPV4) ?
+      enet_socket_create_bind (address, ENET_IPV4) :
+      ENET_SOCKET_NULL;
+    host -> socket6 = (family & ENET_IPV6) ?
+      enet_socket_create_bind (address, ENET_IPV6) :
+      ENET_SOCKET_NULL;
+
+    if (host -> socket4 == ENET_SOCKET_NULL && host -> socket6 == ENET_SOCKET_NULL)
+    {
+        enet_free (host -> peers);
+        enet_free (host);
+        return NULL;
+    }
 
     if (address != NULL)
@@ -160 +156 @@
     ENetPeer * currentPeer;
 
-    enet_socket_destroy (host -> socket4);
-    enet_socket_destroy (host -> socket6);
+    if (host -> socket4 != ENET_SOCKET_NULL)
+      enet_socket_destroy (host -> socket4);
+    if (host -> socket6 != ENET_SOCKET_NULL)
+      enet_socket_destroy (host -> socket6);
 
     for (currentPeer = host -> peers;