Google Git
Sign in
pigweed/third_party/github/FreeRTOS/FreeRTOS-Kernel/8e5addee1e68e784e334d0789e60d92efd175e9b^!/.
commit
8e5addee1e68e784e334d0789e60d92efd175e9b
[log]
author
Richard Barry <ribarry@amazon.com>
Thu Feb 06 22:45:37 2020 +0000
committer
Richard Barry <ribarry@amazon.com>
Thu Feb 06 22:45:37 2020 +0000
tree
9ea0604fda58e3a64b25c6e1d1e090a71612d9bf
parent
7bea399061e9fd829f937af6c01e4373341e3d5d [diff]
Update TCP to last release versions in preparation for kernel V10.3.0 release.

diff --git a/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c b/FreeRTOS-Labs/Source/FreeRTOS-Plus-TCP/FreeRTOS_ARP.c
index c98a7e8..bf82a18 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 9180426..cbd2b7d 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 43b246d..0ee9e87 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 c94f55d..443aa92 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 e158348..bbccb78 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 53a5c69..e7693ad 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 d267565..22e7bec 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 cda8acd..bfa6300 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 c8de697..fa41365 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 52565cc..70d8e0b 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 20cdf73..94d4054 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 166bf3a..42ef41a 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 6a6d372..13b3821 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 449fa51..0494358 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 6bfb4ad..f66400f 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 8604abe..ce5bf88 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 88d3bba..0d5a758 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 95bbbdf..e69f4de 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 76738c4..28a4001 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 9532fd1..9daa5f9 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 a7463fc..4ed078f 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 534f526..21e36e4 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 316e18f..8cc7fa9 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 0fcde34..6a79cc3 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 c3d3fb4..4d452a0 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 9180426..8871d65 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 @@
 	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 @@
 {

 	/* 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 c8de697..e7d2a6c 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 @@
 				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 */