* Fix bug ID #0027891, newer version compaible with 1.3.14

git-svn-id: trunk@43477 -

.gitattributes

@@ -6460,12 +6460,6 @@ packages/libenet/examples/serverapp.lpi svneol=native#text/plain
 packages/libenet/examples/serverapp.pp svneol=native#text/plain
 packages/libenet/fpmake.pp svneol=native#text/plain
 packages/libenet/src/enet.pp svneol=native#text/plain
-packages/libenet/src/enetcallbacks.pp svneol=native#text/plain
-packages/libenet/src/enetlist.pp svneol=native#text/plain
-packages/libenet/src/enetplatform.pp svneol=native#text/plain
-packages/libenet/src/enetprotocol.pp svneol=native#text/plain
-packages/libenet/src/enettime.pp svneol=native#text/plain
-packages/libenet/src/enettypes.pp svneol=native#text/plain
 packages/libenet/src/uenetclass.pp svneol=native#text/plain
 packages/libffi/Makefile svneol=native#text/plain
 packages/libffi/Makefile.fpc svneol=native#text/plain

packages/libenet/examples/clientapp.pp

@@ -102,7 +102,7 @@ begin
   Writeln('-p --port=portno    Port to connect to (default 30000)');
   Writeln('-m --message=msg    Message to send to server (none means no message is sent)');
   Writeln('-c --messagecount=N Number of times the message should be sent');
-  Writeln('-p --pingcout=N     Number of times the server should be pinged. (default 0)');
+  Writeln('-P --pingcout=N     Number of times the server should be pinged. (default 0)');
   Writeln('-c --messagecount=N Number of times the message should be sent (default 1)');
 end;
 
@@ -118,7 +118,7 @@ begin
     exit;
     end;
   DoConnect;
-  PingCount:=StrToIntDef(GetOptionValue('p','pingcount'),0);
+  PingCount:=StrToIntDef(GetOptionValue('P','pingcount'),0);
   if PingCount>0 then
     begin
     Writeln('Pinging server');

packages/libenet/src/enet.pp

@@ -1,53 +1,358 @@
-{$mode objfpc}
-unit enet;
+{$MODE OBJFPC}
+{$PACKRECORDS C}
+
+{$LONGSTRINGS ON}
+{$MACRO ON}
 
+unit ENet;
 
 {
   ENet - Reliable UDP networking library
+  Copyright (c) 2002-2019 Lee Salzman
 
-  FreePascal DLL header: enet.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: enet.h
-  Copyright (c) 2002-2014 Lee Salzman
+  DLL header for Free Pascal
+  Version 4 for 1.3.14: 2019-07-01
+  Copyright (c) 2015-2019 Dmitry D. Chernov aka Black Doomer
 
-  Version 1 for 1.3.12: 25.02.2015
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
 }
 
 interface
 
 uses
-  enetplatform, enettypes, enetprotocol, enetlist, enetcallbacks;
+  ctypes,
+{$IFDEF WINDOWS}
+  WinSock2;
+{$ELSE}
+  BaseUnix, Sockets;
+{$ENDIF}
+
+////////////////////////////////////////////////////////////////////////////////
+// types.h
+////////////////////////////////////////////////////////////////////////////////
+
+type
+  enet_uint8 = cuchar;
+  penet_uint8 = ^enet_uint8;
+
+  enet_uint16 = cushort;
+  penet_uint16 = ^enet_uint16;
+
+  enet_uint32 = cuint;
+  penet_uint32 = ^enet_uint32;
+
+////////////////////////////////////////////////////////////////////////////////
+// callbacks.h
+////////////////////////////////////////////////////////////////////////////////
+
+type
+  pENetCallbacks = ^TENetCallbacks;
+  TENetCallbacks = record
+    malloc    : function( size: csize_t ): Pointer; cdecl;
+    free      : procedure( memory: Pointer ); cdecl;
+    no_memory : procedure(); cdecl;
+  end;
+
+////////////////////////////////////////////////////////////////////////////////
+// protocol.h
+////////////////////////////////////////////////////////////////////////////////
 
 const
+  { unnamed enums }
+  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     = 65536;
+  ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT   = 1;
+  ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT   = 255;
+  ENET_PROTOCOL_MAXIMUM_PEER_ID         = $FFF;
+  ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT  = 1024 * 1024;
+
+  { enum ENetProtocolFlag }
+  ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE = 1 shl 7;
+  ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED = 1 shl 6;
+  ENET_PROTOCOL_HEADER_FLAG_COMPRESSED   = 1 shl 14;
+  ENET_PROTOCOL_HEADER_FLAG_SENT_TIME    = 1 shl 15;
+  ENET_PROTOCOL_HEADER_FLAG_MASK         = ENET_PROTOCOL_HEADER_FLAG_COMPRESSED or
+                                           ENET_PROTOCOL_HEADER_FLAG_SENT_TIME;
+  ENET_PROTOCOL_HEADER_SESSION_MASK      = 3 shl 12;
+  ENET_PROTOCOL_HEADER_SESSION_SHIFT     = 12;
+
+type
+  { enums }
+  ENetProtocolCommand = ( ENET_PROTOCOL_COMMAND_NONE,
+                          ENET_PROTOCOL_COMMAND_ACKNOWLEDGE,
+                          ENET_PROTOCOL_COMMAND_CONNECT,
+                          ENET_PROTOCOL_COMMAND_VERIFY_CONNECT,
+                          ENET_PROTOCOL_COMMAND_DISCONNECT,
+                          ENET_PROTOCOL_COMMAND_PING,
+                          ENET_PROTOCOL_COMMAND_SEND_RELIABLE,
+                          ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE,
+                          ENET_PROTOCOL_COMMAND_SEND_FRAGMENT,
+                          ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED,
+                          ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT,
+                          ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE,
+                          ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT,
+                          ENET_PROTOCOL_COMMAND_COUNT,
+                          ENET_PROTOCOL_COMMAND_MASK = $0F );
+
+  { structs / unions }
+  pENetProtocolHeader = ^ENetProtocolHeader;
+  ENetProtocolHeader = packed record
+    peerID   : enet_uint16;
+    sentTime : enet_uint16;
+  end;
+
+  pENetProtocolCommandHeader = ^ENetProtocolCommandHeader;
+  ENetProtocolCommandHeader = packed record
+    command                : enet_uint8;
+    channelID              : enet_uint8;
+    reliableSequenceNumber : enet_uint16;
+  end;
+
+  pENetProtocolAcknowledge = ^ENetProtocolAcknowledge;
+  ENetProtocolAcknowledge = packed record
+    header                         : ENetProtocolCommandHeader;
+    receivedReliableSequenceNumber : enet_uint16;
+    receivedSentTime               : enet_uint16;
+  end;
+
+  pENetProtocolConnect = ^ENetProtocolConnect;
+  ENetProtocolConnect = packed record
+    header                     : ENetProtocolCommandHeader;
+    outgoingPeerID             : enet_uint16;
+    incomingSessionID          : enet_uint8;
+    outgoingSessionID          : enet_uint8;
+    mtu                        : enet_uint32;
+    windowSize                 : enet_uint32;
+    channelCount               : enet_uint32;
+    incomingBandwidth          : enet_uint32;
+    outgoingBandwidth          : enet_uint32;
+    packetThrottleInterval     : enet_uint32;
+    packetThrottleAcceleration : enet_uint32;
+    packetThrottleDeceleration : enet_uint32;
+    connectID                  : enet_uint32;
+    data                       : enet_uint32;
+  end;
+
+  pENetProtocolVerifyConnect = ^ENetProtocolVerifyConnect;
+  ENetProtocolVerifyConnect = packed record
+    header                     : ENetProtocolCommandHeader;
+    outgoingPeerID             : enet_uint16;
+    incomingSessionID          : enet_uint8;
+    outgoingSessionID          : enet_uint8;
+    mtu                        : enet_uint32;
+    windowSize                 : enet_uint32;
+    channelCount               : enet_uint32;
+    incomingBandwidth          : enet_uint32;
+    outgoingBandwidth          : enet_uint32;
+    packetThrottleInterval     : enet_uint32;
+    packetThrottleAcceleration : enet_uint32;
+    packetThrottleDeceleration : enet_uint32;
+    connectID                  : enet_uint32;
+  end;
+
+  pENetProtocolBandwidthLimit = ^ENetProtocolBandwidthLimit;
+  ENetProtocolBandwidthLimit = packed record
+    header            : ENetProtocolCommandHeader;
+    incomingBandwidth : enet_uint32;
+    outgoingBandwidth : enet_uint32;
+  end;
+
+  pENetProtocolThrottleConfigure = ^ENetProtocolThrottleConfigure;
+  ENetProtocolThrottleConfigure = packed record
+    header                     : ENetProtocolCommandHeader;
+    packetThrottleInterval     : enet_uint32;
+    packetThrottleAcceleration : enet_uint32;
+    packetThrottleDeceleration : enet_uint32;
+  end;
+
+  pENetProtocolDisconnect = ^ENetProtocolDisconnect;
+  ENetProtocolDisconnect = packed record
+    header : ENetProtocolCommandHeader;
+    data   : enet_uint32;
+  end;
+
+  pENetProtocolPing = ^ENetProtocolPing;
+  ENetProtocolPing = packed record
+    header : ENetProtocolCommandHeader;
+  end;
+
+  pENetProtocolSendReliable = ^ENetProtocolSendReliable;
+  ENetProtocolSendReliable = packed record
+    header     : ENetProtocolCommandHeader;
+    dataLength : enet_uint16;
+  end;
+
+  pENetProtocolSendUnreliable = ^ENetProtocolSendUnreliable;
+  ENetProtocolSendUnreliable = packed record
+    header                   : ENetProtocolCommandHeader;
+    unreliableSequenceNumber : enet_uint16;
+    dataLength               : enet_uint16;
+  end;
+
+  pENetProtocolSendUnsequenced = ^ENetProtocolSendUnsequenced;
+  ENetProtocolSendUnsequenced = packed record
+    header           : ENetProtocolCommandHeader;
+    unsequencedGroup : enet_uint16;
+    dataLength       : enet_uint16;
+  end;
+
+  pENetProtocolSendFragment = ^ENetProtocolSendFragment;
+  ENetProtocolSendFragment = packed record
+    header              : ENetProtocolCommandHeader;
+    startSequenceNumber : enet_uint16;
+    dataLength          : enet_uint16;
+    fragmentCount       : enet_uint32;
+    fragmentNumber      : enet_uint32;
+    totalLength         : enet_uint32;
+    fragmentOffset      : enet_uint32;
+  end;
+
+  pENetProtocol = ^TENetProtocol;
+  TENetProtocol = packed record  // union
+    case Byte of
+    $00: (header            : ENetProtocolCommandHeader);
+    $01: (acknowledge       : ENetProtocolAcknowledge);
+    $02: (connect           : ENetProtocolConnect);
+    $03: (verifyConnect     : ENetProtocolVerifyConnect);
+    $04: (disconnect        : ENetProtocolDisconnect);
+    $05: (ping              : ENetProtocolPing);
+    $06: (sendReliable      : ENetProtocolSendReliable);
+    $07: (sendUnreliable    : ENetProtocolSendUnreliable);
+    $08: (sendUnsequenced   : ENetProtocolSendUnsequenced);
+    $09: (sendFragment      : ENetProtocolSendFragment);
+    $0A: (bandwidthLimit    : ENetProtocolBandwidthLimit);
+    $0B: (throttleConfigure : ENetProtocolThrottleConfigure);
+  end;
+
+////////////////////////////////////////////////////////////////////////////////
+// win32.h / unix.h
+////////////////////////////////////////////////////////////////////////////////
+
+const
+{$IFDEF WINDOWS}
+  ENET_SOCKET_NULL = INVALID_SOCKET;
+{$ELSE}
+  ENET_SOCKET_NULL = -1;
+{$ENDIF}
+
+type
+{$IFDEF WINDOWS}
+  ENetSocket = TSocket;
+{$ELSE}
+  ENetSocket = cint;
+{$ENDIF}
+
+  ENetSocketSet = TFDSet;
+  pENetSocketSet = ^ENetSocketSet;
+
+  pENetBuffer = ^ENetBuffer;
+  ENetBuffer = record
+  {$IFDEF WINDOWS}
+    dataLength : csize_t;
+    data       : Pointer;
+  {$ELSE}
+    data       : Pointer;
+    dataLength : csize_t;
+  {$ENDIF}
+  end;
+
+{ inline macros }
+
+function ENET_HOST_TO_NET_16( value: cuint16 ): cuint16; inline;
+function ENET_HOST_TO_NET_32( value: cuint32 ): cuint32; inline;
+
+function ENET_NET_TO_HOST_16( value: cuint16 ): cuint16; inline;
+function ENET_NET_TO_HOST_32( value: cuint32 ): cuint32; inline;
+
+procedure ENET_SOCKETSET_EMPTY( var sockset: ENetSocketSet ); inline;
+procedure ENET_SOCKETSET_ADD( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
+procedure ENET_SOCKETSET_REMOVE( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
+function ENET_SOCKETSET_CHECK( var sockset: ENetSocketSet; socket: ENetSocket ): cbool; inline;
+
+////////////////////////////////////////////////////////////////////////////////
+// list.h
+////////////////////////////////////////////////////////////////////////////////
+
+type
+  pENetListNode = ^ENetListNode;
+  ENetListNode = record
+    next     : pENetListNode;
+    previous : pENetListNode;
+  end;
+
+  pENetList = ^TENetList;
+  TENetList = record
+    sentinel : ENetListNode;
+  end;
+
+  ENetListIterator = pENetListNode;
+
+{ inline macros }
+function enet_list_begin( list: pENetList ): ENetListIterator; inline;
+function enet_list_end( list: pENetList ): ENetListIterator; inline;
+
+function enet_list_empty( list: pENetList ): Boolean; inline;
+
+function enet_list_next( iterator: ENetListIterator ): ENetListIterator; inline;
+function enet_list_previous( iterator: ENetListIterator ): ENetListIterator; inline;
+
+function enet_list_front( list: pENetList ): Pointer; inline;
+function enet_list_back( list: pENetList ): Pointer; inline;
+
+////////////////////////////////////////////////////////////////////////////////
+// time.h
+////////////////////////////////////////////////////////////////////////////////
+
+const
+  ENET_TIME_OVERFLOW = 86400000;
+
+{ inline macros }
+function ENET_TIME_LESS( const a, b: cint ): cbool; inline;
+function ENET_TIME_GREATER( const a, b: cint ): cbool; inline;
+
+function ENET_TIME_LESS_EQUAL( const a, b: cint ): cbool; inline;
+function ENET_TIME_GREATER_EQUAL( const a, b: cint ): cbool; inline;
+
+function ENET_TIME_DIFFERENCE( const a, b: cint ): cint; inline;
+
+////////////////////////////////////////////////////////////////////////////////
+// enet.h
+////////////////////////////////////////////////////////////////////////////////
+
+{$DEFINE libraryENet := cdecl; external 'enet'}
+
+const
+  { defines }
   ENET_VERSION_MAJOR = 1;
   ENET_VERSION_MINOR = 3;
-  ENET_VERSION_PATCH = 12;
+  ENET_VERSION_PATCH = 14;
 
-  ENET_HOST_ANY       = 0;
-  ENET_HOST_BROADCAST : LongWord = $FFFFFFFF;
-  ENET_PORT_ANY       = 0;
+  ENET_HOST_ANY        = 0;
+  ENET_HOST_BROADCAST_ = $FFFFFFFF;  // "_" due to the name conflict
+  ENET_PORT_ANY        = 0;
 
   ENET_BUFFER_MAXIMUM = 1 + 2 * ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS;
 
+  { unnamed enums }
   ENET_HOST_RECEIVE_BUFFER_SIZE          = 256 * 1024;
   ENET_HOST_SEND_BUFFER_SIZE             = 256 * 1024;
   ENET_HOST_BANDWIDTH_THROTTLE_INTERVAL  = 1000;
@@ -68,7 +373,7 @@ const
   ENET_PEER_TIMEOUT_LIMIT                = 32;
   ENET_PEER_TIMEOUT_MINIMUM              = 5000;
   ENET_PEER_TIMEOUT_MAXIMUM              = 30000;
-  ENET_PEER_PING_INTERVAL                = 500;
+  ENET_PEER_PING_INTERVAL_               = 500;  // "_" due to the name conflict
   ENET_PEER_UNSEQUENCED_WINDOWS          = 64;
   ENET_PEER_UNSEQUENCED_WINDOW_SIZE      = 1024;
   ENET_PEER_FREE_UNSEQUENCED_WINDOWS     = 32;
@@ -76,114 +381,86 @@ const
   ENET_PEER_RELIABLE_WINDOW_SIZE         = $1000;
   ENET_PEER_FREE_RELIABLE_WINDOWS        = 8;
 
+  { enum ENetSocketWait }
+  ENET_SOCKET_WAIT_NONE       = 0;
+  ENET_SOCKET_WAIT_SEND       = 1 shl 0;
+  ENET_SOCKET_WAIT_RECEIVE    = 1 shl 1;
+  ENET_SOCKET_WAIT_INTERRUPT  = 1 shl 2;
+
+  { enum ENetPacketFlag }
+  ENET_PACKET_FLAG_RELIABLE            = 1 shl 0;
+  ENET_PACKET_FLAG_UNSEQUENCED         = 1 shl 1;
+  ENET_PACKET_FLAG_NO_ALLOCATE         = 1 shl 2;
+  ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT = 1 shl 3;
+  ENET_PACKET_FLAG_SENT                = 1 shl 8;
+
 type
-  //enums
-  ENetSocketType      = ( ENET_SOCKET_TYPE_STREAM     = 1,
-                          ENET_SOCKET_TYPE_DATAGRAM   = 2 );
-  ENetSocketWait      = ( ENET_SOCKET_WAIT_NONE       = 0,
-                          ENET_SOCKET_WAIT_SEND       = 1,
-                          ENET_SOCKET_WAIT_RECEIVE    = 2,
-                          ENET_SOCKET_WAIT_INTERRUPT  = 4 );
-  ENetSocketOption    = ( ENET_SOCKOPT_NONBLOCK       = 1,
-                          ENET_SOCKOPT_BROADCAST      = 2,
-                          ENET_SOCKOPT_RCVBUF         = 3,
-                          ENET_SOCKOPT_SNDBUF         = 4,
-                          ENET_SOCKOPT_REUSEADDR      = 5,
-                          ENET_SOCKOPT_RCVTIMEO       = 6,
-                          ENET_SOCKOPT_SNDTIMEO       = 7,
-                          ENET_SOCKOPT_ERROR          = 8,
-                          ENET_SOCKOPT_NODELAY        = 9 );
-  ENetSocketShutdown  = ( ENET_SOCKET_SHUTDOWN_READ,
-                          ENET_SOCKET_SHUTDOWN_WRITE,
-                          ENET_SOCKET_SHUTDOWN_READ_WRITE );
-
-Const
-  ENET_PACKET_FLAG_RELIABLE            = 1;
-  ENET_PACKET_FLAG_UNSEQUENCED         = 2;
-  ENET_PACKET_FLAG_NO_ALLOCATE         = 4;
-  ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT = 8;
-  ENET_PACKET_FLAG_SENT                = 256; 
-
-Type
-  ENetPeerState       = ( ENET_PEER_STATE_DISCONNECTED,
-                          ENET_PEER_STATE_CONNECTING,
-                          ENET_PEER_STATE_ACKNOWLEDGING_CONNECT,
-                          ENET_PEER_STATE_CONNECTION_PENDING,
-                          ENET_PEER_STATE_CONNECTION_SUCCEEDED,
-                          ENET_PEER_STATE_CONNECTED,
-                          ENET_PEER_STATE_DISCONNECT_LATER,
-                          ENET_PEER_STATE_DISCONNECTING,
-                          ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT,
-                          ENET_PEER_STATE_ZOMBIE                    );
-
-  ENetEventType       = ( ENET_EVENT_TYPE_NONE,
-                          ENET_EVENT_TYPE_CONNECT,
-                          ENET_EVENT_TYPE_DISCONNECT,
-                          ENET_EVENT_TYPE_RECEIVE     );
-
-  //definitions
+  { enums }
+  ENetSocketType = ( ENET_SOCKET_TYPE_STREAM   = 1,
+                     ENET_SOCKET_TYPE_DATAGRAM = 2 );
+  
+  ENetSocketOption = ( ENET_SOCKOPT_NONBLOCK  = 1,
+                       ENET_SOCKOPT_BROADCAST = 2,
+                       ENET_SOCKOPT_RCVBUF    = 3,
+                       ENET_SOCKOPT_SNDBUF    = 4,
+                       ENET_SOCKOPT_REUSEADDR = 5,
+                       ENET_SOCKOPT_RCVTIMEO  = 6,
+                       ENET_SOCKOPT_SNDTIMEO  = 7,
+                       ENET_SOCKOPT_ERROR     = 8,
+                       ENET_SOCKOPT_NODELAY   = 9 );
+
+  ENetSocketShutdown = ( ENET_SOCKET_SHUTDOWN_READ,
+                         ENET_SOCKET_SHUTDOWN_WRITE,
+                         ENET_SOCKET_SHUTDOWN_READ_WRITE );
+
+  ENetPeerState = ( ENET_PEER_STATE_DISCONNECTED,
+                    ENET_PEER_STATE_CONNECTING,
+                    ENET_PEER_STATE_ACKNOWLEDGING_CONNECT,
+                    ENET_PEER_STATE_CONNECTION_PENDING,
+                    ENET_PEER_STATE_CONNECTION_SUCCEEDED,
+                    ENET_PEER_STATE_CONNECTED,
+                    ENET_PEER_STATE_DISCONNECT_LATER,
+                    ENET_PEER_STATE_DISCONNECTING,
+                    ENET_PEER_STATE_ACKNOWLEDGING_DISCONNECT,
+                    ENET_PEER_STATE_ZOMBIE );
+
+  ENetEventType = ( ENET_EVENT_TYPE_NONE,
+                    ENET_EVENT_TYPE_CONNECT,
+                    ENET_EVENT_TYPE_DISCONNECT,
+                    ENET_EVENT_TYPE_RECEIVE );
+
+  { typedefs }
   ENetVersion = enet_uint32;
 
-  //structs pointers
+  { pointers to structs }
   pENetAddress         = ^ENetAddress;
   pENetPacket          = ^ENetPacket;
-  pENetAcknowledgement = ^ENetAcknowledgement;
-  pENetOutgoingCommand = ^ENetOutgoingCommand;
-  pENetIncomingCommand = ^ENetIncomingCommand;
   pENetChannel         = ^ENetChannel;
   pENetPeer            = ^ENetPeer;
   pENetCompressor      = ^ENetCompressor;
   pENetHost            = ^ENetHost;
   pENetEvent           = ^ENetEvent;
 
-  //callbacks
+  { callbacks }
   ENetPacketFreeCallback = procedure( packet: pENetPacket ); cdecl;
-  ENetChecksumCallback = function( const buffers: pENetBuffer; bufferCount: enet_size_t ): enet_uint32; cdecl;
-  ENetInterceptCallback = function( host: pENetHost; event: pENetEvent ): enet_int; cdecl;
-
-{$PACKRECORDS C}
+  ENetChecksumCallback = function( const buffers: pENetBuffer;
+    bufferCount: csize_t ): enet_uint32; cdecl;
+  ENetInterceptCallback = function( host: pENetHost;
+    event: pENetEvent ): cint; cdecl;
 
-  //structs
+  { structs }
   ENetAddress = record
     host : enet_uint32;
     port : enet_uint16;
   end;
   ENetPacket = record
-    referenceCount : enet_size_t;
+    referenceCount : csize_t;
     flags          : enet_uint32;
     data           : penet_uint8;
-    dataLength     : enet_size_t;
+    dataLength     : csize_t;
     freeCallback   : ENetPacketFreeCallback;
     userData       : Pointer;
   end;
-  ENetAcknowledgement = record
-    acknowledgementList : ENetListNode;
-    sentTime            : enet_uint32;
-    command             : TENetProtocol;
-  end;
-  ENetOutgoingCommand = record
-    outgoingCommandList      : ENetListNode;
-    reliableSequenceNumber   : enet_uint16;
-    unreliableSequenceNumber : enet_uint16;
-    sentTime                 : enet_uint32;
-    roundTripTimeout         : enet_uint32;
-    roundTripTimeoutLimit    : enet_uint32;
-    fragmentOffset           : enet_uint32;
-    fragmentLength           : enet_uint16;
-    sendAttempts             : enet_uint16;
-    command                  : TENetProtocol;
-    packet                   : pENetPacket;
-  end;
-  ENetIncomingCommand = record
-    incomingCommandList      : ENetListNode;
-    reliableSequenceNumber   : enet_uint16;
-    unreliableSequenceNumber : enet_uint16;
-    command                  : TENetProtocol;
-    fragmentCount            : enet_uint32;
-    fragmentsRemaining       : enet_uint32;
-    fragments                : penet_uint32;
-    packet                   : pENetPacket;
-  end;
   ENetChannel = record
     outgoingReliableSequenceNumber   : enet_uint16;
     outgoingUnreliableSequenceNumber : enet_uint16;
@@ -206,7 +483,7 @@ Type
     data                           : Pointer;
     state                          : ENetPeerState;
     channels                       : pENetChannel;
-    channelCount                   : enet_size_t;
+    channelCount                   : csize_t;
     incomingBandwidth              : enet_uint32;
     outgoingBandwidth              : enet_uint32;
     incomingBandwidthThrottleEpoch : enet_uint32;
@@ -249,17 +526,17 @@ Type
     outgoingReliableCommands       : TENetList;
     outgoingUnreliableCommands     : TENetList;
     dispatchedCommands             : TENetList;
-    needsDispatch                  : enet_int;
+    needsDispatch                  : cint;
     incomingUnsequencedGroup       : enet_uint16;
     outgoingUnsequencedGroup       : enet_uint16;
     unsequencedWindow              : array[ 0..(ENET_PEER_UNSEQUENCED_WINDOW_SIZE div 32)-1 ] of enet_uint32;
     eventData                      : enet_uint32;
-    totalWaitingData               : enet_size_t;
+    totalWaitingData               : csize_t;
   end;
   ENetCompressor = record
     context    : Pointer;
-    compress   : function( context: Pointer; const inBuffers: pENetBuffer; inBufferCount, inLimit: enet_size_t; outData: penet_uint8; outLimit: enet_size_t ): enet_size_t; cdecl;
-    decompress : function( context: Pointer; const inData: penet_uint8; inLimit: enet_size_t; outData: penet_uint8; outLimit: enet_size_t ): enet_size_t; cdecl;
+    compress   : function( context: Pointer; const inBuffers: pENetBuffer; inBufferCount, inLimit: csize_t; outData: penet_uint8; outLimit: csize_t ): csize_t; cdecl;
+    decompress : function( context: Pointer; const inData: penet_uint8; inLimit: csize_t; outData: penet_uint8; outLimit: csize_t ): csize_t; cdecl;
     destroy    : procedure( context: Pointer ); cdecl;
   end;
   ENetHost = record
@@ -270,59 +547,54 @@ Type
     bandwidthThrottleEpoch     : enet_uint32;
     mtu                        : enet_uint32;
     randomSeed                 : enet_uint32;
-    recalculateBandwidthLimits : enet_int;
+    recalculateBandwidthLimits : cint;
     peers                      : pENetPeer;
-    peerCount                  : enet_size_t;
-    channelLimit               : enet_size_t;
+    peerCount                  : csize_t;
+    channelLimit               : csize_t;
     serviceTime                : enet_uint32;
     dispatchQueue              : TENetList;
-    continueSending            : enet_int;
-    packetSize                 : enet_size_t;
+    continueSending            : cint;
+    packetSize                 : csize_t;
     headerFlags                : enet_uint16;
     commands                   : array[ 0..ENET_PROTOCOL_MAXIMUM_PACKET_COMMANDS-1 ] of TENetProtocol;
-    commandCount               : enet_size_t;
+    commandCount               : csize_t;
     buffers                    : array[ 0..ENET_BUFFER_MAXIMUM-1 ] of ENetBuffer;
-    bufferCount                : enet_size_t;
+    bufferCount                : csize_t;
     checksum                   : ENetChecksumCallback;
     compressor                 : ENetCompressor;
     packetData                 : array[ 0..1, 0..ENET_PROTOCOL_MAXIMUM_MTU-1 ] of enet_uint8;
     receivedAddress            : ENetAddress;
     receivedData               : penet_uint8;
-    receivedDataLength         : enet_size_t;
+    receivedDataLength         : csize_t;
     totalSentData              : enet_uint32;
     totalSentPackets           : enet_uint32;
     totalReceivedData          : enet_uint32;
     totalReceivedPackets       : enet_uint32;
     intercept                  : ENetInterceptCallback;
-    connectedPeers             : enet_size_t;
-    bandwidthLimitedPeers      : enet_size_t;
-    duplicatePeers             : enet_size_t;
-    maximumPacketSize          : enet_size_t;
-    maximumWaitingData         : enet_size_t;
+    connectedPeers             : csize_t;
+    bandwidthLimitedPeers      : csize_t;
+    duplicatePeers             : csize_t;
+    maximumPacketSize          : csize_t;
+    maximumWaitingData         : csize_t;
   end;
   ENetEvent = record
-    kind      : ENetEventType; //originally "type", which conflicts
+    kind      : ENetEventType;  // originally "type", which conflicts
     peer      : pENetPeer;
     channelID : enet_uint8;
     data      : enet_uint32;
     packet    : pENetPacket;
   end;
 
-{$PACKRECORDS DEFAULT}
-
-//inline macros
-function ENET_VERSION_CREATE( const major, minor, patch: LongInt ): ENetVersion; inline;
-function ENET_VERSION_GET_MAJOR( const version: ENetVersion ): LongInt; inline;
-function ENET_VERSION_GET_MINOR( const version: ENetVersion ): LongInt; inline;
-function ENET_VERSION_GET_PATCH( const version: ENetVersion ): LongInt; inline;
+{ inline macros }
+function ENET_VERSION_CREATE( const major, minor, patch: cint ): ENetVersion; inline;
+function ENET_VERSION_GET_MAJOR( const version: ENetVersion ): cint; inline;
+function ENET_VERSION_GET_MINOR( const version: ENetVersion ): cint; inline;
+function ENET_VERSION_GET_PATCH( const version: ENetVersion ): cint; inline;
 function ENET_VERSION(): ENetVersion; inline;
 
-//external
-{$MACRO ON}
-{$DEFINE libraryENet := cdecl; external 'enet'}
-
-function enet_initialize(): enet_int; libraryENet;
-function enet_initialize_with_callbacks( version: ENetVersion; const inits: pENetCallbacks ): enet_int; libraryENet;
+{ library functions }
+function enet_initialize(): cint; libraryENet;
+function enet_initialize_with_callbacks( version: ENetVersion; const inits: pENetCallbacks ): cint; libraryENet;
 procedure enet_deinitialize(); libraryENet;
 function enet_linked_version(): ENetVersion; libraryENet;
 
@@ -330,45 +602,46 @@ function enet_time_get(): enet_uint32; libraryENet;
 procedure enet_time_set( newTimeBase: enet_uint32 ); libraryENet;
 
 function enet_socket_create( kind: ENetSocketType ): ENetSocket; libraryENet;
-function enet_socket_bind( socket: ENetSocket; const address: pENetAddress ): enet_int; libraryENet;
-function enet_socket_get_address( socket: ENetSocket; address: pENetAddress ): enet_int; libraryENet;
-function enet_socket_listen( socket: ENetSocket; backlog: enet_int ): enet_int; libraryENet;
+function enet_socket_bind( socket: ENetSocket; const address: pENetAddress ): cint; libraryENet;
+function enet_socket_get_address( socket: ENetSocket; address: pENetAddress ): cint; libraryENet;
+function enet_socket_listen( socket: ENetSocket; backlog: cint ): cint; libraryENet;
 function enet_socket_accept( socket: ENetSocket; address: pENetAddress ): ENetSocket; libraryENet;
-function enet_socket_connect( socket: ENetSocket; const address: pENetAddress ): enet_int; libraryENet;
-function enet_socket_send( socket: ENetSocket; const address: pENetAddress; const buffers: pENetBuffer; bufferCount: enet_size_t ): enet_int; libraryENet;
-function enet_socket_receive( socket: ENetSocket; address: pENetAddress; buffers: pENetBuffer; bufferCount: enet_size_t ): enet_int; libraryENet;
-function enet_socket_wait( socket: ENetSocket; condition: penet_uint32; timeout: enet_uint32 ): enet_int; libraryENet;
-function enet_socket_set_option( socket: ENetSocket; option: ENetSocketOption; value: enet_int ): enet_int; libraryENet;
-function enet_socket_get_option( socket: ENetSocket; option: ENetSocketOption; value: penet_int ): enet_int; libraryENet;
-function enet_socket_shutdown( socket: ENetSocket; how: ENetSocketShutdown ): enet_int; libraryENet;
+function enet_socket_connect( socket: ENetSocket; const address: pENetAddress ): cint; libraryENet;
+function enet_socket_send( socket: ENetSocket; const address: pENetAddress; const buffers: pENetBuffer; bufferCount: csize_t ): cint; libraryENet;
+function enet_socket_receive( socket: ENetSocket; address: pENetAddress; buffers: pENetBuffer; bufferCount: csize_t ): cint; libraryENet;
+function enet_socket_wait( socket: ENetSocket; condition: penet_uint32; timeout: enet_uint32 ): cint; libraryENet;
+function enet_socket_set_option( socket: ENetSocket; option: ENetSocketOption; value: cint ): cint; libraryENet;
+function enet_socket_get_option( socket: ENetSocket; option: ENetSocketOption; value: pcint ): cint; libraryENet;
+function enet_socket_shutdown( socket: ENetSocket; how: ENetSocketShutdown ): cint; libraryENet;
 procedure enet_socket_destroy( socket: ENetSocket ); libraryENet;
-function enet_socketset_select( maxSocket: ENetSocket; readSet: pENetSocketSet; writeSet: pENetSocketSet; timeout: enet_uint32 ): enet_int; libraryENet;
+function enet_socketset_select( maxSocket: ENetSocket; readSet: pENetSocketSet; writeSet: pENetSocketSet; timeout: enet_uint32 ): cint; libraryENet;
 
-function enet_address_set_host( address: pENetAddress; const hostName: PChar ): enet_int; libraryENet;
-function enet_address_get_host_ip( const address: pENetAddress; hostName: PChar; nameLength: enet_size_t ): enet_int; libraryENet;
-function enet_address_get_host( const address: pENetAddress; hostName: PChar; nameLength: enet_size_t ): enet_int; libraryENet;
+function enet_address_set_host_ip( address: pENetAddress; const hostName: PChar ): cint; libraryENet;
+function enet_address_set_host( address: pENetAddress; const hostName: PChar ): cint; libraryENet;
+function enet_address_get_host_ip( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet;
+function enet_address_get_host( const address: pENetAddress; hostName: PChar; nameLength: csize_t ): cint; libraryENet;
 
-function enet_packet_create( const data: Pointer; dataLength: enet_size_t; flags: enet_uint32 ): pENetPacket; libraryENet;
+function enet_packet_create( const data: Pointer; dataLength: csize_t; flags: enet_uint32 ): pENetPacket; libraryENet;
 procedure enet_packet_destroy( packet: pENetPacket ); libraryENet;
-function enet_packet_resize( packet: pENetPacket; dataLength: enet_size_t ): enet_int; libraryENet;
-function enet_crc32( const buffers: pENetBuffer; bufferCount: enet_size_t ): enet_uint32; libraryENet;
+function enet_packet_resize( packet: pENetPacket; dataLength: csize_t ): cint; libraryENet;
+function enet_crc32( const buffers: pENetBuffer; bufferCount: csize_t ): enet_uint32; libraryENet;
 
-function enet_host_create( const address: pENetAddress; peerCount, channelLimit: enet_size_t; incomingBandwidth, outgoingBandwidth: enet_uint32 ): pENetHost; libraryENet;
+function enet_host_create( const address: pENetAddress; peerCount, channelLimit: csize_t; incomingBandwidth, outgoingBandwidth: enet_uint32 ): pENetHost; libraryENet;
 procedure enet_host_destroy( host: pENetHost ); libraryENet;
-function enet_host_connect( host: pENetHost; const address: pENetAddress; channelCount: enet_size_t; data: enet_uint32 ): pENetPeer; libraryENet;
-function enet_host_check_events( host: pENetHost; event: pENetEvent ): enet_int; libraryENet;
-function enet_host_service( host: pENetHost; event: pENetEvent; timeout: enet_uint32 ): enet_int; libraryENet;
+function enet_host_connect( host: pENetHost; const address: pENetAddress; channelCount: csize_t; data: enet_uint32 ): pENetPeer; libraryENet;
+function enet_host_check_events( host: pENetHost; event: pENetEvent ): cint; libraryENet;
+function enet_host_service( host: pENetHost; event: pENetEvent; timeout: enet_uint32 ): cint; libraryENet;
 procedure enet_host_flush( host: pENetHost ); libraryENet;
-procedure enet_host_widecast( host: pENetHost; channelID: enet_uint8; packet: pENetPacket ); libraryENet name 'enet_host_broadcast'; //renamed due to names conflict
+procedure enet_host_broadcast( host: pENetHost; channelID: enet_uint8; packet: pENetPacket ); libraryENet;
 procedure enet_host_compress( host: pENetHost; const compressor: pENetCompressor ); libraryENet;
-function enet_host_compress_with_range_coder( host: pENetHost ): enet_int; libraryENet;
-procedure enet_host_channel_limit( host: pENetHost; channelLimit: enet_size_t ); libraryENet;
+function enet_host_compress_with_range_coder( host: pENetHost ): cint; libraryENet;
+procedure enet_host_channel_limit( host: pENetHost; channelLimit: csize_t ); libraryENet;
 procedure enet_host_bandwidth_limit( host: pENetHost; incomingBandwidth, outgoingBandwidth: enet_uint32 ); libraryENet;
 
-function enet_peer_send( peer: pENetPeer; channelID: enet_uint8; packet: pENetPacket ): enet_int; libraryENet;
+function enet_peer_send( peer: pENetPeer; channelID: enet_uint8; packet: pENetPacket ): cint; libraryENet;
 function enet_peer_receive( peer: pENetPeer; channelID: penet_uint8 ): pENetPacket; libraryENet;
 procedure enet_peer_ping( peer: pENetPeer ); libraryENet;
-procedure enet_peer_ping_frequency( peer: pENetPeer; pingInterval: enet_uint32 ); libraryENet name 'enet_peer_ping_interval'; //renamed due to names conflict
+procedure enet_peer_ping_interval( peer: pENetPeer; pingInterval: enet_uint32 ); libraryENet;
 procedure enet_peer_timeout( peer: pENetPeer; timeoutLimit, timeoutMinimum, timeoutMaximum: enet_uint32 ); libraryENet;
 procedure enet_peer_reset( peer: pENetPeer ); libraryENet;
 procedure enet_peer_disconnect( peer: pENetPeer; data: enet_uint32 ); libraryENet;
@@ -378,30 +651,170 @@ procedure enet_peer_throttle_configure( peer: pENetPeer; interval, acceleration,
 
 function enet_range_coder_create(): Pointer; libraryENet;
 procedure enet_range_coder_destroy( context: Pointer ); libraryENet;
-function enet_range_coder_compress( context: Pointer; const inBuffers: pENetBuffer; inBufferCount, inLiit: enet_size_t; outData: penet_uint8; outLimit: enet_size_t ): enet_size_t; libraryENet;
-function enet_range_coder_decompress( context: Pointer; const inData: penet_uint8; inLimit: enet_size_t; outData: penet_uint8; outLimit: enet_size_t ): enet_size_t; libraryENet;
+function enet_range_coder_compress( context: Pointer; const inBuffers: pENetBuffer; inBufferCount, inLiit: csize_t; outData: penet_uint8; outLimit: csize_t ): csize_t; libraryENet;
+function enet_range_coder_decompress( context: Pointer; const inData: penet_uint8; inLimit: csize_t; outData: penet_uint8; outLimit: csize_t ): csize_t; libraryENet;
 
 implementation
 
-function ENET_VERSION_CREATE( const major, minor, patch: LongInt ): ENetVersion; inline;
-   begin Result := (major shl 16) or (minor shl 8) or patch;
-     end;
-
-function ENET_VERSION_GET_MAJOR( const version: ENetVersion ): LongInt; inline;
-   begin Result := (version shr 16) and $FF;
-     end;
-
-function ENET_VERSION_GET_MINOR( const version: ENetVersion ): LongInt; inline;
-   begin Result := (version shr 8) and $FF;
-     end;
-
-function ENET_VERSION_GET_PATCH( const version: ENetVersion ): LongInt; inline;
-   begin Result := version and $FF;
-     end;
-
-function ENET_VERSION(): ENetVersion; inline;
-   begin Result := ENET_VERSION_CREATE( ENET_VERSION_MAJOR, ENET_VERSION_MINOR, ENET_VERSION_PATCH );
-     end;
+////////////////////////////////////////////////////////////////////////////////
+// win32.h / unix.h
+////////////////////////////////////////////////////////////////////////////////
+
+function ENET_HOST_TO_NET_16( value: cuint16 ): cuint16;
+begin
+  Result := htons(value);
+end;
+
+function ENET_HOST_TO_NET_32( value: cuint32 ): cuint32;
+begin
+  Result := htonl(value);
+end;
+
+function ENET_NET_TO_HOST_16( value: cuint16 ): cuint16;
+begin
+  Result := ntohs(value);
+end;
+
+function ENET_NET_TO_HOST_32( value: cuint32 ): cuint32;
+begin
+  Result := ntohl(value);
+end;
+
+procedure ENET_SOCKETSET_EMPTY( var sockset: ENetSocketSet );
+begin
+{$IFDEF WINDOWS}
+  FD_ZERO( sockset );
+{$ELSE}
+  fpFD_ZERO( sockset );
+{$ENDIF}
+end;
+
+procedure ENET_SOCKETSET_ADD( var sockset: ENetSocketSet; socket: ENetSocket );
+begin
+{$IFDEF WINDOWS}
+  FD_SET( socket, sockset );
+{$ELSE}
+  fpFD_SET( socket, sockset );
+{$ENDIF}
+end;
+
+procedure ENET_SOCKETSET_REMOVE( var sockset: ENetSocketSet; socket: ENetSocket );
+begin
+{$IFDEF WINDOWS}
+  FD_CLR( socket, sockset );
+{$ELSE}
+  fpFD_CLR( socket, sockset );
+{$ENDIF}
+end;
+
+function ENET_SOCKETSET_CHECK( var sockset: ENetSocketSet; socket: ENetSocket ): cbool;
+begin
+{$IFDEF WINDOWS}
+  Result := FD_ISSET( socket, sockset );
+{$ELSE}
+  Result := fpFD_ISSET( socket, sockset ) = 1;
+{$ENDIF}
+end;
+
+////////////////////////////////////////////////////////////////////////////////
+// list.h
+////////////////////////////////////////////////////////////////////////////////
+
+function enet_list_begin( list: pENetList ): ENetListIterator;
+begin
+  Result := list^.sentinel.next;
+end;
+
+function enet_list_end( list: pENetList ): ENetListIterator;
+begin
+  Result := @( list^.sentinel );
+end;
+
+function enet_list_empty( list: pENetList ): Boolean;
+begin
+  Result := enet_list_begin(list) = enet_list_end(list);
+end;
+
+function enet_list_next( iterator: ENetListIterator ): ENetListIterator;
+begin
+  Result := iterator^.next;
+end;
+
+function enet_list_previous( iterator: ENetListIterator ): ENetListIterator;
+begin
+  Result := iterator^.previous;
+end;
+
+function enet_list_front( list: pENetList ): Pointer;
+begin
+  Result := Pointer( list^.sentinel.next );
+end;
+
+function enet_list_back( list: pENetList ): Pointer;
+begin
+  Result := Pointer( list^.sentinel.previous );
+end;
+
+////////////////////////////////////////////////////////////////////////////////
+// time.h
+////////////////////////////////////////////////////////////////////////////////
+
+function ENET_TIME_LESS( const a, b: cint ): cbool;
+begin
+  Result := (a - b) >= ENET_TIME_OVERFLOW;
+end;
+
+function ENET_TIME_GREATER( const a, b: cint ): cbool;
+begin
+  Result := (b - a) >= ENET_TIME_OVERFLOW;
+end;
+
+function ENET_TIME_LESS_EQUAL( const a, b: cint ): cbool;
+begin
+  Result := not ENET_TIME_GREATER(a, b);
+end;
+
+function ENET_TIME_GREATER_EQUAL( const a, b: cint ): cbool;
+begin
+  Result := not ENET_TIME_LESS(a, b);
+end;
+
+function ENET_TIME_DIFFERENCE( const a, b: cint ): cint;
+begin
+  if (a - b) >= ENET_TIME_OVERFLOW then
+    Result := b - a
+  else
+    Result := a - b;
+end;
+
+////////////////////////////////////////////////////////////////////////////////
+// enet.h
+////////////////////////////////////////////////////////////////////////////////
+
+function ENET_VERSION_CREATE( const major, minor, patch: cint ): ENetVersion;
+begin
+  Result := (major shl 16) or (minor shl 8) or patch;
+end;
+
+function ENET_VERSION_GET_MAJOR( const version: ENetVersion ): cint;
+begin
+  Result := (version shr 16) and $FF;
+end;
+
+function ENET_VERSION_GET_MINOR( const version: ENetVersion ): cint;
+begin
+  Result := (version shr 8) and $FF;
+end;
+
+function ENET_VERSION_GET_PATCH( const version: ENetVersion ): cint;
+begin
+  Result := version and $FF;
+end;
+
+function ENET_VERSION(): ENetVersion;
+begin
+  Result := ENET_VERSION_CREATE( ENET_VERSION_MAJOR, ENET_VERSION_MINOR, ENET_VERSION_PATCH );
+end;
 
 end.
 

packages/libenet/src/enetcallbacks.pp

@@ -1,54 +0,0 @@
-{$mode objfpc}{$H+}
-unit enetcallbacks;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enetcallbacks.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: callbacks.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-
-uses enettypes; //only for size_t
-
-type
-
-{$PACKRECORDS C}
-
-  pENetCallbacks = ^TENetCallbacks;
-  TENetCallbacks = record
-    malloc    : function( size: enet_size_t ): Pointer; cdecl;
-    free      : procedure( memory: Pointer ); cdecl;
-    no_memory : procedure(); cdecl;
-  end;
-
-{$PACKRECORDS DEFAULT}
-
-implementation
-
-end.
-

packages/libenet/src/enetlist.pp

@@ -1,95 +0,0 @@
-{$mode objfpc}{$H+}
-unit enetlist;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enetlist.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: list.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-                                  
-type
-
-{$PACKRECORDS C}
-
-  pENetListNode = ^ENetListNode;
-  ENetListNode = record
-    next     : pENetListNode;
-    previous : pENetListNode;
-  end;
-
-  ENetListIterator = pENetListNode;
-
-  pENetList = ^TENetList;
-  TENetList = record
-    sentinel : ENetListNode;
-  end;
-
-{$PACKRECORDS DEFAULT}
-
-//inline macros
-function enet_list_begin( list: pENetList ): ENetListIterator; inline;
-function enet_list_end( list: pENetList ): ENetListIterator; inline;
-
-function enet_list_empty( list: pENetList ): Boolean; inline;
-
-function enet_list_next( iterator: ENetListIterator ): ENetListIterator; inline;
-function enet_list_previous( iterator: ENetListIterator ): ENetListIterator; inline;
-
-function enet_list_front( list: pENetList ): Pointer; inline;
-function enet_list_back( list: pENetList ): Pointer; inline;
-
-implementation
-
-function enet_list_begin( list: pENetList ): ENetListIterator; inline;
-   begin Result := list^.sentinel.next;
-     end;
-function enet_list_end( list: pENetList ): ENetListIterator; inline;
-   begin Result := @( list^.sentinel );
-     end;
-
-function enet_list_empty( list: pENetList ): Boolean; inline;
-   begin Result := enet_list_begin(list) = enet_list_end(list);
-     end;
-
-function enet_list_next( iterator: ENetListIterator ): ENetListIterator; inline;
-   begin Result := iterator^.next;
-     end;
-function enet_list_previous( iterator: ENetListIterator ): ENetListIterator; inline;
-   begin Result := iterator^.previous;
-     end;
-
-function enet_list_front( list: pENetList ): Pointer; inline;
-   begin Result := Pointer( list^.sentinel.next );
-     end;
-function enet_list_back( list: pENetList ): Pointer; inline;
-   begin Result := Pointer( list^.sentinel.previous );
-     end;
-
-end.
-

packages/libenet/src/enetplatform.pp

@@ -1,108 +0,0 @@
-{$mode objfpc}{$H+}
-unit enetplatform;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enetplatform
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original files: win32.h & unix.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-
-uses enettypes, // used only for size_t
-     {$IFDEF WINDOWS} WinSock2 {$ELSE} BaseUnix, Sockets {$ENDIF};
-
-const
-  ENET_SOCKET_NULL = {$IFDEF WINDOWS} INVALID_SOCKET; {$ELSE} -1; {$ENDIF}
-//  ENET_BUFFER_MAXIMUM = MSG_MAXIOVLEN; //is it forgotten in win32.h ?
-
-type
-  ENetSocket = {$IFDEF WINDOWS} TSocket {$ELSE} enet_int {$ENDIF};
-
-  ENetSocketSet = TFDSet;
-  pENetSocketSet = ^ENetSocketSet;
-
-{$PACKRECORDS C}
-
-  pENetBuffer = ^ENetBuffer;
-  ENetBuffer = record
-    {$IFDEF WINDOWS}
-    dataLength : enet_size_t;
-    data       : Pointer;
-    {$ELSE}
-    data       : Pointer;
-    dataLength : enet_size_t;
-    {$ENDIF}
-  end;
-
-{$PACKRECORDS DEFAULT}
-
-//inline macros
-function ENET_HOST_TO_NET_16( const value: Word ): Word; inline;
-function ENET_HOST_TO_NET_32( const value: LongWord ): LongWord; inline;
-
-function ENET_NET_TO_HOST_16( const value: Word ): Word; inline;
-function ENET_NET_TO_HOST_32( const value: LongWord ): LongWord; inline;
-
-procedure ENET_SOCKETSET_EMPTY( var sockset: ENetSocketSet ); inline;
-procedure ENET_SOCKETSET_ADD( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
-procedure ENET_SOCKETSET_REMOVE( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
-function  ENET_SOCKETSET_CHECK( var sockset: ENetSocketSet; socket: ENetSocket ): Boolean; inline;
-
-implementation
-
-function ENET_HOST_TO_NET_16( const value: Word ): Word; inline;
-   begin Result := htons(value);
-     end;
-function ENET_HOST_TO_NET_32( const value: LongWord ): LongWord; inline;
-   begin Result := htonl(value);
-     end;
-
-function ENET_NET_TO_HOST_16( const value: Word ): Word; inline;
-   begin Result := ntohs(value);
-     end;
-function ENET_NET_TO_HOST_32( const value: LongWord ): LongWord; inline;
-   begin Result := ntohl(value);
-     end;
-
-procedure ENET_SOCKETSET_EMPTY( var sockset: ENetSocketSet ); inline;
-    begin {$IFNDEF WINDOWS}fpFD_ZERO{$ELSE}FD_ZERO{$ENDIF}( sockset );
-      end;
-procedure ENET_SOCKETSET_ADD( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
-    begin {$IFNDEF WINDOWS}fpFD_SET{$ELSE}FD_SET{$ENDIF}( socket, sockset );
-      end;
-procedure ENET_SOCKETSET_REMOVE( var sockset: ENetSocketSet; socket: ENetSocket ); inline;
-    begin {$IFNDEF WINDOWS}fpFD_CLR{$ELSE}FD_CLR{$ENDIF}( socket, sockset );
-      end;
-
-function ENET_SOCKETSET_CHECK( var sockset: ENetSocketSet; socket: ENetSocket ): Boolean; inline;
-   begin Result := {$IFNDEF WINDOWS} fpFD_ISSET( socket, sockset ) <> 0
-                               {$ELSE}   FD_ISSET( socket, sockset ) {$ENDIF};
-     end;
-
-end.
-

packages/libenet/src/enetprotocol.pp

@@ -1,214 +0,0 @@
-{$mode objfpc}
-unit enetprotocol;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enetprotocol.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: protocol.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-
-uses enettypes;
-
-const
-   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     = 65536;
-   ENET_PROTOCOL_MINIMUM_CHANNEL_COUNT   = 1;
-   ENET_PROTOCOL_MAXIMUM_CHANNEL_COUNT   = 255;
-   ENET_PROTOCOL_MAXIMUM_PEER_ID         = $FFF;
-   ENET_PROTOCOL_MAXIMUM_FRAGMENT_COUNT  = 1024 * 1024;
-
-   // ENetProtocolFlag
-   ENET_PROTOCOL_COMMAND_FLAG_ACKNOWLEDGE = 1 shl 7;
-   ENET_PROTOCOL_COMMAND_FLAG_UNSEQUENCED = 1 shl 6;
-   ENET_PROTOCOL_HEADER_FLAG_COMPRESSED   = 1 shl 14;
-   ENET_PROTOCOL_HEADER_FLAG_SENT_TIME    = 1 shl 15;
-   ENET_PROTOCOL_HEADER_FLAG_MASK         = ENET_PROTOCOL_HEADER_FLAG_COMPRESSED or
-                                            ENET_PROTOCOL_HEADER_FLAG_SENT_TIME;
-   ENET_PROTOCOL_HEADER_SESSION_MASK      = 3 shl 12;
-   ENET_PROTOCOL_HEADER_SESSION_SHIFT     = 12;
-
-type
-  ENetProtocolCommand = ( ENET_PROTOCOL_COMMAND_NONE,
-                          ENET_PROTOCOL_COMMAND_ACKNOWLEDGE,
-                          ENET_PROTOCOL_COMMAND_CONNECT,
-                          ENET_PROTOCOL_COMMAND_VERIFY_CONNECT,
-                          ENET_PROTOCOL_COMMAND_DISCONNECT,
-                          ENET_PROTOCOL_COMMAND_PING,
-                          ENET_PROTOCOL_COMMAND_SEND_RELIABLE,
-                          ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE,
-                          ENET_PROTOCOL_COMMAND_SEND_FRAGMENT,
-                          ENET_PROTOCOL_COMMAND_SEND_UNSEQUENCED,
-                          ENET_PROTOCOL_COMMAND_BANDWIDTH_LIMIT,
-                          ENET_PROTOCOL_COMMAND_THROTTLE_CONFIGURE,
-                          ENET_PROTOCOL_COMMAND_SEND_UNRELIABLE_FRAGMENT,
-                          ENET_PROTOCOL_COMMAND_COUNT,
-                          ENET_PROTOCOL_COMMAND_MASK = $0F                );
-
-  ENetProtocolFlag = Integer; //alias for FPC-uncompatible enum, placed in const
-
-{$PACKRECORDS 1}
-
-  pENetProtocolHeader = ^ENetProtocolHeader;
-  ENetProtocolHeader = record
-    peerID   : enet_uint16;
-    sentTime : enet_uint16;
-  end;
-
-  pENetProtocolCommandHeader = ^ENetProtocolCommandHeader;
-  ENetProtocolCommandHeader = record
-    command                : enet_uint8;
-    channelID              : enet_uint8;
-    reliableSequenceNumber : enet_uint16;
-  end;
-
-  pENetProtocolAcknowledge = ^ENetProtocolAcknowledge;
-  ENetProtocolAcknowledge = record
-    header                         : ENetProtocolCommandHeader;
-    receivedReliableSequenceNumber : enet_uint16;
-    receivedSentTime               : enet_uint16;
-  end;
-
-  pENetProtocolConnect = ^ENetProtocolConnect;
-  ENetProtocolConnect = record
-    header                     : ENetProtocolCommandHeader;
-    outgoingPeerID             : enet_uint16;
-    incomingSessionID          : enet_uint8;
-    outgoingSessionID          : enet_uint8;
-    mtu                        : enet_uint32;
-    windowSize                 : enet_uint32;
-    channelCount               : enet_uint32;
-    incomingBandwidth          : enet_uint32;
-    outgoingBandwidth          : enet_uint32;
-    packetThrottleInterval     : enet_uint32;
-    packetThrottleAcceleration : enet_uint32;
-    packetThrottleDeceleration : enet_uint32;
-    connectID                  : enet_uint32;
-    data                       : enet_uint32;
-  end;
-
-  pENetProtocolVerifyConnect = ^ENetProtocolVerifyConnect;
-  ENetProtocolVerifyConnect = record
-    header                     : ENetProtocolCommandHeader;
-    outgoingPeerID             : enet_uint16;
-    incomingSessionID          : enet_uint8;
-    outgoingSessionID          : enet_uint8;
-    mtu                        : enet_uint32;
-    windowSize                 : enet_uint32;
-    channelCount               : enet_uint32;
-    incomingBandwidth          : enet_uint32;
-    outgoingBandwidth          : enet_uint32;
-    packetThrottleInterval     : enet_uint32;
-    packetThrottleAcceleration : enet_uint32;
-    packetThrottleDeceleration : enet_uint32;
-    connectID                  : enet_uint32;
-  end;
-
-  pENetProtocolBandwidthLimit = ^ENetProtocolBandwidthLimit;
-  ENetProtocolBandwidthLimit = record
-    header            : ENetProtocolCommandHeader;
-    incomingBandwidth : enet_uint32;
-    outgoingBandwidth : enet_uint32;
-  end;
-
-  pENetProtocolThrottleConfigure = ^ENetProtocolThrottleConfigure;
-  ENetProtocolThrottleConfigure = record
-    header                     : ENetProtocolCommandHeader;
-    packetThrottleInterval     : enet_uint32;
-    packetThrottleAcceleration : enet_uint32;
-    packetThrottleDeceleration : enet_uint32;
-  end;
-
-  pENetProtocolDisconnect = ^ENetProtocolDisconnect;
-  ENetProtocolDisconnect = record
-    header : ENetProtocolCommandHeader;
-    data   : enet_uint32;
-  end;
-
-  pENetProtocolPing = ^ENetProtocolPing;
-  ENetProtocolPing = record
-    header : ENetProtocolCommandHeader;
-  end;
-
-  pENetProtocolSendReliable = ^ENetProtocolSendReliable;
-  ENetProtocolSendReliable = record
-    header     : ENetProtocolCommandHeader;
-    dataLength : enet_uint16;
-  end;
-
-  pENetProtocolSendUnreliable = ^ENetProtocolSendUnreliable;
-  ENetProtocolSendUnreliable = record
-    header                   : ENetProtocolCommandHeader;
-    unreliableSequenceNumber : enet_uint16;
-    dataLength               : enet_uint16;
-  end;
-
-  pENetProtocolSendUnsequenced = ^ENetProtocolSendUnsequenced;
-  ENetProtocolSendUnsequenced = record
-    header           : ENetProtocolCommandHeader;
-    unsequencedGroup : enet_uint16;
-    dataLength       : enet_uint16;
-  end;
-
-  pENetProtocolSendFragment = ^ENetProtocolSendFragment;
-  ENetProtocolSendFragment = record
-    header              : ENetProtocolCommandHeader;
-    startSequenceNumber : enet_uint16;
-    dataLength          : enet_uint16;
-    fragmentCount       : enet_uint32;
-    fragmentNumber      : enet_uint32;
-    totalLength         : enet_uint32;
-    fragmentOffset      : enet_uint32;
-  end;
-
-  pENetProtocol = ^TENetProtocol;
-  TENetProtocol = record //union
-  case Byte of
-  0 : (header            : ENetProtocolCommandHeader);
-  1 : (acknowledge       : ENetProtocolAcknowledge);
-  2 : (connect           : ENetProtocolConnect);
-  3 : (verifyConnect     : ENetProtocolVerifyConnect);
-  4 : (disconnect        : ENetProtocolDisconnect);
-  5 : (ping              : ENetProtocolPing);
-  6 : (sendReliable      : ENetProtocolSendReliable);
-  7 : (sendUnreliable    : ENetProtocolSendUnreliable);
-  8 : (sendUnsequenced   : ENetProtocolSendUnsequenced);
-  9 : (sendFragment      : ENetProtocolSendFragment);
-  10: (bandwidthLimit    : ENetProtocolBandwidthLimit);
-  11: (throttleConfigure : ENetProtocolThrottleConfigure);
-  end;
-
-{$PACKRECORDS DEFAULT}
-
-implementation
-
-end.
-

packages/libenet/src/enettime.pp

@@ -1,69 +0,0 @@
-{$mode objfpc}
-unit enettime;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enettime.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: time.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-
-const
-  ENET_TIME_OVERFLOW = 86400000;
-
-//inline macros
-function ENET_TIME_LESS( const a, b: LongInt ): Boolean; inline;
-function ENET_TIME_GREATER( const a, b: LongInt ): Boolean; inline;
-
-function ENET_TIME_LESS_EQUAL( const a, b: LongInt ): Boolean; inline;
-function ENET_TIME_GREATER_EQUAL( const a, b: LongInt ): Boolean; inline;
-
-function ENET_TIME_DIFFERENCE( const a, b: LongInt ): LongInt; inline;
-
-implementation
-
-function ENET_TIME_LESS( const a, b: LongInt ): Boolean; inline;
-   begin Result := a - b >= ENET_TIME_OVERFLOW;
-     end;
-function ENET_TIME_GREATER( const a, b: LongInt ): Boolean; inline;
-   begin Result := b - a >= ENET_TIME_OVERFLOW;
-     end;
-
-function ENET_TIME_LESS_EQUAL( const a, b: LongInt ): Boolean; inline;
-   begin Result := not ENET_TIME_GREATER( a, b );
-     end;
-function ENET_TIME_GREATER_EQUAL( const a, b: LongInt ): Boolean; inline;
-   begin Result := not ENET_TIME_LESS( a, b );
-     end;
-
-function ENET_TIME_DIFFERENCE( const a, b: LongInt ): LongInt; inline;
-   begin if a - b >= ENET_TIME_OVERFLOW then Result := b - a else Result := a - b;
-     end;
-
-end.
-

packages/libenet/src/enettypes.pp

@@ -1,55 +0,0 @@
-{$mode objfpc}
-unit enettypes;
-
-{
-  ENet - Reliable UDP networking library
-
-  FreePascal DLL header: enettypes.pp
-  Copyright (c) 2015 Dmitry D. Chernov aka Black Doomer
-
-  Original file: types.h
-  Copyright (c) 2002-2014 Lee Salzman
-
-  Version 1 for 1.3.12: 25.02.2015
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-}
-
-interface
-
-type
-  enet_size_t = SizeUInt; //alias for C size_t
-  penet_size_t = ^enet_size_t;
-
-  enet_int = LongInt; //alias for C int
-  penet_int = ^enet_int;
-
-  enet_uint8 = Byte;
-  penet_uint8 = ^enet_uint8;
-
-  enet_uint16 = Word;
-  penet_uint16 = ^enet_uint16;
-
-  enet_uint32 = LongWord;
-  penet_uint32 = ^enet_uint32;
-
-implementation
-
-end.
-

packages/libenet/src/uenetclass.pp

@@ -1,50 +1,52 @@
-unit uenetclass;
+{$MODE OBJFPC}
+{$LONGSTRINGS ON}
 
+unit UENetClass;
 
-{ ENet UDP Class for FreePascal
+{
+  ENet UDP Class for Free Pascal
 
   Copyright (c) 2013 Do-wan Kim
+  2016-08-24: revised by Dmitry D. Chernov
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to
-  deal in the Software without restriction, including without limitation the
-  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-  sell copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
 
+  TODO:
   - Add SendMsgEventPeer
 }
 
-
-
-{$mode objfpc}{$H+}
-
 interface
 
 uses
-  Classes, SysUtils, enet, enettime, enetprotocol;
+  SysUtils, Classes, ENet;
 
 type
+  TENetEventType = ( ENetEventNone, ENetEventConnect, ENetEventDisconnect,
+    ENetEventReceive );
 
-  TENet_Event_Type = (ENetEventNone, ENetEventConnect, ENetEventDisConnect, ENetEventReceive);
-  TENetPacketFlag = (ENetPacketReliable, ENetPacketUnsequenced,
-                     ENetPacketNoAllocate, ENetPacketUnReliableFragment);
+  TENetPacketFlag = ( ENetPacketReliable, ENetPacketUnsequenced,
+    ENetPacketNoAllocate, ENetPacketUnReliableFragment );
   TENetPacketFlags = set of TENetPacketFlag;
 
-  TENetEventProc = procedure (const Event:ENetEvent) of object;
-  TENetEventRecv = procedure (const Event:ENetEvent; var BroadcastMsg : Boolean; var BroadcastChannel : Byte) of object;
+  TENetEventProc = procedure( const Event: ENetEvent ) of object;
+  TENetEventRecv = procedure( const Event: ENetEvent; var BroadcastMsg: Boolean;
+    var BroadcastChannel: Byte ) of object;
 
   { TENetClass }
 
@@ -58,7 +60,8 @@ type
 
       FMaxPeer : Cardinal;
       FMaxChannels : Byte;
-      FBandwidthIncoming, FBandwidthOutgoing : Cardinal;
+      FBandwidthIncoming : Cardinal;
+      FBandwidthOutgoing : Cardinal;
 
       FHost : pENetHost;
       FEvent : ENetEvent;
@@ -70,270 +73,264 @@ type
 
       FEventNone : TENetEventProc;
       FEventConnect : TENetEventProc;
-      FEventDisConnect : TENetEventProc;
+      FEventDisconnect : TENetEventProc;
       FEventReceive : TENetEventRecv;
-    protected
+
     public
-      constructor Create(Port : word; bServer : Boolean);
-      destructor Destroy; override;
-
-      function InitHost:Boolean;
-      procedure DeInitHost;
-      function Connect(const Host: string; Port: Word): Boolean;
-      function DisConnect(bNow: Boolean): Boolean;
-      function SendMsg(Channel: Byte; Data: Pointer; Length: Integer; flag: TENetPacketFlags;
-        WaitResponse: Boolean = False): Boolean;
-      function SendMsgEventPeer(Data: Pointer; Length: Integer;
-        flag: TENetPacketFlags; WaitResponse: Boolean=False): Boolean;
-      procedure FlushMsg;
-      function BroadcastMsg(Channel: Byte; Data: Pointer; Length: Integer; flag: TENetPacketFlags; WaitResponse : Boolean = False):Boolean;
-      function ProcessMsg:Boolean; virtual;
-      procedure Ping;
-
-
-      property Port : Word read FAddress.port write FAddress.port;
-      property MaxClient : Cardinal read FMaxPeer write FMaxPeer;
-      property MaxChannels : Byte read FMaxChannels write FMaxChannels;
-      property BandwidthIncoming : Cardinal read FBandwidthIncoming write FBandwidthIncoming;
-      property BandwidthOutgoing : Cardinal read FBandwidthOutgoing write FBandwidthOutgoing;
-      property ClientData : Cardinal read FClientData;
-      property ConnectTimeout : Cardinal read FConnectTimeout write FConnectTimeout;
-      property MessageTimeout : Cardinal read FMessageTimeout write FMessageTimeout;
-      property OnNone : TENetEventProc read FEventNone write FEventNone;
-      property OnConnect : TENetEventProc read FEventConnect write FEventConnect;
-      property OnDisconnect : TENetEventProc read FEventDisConnect write FEventDisConnect;
-      property OnReceive : TENetEventRecv read FEventReceive write FEventReceive;
+      constructor Create( Port: Word; bServer: Boolean );
+      destructor Destroy(); override;
+
+      function InitHost(): Boolean;
+      procedure DeinitHost();
+      function Connect( const Host: string; Port: Word ): Boolean;
+      function Disconnect( bNow: Boolean ): Boolean;
+      function SendMsg( Channel: Byte; Data: Pointer; Length: Integer;
+        flag: TENetPacketFlags; WaitResponse: Boolean = False ): Boolean;
+      function SendMsgEventPeer( Data: Pointer; Length: Integer;
+        flag: TENetPacketFlags; WaitResponse: Boolean = False ): Boolean;
+      procedure FlushMsg();
+      function BroadcastMsg( Channel: Byte; Data: Pointer; Length: Integer;
+        flag: TENetPacketFlags; WaitResponse: Boolean = False ): Boolean;
+      function ProcessMsg(): Boolean; virtual;
+      procedure Ping();
+
+
+      property Port: Word read FAddress.port write FAddress.port;
+      property MaxClient: Cardinal read FMaxPeer write FMaxPeer;
+      property MaxChannels: Byte read FMaxChannels write FMaxChannels;
+      property BandwidthIncoming: Cardinal read FBandwidthIncoming write FBandwidthIncoming;
+      property BandwidthOutgoing: Cardinal read FBandwidthOutgoing write FBandwidthOutgoing;
+      property ClientData: Cardinal read FClientData;
+      property ConnectTimeout: Cardinal read FConnectTimeout write FConnectTimeout;
+      property MessageTimeout: Cardinal read FMessageTimeout write FMessageTimeout;
+      property OnNone: TENetEventProc read FEventNone write FEventNone;
+      property OnConnect: TENetEventProc read FEventConnect write FEventConnect;
+      property OnDisconnect: TENetEventProc read FEventDisconnect write FEventDisconnect;
+      property OnReceive: TENetEventRecv read FEventReceive write FEventReceive;
   end;
 
 implementation
 
-function GetPacketFlag(flag:TENetPacketFlags):Integer;
+function GetPacketFlag( flag: TENetPacketFlags ): Integer;
 begin
-  Result:=0;
+  Result := 0;
   if ENetPacketReliable in flag then
-     Inc(Result,Ord(ENET_PACKET_FLAG_RELIABLE));
+    Inc( Result, Ord(ENET_PACKET_FLAG_RELIABLE) );
   if ENetPacketUnsequenced in flag then
-     Inc(Result,Ord(ENET_PACKET_FLAG_UNSEQUENCED));
+    Inc( Result, Ord(ENET_PACKET_FLAG_UNSEQUENCED) );
   if ENetPacketNoAllocate in flag then
-     Inc(Result,Ord(ENET_PACKET_FLAG_NO_ALLOCATE));
+    Inc( Result, Ord(ENET_PACKET_FLAG_NO_ALLOCATE) );
   if ENetPacketUnReliableFragment in flag then
-     Inc(Result,Ord(ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT));
+    Inc( Result, Ord(ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT) );
 end;
 
 { TENetClass }
 
-constructor TENetClass.Create(Port: word; bServer: Boolean);
+constructor TENetClass.Create( Port: word; bServer: Boolean );
 begin
-  FAddress.port:=Port;
-  FMaxPeer:=100;
-  FMaxChannels:=255;
-  FBandwidthIncoming:=0;
-  FBandwidthOutgoing:=0;
-  FIsServer:=False;
-  FConnectTimeout:=5000;
-  FMessageTimeout:=100;
-  FHost:=nil;
-  FPeer:=nil;
-  FEventNone:=nil;
-  FEventConnect:=nil;
-  FEventDisConnect:=nil;
-  FEventReceive:=nil;
-
-  FIsServer:=bServer;
-  FInit :=  enet_initialize = 0;
+  FAddress.port := Port;
+  FMaxPeer := 100;
+  FMaxChannels := 255;
+  FBandwidthIncoming := 0;
+  FBandwidthOutgoing := 0;
+  FIsServer := False;
+  FConnectTimeout := 5000;
+  FMessageTimeout := 100;
+  FHost := nil;
+  FPeer := nil;
+  FEventNone := nil;
+  FEventConnect := nil;
+  FEventDisconnect := nil;
+  FEventReceive := nil;
+
+  FIsServer := bServer;
+  FInit := enet_initialize() = 0;
 end;
 
-destructor TENetClass.Destroy;
+destructor TENetClass.Destroy();
 begin
-  DisConnect(True);
+  Disconnect(True);
   if FInit then
-    enet_deinitialize;
-  inherited Destroy;
+    enet_deinitialize();
+  inherited Destroy();
 end;
 
-function TENetClass.InitHost: Boolean;
+function TENetClass.InitHost(): Boolean;
 begin
-  DeInitHost;
-  if FInit then
+  DeinitHost;
+  if FInit then begin
     if FIsServer then begin
       // for server
-      FAddress.host:=ENET_HOST_ANY;
-      FHost:=enet_host_create(@FAddress,
-                              FMaxPeer,
-                              FMaxChannels,
-                              FBandwidthIncoming,
-                              FBandwidthOutgoing
-                                  );
+      FAddress.host := ENET_HOST_ANY;
+      FHost := enet_host_create( @FAddress, FMaxPeer, FMaxChannels,
+        FBandwidthIncoming, FBandwidthOutgoing );
     end else begin
       // for client
-      FMaxPeer:=1;
-      FHost:=enet_host_create(nil,
-                              FMaxPeer,
-                              FMaxChannels,
-                              FBandwidthIncoming,
-                              FBandwidthOutgoing
-                                  );
+      FMaxPeer := 1;
+      FHost := enet_host_create( nil, FMaxPeer, FMaxChannels,
+        FBandwidthIncoming, FBandwidthOutgoing );
     end;
-    Result:= FHost<>nil;
+  end;
+  Result := FHost <> nil;
 end;
 
-procedure TENetClass.DeInitHost;
+procedure TENetClass.DeinitHost();
 begin
-  if FHost<>nil then
+  if FHost <> nil then
     enet_host_destroy(FHost);
-  FHost:=nil;
+  FHost := nil;
 end;
 
-function TENetClass.Connect(const Host: string; Port: Word): Boolean;
+function TENetClass.Connect( const Host: string; Port: Word ): Boolean;
 begin
-  Result:=False;
+  Result := False;
   if not FIsServer then begin
-     DisConnect(True);
-     InitHost;
-     enet_address_set_host(@FAddress,PAnsiChar(Host));
-     FAddress.port:=Port;
-
-     FClientData:=Random(MaxInt);
-     FPeer:=enet_host_connect(FHost,@FAddress,FMaxChannels,FClientData);
-
-     Result:=FPeer<>nil;
-     if Result then
-        if (enet_host_service(FHost,@FEvent,FConnectTimeout)>0) and
-           (FEvent.kind=ENET_EVENT_TYPE_CONNECT) then begin
-              Result:=True;
-              if Assigned(FEventConnect) then
-                 FEventConnect(FEvent);
-        end else begin
-              enet_peer_reset(FPeer);
-              FPeer:=nil;
-              DeInitHost;
-        end;
+    Disconnect(True);
+    InitHost();
+    enet_address_set_host( @FAddress, PAnsiChar(Host) );
+    FAddress.port := Port;
+
+    FClientData := Random(MaxInt);
+    FPeer := enet_host_connect( FHost, @FAddress, FMaxChannels, FClientData );
+
+    Result := FPeer <> nil;
+    if Result then begin
+      if (enet_host_service( FHost, @FEvent, FConnectTimeout ) > 0) and
+        (FEvent.kind = ENET_EVENT_TYPE_CONNECT) then
+      begin
+        Result := True;
+        if Assigned(FEventConnect) then
+          FEventConnect(FEvent);
+      end else begin
+        enet_peer_reset(FPeer);
+        FPeer := nil;
+        DeinitHost();
+      end;
+    end;
   end;
 end;
 
-function TENetClass.DisConnect(bNow:Boolean): Boolean;
+function TENetClass.Disconnect( bNow: Boolean ): Boolean;
 begin
-  Result:=False;
-  if (not FIsServer) and (FHost<>nil) then begin
-     if FPeer<>nil then begin
-        if bNow then
-           enet_peer_disconnect_now(FPeer,FClientData)
-           else
-             enet_peer_disconnect(FPeer,FClientData);
-        FPeer:=nil;
-     end;
-     Result:=True;
+  Result := False;
+  if (not FIsServer) and (FHost <> nil) then begin
+    if FPeer <> nil then begin
+      if bNow then
+        enet_peer_disconnect_now( FPeer, FClientData )
+      else
+        enet_peer_disconnect( FPeer, FClientData );
+      FPeer := nil;
+    end;
+  Result := True;
   end;
-  DeInitHost;
+  DeinitHost();
 end;
 
-
-function TENetClass.SendMsg(Channel: Byte; Data: Pointer; Length: Integer;
-  flag: TENetPacketFlags; WaitResponse: Boolean): Boolean;
+function TENetClass.SendMsg( Channel: Byte; Data: Pointer; Length: Integer;
+  flag: TENetPacketFlags; WaitResponse: Boolean ): Boolean;
 var
   FPacket : pENetPacket;
   PacketFlag : Cardinal;
 begin
-  Result:=False;
-  if FPeer<>nil then begin
-     PacketFlag:=GetPacketFlag(flag);
-     FPacket := enet_packet_create(Data, Length, PacketFlag);
-     if enet_peer_send(FPeer,Channel,FPacket)=0 then
-       if WaitResponse then
-          Result:=ProcessMsg;
+  Result := False;
+  if FPeer <> nil then begin
+    PacketFlag := GetPacketFlag(flag);
+    FPacket := enet_packet_create( Data, Length, PacketFlag );
+    if enet_peer_send( FPeer, Channel, FPacket ) = 0 then
+      if WaitResponse then
+        Result := ProcessMsg();
   end;
 end;
 
-function TENetClass.SendMsgEventPeer(Data: Pointer; Length: Integer;
-  flag: TENetPacketFlags; WaitResponse: Boolean = False): Boolean;
+function TENetClass.SendMsgEventPeer( Data: Pointer; Length: Integer;
+  flag: TENetPacketFlags; WaitResponse: Boolean ): Boolean;
 var
   FPacket : pENetPacket;
   PacketFlag : Cardinal;
 begin
-  Result:=False;
-  if FEvent.Peer<>nil then begin
-     PacketFlag:=GetPacketFlag(flag);
-     FPacket := enet_packet_create(Data, Length, PacketFlag);
-     if enet_peer_send(FEvent.Peer,FEvent.channelID,FPacket)=0 then
-       if WaitResponse then
-          Result:=ProcessMsg;
+  Result := False;
+  if FEvent.Peer <> nil then begin
+    PacketFlag := GetPacketFlag(flag);
+    FPacket := enet_packet_create( Data, Length, PacketFlag );
+    if enet_peer_send( FEvent.Peer, FEvent.channelID, FPacket ) = 0 then
+      if WaitResponse then
+        Result := ProcessMsg();
   end;
 end;
 
-procedure TENetClass.FlushMsg;
+procedure TENetClass.FlushMsg();
 begin
-  if FHost<>nil then
-     enet_host_flush(FHost);
+  if FHost <> nil then
+    enet_host_flush(FHost);
 end;
 
-function TENetClass.BroadcastMsg(Channel: Byte; Data: Pointer; Length: Integer;
-  flag: TENetPacketFlags; WaitResponse: Boolean): Boolean;
+function TENetClass.BroadcastMsg( Channel: Byte; Data: Pointer; Length: Integer;
+  flag: TENetPacketFlags; WaitResponse: Boolean ): Boolean;
 var
   FPacket : pENetPacket;
   PacketFlag : Cardinal;
 begin
-  Result:=False;
-  if FPeer<>nil then begin
-     PacketFlag:=GetPacketFlag(flag);
-     FPacket:= enet_packet_create(Data, Length, PacketFlag);
-     enet_host_widecast(FHost,Channel,FPacket);
+  Result := False;
+  if FPeer <> nil then begin
+     PacketFlag := GetPacketFlag(flag);
+     FPacket := enet_packet_create( Data, Length, PacketFlag );
+     enet_host_broadcast( FHost, Channel, FPacket );
      if WaitResponse then
-       Result:=ProcessMsg;
+       Result := ProcessMsg();
   end;
 end;
 
-function TENetClass.ProcessMsg: Boolean;
+function TENetClass.ProcessMsg(): Boolean;
 var
   broadcast : Boolean;
   bdChannel : Byte;
   packet : pENetPacket;
   pflag : Integer;
   svcres : integer;
-
 begin
   Result := False;
-  if FHost<>nil then
-    begin
-    SvcRes:=enet_host_service(FHost,@FEvent,FMessageTimeout);
-    if SvcRes>0 then
-      begin
+  if FHost <> nil then begin
+    SvcRes := enet_host_service( FHost, @FEvent, FMessageTimeout );
+    if SvcRes > 0 then begin
       case FEvent.kind of
-      ENET_EVENT_TYPE_NONE : if Assigned(FEventNone) then
-                                FEventNone(FEvent);
-      ENET_EVENT_TYPE_CONNECT : if Assigned(FEventConnect) then
-                                   FEventConnect(FEvent);
-      ENET_EVENT_TYPE_DISCONNECT : if Assigned(FEventDisConnect) then
-                                      FEventDisConnect(FEvent);
-      ENET_EVENT_TYPE_RECEIVE : begin
-                  try
-                    if FIsServer then begin
-                       broadcast:=True;
-                       pflag:=FEvent.packet^.flags;
-                       bdChannel:= FEvent.channelID;
-                    end;
-                    if Assigned(FEventReceive) then
-                       FEventReceive(FEvent,broadcast,bdChannel);
-                    if FIsServer and broadcast then begin
-                       packet := enet_packet_create(FEvent.packet^.data,FEvent.packet^.dataLength,pflag);
-                       enet_host_widecast(FHost,bdChannel,packet);
-                    end;
-                  finally
-                    enet_packet_destroy(FEvent.packet);
-                  end;
-                  end;
-      else ;
+        ENET_EVENT_TYPE_NONE:
+          if Assigned(FEventNone) then
+            FEventNone(FEvent);
+        ENET_EVENT_TYPE_CONNECT:
+          if Assigned(FEventConnect) then
+            FEventConnect(FEvent);
+        ENET_EVENT_TYPE_DISCONNECT:
+          if Assigned(FEventDisconnect) then
+            FEventDisconnect(FEvent);
+        ENET_EVENT_TYPE_RECEIVE: begin
+          try
+            if FIsServer then begin
+               broadcast := True;
+               pflag := FEvent.packet^.flags;
+               bdChannel := FEvent.channelID;
+            end;
+            if Assigned(FEventReceive) then
+               FEventReceive( FEvent, broadcast, bdChannel );
+            if FIsServer and broadcast then begin
+               packet := enet_packet_create( FEvent.packet^.data,
+                 FEvent.packet^.dataLength, pflag );
+               enet_host_broadcast( FHost, bdChannel, packet );
+            end;
+          finally
+            enet_packet_destroy( FEvent.packet );
+          end;
+        end;
       end;
       Result := True;
-      end;
     end;
+  end;
 end;
 
-procedure TENetClass.Ping;
+procedure TENetClass.Ping();
 begin
-  if (not FIsServer) and (FPeer<>nil) then
+  if (not FIsServer) and (FPeer <> nil) then
     enet_peer_ping(FPeer);
 end;
 
-
 end.