Index: /branches/rel_apv_10_7/usr/src/sys/click/app/segment/segment_cli_kern.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/app/segment/segment_cli_kern.c	(revision 38166)
+++ /branches/rel_apv_10_7/usr/src/sys/click/app/segment/segment_cli_kern.c	(working copy)
@@ -103,6 +103,10 @@
 static __inline int 
 segment_ipv4_addr_overlap(uint32_t ip1, uint32_t mask1, uint32_t ip2, uint32_t mask2)
 {
+        if (ip1 == ip2 && mask1 == mask2) {
+        return 0; // No overlap
+        }
+
 	uint32_t mask = mask1 & mask2;
 	return ((ip1 & mask) == (ip2 & mask));
 }
@@ -123,6 +127,10 @@
 	if(masklen2ip6(prefixlen2, &mask2) != 0) {
 		return -1;
 	}
+        
+        if (IN6_ARE_ADDR_EQUAL(ip1, ip2) && prefixlen1 == prefixlen2) {
+        return 0; // No overlap
+        }
 	
 	if(prefixlen1 <= prefixlen2) {
 		pmask = &mask1;