Changeset 7377 for code/branches/ipv6/src/external/enet/include

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/include/enet/enet.h (modified) (6 diffs)

code/branches/ipv6/src/external/enet/include/enet/enet.h

@@ -51 +51 @@
    ENET_SOCKOPT_RCVBUF    = 3,
    ENET_SOCKOPT_SNDBUF    = 4,
-   ENET_SOCKOPT_REUSEADDR = 5,
-   ENET_SOCKOPT_V6ONLY = 6
+   ENET_SOCKOPT_REUSEADDR = 5
 } ENetSocketOption;
 
@@ -60 +59 @@
 } ENetHostAddress;
 
-extern const ENetHostAddress ENET_HOST_ANY;       /**< specifies the default server host */
-extern const ENetHostAddress ENET_HOST_BROADCAST; /**< specifies a IPv4 subnet-wide broadcast */
-#define ENET_PORT_ANY 0                           /**< specifies that a port should be automatically chosen */
+extern const ENetHostAddress ENET_HOST_ANY;          /**< specifies the default server host */
+extern const ENetHostAddress ENET_IPV4MAPPED_PREFIX; /**< specifies the IPv4-mapped IPv6 prefix */
+extern const ENetHostAddress ENET_HOST_BROADCAST;    /**< specifies a IPv4 subnet-wide broadcast */
+#define ENET_IPV4MAPPED_PREFIX_LEN 12                /**< specifies the length of the IPv4-mapped IPv6 prefix */
+#define ENET_PORT_ANY 0                              /**< specifies that a port should be automatically chosen */
 
 /**
@@ -80 +81 @@
    enet_uint16 port;
 } ENetAddress;
+
+/**
+ * The address family type.
+ */
+typedef enum _ENetAddressFamily
+{
+    ENET_NO_ADDRESS_FAMILY = 0,
+    ENET_IPV4 = 1,
+    ENET_IPV6 = 2
+} ENetAddressFamily;
 
 /**
@@ -325 +336 @@
 typedef struct _ENetHost
 {
-   ENetSocket           socket;
+   ENetSocket           socket4;
+   ENetSocket           socket6;
    ENetAddress          address;                     /**< Internet address of the host */
    enet_uint32          incomingBandwidth;           /**< downstream bandwidth of the host */
@@ -445 +457 @@
     @{
 */
-ENET_API ENetSocket enet_socket_create (ENetSocketType);
-ENET_API int        enet_socket_bind (ENetSocket, const ENetAddress *);
+ENET_API ENetSocket enet_socket_create (ENetSocketType, ENetAddressFamily);
+ENET_API int        enet_socket_bind (ENetSocket, const ENetAddress *, ENetAddressFamily);
 ENET_API int        enet_socket_listen (ENetSocket, int);
-ENET_API ENetSocket enet_socket_accept (ENetSocket, ENetAddress *);
-ENET_API int        enet_socket_connect (ENetSocket, const ENetAddress *);
-ENET_API int        enet_socket_send (ENetSocket, const ENetAddress *, const ENetBuffer *, size_t);
-ENET_API int        enet_socket_receive (ENetSocket, ENetAddress *, ENetBuffer *, size_t);
-ENET_API int        enet_socket_wait (ENetSocket, enet_uint32 *, enet_uint32);
+ENET_API ENetSocket enet_socket_accept (ENetSocket, ENetAddress *, ENetAddressFamily);
+ENET_API int        enet_socket_connect (ENetSocket, const ENetAddress *, ENetAddressFamily);
+ENET_API int        enet_socket_send (ENetSocket, const ENetAddress *, const ENetBuffer *, size_t, ENetAddressFamily);
+ENET_API int        enet_socket_receive (ENetSocket, ENetAddress *, ENetBuffer *, size_t, ENetAddressFamily);
+ENET_API int        enet_socket_wait (ENetSocket, ENetSocket, enet_uint32 *, enet_uint32);
 ENET_API int        enet_socket_set_option (ENetSocket, ENetSocketOption, int);
 ENET_API void       enet_socket_destroy (ENetSocket);
@@ -496 +508 @@
     @returns the IPv4-mapped IPv6 address in network byte order
 */
-static inline ENetHostAddress enet_address_map4 (enet_uint32 address)
-{
-   ENetHostAddress addr = ENET_HOST_ANY;
-   ((enet_uint16 *)addr.addr)[5] = 0xffff;
-   ((enet_uint32 *)addr.addr)[3] = address;
-   return addr;
-}
+ENET_API ENetHostAddress enet_address_map4 (enet_uint32 address);
+
+/** Returns the Address family of an (IPv4-mapped) IPv6 address.
+    @param address IPv6 address
+    @returns address family
+*/
+ENET_API ENetAddressFamily enet_get_address_family (const ENetAddress * address);
 
 /** @} */