CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 set(BUILD_NUMBER CACHE STRING "The number of the current build.")
 
 if ("${BUILD_NUMBER}" STREQUAL "")
-	set(BUILD_NUMBER "5185")
+	set(BUILD_NUMBER "5184")
 endif()
 
 if (BUILD_NUMBER LESS 5180)
@@ -53,7 +53,7 @@ if(UNIX)
   #
   # use rpath for locating installed libraries
   #
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
   include(CheckIncludeFile)

CMakeSettings.json

@@ -1,5 +1,5 @@
 {
-  "environments": [ { "BuildNumber": "5185" } ],
+  "environments": [ { "BuildNumber": "5184" } ],
   "configurations": [
     {
       "name": "x64-native",

src/Cedar/Virtual.c

@@ -9340,75 +9340,20 @@ UINT ServeDhcpDiscoverEx(VH *v, UCHAR *mac, UINT request_ip, bool is_static_ip)
 		return 0;
 	}
 
-	UINT ret = 0;
 	DHCP_LEASE *d = SearchDhcpLeaseByIp(v, request_ip);
-
 	if (d != NULL)
 	{
-		// If an entry for the same IP address already exists,
-		// check whether it is a request from the same MAC address
-		if (Cmp(mac, d->MacAddress, 6) == 0)
-		{
-			// Examine whether the specified IP address is within the range of assignment
-			if (Endian32(v->DhcpIpStart) > Endian32(request_ip) ||
-				Endian32(request_ip) > Endian32(v->DhcpIpEnd))
-			{
-				// Accept if within the range
-				ret = request_ip;
+		// The requested IP address is used already
+		return 0;
 	}
-		}
-		else {
-			// Duplicated IPV4 address found. The DHCP server replies to DHCPREQUEST with DHCP NAK.
-			char ipstr[MAX_HOST_NAME_LEN + 1] = { 0 };
-			char macstr[128] = { 0 };
-			IPToStr32(ipstr, sizeof(ipstr), request_ip);
-			BinToStr(macstr, sizeof(macstr), d->MacAddress, 6);
-			Debug("Virtual DHC Server: Duplicated IP address detected. Static IP: %s, Used by MAC:%s\n", ipstr, macstr);
-			return ret;
-		}
-	}
-	else
-	{
-		// Examine whether the specified IP address is within the range of assignment
-		if (Endian32(v->DhcpIpStart) > Endian32(request_ip) ||
-			Endian32(request_ip) > Endian32(v->DhcpIpEnd))
-		{
-			// Accept if within the range
-			ret = request_ip;
-		}
-		else
-		{
-			// Propose an IP in the range since it's a Discover although It is out of range
-		}
-	}
-	if (ret == 0)
-	{
-		// If there is any entry with the same MAC address
-		// that are already registered, use it with priority
-		DHCP_LEASE *d = SearchDhcpLeaseByMac(v, mac);
 
-		if (d != NULL)
-		{
-			// Examine whether the found IP address is in the allocation region
-			if (Endian32(v->DhcpIpStart) > Endian32(d->IpAddress) ||
-				Endian32(d->IpAddress) > Endian32(v->DhcpIpEnd))
-			{
-				// Use the IP address if it's found within the range
-				ret = d->IpAddress;
-			}
-		}
-	}
-	if (ret == 0)
-	{
 	// For static IP, the requested IP address must NOT be within the range of the DHCP pool
-		if (Endian32(v->DhcpIpStart) > Endian32(request_ip) ||
-			Endian32(request_ip) > Endian32(v->DhcpIpEnd))
+	if (Endian32(request_ip) < Endian32(v->DhcpIpStart) || Endian32(request_ip) > Endian32(v->DhcpIpEnd))
 	{
-			ret = request_ip;
-		}
+		return request_ip;
 	}
 
-	return ret;
+	return 0;
 }
 
 // Take an appropriate IP addresses that can be assigned newly
@@ -9764,9 +9709,6 @@ void VirtualDhcpServer(VH *v, PKT *p)
 			}
 		}
 		else
-		{
-			// Reply of DHCP_REQUEST must be either DHCP_ACK or DHCP_NAK.
-			if (opt->Opcode == DHCP_REQUEST)
 		{
 			// There is no IP address that can be provided
 			DHCP_OPTION_LIST ret;
@@ -9801,7 +9743,6 @@ void VirtualDhcpServer(VH *v, PKT *p)
 			}
 		}
 	}
-	}
 
 	// Release the memory
 	Free(opt);