enet.h   enet.h 
skipping to change at line 44 skipping to change at line 44
ENET_SOCKET_TYPE_DATAGRAM = 2 ENET_SOCKET_TYPE_DATAGRAM = 2
} ENetSocketType; } ENetSocketType;
typedef enum typedef enum
{ {
ENET_SOCKET_WAIT_NONE = 0, ENET_SOCKET_WAIT_NONE = 0,
ENET_SOCKET_WAIT_SEND = (1 << 0), ENET_SOCKET_WAIT_SEND = (1 << 0),
ENET_SOCKET_WAIT_RECEIVE = (1 << 1) ENET_SOCKET_WAIT_RECEIVE = (1 << 1)
} ENetSocketWait; } ENetSocketWait;
typedef enum
{
ENET_SOCKOPT_NONBLOCK = 1,
ENET_SOCKOPT_BROADCAST = 2,
ENET_SOCKOPT_RCVBUF = 3,
ENET_SOCKOPT_SNDBUF = 4
} ENetSocketOption;
enum enum
{ {
ENET_HOST_ANY = 0, /**< specifies the default server ho st */ ENET_HOST_ANY = 0, /**< specifies the default server ho st */
ENET_HOST_BROADCAST = 0xFFFFFFFF, /**< specifies a subnet-wide broadca st */ ENET_HOST_BROADCAST = 0xFFFFFFFF, /**< specifies a subnet-wide broadca st */
ENET_PORT_ANY = 0 /**< specifies that a port should be automatically chosen */ ENET_PORT_ANY = 0 /**< specifies that a port should be automatically chosen */
}; };
/** /**
* Portable internet address structure. * Portable internet address structure.
skipping to change at line 138 skipping to change at line 146
typedef struct _ENetOutgoingCommand typedef struct _ENetOutgoingCommand
{ {
ENetListNode outgoingCommandList; ENetListNode outgoingCommandList;
enet_uint16 reliableSequenceNumber; enet_uint16 reliableSequenceNumber;
enet_uint16 unreliableSequenceNumber; enet_uint16 unreliableSequenceNumber;
enet_uint32 sentTime; enet_uint32 sentTime;
enet_uint32 roundTripTimeout; enet_uint32 roundTripTimeout;
enet_uint32 roundTripTimeoutLimit; enet_uint32 roundTripTimeoutLimit;
enet_uint32 fragmentOffset; enet_uint32 fragmentOffset;
enet_uint16 fragmentLength; enet_uint16 fragmentLength;
enet_uint16 sendAttempts;
ENetProtocol command; ENetProtocol command;
ENetPacket * packet; ENetPacket * packet;
} ENetOutgoingCommand; } ENetOutgoingCommand;
typedef struct _ENetIncomingCommand typedef struct _ENetIncomingCommand
{ {
ENetListNode incomingCommandList; ENetListNode incomingCommandList;
enet_uint16 reliableSequenceNumber; enet_uint16 reliableSequenceNumber;
enet_uint16 unreliableSequenceNumber; enet_uint16 unreliableSequenceNumber;
ENetProtocol command; ENetProtocol command;
skipping to change at line 193 skipping to change at line 202
ENET_PEER_PACKET_THROTTLE_ACCELERATION = 2, ENET_PEER_PACKET_THROTTLE_ACCELERATION = 2,
ENET_PEER_PACKET_THROTTLE_DECELERATION = 2, ENET_PEER_PACKET_THROTTLE_DECELERATION = 2,
ENET_PEER_PACKET_THROTTLE_INTERVAL = 5000, ENET_PEER_PACKET_THROTTLE_INTERVAL = 5000,
ENET_PEER_PACKET_LOSS_SCALE = (1 << 16), ENET_PEER_PACKET_LOSS_SCALE = (1 << 16),
ENET_PEER_PACKET_LOSS_INTERVAL = 10000, ENET_PEER_PACKET_LOSS_INTERVAL = 10000,
ENET_PEER_WINDOW_SIZE_SCALE = 64 * 1024, ENET_PEER_WINDOW_SIZE_SCALE = 64 * 1024,
ENET_PEER_TIMEOUT_LIMIT = 32, ENET_PEER_TIMEOUT_LIMIT = 32,
ENET_PEER_TIMEOUT_MINIMUM = 5000, ENET_PEER_TIMEOUT_MINIMUM = 5000,
ENET_PEER_TIMEOUT_MAXIMUM = 30000, ENET_PEER_TIMEOUT_MAXIMUM = 30000,
ENET_PEER_PING_INTERVAL = 500, ENET_PEER_PING_INTERVAL = 500,
ENET_PEER_UNSEQUENCED_WINDOW_SIZE = 4 * 32 ENET_PEER_UNSEQUENCED_WINDOWS = 64,
ENET_PEER_UNSEQUENCED_WINDOW_SIZE = 1024,
ENET_PEER_FREE_UNSEQUENCED_WINDOWS = 32,
ENET_PEER_RELIABLE_WINDOWS = 16,
ENET_PEER_RELIABLE_WINDOW_SIZE = 0x1000,
ENET_PEER_FREE_RELIABLE_WINDOWS = 8
}; };
typedef struct _ENetChannel typedef struct _ENetChannel
{ {
enet_uint16 outgoingReliableSequenceNumber; enet_uint16 outgoingReliableSequenceNumber;
enet_uint16 outgoingUnreliableSequenceNumber; enet_uint16 outgoingUnreliableSequenceNumber;
enet_uint16 usedReliableWindows;
enet_uint16 reliableWindows [ENET_PEER_RELIABLE_WINDOWS];
enet_uint16 incomingReliableSequenceNumber; enet_uint16 incomingReliableSequenceNumber;
enet_uint16 incomingUnreliableSequenceNumber;
ENetList incomingReliableCommands; ENetList incomingReliableCommands;
ENetList incomingUnreliableCommands; ENetList incomingUnreliableCommands;
} ENetChannel; } ENetChannel;
/** /**
* An ENet peer which data packets may be sent or received from. * An ENet peer which data packets may be sent or received from.
* *
* No fields should be modified unless otherwise specified. * No fields should be modified unless otherwise specified.
*/ */
typedef struct _ENetPeer typedef struct _ENetPeer
skipping to change at line 289 skipping to change at line 304
{ {
ENetSocket socket; ENetSocket socket;
ENetAddress address; /**< Internet address of the host */ ENetAddress address; /**< Internet address of the host */
enet_uint32 incomingBandwidth; /**< downstream bandwidt h of the host */ enet_uint32 incomingBandwidth; /**< downstream bandwidt h of the host */
enet_uint32 outgoingBandwidth; /**< upstream bandwidth of the host */ enet_uint32 outgoingBandwidth; /**< upstream bandwidth of the host */
enet_uint32 bandwidthThrottleEpoch; enet_uint32 bandwidthThrottleEpoch;
enet_uint32 mtu; enet_uint32 mtu;
int recalculateBandwidthLimits; int recalculateBandwidthLimits;
ENetPeer * peers; /**< array of peers allo cated for this host */ ENetPeer * peers; /**< array of peers allo cated for this host */
size_t peerCount; /**< number of peers all ocated for this host */ size_t peerCount; /**< number of peers all ocated for this host */
enet_uint32 serviceTime;
ENetPeer * lastServicedPeer; ENetPeer * lastServicedPeer;
int continueSending; int continueSending;
size_t packetSize; size_t packetSize;
enet_uint16 headerFlags; enet_uint16 headerFlags;
ENetProtocol commands [ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS]; ENetProtocol commands [ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS];
size_t commandCount; size_t commandCount;
ENetBuffer buffers [ENET_BUFFER_MAXIMUM]; ENetBuffer buffers [ENET_BUFFER_MAXIMUM];
size_t bufferCount; size_t bufferCount;
ENetAddress receivedAddress; ENetAddress receivedAddress;
enet_uint8 receivedData [ENET_PROTOCOL_MAXIMUM_MTU]; enet_uint8 receivedData [ENET_PROTOCOL_MAXIMUM_MTU];
skipping to change at line 396 skipping to change at line 412
/** @defgroup socket ENet socket functions /** @defgroup socket ENet socket functions
@{ @{
*/ */
ENET_API ENetSocket enet_socket_create (ENetSocketType, const ENetAddress * ); ENET_API ENetSocket enet_socket_create (ENetSocketType, const ENetAddress * );
ENET_API ENetSocket enet_socket_accept (ENetSocket, ENetAddress *); ENET_API ENetSocket enet_socket_accept (ENetSocket, ENetAddress *);
ENET_API int enet_socket_connect (ENetSocket, const ENetAddress *); ENET_API int enet_socket_connect (ENetSocket, const ENetAddress *);
ENET_API int enet_socket_send (ENetSocket, const ENetAddress *, cons t ENetBuffer *, size_t); ENET_API int enet_socket_send (ENetSocket, const ENetAddress *, cons t ENetBuffer *, size_t);
ENET_API int enet_socket_receive (ENetSocket, ENetAddress *, ENetBuf fer *, size_t); ENET_API int enet_socket_receive (ENetSocket, ENetAddress *, ENetBuf fer *, size_t);
ENET_API int enet_socket_wait (ENetSocket, enet_uint32 *, enet_uint3 2); ENET_API int enet_socket_wait (ENetSocket, enet_uint32 *, enet_uint3 2);
ENET_API int enet_socket_set_option (ENetSocket, ENetSocketOption, i nt);
ENET_API void enet_socket_destroy (ENetSocket); ENET_API void enet_socket_destroy (ENetSocket);
/** @} */ /** @} */
/** @defgroup Address ENet address functions /** @defgroup Address ENet address functions
@{ @{
*/ */
/** Attempts to resolve the host named by the parameter hostName and sets /** Attempts to resolve the host named by the parameter hostName and sets
the host field in the address parameter if successful. the host field in the address parameter if successful.
@param address destination to store resolved address @param address destination to store resolved address
skipping to change at line 443 skipping to change at line 460
/** @} */ /** @} */
ENET_API ENetPacket * enet_packet_create (const void *, size_t, enet_uint32 ); ENET_API ENetPacket * enet_packet_create (const void *, size_t, enet_uint32 );
ENET_API void enet_packet_destroy (ENetPacket *); ENET_API void enet_packet_destroy (ENetPacket *);
ENET_API int enet_packet_resize (ENetPacket *, size_t); ENET_API int enet_packet_resize (ENetPacket *, size_t);
extern enet_uint32 enet_crc32 (const ENetBuffer *, size_t); extern enet_uint32 enet_crc32 (const ENetBuffer *, size_t);
ENET_API ENetHost * enet_host_create (const ENetAddress *, size_t, enet_uin t32, enet_uint32); ENET_API ENetHost * enet_host_create (const ENetAddress *, size_t, enet_uin t32, enet_uint32);
ENET_API void enet_host_destroy (ENetHost *); ENET_API void enet_host_destroy (ENetHost *);
ENET_API ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, siz e_t); ENET_API ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, siz e_t);
ENET_API int enet_host_check_events (ENetHost *, ENetEvent *);
ENET_API int enet_host_service (ENetHost *, ENetEvent *, enet_uint32 ); ENET_API int enet_host_service (ENetHost *, ENetEvent *, enet_uint32 );
ENET_API void enet_host_flush (ENetHost *); ENET_API void enet_host_flush (ENetHost *);
ENET_API void enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *); ENET_API void enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *);
ENET_API void enet_host_bandwidth_limit (ENetHost *, enet_uint32, ene t_uint32); ENET_API void enet_host_bandwidth_limit (ENetHost *, enet_uint32, ene t_uint32);
extern void enet_host_bandwidth_throttle (ENetHost *); extern void enet_host_bandwidth_throttle (ENetHost *);
ENET_API int enet_peer_send (ENetPeer *, enet_uint8, ENetPa cket *); ENET_API int enet_peer_send (ENetPeer *, enet_uint8, ENetPa cket *);
ENET_API ENetPacket * enet_peer_receive (ENetPeer *, enet_uint8); ENET_API ENetPacket * enet_peer_receive (ENetPeer *, enet_uint8);
ENET_API void enet_peer_ping (ENetPeer *); ENET_API void enet_peer_ping (ENetPeer *);
ENET_API void enet_peer_reset (ENetPeer *); ENET_API void enet_peer_reset (ENetPeer *);
 End of changes. 8 change blocks. 
2 lines changed or deleted 20 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/