[enet-cvs] CVS: enet/include/enet enet.h,1.8,1.9 protocol.h,1.6,1.7
Lee Salzman
enet-discuss@lists.puremagic.com
Tue, 11 Mar 2003 17:51:03 -0700
Update of /home/enet/cvsroot/enet/include/enet
In directory sferik:/tmp/cvs-serv3954/include/enet
Modified Files:
enet.h protocol.h
Log Message:
Made MTU handling a bit more explicit, nomenclature-wise, gave it the
Quake-proven default of 1400, and added a nod to possible future support
for explicitly setting host MTU.
Index: enet.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/enet.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- enet.h 2003/03/09 02:17:05 1.8
+++ enet.h 2003/03/12 00:51:00 1.9
@@ -155,6 +155,7 @@
{
ENET_HOST_RECEIVE_BUFFER_SIZE = 256 * 1024,
ENET_HOST_BANDWIDTH_THROTTLE_INTERVAL = 1000,
+ ENET_HOST_DEFAULT_MTU = 1400,
ENET_PEER_DEFAULT_ROUND_TRIP_TIME = 500,
ENET_PEER_DEFAULT_PACKET_THROTTLE = 32,
@@ -220,7 +221,7 @@
enet_uint32 bestRoundTripTime;
enet_uint32 roundTripTime; /**< mean round trip time (RTT), in milliseconds, between sending a reliable packet and receiving its acknowledgement */
enet_uint32 roundTripTimeVariance;
- enet_uint16 packetSize;
+ enet_uint16 mtu;
enet_uint32 windowSize;
enet_uint32 reliableDataInTransit;
enet_uint32 outgoingReliableSequenceNumber;
@@ -251,6 +252,7 @@
enet_uint32 incomingBandwidth; /**< downstream bandwidth of the host */
enet_uint32 outgoingBandwidth; /**< upstream bandwidth of the host */
enet_uint32 bandwidthThrottleEpoch;
+ enet_uint32 mtu;
int recalculateBandwidthLimits;
ENetPeer * peers; /**< array of peers allocated for this host */
size_t peerCount; /**< number of peers allocated for this host */
@@ -261,7 +263,7 @@
ENetBuffer buffers [1 + 2 * ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS];
size_t bufferCount;
ENetAddress receivedAddress;
- enet_uint8 receivedData [ENET_PROTOCOL_MAXIMUM_PACKET_SIZE];
+ enet_uint8 receivedData [ENET_PROTOCOL_MAXIMUM_MTU];
size_t receivedDataLength;
} ENetHost;
Index: protocol.h
===================================================================
RCS file: /home/enet/cvsroot/enet/include/enet/protocol.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- protocol.h 2003/03/08 23:57:25 1.6
+++ protocol.h 2003/03/12 00:51:00 1.7
@@ -9,8 +9,8 @@
enum
{
- ENET_PROTOCOL_MINIMUM_PACKET_SIZE = 576,
- ENET_PROTOCOL_MAXIMUM_PACKET_SIZE = 4096,
+ ENET_PROTOCOL_MINIMUM_MTU = 576,
+ ENET_PROTOCOL_MAXIMUM_MTU = 4096,
ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS = 32,
ENET_PROTOCOL_MINIMUM_WINDOW_SIZE = 4096,
ENET_PROTOCOL_MAXIMUM_WINDOW_SIZE = 32768,
@@ -68,7 +68,7 @@
{
ENetProtocolCommandHeader header;
enet_uint16 outgoingPeerID;
- enet_uint16 packetSize;
+ enet_uint16 mtu;
enet_uint32 windowSize;
enet_uint32 channelCount;
enet_uint32 incomingBandwidth;
@@ -82,7 +82,7 @@
{
ENetProtocolCommandHeader header;
enet_uint16 outgoingPeerID;
- enet_uint16 packetSize;
+ enet_uint16 mtu;
enet_uint32 windowSize;
enet_uint32 channelCount;
enet_uint32 incomingBandwidth;