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

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.

File:

• code/branches/ipv6/src/external/enet/patches/0003-using-address-family-in-functions.patch (modified) (13 diffs)

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)
      {