From 4b7f87b9c80b792080640a1d7a7a251e254fdc92 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Sat, 21 Nov 2015 18:58:54 +0100 Subject: [PATCH] move back to original contract of isNetworksOverlap() --- .../main/java/com/cloud/utils/net/NetUtils.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index db724f6a1f4a..90a43fa7e2a9 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -1170,14 +1170,15 @@ public static boolean verifyInstanceName(final String instanceName) { } public static boolean isNetworksOverlap(final String cidrA, final String cidrB) { - if (!areCidrsNotEmpty(cidrA, cidrB)) { - return false; + try { + Long[] cidrALong = cidrToLong(cidrA); + Long[] cidrBLong = cidrToLong(cidrB); + final long shift = MAX_CIDR - (cidrALong[1] > cidrBLong[1] ? cidrBLong[1] : cidrALong[1]); + return cidrALong[0] >> shift == cidrBLong[0] >> shift; + } catch (CloudRuntimeException e) { + s_logger.error(e.getLocalizedMessage(),e); } - Long[] cidrALong = cidrToLong(cidrA); - Long[] cidrBLong = cidrToLong(cidrB); - - final long shift = MAX_CIDR - (cidrALong[1] > cidrBLong[1] ? cidrBLong[1] : cidrALong[1]); - return cidrALong[0] >> shift == cidrBLong[0] >> shift; + return false; } public static boolean isValidS2SVpnPolicy(final String policys) {