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 1 | #define ENET_VERSION_PATCH 2 | |||
#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 99 | skipping to change at line 99 | |||
typedef enum _ENetPacketFlag | typedef enum _ENetPacketFlag | |||
{ | { | |||
/** packet must be received by the target peer and resend attempts shoul d be | /** packet must be received by the target peer and resend attempts shoul d be | |||
* made until the packet is delivered */ | * made until the packet is delivered */ | |||
ENET_PACKET_FLAG_RELIABLE = (1 << 0), | ENET_PACKET_FLAG_RELIABLE = (1 << 0), | |||
/** packet will not be sequenced with other packets | /** packet will not be sequenced with other packets | |||
* not supported for reliable packets | * not supported for reliable packets | |||
*/ | */ | |||
ENET_PACKET_FLAG_UNSEQUENCED = (1 << 1), | ENET_PACKET_FLAG_UNSEQUENCED = (1 << 1), | |||
/** packet will not allocate data, and user must supply it instead */ | /** packet will not allocate data, and user must supply it instead */ | |||
ENET_PACKET_FLAG_NO_ALLOCATE = (1 << 2) | ENET_PACKET_FLAG_NO_ALLOCATE = (1 << 2), | |||
/** packet will be fragmented using unreliable (instead of reliable) sen | ||||
ds | ||||
* if it exceeds the MTU */ | ||||
ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT = (1 << 3) | ||||
} ENetPacketFlag; | } ENetPacketFlag; | |||
struct _ENetPacket; | struct _ENetPacket; | |||
typedef void (ENET_CALLBACK * ENetPacketFreeCallback) (struct _ENetPacket * ); | typedef void (ENET_CALLBACK * ENetPacketFreeCallback) (struct _ENetPacket * ); | |||
/** | /** | |||
* ENet packet structure. | * ENet packet structure. | |||
* | * | |||
* An ENet data packet that may be sent to or received from a peer. The sho wn | * An ENet data packet that may be sent to or received from a peer. The sho wn | |||
* fields should only be read and never modified. The data field contains t he | * fields should only be read and never modified. The data field contains t he | |||
skipping to change at line 221 | skipping to change at line 224 | |||
ENET_PEER_FREE_RELIABLE_WINDOWS = 8 | 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 usedReliableWindows; | |||
enet_uint16 reliableWindows [ENET_PEER_RELIABLE_WINDOWS]; | 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 | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added | |||
protocol.h | protocol.h | |||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
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, | |||
ENET_PROTOCOL_COMMAND_SEND_RELIABLE = 6, | ENET_PROTOCOL_COMMAND_SEND_RELIABLE = 6, | |||
ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE = 7, | ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE = 7, | |||
ENET_PROTOCOL_COMMAND_SEND_FRAGMENT = 8, | ENET_PROTOCOL_COMMAND_SEND_FRAGMENT = 8, | |||
ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED = 9, | ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED = 9, | |||
ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT = 10, | ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT = 10, | |||
ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE = 11, | ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE = 11, | |||
ENET_PROTOCOL_COMMAND_COUNT = 12, | ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT = 12, | |||
ENET_PROTOCOL_COMMAND_COUNT = 13, | ||||
ENET_PROTOCOL_COMMAND_MASK = 0x0F | ENET_PROTOCOL_COMMAND_MASK = 0x0F | |||
} ENetProtocolCommand; | } ENetProtocolCommand; | |||
typedef enum _ENetProtocolFlag | typedef enum _ENetProtocolFlag | |||
{ | { | |||
ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE = (1 << 7), | ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE = (1 << 7), | |||
ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED = (1 << 6), | ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED = (1 << 6), | |||
ENET_PROTOCOL_HEADER_FLAG_COMPRESSED = (1 << 14), | ENET_PROTOCOL_HEADER_FLAG_COMPRESSED = (1 << 14), | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added | |||