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

Timestamp:

Sep 8, 2010, 4:08:09 AM (15 years ago)

Author:

adrfried

Message:

using two separate sockets for ipv4 and ipv6

File:

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

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

@@ -49 +49 @@
     memset (host -> peers, 0, peerCount * sizeof (ENetPeer));
 
-    host -> socket = enet_socket_create (ENET_SOCKET_TYPE_DATAGRAM);
-    enet_socket_set_option (host -> socket, ENET_SOCKOPT_V6ONLY, 0); // Needs to be set before bind.
-
-    if (host -> socket == ENET_SOCKET_NULL || (address != NULL && enet_socket_bind (host -> socket, address) < 0))
-    {
-       if (host -> socket != ENET_SOCKET_NULL)
-         enet_socket_destroy (host -> socket);
+
+    // 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);
@@ -63 +65 @@
     }
 
-    enet_socket_set_option (host -> socket, ENET_SOCKOPT_NONBLOCK, 1);
-    enet_socket_set_option (host -> socket, ENET_SOCKOPT_BROADCAST, 1);
-    enet_socket_set_option (host -> socket, ENET_SOCKOPT_RCVBUF, ENET_HOST_RECEIVE_BUFFER_SIZE);
-    enet_socket_set_option (host -> socket, ENET_SOCKOPT_SNDBUF, ENET_HOST_SEND_BUFFER_SIZE);
+    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);
+
 
     if (address != NULL)
@@ -136 +160 @@
     ENetPeer * currentPeer;
 
-    enet_socket_destroy (host -> socket);
+    enet_socket_destroy (host -> socket4);
+    enet_socket_destroy (host -> socket6);
 
     for (currentPeer = host -> peers;