Update TCP to last release versions in preparation for kernel V10.3.0 release.

git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2818 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

27 files changed, 35 insertions, 31 deletions

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c
index c98a7e870..bf82a18b9 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
index 9180426df..cbd2b7d72 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
index 43b246d26..0ee9e870f 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_IP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_IP.c
index c94f55dd7..443aa9227 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_IP.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_IP.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
index e15834849..bbccb780d 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Stream_Buffer.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Stream_Buffer.c
index 53a5c69c6..e7693ad0d 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Stream_Buffer.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_Stream_Buffer.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_IP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_IP.c
index d26756589..22e7bec7a 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_IP.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_IP.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_WIN.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_WIN.c
index cda8acd1c..bfa630042 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_WIN.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_TCP_WIN.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
index c8de69790..fa4136517 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/History.txt b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/History.txt
index 52565cc86..70d8e0b5a 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/History.txt
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/History.txt
@@ -1,3 +1,8 @@
+Changes between 180821 and TBD.

+	Currently FreeRTOS+TCP files under this directory have version number "2.2.x Labs copy". 

+	Please be aware that the projects under FreeRTOS-Labs are experimental and in working 

+	progress. 

+

 Changes between 160919 and 180821 releases:

 

 	+ Multiple security improvements and fixes in packet parsing routines, DNS

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
index 20cdf739f..94d40542d 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOSIPConfigDefaults.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_ARP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_ARP.h
index 166bf3a97..42ef41aff 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_ARP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_ARP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DHCP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DHCP.h
index 6a6d372b6..13b3821bd 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DHCP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DHCP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DNS.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DNS.h
index 449fa514f..0494358a2 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DNS.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_DNS.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
index 6bfb4ad42..f66400f32 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
index 8604abed0..ce5bf8858 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
index 88d3bba65..0d5a75823 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Stream_Buffer.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Stream_Buffer.h
index 95bbbdf0a..e69f4de22 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Stream_Buffer.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Stream_Buffer.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_IP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_IP.h
index 76738c460..28a4001bc 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_IP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_IP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
index 9532fd159..9daa5f97d 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_TCP_WIN.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_UDP_IP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_UDP_IP.h
index a7463fcee..4ed078ffe 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_UDP_IP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_UDP_IP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_errno_TCP.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_errno_TCP.h
index 534f5261d..21e36e412 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_errno_TCP.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_errno_TCP.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/IPTraceMacroDefaults.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/IPTraceMacroDefaults.h
index 316e18f56..8cc7fa9c9 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/IPTraceMacroDefaults.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/IPTraceMacroDefaults.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkBufferManagement.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkBufferManagement.h
index 0fcde3439..6a79cc327 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkBufferManagement.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkBufferManagement.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkInterface.h b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkInterface.h
index c3d3fb4bc..4d452a0bd 100644
--- a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkInterface.h
+++ b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/include/NetworkInterface.h
@@ -1,5 +1,5 @@
 /*

- * FreeRTOS+TCP V2.2.0

+ * FreeRTOS+TCP 2.2.x Labs copy

  * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.

  *

  * Permission is hereby granted, free of charge, to any person obtaining a copy of

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
index 9180426df..8871d6563 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DHCP.c
@@ -84,9 +84,9 @@
 

 /* Offsets into the transmitted DHCP options fields at which various parameters

 are located. */

-#define dhcpCLIENT_IDENTIFIER_OFFSET			( 6 )

-#define dhcpREQUESTED_IP_ADDRESS_OFFSET			( 14 )

-#define dhcpDHCP_SERVER_IP_ADDRESS_OFFSET		( 20 )

+#define dhcpCLIENT_IDENTIFIER_OFFSET			( 5 )

+#define dhcpREQUESTED_IP_ADDRESS_OFFSET			( 13 )

+#define dhcpDHCP_SERVER_IP_ADDRESS_OFFSET		( 19 )

 

 /* Values used in the DHCP packets. */

 #define dhcpREQUEST_OPCODE						( 1 )

@@ -905,7 +905,7 @@ static const uint8_t ucDHCPRequestOptions[] =
 	dhcpCLIENT_IDENTIFIER_OFFSET, dhcpREQUESTED_IP_ADDRESS_OFFSET and

 	dhcpDHCP_SERVER_IP_ADDRESS_OFFSET. */

 	dhcpMESSAGE_TYPE_OPTION_CODE, 1, dhcpMESSAGE_TYPE_REQUEST,		/* Message type option. */

-	dhcpCLIENT_IDENTIFIER_OPTION_CODE, 7, 1, 0, 0, 0, 0, 0, 0,			/* Client identifier. */

+	dhcpCLIENT_IDENTIFIER_OPTION_CODE, 6, 0, 0, 0, 0, 0, 0,			/* Client identifier. */

 	dhcpREQUEST_IP_ADDRESS_OPTION_CODE, 4, 0, 0, 0, 0,				/* The IP address being requested. */

 	dhcpSERVER_IP_ADDRESS_OPTION_CODE, 4, 0, 0, 0, 0,				/* The IP address of the DHCP server. */

 	dhcpOPTION_END_BYTE

@@ -943,7 +943,7 @@ static const uint8_t ucDHCPDiscoverOptions[] =
 {

 	/* Do not change the ordering without also changing dhcpCLIENT_IDENTIFIER_OFFSET. */

 	dhcpMESSAGE_TYPE_OPTION_CODE, 1, dhcpMESSAGE_TYPE_DISCOVER,					/* Message type option. */

-	dhcpCLIENT_IDENTIFIER_OPTION_CODE, 7, 1, 0, 0, 0, 0, 0, 0,						/* Client identifier. */

+	dhcpCLIENT_IDENTIFIER_OPTION_CODE, 6, 0, 0, 0, 0, 0, 0,						/* Client identifier. */

 	dhcpPARAMETER_REQUEST_OPTION_CODE, 3, dhcpSUBNET_MASK_OPTION_CODE, dhcpGATEWAY_OPTION_CODE, dhcpDNS_SERVER_OPTIONS_CODE,	/* Parameter request option. */

 	dhcpOPTION_END_BYTE

 };

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
index c8de69790..e7d2a6c50 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_UDP_IP.c
@@ -280,8 +280,7 @@ UDPPacket_t *pxUDPPacket = (UDPPacket_t *) pxNetworkBuffer->pucEthernetBuffer;
 				destinationAddress.sin_port = usPort;

 				destinationAddress.sin_addr = pxUDPPacket->xIPHeader.ulDestinationIPAddress;

 

-				/* The value of 'xDataLength' was proven to be at least the size of a UDP packet in prvProcessIPPacket(). */

-				if( xHandler( ( Socket_t ) pxSocket, ( void* ) pcData, ( size_t ) ( pxNetworkBuffer->xDataLength - ipUDP_PAYLOAD_OFFSET_IPv4 ),

+				if( xHandler( ( Socket_t ) pxSocket, ( void* ) pcData, ( size_t ) pxNetworkBuffer->xDataLength,

 					&xSourceAddress, &destinationAddress ) )

 				{

 					xReturn = pdFAIL; /* FAIL means that we did not consume or release the buffer */