Browse Source

minor fix for packet creation with offset calculation

Vladislav Gritsenko 6 years ago
parent
commit
8244eb5533
4 changed files with 6 additions and 6 deletions
  1. 3 3
      include/enet.h
  2. 1 1
      include/enet/enet.h
  3. 1 1
      package.json
  4. 1 1
      src/packet.c

+ 3 - 3
include/enet.h

@@ -443,7 +443,7 @@ extern void   enet_free (void *);
 
 #define ENET_VERSION_MAJOR 1
 #define ENET_VERSION_MINOR 4
-#define ENET_VERSION_PATCH 1
+#define ENET_VERSION_PATCH 3
 #define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
 #define ENET_VERSION_GET_MAJOR(version) (((version)>>16)&0xFF)
 #define ENET_VERSION_GET_MINOR(version) (((version)>>8)&0xFF)
@@ -2373,7 +2373,7 @@ extern size_t enet_protocol_command_size (enet_uint8);
         if (flags & ENET_PACKET_FLAG_NO_ALLOCATE)
           packet -> data = (enet_uint8 *) data;
         else
-        if (dataLength <= 0)
+        if ((dataLength + dataOffset) <= 0)
           packet -> data = NULL;
         else
         {
@@ -2390,7 +2390,7 @@ extern size_t enet_protocol_command_size (enet_uint8);
 
         packet -> referenceCount = 0;
         packet -> flags = flags;
-        packet -> dataLength = dataLength;
+        packet -> dataLength = dataLength + dataOffset;
         packet -> freeCallback = NULL;
         packet -> userData = NULL;
 

+ 1 - 1
include/enet/enet.h

@@ -27,7 +27,7 @@ extern "C"
 
 #define ENET_VERSION_MAJOR 1
 #define ENET_VERSION_MINOR 4
-#define ENET_VERSION_PATCH 2
+#define ENET_VERSION_PATCH 4
 #define ENET_VERSION_CREATE(major, minor, patch) (((major)<<16) | ((minor)<<8) | (patch))
 #define ENET_VERSION_GET_MAJOR(version) (((version)>>16)&0xFF)
 #define ENET_VERSION_GET_MINOR(version) (((version)>>8)&0xFF)

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "enet.c",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "ENet - Simple, lightweight and reliable UDP networking library written on pure C.",
   "main": "include/enet.h",
   "directories": {

+ 1 - 1
src/packet.c

@@ -77,7 +77,7 @@ enet_packet_create_offset (const void * data, size_t dataLength, size_t dataOffs
 
     packet -> referenceCount = 0;
     packet -> flags = flags;
-    packet -> dataLength = dataLength;
+    packet -> dataLength = dataLength + dataOffset;
     packet -> freeCallback = NULL;
     packet -> userData = NULL;