CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic

Jayapal · Jayapal · commit cd6e6a4d3cd7 · 2013-12-02T11:05:41.000+05:30
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1644,6 +1644,7 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {
         Set<Long> availableIps = _networkModel.getAvailableIps(network, requestedIp);
 
         if (availableIps == null || availableIps.isEmpty()) {
+            s_logger.debug("There are no free ips in the  network " + network );
             return null;
         }
 
@@ -1656,9 +1657,11 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {
             if (!isSameCidr) {
                 s_logger.warn("Requested ip address " + requestedIp + " doesn't belong to the network " + network + " cidr");
                 return null;
-            } else {
-                return requestedIp;
+            } else if (NetUtils.IsIpEqualToNetworkOrBroadCastIp(requestedIp, cidr[0], Integer.parseInt(cidr[1]))) {
+                s_logger.warn("Requested ip address " + requestedIp + " is equal to the to the network/broadcast ip of the network" + network);
+                return null;
             }
+            return requestedIp;
         }
 
         String result;
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1427,4 +1427,26 @@ public static boolean isIpWithtInCidrRange(String ipAddress, String cidr) {
         SubnetUtils subnetUtils = new SubnetUtils(cidr);
         return subnetUtils.getInfo().isInRange(ipAddress);
     }
+
+    public static Boolean IsIpEqualToNetworkOrBroadCastIp(String requestedIp, String cidr, long size) {
+        assert (size < 32) : "You do know this is not for ipv6 right?  Keep it smaller than 32 but you have " + size;
+
+        long ip = ip2Long(cidr);
+        long startNetMask = ip2Long(getCidrNetmask(size));
+
+        long start = (ip & startNetMask);
+        long end = start;
+
+        end = end >> (32 - size);
+
+        end++;
+        end = (end << (32 - size)) - 1;
+
+        long reqIp = ip2Long(requestedIp);
+        if (reqIp == start || reqIp == end) {
+            return true;
+        }
+        return false;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -1644,6 +1644,7 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {`
`1644`	`1644`	`Set<Long> availableIps = _networkModel.getAvailableIps(network, requestedIp);`
`1645`	`1645`
`1646`	`1646`	`if (availableIps == null \|\| availableIps.isEmpty()) {`
	`1647`	`+ s_logger.debug("There are no free ips in the network " + network );`
`1647`	`1648`	`return null;`
`1648`	`1649`	`}`
`1649`	`1650`
`@@ -1656,9 +1657,11 @@ public String acquireGuestIpAddress(Network network, String requestedIp) {`
`1656`	`1657`	`if (!isSameCidr) {`
`1657`	`1658`	`s_logger.warn("Requested ip address " + requestedIp + " doesn't belong to the network " + network + " cidr");`
`1658`	`1659`	`return null;`
`1659`		`- } else {`
`1660`		`- return requestedIp;`
	`1660`	`+ } else if (NetUtils.IsIpEqualToNetworkOrBroadCastIp(requestedIp, cidr[0], Integer.parseInt(cidr[1]))) {`
	`1661`	`+ s_logger.warn("Requested ip address " + requestedIp + " is equal to the to the network/broadcast ip of the network" + network);`
	`1662`	`+ return null;`
`1661`	`1663`	`}`
	`1664`	`+ return requestedIp;`
`1662`	`1665`	`}`
`1663`	`1666`
`1664`	`1667`	`String result;`