enet.h | enet.h | |||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
#include "enet/unix.h" | #include "enet/unix.h" | |||
#endif | #endif | |||
#include "enet/types.h" | #include "enet/types.h" | |||
#include "enet/protocol.h" | #include "enet/protocol.h" | |||
#include "enet/list.h" | #include "enet/list.h" | |||
#include "enet/callbacks.h" | #include "enet/callbacks.h" | |||
#define ENET_VERSION_MAJOR 1 | #define ENET_VERSION_MAJOR 1 | |||
#define ENET_VERSION_MINOR 3 | #define ENET_VERSION_MINOR 3 | |||
#define ENET_VERSION_PATCH 3 | #define ENET_VERSION_PATCH 4 | |||
#define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)< <8) | (patch)) | #define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)< <8) | (patch)) | |||
#define ENET_VERSION ENET_VERSION_CREATE(ENET_VERSION_MAJOR, ENET_VERSION_M INOR, ENET_VERSION_PATCH) | #define ENET_VERSION ENET_VERSION_CREATE(ENET_VERSION_MAJOR, ENET_VERSION_M INOR, ENET_VERSION_PATCH) | |||
typedef enet_uint32 ENetVersion; | typedef enet_uint32 ENetVersion; | |||
typedef enum _ENetSocketType | typedef enum _ENetSocketType | |||
{ | { | |||
ENET_SOCKET_TYPE_STREAM = 1, | ENET_SOCKET_TYPE_STREAM = 1, | |||
ENET_SOCKET_TYPE_DATAGRAM = 2 | ENET_SOCKET_TYPE_DATAGRAM = 2 | |||
} ENetSocketType; | } ENetSocketType; | |||
skipping to change at line 53 | skipping to change at line 53 | |||
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 _ENetSocketOption | typedef enum _ENetSocketOption | |||
{ | { | |||
ENET_SOCKOPT_NONBLOCK = 1, | ENET_SOCKOPT_NONBLOCK = 1, | |||
ENET_SOCKOPT_BROADCAST = 2, | ENET_SOCKOPT_BROADCAST = 2, | |||
ENET_SOCKOPT_RCVBUF = 3, | ENET_SOCKOPT_RCVBUF = 3, | |||
ENET_SOCKOPT_SNDBUF = 4, | ENET_SOCKOPT_SNDBUF = 4, | |||
ENET_SOCKOPT_REUSEADDR = 5 | ENET_SOCKOPT_REUSEADDR = 5, | |||
ENET_SOCKOPT_RCVTIMEO = 6, | ||||
ENET_SOCKOPT_SNDTIMEO = 7 | ||||
} ENetSocketOption; | } 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 */ | |||
}; | }; | |||
skipping to change at line 270 | skipping to change at line 272 | |||
enet_uint32 packetsLost; | enet_uint32 packetsLost; | |||
enet_uint32 packetLoss; /**< mean packet loss of reliable pac kets as a ratio with respect to the constant ENET_PEER_PACKET_LOSS_SCALE */ | enet_uint32 packetLoss; /**< mean packet loss of reliable pac kets as a ratio with respect to the constant ENET_PEER_PACKET_LOSS_SCALE */ | |||
enet_uint32 packetLossVariance; | enet_uint32 packetLossVariance; | |||
enet_uint32 packetThrottle; | enet_uint32 packetThrottle; | |||
enet_uint32 packetThrottleLimit; | enet_uint32 packetThrottleLimit; | |||
enet_uint32 packetThrottleCounter; | enet_uint32 packetThrottleCounter; | |||
enet_uint32 packetThrottleEpoch; | enet_uint32 packetThrottleEpoch; | |||
enet_uint32 packetThrottleAcceleration; | enet_uint32 packetThrottleAcceleration; | |||
enet_uint32 packetThrottleDeceleration; | enet_uint32 packetThrottleDeceleration; | |||
enet_uint32 packetThrottleInterval; | enet_uint32 packetThrottleInterval; | |||
enet_uint32 pingInterval; | ||||
enet_uint32 timeoutLimit; | ||||
enet_uint32 timeoutMinimum; | ||||
enet_uint32 timeoutMaximum; | ||||
enet_uint32 lastRoundTripTime; | enet_uint32 lastRoundTripTime; | |||
enet_uint32 lowestRoundTripTime; | enet_uint32 lowestRoundTripTime; | |||
enet_uint32 lastRoundTripTimeVariance; | enet_uint32 lastRoundTripTimeVariance; | |||
enet_uint32 highestRoundTripTimeVariance; | enet_uint32 highestRoundTripTimeVariance; | |||
enet_uint32 roundTripTime; /**< mean round trip time (RTT), in milliseconds, between sending a reliable packet and receiving its ackno wledgement */ | enet_uint32 roundTripTime; /**< mean round trip time (RTT), in milliseconds, between sending a reliable packet and receiving its ackno wledgement */ | |||
enet_uint32 roundTripTimeVariance; | enet_uint32 roundTripTimeVariance; | |||
enet_uint32 mtu; | enet_uint32 mtu; | |||
enet_uint32 windowSize; | enet_uint32 windowSize; | |||
enet_uint32 reliableDataInTransit; | enet_uint32 reliableDataInTransit; | |||
enet_uint16 outgoingReliableSequenceNumber; | enet_uint16 outgoingReliableSequenceNumber; | |||
skipping to change at line 500 | skipping to change at line 506 | |||
@retval 0 on success | @retval 0 on success | |||
@retval < 0 on failure | @retval < 0 on failure | |||
*/ | */ | |||
ENET_API int enet_address_get_host (const ENetAddress * address, char * hos tName, size_t nameLength); | ENET_API int enet_address_get_host (const ENetAddress * address, char * hos tName, size_t nameLength); | |||
/** @} */ | /** @} */ | |||
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); | ENET_API enet_uint32 enet_crc32 (const ENetBuffer *, size_t); | |||
ENET_API ENetHost * enet_host_create (const ENetAddress *, size_t, size_t, enet_uint32, enet_uint32); | ENET_API ENetHost * enet_host_create (const ENetAddress *, size_t, size_t, enet_uint32, 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_uint32); | ENET_API ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, siz e_t, enet_uint32); | |||
ENET_API int enet_host_check_events (ENetHost *, ENetEvent *); | 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_compress (ENetHost *, const ENetCompressor *) ; | ENET_API void enet_host_compress (ENetHost *, const ENetCompressor *) ; | |||
ENET_API int enet_host_compress_with_range_coder (ENetHost * host); | ENET_API int enet_host_compress_with_range_coder (ENetHost * host); | |||
ENET_API void enet_host_channel_limit (ENetHost *, size_t); | ENET_API void enet_host_channel_limit (ENetHost *, size_t); | |||
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 * ch annelID); | ENET_API ENetPacket * enet_peer_receive (ENetPeer *, enet_uint8 * ch annelID); | |||
ENET_API void enet_peer_ping (ENetPeer *); | ENET_API void enet_peer_ping (ENetPeer *); | |||
ENET_API void enet_peer_ping_interval (ENetPeer *, enet_uint | ||||
32); | ||||
ENET_API void enet_peer_timeout (ENetPeer *, enet_uint32, en | ||||
et_uint32, enet_uint32); | ||||
ENET_API void enet_peer_reset (ENetPeer *); | ENET_API void enet_peer_reset (ENetPeer *); | |||
ENET_API void enet_peer_disconnect (ENetPeer *, enet_uint32) ; | ENET_API void enet_peer_disconnect (ENetPeer *, enet_uint32) ; | |||
ENET_API void enet_peer_disconnect_now (ENetPeer *, enet_uin t32); | ENET_API void enet_peer_disconnect_now (ENetPeer *, enet_uin t32); | |||
ENET_API void enet_peer_disconnect_later (ENetPeer *, enet_u int32); | ENET_API void enet_peer_disconnect_later (ENetPeer *, enet_u int32); | |||
ENET_API void enet_peer_throttle_configure (ENetPeer *, enet _uint32, enet_uint32, enet_uint32); | ENET_API void enet_peer_throttle_configure (ENetPeer *, enet _uint32, enet_uint32, enet_uint32); | |||
extern int enet_peer_throttle (ENetPeer *, enet_uint32); | extern int enet_peer_throttle (ENetPeer *, enet_uint32); | |||
extern void enet_peer_reset_queues (ENetPeer *); | extern void enet_peer_reset_queues (ENetPeer *); | |||
extern void enet_peer_setup_outgoing_command (ENetPeer *, ENetOutgoingCommand *); | extern void enet_peer_setup_outgoing_command (ENetPeer *, ENetOutgoingCommand *); | |||
extern ENetOutgoingCommand * enet_peer_queue_outgoing_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32, enet_uint16); | extern ENetOutgoingCommand * enet_peer_queue_outgoing_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32, enet_uint16); | |||
extern ENetIncomingCommand * enet_peer_queue_incoming_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32); | extern ENetIncomingCommand * enet_peer_queue_incoming_command (ENetPeer *, const ENetProtocol *, ENetPacket *, enet_uint32); | |||
End of changes. 5 change blocks. | ||||
3 lines changed or deleted | 13 lines changed or added | |||
protocol.h | protocol.h | |||
---|---|---|---|---|
skipping to change at line 19 | skipping to change at line 19 | |||
enum | enum | |||
{ | { | |||
ENET_PROTOCOL_MINIMUM_MTU = 576, | ENET_PROTOCOL_MINIMUM_MTU = 576, | |||
ENET_PROTOCOL_MAXIMUM_MTU = 4096, | ENET_PROTOCOL_MAXIMUM_MTU = 4096, | |||
ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS = 32, | ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS = 32, | |||
ENET_PROTOCOL_MINIMUM_WINDOW_SIZE = 4096, | ENET_PROTOCOL_MINIMUM_WINDOW_SIZE = 4096, | |||
ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE = 32768, | ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE = 32768, | |||
ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT = 1, | ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT = 1, | |||
ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT = 255, | ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT = 255, | |||
ENET_PROTOCOL_MAXIMUM_PEER_ID = 0xFFF | ENET_PROTOCOL_MAXIMUM_PEER_ID = 0xFFF, | |||
ENET_PROTOCOL_MAXIMUM_PACKET_SIZE = 1024 * 1024 * 1024, | ||||
ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT = 1024 * 1024 | ||||
}; | }; | |||
typedef enum _ENetProtocolCommand | typedef enum _ENetProtocolCommand | |||
{ | { | |||
ENET_PROTOCOL_COMMAND_NONE = 0, | ENET_PROTOCOL_COMMAND_NONE = 0, | |||
ENET_PROTOCOL_COMMAND_ACKNOWLEDGE = 1, | ENET_PROTOCOL_COMMAND_ACKNOWLEDGE = 1, | |||
ENET_PROTOCOL_COMMAND_CONNECT = 2, | ENET_PROTOCOL_COMMAND_CONNECT = 2, | |||
ENET_PROTOCOL_COMMAND_VERIFY_CONNECT = 3, | ENET_PROTOCOL_COMMAND_VERIFY_CONNECT = 3, | |||
ENET_PROTOCOL_COMMAND_DISCONNECT = 4, | ENET_PROTOCOL_COMMAND_DISCONNECT = 4, | |||
ENET_PROTOCOL_COMMAND_PING = 5, | ENET_PROTOCOL_COMMAND_PING = 5, | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added | |||