Fix subnet() mask

qiluo-msft · qiluo-msft · commit 3681e98c8dfb · 2016-09-13T21:59:47.000-07:00
diff --git a/orchagent/swssnet.h b/orchagent/swssnet.h
@@ -83,13 +83,13 @@ inline static sai_ip_prefix_t& subnet(sai_ip_prefix_t& dst, const sai_ip_prefix_
     {
         case SAI_IP_ADDR_FAMILY_IPV4:
             dst.addr.ip4 = src.addr.ip4 & src.mask.ip4;
-            dst.mask.ip4 = 0xFFFFFFFF;
+            dst.mask.ip4 = src.mask.ip4;
             break;
         case SAI_IP_ADDR_FAMILY_IPV6:
             for (size_t i = 0; i < 16; i++)
             {
                 dst.addr.ip6[i] = src.addr.ip6[i] & src.mask.ip6[i];
-                dst.mask.ip6[i] = 0xFF;
+                dst.mask.ip6[i] = src.mask.ip6[i];
             }
             break;
         default:

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ inline static sai_ip_prefix_t& subnet(sai_ip_prefix_t& dst, const sai_ip_prefix_`
`83`	`83`	`{`
`84`	`84`	`case SAI_IP_ADDR_FAMILY_IPV4:`
`85`	`85`	`dst.addr.ip4 = src.addr.ip4 & src.mask.ip4;`
`86`		`- dst.mask.ip4 = 0xFFFFFFFF;`
	`86`	`+ dst.mask.ip4 = src.mask.ip4;`
`87`	`87`	`break;`
`88`	`88`	`case SAI_IP_ADDR_FAMILY_IPV6:`
`89`	`89`	`for (size_t i = 0; i < 16; i++)`
`90`	`90`	`{`
`91`	`91`	`dst.addr.ip6[i] = src.addr.ip6[i] & src.mask.ip6[i];`
`92`		`- dst.mask.ip6[i] = 0xFF;`
	`92`	`+ dst.mask.ip6[i] = src.mask.ip6[i];`
`93`	`93`	`}`
`94`	`94`	`break;`
`95`	`95`	`default:`