From e48883ece99cbc67ceae53c3bf85969734c4e853 Mon Sep 17 00:00:00 2001
From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sun, 18 Feb 2018 19:58:26 +0000
Subject: [PATCH] Allow IP address to be passed into gethostbyname(). Ensure
 xNetworkBuffersInitialise() doesn't use a semaphore before it has been tested
 against NULL.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2529 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 .../Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c   | 25 ++++++++++----
 .../BufferManagement/BufferAllocation_2.c     | 33 ++++++++++---------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
index a457b7b2f..4ba27963e 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
@@ -404,18 +404,29 @@ TickType_t xReadTimeOut_ms = 1200U;
  as gethostbyname() may be called from different threads */
 TickType_t xIdentifier = ( TickType_t )usIdentifier++;
 
+	/* If the supplied hostname is IP address, convert it to uint32_t
+	and return. */
+	#if( ipconfigINCLUDE_FULL_INET_ADDR == 1 )
+	{
+		ulIPAddress = FreeRTOS_inet_addr( pcHostName );
+	}
+	#endif /* ipconfigINCLUDE_FULL_INET_ADDR == 1 */
+
 	/* If a DNS cache is used then check the cache before issuing another DNS
 	request. */
 	#if( ipconfigUSE_DNS_CACHE == 1 )
 	{
-		ulIPAddress = FreeRTOS_dnslookup( pcHostName );
-		if( ulIPAddress != 0 )
-		{
-			FreeRTOS_debug_printf( ( "FreeRTOS_gethostbyname: found '%s' in cache: %lxip\n", pcHostName, ulIPAddress ) );
-		}
-		else
+		if( ulIPAddress == 0UL )
 		{
-			/* prvGetHostByName will be called to start a DNS lookup. */
+			ulIPAddress = FreeRTOS_dnslookup( pcHostName );
+			if( ulIPAddress != 0 )
+			{
+				FreeRTOS_debug_printf( ( "FreeRTOS_gethostbyname: found '%s' in cache: %lxip\n", pcHostName, ulIPAddress ) );
+			}
+			else
+			{
+				/* prvGetHostByName will be called to start a DNS lookup */
+			}
 		}
 	}
 	#endif /* ipconfigUSE_DNS_CACHE == 1 */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/BufferManagement/BufferAllocation_2.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/BufferManagement/BufferAllocation_2.c
index 16ece7149..63da970b8 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/BufferManagement/BufferAllocation_2.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/portable/BufferManagement/BufferAllocation_2.c
@@ -103,24 +103,25 @@ BaseType_t xReturn, x;
 	{
 		xNetworkBufferSemaphore = xSemaphoreCreateCounting( ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS, ipconfigNUM_NETWORK_BUFFER_DESCRIPTORS );
 		configASSERT( xNetworkBufferSemaphore );
-		#if ( configQUEUE_REGISTRY_SIZE > 0 )
-		{
-			vQueueAddToRegistry( xNetworkBufferSemaphore, "NetBufSem" );
-		}
-		#endif /* configQUEUE_REGISTRY_SIZE */
-
-		/* If the trace recorder code is included name the semaphore for viewing
-		in FreeRTOS+Trace.  */
-		#if( ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1 )
-		{
-			extern QueueHandle_t xNetworkEventQueue;
-			vTraceSetQueueName( xNetworkEventQueue, "IPStackEvent" );
-			vTraceSetQueueName( xNetworkBufferSemaphore, "NetworkBufferCount" );
-		}
-		#endif /*  ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1 */
 
 		if( xNetworkBufferSemaphore != NULL )
 		{
+			#if ( configQUEUE_REGISTRY_SIZE > 0 )
+			{
+				vQueueAddToRegistry( xNetworkBufferSemaphore, "NetBufSem" );
+			}
+			#endif /* configQUEUE_REGISTRY_SIZE */
+
+			/* If the trace recorder code is included name the semaphore for viewing
+			in FreeRTOS+Trace.  */
+			#if( ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1 )
+			{
+				extern QueueHandle_t xNetworkEventQueue;
+				vTraceSetQueueName( xNetworkEventQueue, "IPStackEvent" );
+				vTraceSetQueueName( xNetworkBufferSemaphore, "NetworkBufferCount" );
+			}
+			#endif /*  ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1 */
+
 			vListInitialise( &xFreeBuffersList );
 
 			/* Initialise all the network buffers.  No storage is allocated to
@@ -374,7 +375,7 @@ uint8_t *pucBuffer;
 		vReleaseNetworkBuffer( pxNetworkBuffer->pucEthernetBuffer );
 		pxNetworkBuffer->pucEthernetBuffer = pucBuffer;
 	}
-	
+
 	return pxNetworkBuffer;
 }
 
-- 
2.39.5