FreeRTOS+TCP after merging with the multi branch v2

libraries/freertos_plus/standard/freertos_plus_tcp/include/FreeRTOSIPConfigDefaults.h

@@ -157,7 +157,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
  * This macro will only be used if FreeRTOS_debug_printf() is defined for logging
  */
 #ifndef ipconfigTCP_MAY_LOG_PORT
-	#define ipconfigTCP_MAY_LOG_PORT(xPort)			( ( xPort ) != 23u )
+	#define ipconfigTCP_MAY_LOG_PORT(xPort)			( ( xPort ) != 23U )
 #endif
 
 
@@ -171,11 +171,11 @@ from the FreeRTOSIPConfig.h configuration header file. */
 
 
 #ifndef	ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS
-	#define	ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS	pdMS_TO_TICKS( 500u )
+	#define	ipconfigDNS_RECEIVE_BLOCK_TIME_TICKS	pdMS_TO_TICKS( 5000U )
 #endif
 
 #ifndef	ipconfigDNS_SEND_BLOCK_TIME_TICKS
-	#define	ipconfigDNS_SEND_BLOCK_TIME_TICKS		pdMS_TO_TICKS( 500u )
+	#define	ipconfigDNS_SEND_BLOCK_TIME_TICKS		pdMS_TO_TICKS( 500U )
 #endif
 /*
  * FreeRTOS debug logging routine (proposal)
@@ -196,7 +196,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
 #endif /* ifdef ipconfigHAS_DEBUG_PRINTF */
 
 #ifndef FreeRTOS_debug_printf
-    #define FreeRTOS_debug_printf( MSG )		do{} while(0)
+    #define FreeRTOS_debug_printf( MSG )		do{} while( ipFALSE_BOOL )
 	#define ipconfigHAS_DEBUG_PRINTF			0
 #endif
 
@@ -217,7 +217,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
 #endif /* ifdef ipconfigHAS_PRINTF */
 
 #ifndef FreeRTOS_printf
-    #define FreeRTOS_printf( MSG )				do{} while(0)
+    #define FreeRTOS_printf( MSG )				do{} while( ipFALSE_BOOL )
 	#define ipconfigHAS_PRINTF					0
 #endif
 
@@ -227,7 +227,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
  * An example of this is the netstat command, which produces many lines of logging
  */
 #ifndef FreeRTOS_flush_logging
-    #define FreeRTOS_flush_logging( )			do{} while(0)
+    #define FreeRTOS_flush_logging( )			do{} while( ipFALSE_BOOL )
 #endif
 
 /* Malloc functions. Within most applications of FreeRTOS, the couple
@@ -274,19 +274,19 @@ from the FreeRTOSIPConfig.h configuration header file. */
 #endif
 
 #ifndef ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS
-	#define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS ( pdMS_TO_TICKS( 20 ) )
+	#define ipconfigUDP_MAX_SEND_BLOCK_TIME_TICKS ( pdMS_TO_TICKS( 20U ) )
 #endif
 
 #ifndef ipconfigARP_CACHE_ENTRIES
 	#define ipconfigARP_CACHE_ENTRIES		10
 #endif
 
 #ifndef ipconfigMAX_ARP_RETRANSMISSIONS
-	#define ipconfigMAX_ARP_RETRANSMISSIONS ( 5u )
+	#define ipconfigMAX_ARP_RETRANSMISSIONS ( 5U )
 #endif
 
 #ifndef ipconfigMAX_ARP_AGE
-	#define ipconfigMAX_ARP_AGE			150u
+	#define ipconfigMAX_ARP_AGE			150U
 #endif
 
 #ifndef ipconfigUSE_ARP_REVERSED_LOOKUP
@@ -301,6 +301,10 @@ from the FreeRTOSIPConfig.h configuration header file. */
 	#define ipconfigINCLUDE_FULL_INET_ADDR	1
 #endif
 
+#ifndef ipconfigUSE_LINKED_RX_MESSAGES
+	#define ipconfigUSE_LINKED_RX_MESSAGES			0
+#endif
+
 #ifndef ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS
 	#define ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS		45
 #endif
@@ -326,7 +330,7 @@ from the FreeRTOSIPConfig.h configuration header file. */
 	 * for each UDP socket.
 	 * Can be overridden with the socket option FREERTOS_SO_UDP_MAX_RX_PACKETS
 	 */
-	#define ipconfigUDP_MAX_RX_PACKETS		0u
+	#define ipconfigUDP_MAX_RX_PACKETS		0U
 #endif
 
 #ifndef ipconfigUSE_DHCP
@@ -359,27 +363,27 @@ from the FreeRTOSIPConfig.h configuration header file. */
 #endif
 
 #ifndef ipconfigTCP_MSS
-	#define ipconfigTCP_MSS		( ipconfigNETWORK_MTU - ipSIZE_OF_IPv4_HEADER - ipSIZE_OF_TCP_HEADER )
+	#define ipconfigTCP_MSS		( ipconfigNETWORK_MTU - ( ipSIZE_OF_IPv4_HEADER + ipSIZE_OF_TCP_HEADER  ) )
 #endif
 
 /* Each TCP socket has circular stream buffers for Rx and Tx, which
  * have a fixed maximum size.
  * The defaults for these size are defined here, although
  * they can be overridden at runtime by using the setsockopt() call */
 #ifndef ipconfigTCP_RX_BUFFER_LENGTH
-	#define ipconfigTCP_RX_BUFFER_LENGTH			( 4u * ipconfigTCP_MSS )	/* defaults to 5840 bytes */
+	#define ipconfigTCP_RX_BUFFER_LENGTH			( 4U * ipconfigTCP_MSS )	/* defaults to 5840 bytes */
 #endif
 
 /* Define the size of Tx stream buffer for TCP sockets */
 #ifndef ipconfigTCP_TX_BUFFER_LENGTH
-#	define ipconfigTCP_TX_BUFFER_LENGTH			( 4u * ipconfigTCP_MSS )	/* defaults to 5840 bytes */
+#	define ipconfigTCP_TX_BUFFER_LENGTH			( 4U * ipconfigTCP_MSS )	/* defaults to 5840 bytes */
 #endif
 
 #ifndef ipconfigMAXIMUM_DISCOVER_TX_PERIOD
 	#ifdef _WINDOWS_
-		#define ipconfigMAXIMUM_DISCOVER_TX_PERIOD		( pdMS_TO_TICKS( 999 ) )
+		#define ipconfigMAXIMUM_DISCOVER_TX_PERIOD		( pdMS_TO_TICKS( 999U ) )
 	#else
-		#define ipconfigMAXIMUM_DISCOVER_TX_PERIOD		( pdMS_TO_TICKS( 30000 ) )
+		#define ipconfigMAXIMUM_DISCOVER_TX_PERIOD		( pdMS_TO_TICKS( 30000U ) )
 	#endif /* _WINDOWS_ */
 #endif /* ipconfigMAXIMUM_DISCOVER_TX_PERIOD */
 
@@ -414,14 +418,15 @@ from the FreeRTOSIPConfig.h configuration header file. */
 		#define ipconfigDNS_CACHE_ENTRIES			1
 	#endif
 
-		/* When accessing services which have multiple IP addresses, setting this
-		greater than 1 can improve reliability by returning different IP address
-		answers on successive calls to FreeRTOS_gethostbyname(). */
-	#ifndef ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY 
-		#define ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY 1
-	#endif
 #endif /* ipconfigUSE_DNS_CACHE != 0 */
 
+/* When accessing services which have multiple IP addresses, setting this
+greater than 1 can improve reliability by returning different IP address
+answers on successive calls to FreeRTOS_gethostbyname(). */
+#ifndef ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY 
+	#define ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY 1
+#endif
+
 #ifndef ipconfigCHECK_IP_QUEUE_SPACE
 	#define ipconfigCHECK_IP_QUEUE_SPACE			0
 #endif
@@ -551,7 +556,7 @@ connections, hang protection can help reduce the impact of SYN floods. */
 
 /* Non-activity timeout is expressed in seconds. */
 #ifndef ipconfigTCP_HANG_PROTECTION_TIME
-	#define ipconfigTCP_HANG_PROTECTION_TIME 30
+	#define ipconfigTCP_HANG_PROTECTION_TIME 30U
 #endif
 
 #ifndef ipconfigTCP_IP_SANITY
@@ -566,11 +571,15 @@ connections, hang protection can help reduce the impact of SYN floods. */
 	/* Expert option: define a value for 'ipBUFFER_PADDING'.
 	When 'ipconfigBUFFER_PADDING' equals 0,
 	'ipBUFFER_PADDING' will get a default value of 8 + 2 bytes. */
-	#define ipconfigBUFFER_PADDING 0
+	#define ipconfigBUFFER_PADDING			0U
 #endif
 
 #ifndef ipconfigPACKET_FILLER_SIZE
-	#define ipconfigPACKET_FILLER_SIZE 2
+	#define ipconfigPACKET_FILLER_SIZE		2U
+#endif
+
+#ifndef ipconfigSELECT_USES_NOTIFY
+	#define ipconfigSELECT_USES_NOTIFY		0
 #endif
 
 #endif /* FREERTOS_DEFAULT_IP_CONFIG_H */

libraries/freertos_plus/standard/freertos_plus_tcp/include/FreeRTOS_ARP.h

@@ -42,7 +42,7 @@ extern "C" {
 typedef struct xARP_CACHE_TABLE_ROW
 {
 	uint32_t ulIPAddress;		/* The IP address of an ARP cache entry. */
-	MACAddress_t xMACAddress;  /* The MAC address of an ARP cache entry. */
+	MACAddress_t xMACAddress;	/* The MAC address of an ARP cache entry. */
 	uint8_t ucAge;				/* A value that is periodically decremented but can also be refreshed by active communication.  The ARP cache entry is removed if the value reaches zero. */
     uint8_t ucValid;			/* pdTRUE: xMACAddress is valid, pdFALSE: waiting for ARP reply */
 } ARPCacheRow_t;
@@ -54,13 +54,6 @@ typedef enum
 	eCantSendPacket				/* 2 There is no IP address, or an ARP is still in progress, so the packet cannot be sent. */
 } eARPLookupResult_t;
 
-typedef enum
-{
-	eNotFragment = 0,			/* The IP packet being sent is not part of a fragment. */
-	eFirstFragment,				/* The IP packet being sent is the first in a set of fragmented packets. */
-	eFollowingFragment			/* The IP packet being sent is part of a set of fragmented packets. */
-} eIPFragmentStatus_t;
-
 /*
  * If ulIPAddress is already in the ARP cache table then reset the age of the
  * entry back to its maximum value.  If ulIPAddress is not already in the ARP
@@ -121,6 +114,23 @@ void vARPGenerateRequestPacket( NetworkBufferDescriptor_t * const pxNetworkBuffe
  */
 void vARPSendGratuitous( void );
 
+/* This function will check if the target IP-address belongs to this device.
+If so, the packet will be passed to the IP-stack, who will answer it.
+The function is to be called within the function xNetworkInterfaceOutput()
+in NetworkInterface.c as follows:
+
+	if( xCheckLoopback( pxDescriptor, bReleaseAfterSend ) != 0 )
+	{
+	   / * The packet has been sent back to the IP-task.
+		 * The IP-task will further handle it.
+		 * Do not release the descriptor.
+		 * /
+		return pdTRUE;
+	}
+	/ * Send the packet as usual. * /
+*/
+BaseType_t xCheckLoopback( NetworkBufferDescriptor_t * const pxDescriptor, BaseType_t bReleaseAfterSend );
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

libraries/freertos_plus/standard/freertos_plus_tcp/include/FreeRTOS_DHCP.h

@@ -34,23 +34,53 @@ extern "C" {
 #include "FreeRTOSIPConfig.h"
 #include "IPTraceMacroDefaults.h"
 
-/* Used in the DHCP callback if ipconfigUSE_DHCP_HOOK is set to 1. */
-typedef enum eDHCP_PHASE
+#if( ipconfigUSE_DHCP_HOOK != 0 )
+	/* Used in the DHCP callback if ipconfigUSE_DHCP_HOOK is set to 1. */
+	typedef enum eDHCP_PHASE
+	{
+		eDHCPPhasePreDiscover,	/* Driver is about to send a DHCP discovery. */
+		eDHCPPhasePreRequest	/* Driver is about to request DHCP an IP address. */
+	} eDHCPCallbackPhase_t;
+
+	/* Used in the DHCP callback if ipconfigUSE_DHCP_HOOK is set to 1. */
+	typedef enum eDHCP_ANSWERS
+	{
+		eDHCPContinue,			/* Continue the DHCP process */
+		eDHCPUseDefaults,		/* Stop DHCP and use the static defaults. */
+		eDHCPStopNoChanges,		/* Stop DHCP and continue with current settings. */
+	} eDHCPCallbackAnswer_t;
+#endif	/* #if( ipconfigUSE_DHCP_HOOK != 0 ) */
+
+/* DHCP state machine states. */
+typedef enum
 {
-	eDHCPPhasePreDiscover,	/* Driver is about to send a DHCP discovery. */
-	eDHCPPhasePreRequest,	/* Driver is about to request DHCP an IP address. */
-#if( ipconfigDHCP_SEND_DISCOVER_AFTER_AUTO_IP != 0 )
-	eDHCPPhasePreLLA,		/* Driver is about to try get an LLA address */
-#endif /* ipconfigDHCP_SEND_DISCOVER_AFTER_AUTO_IP */
-} eDHCPCallbackPhase_t;
-
-/* Used in the DHCP callback if ipconfigUSE_DHCP_HOOK is set to 1. */
-typedef enum eDHCP_ANSWERS
+	eWaitingSendFirstDiscover = 0,	/* Initial state.  Send a discover the first time it is called, and reset all timers. */
+	eWaitingOffer,					/* Either resend the discover, or, if the offer is forthcoming, send a request. */
+	eWaitingAcknowledge,			/* Either resend the request. */
+	#if( ipconfigDHCP_FALL_BACK_AUTO_IP != 0 )
+		eGetLinkLayerAddress,		/* When DHCP didn't respond, try to obtain a LinkLayer address 168.254.x.x. */
+	#endif
+	eLeasedAddress,					/* Resend the request at the appropriate time to renew the lease. */
+	eNotUsingLeasedAddress			/* DHCP failed, and a default IP address is being used. */
+} eDHCPState_t;
+
+/* Hold information in between steps in the DHCP state machine. */
+struct xDHCP_DATA
 {
-	eDHCPContinue,			/* Continue the DHCP process */
-	eDHCPUseDefaults,		/* Stop DHCP and use the static defaults. */
-	eDHCPStopNoChanges,		/* Stop DHCP and continue with current settings. */
-} eDHCPCallbackAnswer_t;
+	uint32_t ulTransactionId;
+	uint32_t ulOfferedIPAddress;
+	uint32_t ulDHCPServerAddress;
+	uint32_t ulLeaseTime;
+	/* Hold information on the current timer state. */
+	TickType_t xDHCPTxTime;
+	TickType_t xDHCPTxPeriod;
+	/* Try both without and with the broadcast flag */
+	BaseType_t xUseBroadcast;
+	/* Maintains the DHCP state machine state. */
+	eDHCPState_t eDHCPState;
+};
+
+typedef struct xDHCP_DATA DHCPData_t;
 
 /*
  * NOT A PUBLIC API FUNCTION.
@@ -60,12 +90,14 @@ void vDHCPProcess( BaseType_t xReset );
 /* Internal call: returns true if socket is the current DHCP socket */
 BaseType_t xIsDHCPSocket( Socket_t xSocket );
 
-/* Prototype of the hook (or callback) function that must be provided by the
-application if ipconfigUSE_DHCP_HOOK is set to 1.  See the following URL for
-usage information:
-http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html#ipconfigUSE_DHCP_HOOK
-*/
-eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase, uint32_t ulIPAddress );
+#if( ipconfigUSE_DHCP_HOOK != 0 )
+	/* Prototype of the hook (or callback) function that must be provided by the
+	application if ipconfigUSE_DHCP_HOOK is set to 1.  See the following URL for
+	usage information:
+	http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html#ipconfigUSE_DHCP_HOOK
+	*/
+	eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase, uint32_t ulIPAddress );
+#endif	/* ( ipconfigUSE_DHCP_HOOK != 0 ) */
 
 #ifdef __cplusplus
 }	/* extern "C" */