[enet-cvs] CVS: enet/include/enet enet.h,1.5,1.6 protocol.h,1.4,1.5 types.h,1.1,1.2
Lee Salzman
enet-discuss@lists.puremagic.com
Fri, 7 Mar 2003 15:10:10 -0700
- Previous message: [enet-cvs] CVS: enet host.c,1.5,1.6 packet.c,1.1,1.2 peer.c,1.6,1.7 protocol.c,1.8,1.9 unix.c,1.5,1.6 win32.c,1.4,1.5
- Next message: [enet-cvs] CVS: web/download enet.tar.gz,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/enet/cvsroot/enet/include/enet
In directory sferik:/tmp/cvs-serv5952/enet/include/enet
Modified Files:
enet.h protocol.h types.h
Log Message:
Modified ENet to have cleaner typedefs.
Index: enet.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/enet.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- enet.h 2002/07/28 21:26:07 1.5
+++ enet.h 2003/03/07 22:10:08 1.6
@@ -38,8 +38,8 @@
typedef struct _ENetAddress
{
- uint32 host;
- uint16 port;
+ enet_uint32 host;
+ enet_uint16 port;
} ENetAddress;
typedef enum
@@ -50,42 +50,42 @@
typedef struct _ENetPacket
{
size_t referenceCount;
- uint32 flags;
- uint8 * data;
+ enet_uint32 flags;
+ enet_uint8 * data;
size_t dataLength;
} ENetPacket;
typedef struct _ENetAcknowledgement
{
ENetListNode acknowledgementList;
- uint32 sentTime;
+ enet_uint32 sentTime;
ENetProtocol command;
} ENetAcknowledgement;
typedef struct _ENetOutgoingCommand
{
ENetListNode outgoingCommandList;
- uint32 reliableSequenceNumber;
- uint32 unreliableSequenceNumber;
- uint32 sentTime;
- uint32 roundTripTimeout;
- uint32 roundTripTimeoutLimit;
- uint32 fragmentOffset;
- uint16 fragmentLength;
+ enet_uint32 reliableSequenceNumber;
+ enet_uint32 unreliableSequenceNumber;
+ enet_uint32 sentTime;
+ enet_uint32 roundTripTimeout;
+ enet_uint32 roundTripTimeoutLimit;
+ enet_uint32 fragmentOffset;
+ enet_uint16 fragmentLength;
ENetProtocol command;
ENetPacket * packet;
} ENetOutgoingCommand;
typedef struct _ENetIncomingCommand
{
- ENetListNode incomingCommandList;
- uint32 reliableSequenceNumber;
- uint32 unreliableSequenceNumber;
- ENetProtocol command;
- uint32 fragmentCount;
- uint32 fragmentsRemaining;
- uint32 * fragments;
- ENetPacket * packet;
+ ENetListNode incomingCommandList;
+ enet_uint32 reliableSequenceNumber;
+ enet_uint32 unreliableSequenceNumber;
+ ENetProtocol command;
+ enet_uint32 fragmentCount;
+ enet_uint32 fragmentsRemaining;
+ enet_uint32 * fragments;
+ ENetPacket * packet;
} ENetIncomingCommand;
typedef enum
@@ -119,53 +119,53 @@
typedef struct _ENetChannel
{
- uint32 outgoingReliableSequenceNumber;
- uint32 outgoingUnreliableSequenceNumber;
- uint32 incomingReliableSequenceNumber;
- uint32 incomingUnreliableSequenceNumber;
- ENetList incomingReliableCommands;
- ENetList incomingUnreliableCommands;
+ enet_uint32 outgoingReliableSequenceNumber;
+ enet_uint32 outgoingUnreliableSequenceNumber;
+ enet_uint32 incomingReliableSequenceNumber;
+ enet_uint32 incomingUnreliableSequenceNumber;
+ ENetList incomingReliableCommands;
+ ENetList incomingUnreliableCommands;
} ENetChannel;
typedef struct _ENetPeer
{
struct _ENetHost * host;
- uint16 outgoingPeerID;
- uint16 incomingPeerID;
- uint32 challenge;
+ enet_uint16 outgoingPeerID;
+ enet_uint16 incomingPeerID;
+ enet_uint32 challenge;
ENetAddress address;
void * data;
ENetPeerState state;
ENetChannel * channels;
size_t channelCount;
- uint32 incomingBandwidth;
- uint32 outgoingBandwidth;
- uint32 incomingBandwidthThrottleEpoch;
- uint32 outgoingBandwidthThrottleEpoch;
- uint32 incomingDataTotal;
- uint32 outgoingDataTotal;
- uint32 lastSendTime;
- uint32 lastReceiveTime;
- uint32 nextTimeout;
- uint32 packetLossEpoch;
- uint32 packetsSent;
- uint32 packetsLost;
- uint32 packetLoss;
- uint32 packetLossVariance;
- uint32 packetThrottle;
- uint32 packetThrottleLimit;
- uint32 packetThrottleCounter;
- uint32 packetThrottleEpoch;
- uint32 packetThrottleAcceleration;
- uint32 packetThrottleDeceleration;
- uint32 packetThrottleInterval;
- uint32 bestRoundTripTime;
- uint32 roundTripTime;
- uint32 roundTripTimeVariance;
- uint16 packetSize;
- uint32 windowSize;
- uint32 reliableDataInTransit;
- uint32 outgoingReliableSequenceNumber;
+ enet_uint32 incomingBandwidth;
+ enet_uint32 outgoingBandwidth;
+ enet_uint32 incomingBandwidthThrottleEpoch;
+ enet_uint32 outgoingBandwidthThrottleEpoch;
+ enet_uint32 incomingDataTotal;
+ enet_uint32 outgoingDataTotal;
+ enet_uint32 lastSendTime;
+ enet_uint32 lastReceiveTime;
+ enet_uint32 nextTimeout;
+ enet_uint32 packetLossEpoch;
+ enet_uint32 packetsSent;
+ enet_uint32 packetsLost;
+ enet_uint32 packetLoss;
+ enet_uint32 packetLossVariance;
+ enet_uint32 packetThrottle;
+ enet_uint32 packetThrottleLimit;
+ enet_uint32 packetThrottleCounter;
+ enet_uint32 packetThrottleEpoch;
+ enet_uint32 packetThrottleAcceleration;
+ enet_uint32 packetThrottleDeceleration;
+ enet_uint32 packetThrottleInterval;
+ enet_uint32 bestRoundTripTime;
+ enet_uint32 roundTripTime;
+ enet_uint32 roundTripTimeVariance;
+ enet_uint16 packetSize;
+ enet_uint32 windowSize;
+ enet_uint32 reliableDataInTransit;
+ enet_uint32 outgoingReliableSequenceNumber;
ENetList acknowledgements;
ENetList sentReliableCommands;
ENetList sentUnreliableCommands;
@@ -177,9 +177,9 @@
{
ENetSocket socket;
ENetAddress address;
- uint32 incomingBandwidth;
- uint32 outgoingBandwidth;
- uint32 bandwidthThrottleEpoch;
+ enet_uint32 incomingBandwidth;
+ enet_uint32 outgoingBandwidth;
+ enet_uint32 bandwidthThrottleEpoch;
int recalculateBandwidthLimits;
ENetPeer * peers;
size_t peerCount;
@@ -190,7 +190,7 @@
ENetBuffer buffers [1 + 2 * ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS];
size_t bufferCount;
ENetAddress receivedAddress;
- uint8 receivedData [ENET_PROTOCOL_MAXIMUM_PACKET_SIZE];
+ enet_uint8 receivedData [ENET_PROTOCOL_MAXIMUM_PACKET_SIZE];
size_t receivedDataLength;
} ENetHost;
@@ -206,50 +206,50 @@
{
ENetEventType type;
ENetPeer * peer;
- uint8 channelID;
+ enet_uint8 channelID;
ENetPacket * packet;
} ENetEvent;
extern int enet_initialize (void);
extern void enet_deinitialize (void);
-extern uint32 enet_time_get (void);
-extern void enet_time_set (uint32);
+extern enet_uint32 enet_time_get (void);
+extern void enet_time_set (enet_uint32);
extern ENetSocket enet_socket_create (ENetSocketType, const ENetAddress *);
extern ENetSocket enet_socket_accept (ENetSocket, ENetAddress *);
extern int enet_socket_connect (ENetSocket, const ENetAddress *);
extern int enet_socket_send (ENetSocket, const ENetAddress *, const ENetBuffer *, size_t);
extern int enet_socket_receive (ENetSocket, ENetAddress *, ENetBuffer *, size_t);
-extern int enet_socket_wait (ENetSocket, uint32 *, uint32);
+extern int enet_socket_wait (ENetSocket, enet_uint32 *, enet_uint32);
extern void enet_socket_destroy (ENetSocket);
extern int enet_address_set_host (ENetAddress *, const char *);
extern int enet_address_get_host (const ENetAddress *, char *, size_t);
-extern ENetPacket * enet_packet_create (const void *, size_t, uint32);
+extern ENetPacket * enet_packet_create (const void *, size_t, enet_uint32);
extern void enet_packet_destroy (ENetPacket *);
extern int enet_packet_resize (ENetPacket *, size_t);
-extern ENetHost * enet_host_create (const ENetAddress *, size_t, uint32, uint32);
+extern ENetHost * enet_host_create (const ENetAddress *, size_t, enet_uint32, enet_uint32);
extern void enet_host_destroy (ENetHost *);
extern ENetPeer * enet_host_connect (ENetHost *, const ENetAddress *, size_t);
-extern int enet_host_service (ENetHost *, ENetEvent *, uint32);
+extern int enet_host_service (ENetHost *, ENetEvent *, enet_uint32);
extern void enet_host_flush (ENetHost *);
-extern void enet_host_broadcast (ENetHost *, uint8, ENetPacket *);
-extern void enet_host_bandwidth_limit (ENetHost *, uint32, uint32);
+extern void enet_host_broadcast (ENetHost *, enet_uint8, ENetPacket *);
+extern void enet_host_bandwidth_limit (ENetHost *, enet_uint32, enet_uint32);
extern void enet_host_bandwidth_throttle (ENetHost *);
-extern int enet_peer_send (ENetPeer *, uint8, ENetPacket *);
-extern ENetPacket * enet_peer_receive (ENetPeer *, uint8);
+extern int enet_peer_send (ENetPeer *, enet_uint8, ENetPacket *);
+extern ENetPacket * enet_peer_receive (ENetPeer *, enet_uint8);
extern void enet_peer_ping (ENetPeer *);
extern void enet_peer_reset (ENetPeer *);
extern void enet_peer_disconnect (ENetPeer *);
-extern void enet_peer_throttle_configure (ENetPeer *, uint32, uint32, uint32);
-extern int enet_peer_throttle (ENetPeer *, uint32);
-extern ENetOutgoingCommand * enet_peer_queue_outgoing_command (ENetPeer *, const ENetProtocol *, ENetPacket *, uint32, uint16);
-extern ENetIncomingCommand * enet_peer_queue_incoming_command (ENetPeer *, const ENetProtocol *, ENetPacket *, uint32);
-extern ENetAcknowledgement * enet_peer_queue_acknowledgement (ENetPeer *, const ENetProtocol *, uint32);
+extern void enet_peer_throttle_configure (ENetPeer *, enet_uint32, enet_uint32, enet_uint32);
+extern int enet_peer_throttle (ENetPeer *, enet_uint32);
+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 ENetAcknowledgement * enet_peer_queue_acknowledgement (ENetPeer *, const ENetProtocol *, enet_uint32);
#ifdef __cplusplus
}
Index: protocol.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/protocol.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- protocol.h 2002/06/11 00:22:02 1.4
+++ protocol.h 2003/03/07 22:10:08 1.5
@@ -36,71 +36,71 @@
typedef struct
{
- uint16 peerID;
- uint8 flags;
- uint8 commandCount;
- uint32 sentTime;
- uint32 challenge;
+ enet_uint16 peerID;
+ enet_uint8 flags;
+ enet_uint8 commandCount;
+ enet_uint32 sentTime;
+ enet_uint32 challenge;
} ENetProtocolHeader;
typedef struct
{
- uint8 command;
- uint8 channelID;
- uint8 flags;
- uint8 reserved;
- uint32 commandLength;
- uint32 reliableSequenceNumber;
+ enet_uint8 command;
+ enet_uint8 channelID;
+ enet_uint8 flags;
+ enet_uint8 reserved;
+ enet_uint32 commandLength;
+ enet_uint32 reliableSequenceNumber;
} ENetProtocolCommandHeader;
typedef struct
{
ENetProtocolCommandHeader header;
- uint32 receivedReliableSequenceNumber;
- uint32 receivedSentTime;
+ enet_uint32 receivedReliableSequenceNumber;
+ enet_uint32 receivedSentTime;
} ENetProtocolAcknowledge;
typedef struct
{
ENetProtocolCommandHeader header;
- uint16 outgoingPeerID;
- uint16 packetSize;
- uint32 windowSize;
- uint32 channelCount;
- uint32 incomingBandwidth;
- uint32 outgoingBandwidth;
- uint32 packetThrottleInterval;
- uint32 packetThrottleAcceleration;
- uint32 packetThrottleDeceleration;
+ enet_uint16 outgoingPeerID;
+ enet_uint16 packetSize;
+ enet_uint32 windowSize;
+ enet_uint32 channelCount;
+ enet_uint32 incomingBandwidth;
+ enet_uint32 outgoingBandwidth;
+ enet_uint32 packetThrottleInterval;
+ enet_uint32 packetThrottleAcceleration;
+ enet_uint32 packetThrottleDeceleration;
} ENetProtocolConnect;
typedef struct
{
ENetProtocolCommandHeader header;
- uint16 outgoingPeerID;
- uint16 packetSize;
- uint32 windowSize;
- uint32 channelCount;
- uint32 incomingBandwidth;
- uint32 outgoingBandwidth;
- uint32 packetThrottleInterval;
- uint32 packetThrottleAcceleration;
- uint32 packetThrottleDeceleration;
+ enet_uint16 outgoingPeerID;
+ enet_uint16 packetSize;
+ enet_uint32 windowSize;
+ enet_uint32 channelCount;
+ enet_uint32 incomingBandwidth;
+ enet_uint32 outgoingBandwidth;
+ enet_uint32 packetThrottleInterval;
+ enet_uint32 packetThrottleAcceleration;
+ enet_uint32 packetThrottleDeceleration;
} ENetProtocolVerifyConnect;
typedef struct
{
ENetProtocolCommandHeader header;
- uint32 incomingBandwidth;
- uint32 outgoingBandwidth;
+ enet_uint32 incomingBandwidth;
+ enet_uint32 outgoingBandwidth;
} ENetProtocolBandwidthLimit;
typedef struct
{
ENetProtocolCommandHeader header;
- uint32 packetThrottleInterval;
- uint32 packetThrottleAcceleration;
- uint32 packetThrottleDeceleration;
+ enet_uint32 packetThrottleInterval;
+ enet_uint32 packetThrottleAcceleration;
+ enet_uint32 packetThrottleDeceleration;
} ENetProtocolThrottleConfigure;
typedef struct
@@ -121,17 +121,17 @@
typedef struct
{
ENetProtocolCommandHeader header;
- uint32 unreliableSequenceNumber;
+ enet_uint32 unreliableSequenceNumber;
} ENetProtocolSendUnreliable;
typedef struct
{
ENetProtocolCommandHeader header;
- uint32 startSequenceNumber;
- uint32 fragmentCount;
- uint32 fragmentNumber;
- uint32 totalLength;
- uint32 fragmentOffset;
+ enet_uint32 startSequenceNumber;
+ enet_uint32 fragmentCount;
+ enet_uint32 fragmentNumber;
+ enet_uint32 totalLength;
+ enet_uint32 fragmentOffset;
} ENetProtocolSendFragment;
typedef union
Index: types.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/types.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- types.h 2002/02/10 21:27:03 1.1
+++ types.h 2003/03/07 22:10:08 1.2
@@ -1,9 +1,9 @@
#ifndef __ENET_TYPES_H__
#define __ENET_TYPES_H__
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned long uint32;
+typedef unsigned char enet_uint8;
+typedef unsigned short enet_uint16;
+typedef unsigned long enet_uint32;
#endif /* __ENET_TYPES_H__ */
- Previous message: [enet-cvs] CVS: enet host.c,1.5,1.6 packet.c,1.1,1.2 peer.c,1.6,1.7 protocol.c,1.8,1.9 unix.c,1.5,1.6 win32.c,1.4,1.5
- Next message: [enet-cvs] CVS: web/download enet.tar.gz,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]