Changeset 7390 for code/branches/ipv6/src/external/enet/patches

Timestamp:

Sep 9, 2010, 4:30:50 PM (14 years ago)

Author:

adrfried

Message:

IPv6 for Windows

I have not tested this, please test this and report issues to me.

Location:

code/branches/ipv6/src/external/enet/patches

Files:

• 0001-use-getaddrinfo-for-lookup-in-unix.c.patch (modified) (1 diff)
• 0002-basic-IPv6-support-on-Linux-systems.patch (modified) (1 diff)
• 0003-using-address-family-in-functions.patch (modified) (13 diffs)
• 0004-using-two-separate-sockets-for-IPv4-and-IPv6.patch (modified) (7 diffs)
• 0005-IPv6-for-Windows.patch (added)

code/branches/ipv6/src/external/enet/patches/0001-use-getaddrinfo-for-lookup-in-unix.c.patch

@@ -2 +2 @@
 From: Adrian Friedli <adi@koalatux.ch>
 Date: Thu, 2 Sep 2010 14:26:42 +0200
-Subject: [PATCH 1/4] use getaddrinfo for lookup in unix.c
+Subject: [PATCH 1/5] use getaddrinfo for lookup in unix.c
 
 ---

code/branches/ipv6/src/external/enet/patches/0002-basic-IPv6-support-on-Linux-systems.patch

@@ -2 +2 @@
 From: Adrian Friedli <adi@koalatux.ch>
 Date: Thu, 2 Sep 2010 14:27:07 +0200
-Subject: [PATCH 2/4] basic IPv6 support on Linux systems
+Subject: [PATCH 2/5] basic IPv6 support on Linux systems
 
 this uses IPv4-mapped IPv6 addresses

code/branches/ipv6/src/external/enet/patches/0003-using-address-family-in-functions.patch

@@ -1 @@
-From af3c0910bd25d73b1a3c06bbfa4e0a3c6b96ddc5 Mon Sep 17 00:00:00 2001
+From b26e4ef3fa9c0139fc2ec086d2243b809365d683 Mon Sep 17 00:00:00 2001
 From: Adrian Friedli <adi@koalatux.ch>
 Date: Mon, 6 Sep 2010 14:58:50 +0200
-Subject: [PATCH 3/4] using address family in functions
+Subject: [PATCH 3/5] using address family in functions
 
 ---
@@ -8 +8 @@
  include/enet/enet.h |   22 +++++++++---
  protocol.c          |    5 ++-
- unix.c              |   87 ++++++++++++++++++++++++++++++++------------------
- 4 files changed, 77 insertions(+), 41 deletions(-)
+ unix.c              |   86 ++++++++++++++++++++++++++++++++------------------
+ 4 files changed, 76 insertions(+), 41 deletions(-)
 
 diff --git a/host.c b/host.c
@@ -91 +91 @@
  
 diff --git a/unix.c b/unix.c
-index de032bb..13a24d8 100644
+index de032bb..475c6e3 100644
 --- a/unix.c
 +++ b/unix.c
-@@ -71,7 +71,28 @@ enet_time_set (enet_uint32 newTimeBase)
+@@ -71,7 +71,27 @@ enet_time_set (enet_uint32 newTimeBase)
      timeBase = timeVal.tv_sec * 1000 + timeVal.tv_usec / 1000 - newTimeBase;
  }
@@ -119 +119 @@
 +}
 +
-+
 +static ENetAddressFamily
  enet_address_set_address (ENetAddress * address, const struct sockaddr * sin)
  {
      memset (address, 0, sizeof (ENetAddress));
-@@ -80,32 +101,31 @@ enet_address_set_address (ENetAddress * address, const struct sockaddr * sin)
+@@ -80,32 +100,31 @@ enet_address_set_address (ENetAddress * address, const struct sockaddr * sin)
          address -> host = enet_address_map4 ((((struct sockaddr_in *) sin) -> sin_addr.s_addr));
          //address -> scopeID = 0;
@@ -164 +163 @@
          ((struct sockaddr_in6 *) sin) -> sin6_addr = * (struct in6_addr *) & address -> host;
          ((struct sockaddr_in6 *) sin) -> sin6_scope_id = address -> scopeID;
-@@ -132,7 +152,7 @@ enet_address_set_host (ENetAddress * address, const char * name)
+@@ -132,7 +151,7 @@ enet_address_set_host (ENetAddress * address, const char * name)
  
      for (res = result; res != NULL; res = res -> ai_next)
@@ -173 +172 @@
      }
  
-@@ -147,9 +167,9 @@ static int
+@@ -147,9 +166,9 @@ static int
  enet_address_get_host_x (const ENetAddress * address, char * name, size_t nameLength, int flags)
  {
@@ -185 +184 @@
  
      return 0;
-@@ -168,21 +188,21 @@ enet_address_get_host (const ENetAddress * address, char * name, size_t nameLeng
+@@ -168,21 +187,21 @@ enet_address_get_host (const ENetAddress * address, char * name, size_t nameLeng
  }
  
@@ -211 +210 @@
  
  int
-@@ -192,13 +212,16 @@ enet_socket_listen (ENetSocket socket, int backlog)
+@@ -192,13 +211,16 @@ enet_socket_listen (ENetSocket socket, int backlog)
  }
  
@@ -232 +231 @@
  
      return sock;
-@@ -241,25 +264,25 @@ enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value)
+@@ -241,25 +263,25 @@ enet_socket_set_option (ENetSocket socket, ENetSocketOption option, int value)
  }
  
@@ -264 +263 @@
        return ENET_SOCKET_NULL;
  
-@@ -281,7 +304,8 @@ int
+@@ -281,7 +303,8 @@ int
  enet_socket_send (ENetSocket socket,
                    const ENetAddress * address,
@@ -274 +273 @@
      struct msghdr msgHdr;
      struct sockaddr_storage sin;
-@@ -291,9 +315,9 @@ enet_socket_send (ENetSocket socket,
+@@ -291,9 +314,9 @@ enet_socket_send (ENetSocket socket,
  
      if (address != NULL)
@@ -286 +285 @@
  
      msgHdr.msg_iov = (struct iovec *) buffers;
-@@ -316,7 +340,8 @@ int
+@@ -316,7 +339,8 @@ int
  enet_socket_receive (ENetSocket socket,
                       ENetAddress * address,
@@ -296 +295 @@
      struct msghdr msgHdr;
      struct sockaddr_storage sin;
-@@ -327,7 +352,7 @@ enet_socket_receive (ENetSocket socket,
+@@ -327,7 +351,7 @@ enet_socket_receive (ENetSocket socket,
      if (address != NULL)
      {

code/branches/ipv6/src/external/enet/patches/0004-using-two-separate-sockets-for-IPv4-and-IPv6.patch

@@ -1 @@
-From 9801a6bcd072870248a6b07245fc09a9492f8f51 Mon Sep 17 00:00:00 2001
+From 73fa28a84ce456561d3912578121a30bc8263c50 Mon Sep 17 00:00:00 2001
 From: Adrian Friedli <adi@koalatux.ch>
 Date: Wed, 8 Sep 2010 12:50:04 +0200
-Subject: [PATCH 4/4] using two separate sockets for IPv4 and IPv6
+Subject: [PATCH 4/5] using two separate sockets for IPv4 and IPv6
 
 ---
- host.c              |   53 +++++++++++++++++++++++++++++++++++++-------------
- include/enet/enet.h |   11 ++++++++-
- protocol.c          |   47 +++++++++++++++++++++++++++++++++++++++-----
- unix.c              |   47 ++++++++++++++++++++++++++++++++------------
- 4 files changed, 123 insertions(+), 35 deletions(-)
+ host.c              |   53 +++++++++++++++++++++++++++---------
+ include/enet/enet.h |   11 ++++++-
+ protocol.c          |   47 ++++++++++++++++++++++++++++----
+ unix.c              |   74 +++++++++++++++++++++++++++++++++++++-------------
+ 4 files changed, 144 insertions(+), 41 deletions(-)
 
 diff --git a/host.c b/host.c
@@ -233 +233 @@
         host -> serviceTime = enet_time_get ();
 diff --git a/unix.c b/unix.c
-index 13a24d8..22ffb76 100644
+index 475c6e3..751cb6f 100644
 --- a/unix.c
 +++ b/unix.c
-@@ -117,7 +117,9 @@ static int
+@@ -116,7 +116,9 @@ static int
  enet_address_set_sin (struct sockaddr * sin, const ENetAddress * address, ENetAddressFamily family)
  {
@@ -247 +247 @@
          ((struct sockaddr_in *) sin) -> sin_family = AF_INET;
          ((struct sockaddr_in *) sin) -> sin_addr = * (struct in_addr *) & address -> host.addr[12];
-@@ -219,7 +221,7 @@ enet_socket_create (ENetSocketType type, ENetAddressFamily family)
+@@ -218,7 +220,7 @@ enet_socket_create (ENetSocketType type, ENetAddressFamily family)
  #ifdef IPV6_V6ONLY
      if (family == ENET_IPV6)
@@ -256 +256 @@
      }
  #endif // IPV6_V6ONLY
-@@ -393,22 +395,38 @@ enet_socketset_select (ENetSocket maxSocket, ENetSocketSet * readSet, ENetSocket
+@@ -392,22 +394,38 @@ enet_socketset_select (ENetSocket maxSocket, ENetSocketSet * readSet, ENetSocket
  }
  
@@ -263 +263 @@
 +enet_socket_wait (ENetSocket socket4, ENetSocket socket6, enet_uint32 * condition, enet_uint32 timeout)
  {
--#ifdef HAS_POLL
+ #ifdef HAS_POLL
 -    struct pollfd pollSocket;
-+//#ifdef HAS_POLL
 +    struct pollfd pollSocket[2];
      int pollCount;
@@ -304 +303 @@
      if (pollCount < 0)
        return -1;
-@@ -418,13 +436,15 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
+@@ -417,10 +435,10 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
      if (pollCount == 0)
        return 0;
@@ -317 +316 @@
  
      return 0;
-+/*
-+FIXME: implement or remove this
- #else
-     fd_set readSet, writeSet;
-     struct timeval timeVal;
-@@ -460,6 +480,7 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
+@@ -436,12 +454,28 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
+     FD_ZERO (& writeSet);
+ 
+     if (* condition & ENET_SOCKET_WAIT_SEND)
+-      FD_SET (socket, & writeSet);
++    {
++        if (socket4 != ENET_SOCKET_NULL)
++            FD_SET (socket4, & writeSet);
++        if (socket6 != ENET_SOCKET_NULL)
++            FD_SET (socket6, & writeSet);
++    }
+ 
+     if (* condition & ENET_SOCKET_WAIT_RECEIVE)
+-      FD_SET (socket, & readSet);
++    {
++        if (socket4 != ENET_SOCKET_NULL)
++            FD_SET (socket4, & readSet);
++        if (socket6 != ENET_SOCKET_NULL)
++            FD_SET (socket6, & readSet);
++    }
++
++    ENetSocket maxSocket = 0;
++    if (socket4 != ENET_SOCKET_NULL)
++        maxSocket = socket4;
++    if (socket6 != ENET_SOCKET_NULL && socket6 > maxSocket)
++        maxSocket = socket6;
+ 
+-    selectCount = select (socket + 1, & readSet, & writeSet, NULL, & timeVal);
++    selectCount = select (maxSocket + 1, & readSet, & writeSet, NULL, & timeVal);
+ 
+     if (selectCount < 0)
+       return -1;
+@@ -451,11 +485,13 @@ enet_socket_wait (ENetSocket socket, enet_uint32 * condition, enet_uint32 timeou
+     if (selectCount == 0)
+       return 0;
+ 
+-    if (FD_ISSET (socket, & writeSet))
+-      * condition |= ENET_SOCKET_WAIT_SEND;
++    if ( (socket4 != ENET_SOCKET_NULL && FD_ISSET (socket4, & writeSet)) ||
++        (socket6 != ENET_SOCKET_NULL && FD_ISSET (socket6, & writeSet)) )
++        * condition |= ENET_SOCKET_WAIT_SEND;
+ 
+-    if (FD_ISSET (socket, & readSet))
+-      * condition |= ENET_SOCKET_WAIT_RECEIVE;
++    if ( (socket4 != ENET_SOCKET_NULL && FD_ISSET (socket4, & readSet)) ||
++        (socket6 != ENET_SOCKET_NULL && FD_ISSET (socket6, & readSet)) )
++        * condition |= ENET_SOCKET_WAIT_RECEIVE;
  
      return 0;
- #endif
-+*/
- }
- 
  #endif
 --