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

Timestamp:

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

Author:

adrfried

Message:

using two separate sockets for ipv4 and ipv6

File:

• code/branches/ipv6/src/external/enet/protocol.c (modified) (8 diffs)

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

@@ -11 +11 @@
 
 const ENetHostAddress ENET_HOST_ANY = { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } };
+const ENetHostAddress ENET_IPV4MAPPED_PREFIX = { { 0,0,0,0,0,0,0,0,0,0, 0xff, 0xff, 0,0,0,0 } };
 const ENetHostAddress ENET_HOST_BROADCAST = { { 0,0,0,0,0,0,0,0,0,0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
 
@@ -28 +29 @@
     sizeof (ENetProtocolThrottleConfigure),
 };
+
+ENetHostAddress
+enet_address_map4 (enet_uint32 address)
+{
+    ENetHostAddress addr = ENET_IPV4MAPPED_PREFIX;
+    ((enet_uint32 *)addr.addr)[3] = address;
+    return addr;
+}
+
+ENetAddressFamily
+enet_get_address_family (const ENetAddress * address)
+{
+    if (!memcmp(& address->host, & ENET_IPV4MAPPED_PREFIX, ENET_IPV4MAPPED_PREFIX_LEN))
+        return ENET_IPV4;
+    return ENET_IPV6;
+}
 
 size_t
@@ -1025 +1042 @@
  
 static int
-enet_protocol_receive_incoming_commands (ENetHost * host, ENetEvent * event)
+enet_protocol_receive_incoming_commands (ENetHost * host, ENetEvent * event, ENetAddressFamily family)
 {
     for (;;)
@@ -1035 +1052 @@
        buffer.dataLength = sizeof (host -> packetData [0]);
 
-       receivedLength = enet_socket_receive (host -> socket,
+       receivedLength = enet_socket_receive (family == ENET_IPV4 ? host -> socket4 : host -> socket6,
                                              & host -> receivedAddress,
                                              & buffer,
-                                             1);
+                                             1,
+                                             family);
 
        if (receivedLength < 0)
@@ -1045 +1063 @@
        if (receivedLength == 0)
          return 0;
+
+       if (enet_get_address_family (& host -> receivedAddress) != family)
+         return -1;
 
        host -> receivedData = host -> packetData [0];
@@ -1501 +1522 @@
         currentPeer -> lastSendTime = host -> serviceTime;
 
-        sentLength = enet_socket_send (host -> socket, & currentPeer -> address, host -> buffers, host -> bufferCount);
+        ENetAddressFamily family = enet_get_address_family (& currentPeer -> address);
+        sentLength = enet_socket_send (family == ENET_IPV4 ? host -> socket4 : host -> socket6,
+                                           & currentPeer -> address,
+                                           host -> buffers,
+                                           host -> bufferCount,
+                                           family);
 
         enet_protocol_remove_sent_unreliable_commands (currentPeer);
@@ -1612 +1638 @@
        }
 
-       switch (enet_protocol_receive_incoming_commands (host, event))
+       switch (enet_protocol_receive_incoming_commands (host, event, ENET_IPV4))
+       {
+       case 1:
+          return 1;
+
+       case -1:
+          perror ("Error receiving incoming packets");
+
+          return -1;
+
+       default:
+          break;
+       }
+
+       switch (enet_protocol_receive_incoming_commands (host, event, ENET_IPV6))
        {
        case 1:
@@ -1664 +1704 @@
        waitCondition = ENET_SOCKET_WAIT_RECEIVE;
 
-       if (enet_socket_wait (host -> socket, & waitCondition, ENET_TIME_DIFFERENCE (timeout, host -> serviceTime)) != 0)
+       if (enet_socket_wait (host -> socket4, host -> socket6, & waitCondition, ENET_TIME_DIFFERENCE (timeout, host -> serviceTime)) != 0)
          return -1;