Fix Subnet/Hosts listing which did not begin at first subnet

Add classMask func which returns the Mask of the Class type in UInt32 format

Author: mulot

IPSubnetcalc.swift

@@ -394,6 +394,27 @@ class IPSubnetCalc: NSObject {
         return (32)
     }
 
+    func classMask() -> UInt32 {
+        let classType = self.netClass()
+    
+        if (classType == "A") {
+           return (Constants.maskClassA)
+        }
+        else if (classType == "B") {
+            return (Constants.maskClassB)
+        }
+        else if (classType == "C") {
+            return (Constants.maskClassC)
+        }
+        else if (classType == "D") {
+            return (Constants.maskClassD)
+        }
+        else if (classType == "E") {
+            return (Constants.maskClassE)
+        }
+        return (Constants.maskClassE)
+    }
+    
     static func maskBits(maskAddr: String) -> Int {
         var bits: Int = 0
 

SubnetCalcAppDelegate.swift

@@ -731,7 +731,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
                    row: Int) -> Any?
     {
         if (ipsc != nil) {
-            let ipaddr: UInt32 = (((IPSubnetCalc.numerize(ipAddress: ipsc!.subnetId())) >> (32 - ipsc!.maskBits)) + UInt32(row)) << (32 - ipsc!.maskBits)
+            let ipaddr: UInt32 = (((IPSubnetCalc.numerize(ipAddress: ipsc!.ipv4Address) & ipsc!.classMask()) >> (32 - ipsc!.maskBits)) + UInt32(row)) << (32 - ipsc!.maskBits)
             let ipsc_tmp = IPSubnetCalc(ipAddress: IPSubnetCalc.digitize(ipAddress: ipaddr), maskbits: ipsc!.maskBits)
             //print("tableView Row: \(row) IP num : \(ipaddr) IP: \(IPSubnetCalc.digitize(ipAddress: ipaddr)) IP Subnet: \(ipsc_tmp!.subnetId())")
             if (tableColumn != nil && ipsc_tmp != nil) {