Fix a bug in networkRangeIPv6 func with the IPv6 address is short

Integrate fullAddressIPv6 normalization in digitizeIPv6 func
Change fullAddressIPv6 and compactAddressIPv6 to static functions

Author: mulot

IPSubnetcalc.swift

@@ -927,7 +927,7 @@ class IPSubnetCalc: NSObject {
     /**
      Convert an IPv6 address in hexadecimal format to its digital format
 
-     - Parameter ipAddress: an IPv6 address in hexadecimal format
+     - Parameter ipAddress: an IPv6 address in hexadecimal format. Must be in full format.
 
      - Returns:
      UInt16 array of each digitized IPv6 address hexa segments
@@ -937,7 +937,7 @@ class IPSubnetCalc: NSObject {
         var ipAddressNum: [UInt16] = Array(repeating: 0, count: 8)
         var ip4Hex = [String]()
 
-        ip4Hex = ipAddress.components(separatedBy: ":")
+        ip4Hex = IPSubnetCalc.fullAddressIPv6(ipAddress: ipAddress).components(separatedBy: ":")
         for index in 0...(ip4Hex.count - 1) {
             if (ip4Hex[index] == "") {
                 ip4Hex[index] = "0"
@@ -1044,7 +1044,7 @@ class IPSubnetCalc: NSObject {
 
      */
     func hexaIDIPv6() -> String {
-        var hexID: String = fullAddressIPv6(ipAddress: self.ipv6Address)
+        var hexID: String = IPSubnetCalc.fullAddressIPv6(ipAddress: self.ipv6Address)
         let delimiter: Set<Character> = [":"]
         hexID.removeAll(where: { delimiter.contains($0) })
         return("0x\(hexID)")
@@ -1070,7 +1070,7 @@ class IPSubnetCalc: NSObject {
      the long notation (non compact) of the given IPv6 address
 
      */
-    func fullAddressIPv6(ipAddress: String) -> String {
+    static func fullAddressIPv6(ipAddress: String) -> String {
         var fullAddr = String()
         var ip4Hex = [String]()
         var prevIsZero = false
@@ -1109,7 +1109,7 @@ class IPSubnetCalc: NSObject {
      the compact notation of the given IPv6 address
 
      */
-    func compactAddressIPv6(ipAddress: String) -> String {
+    static func compactAddressIPv6(ipAddress: String) -> String {
         var shortAddr = String()
         var ip4Hex = [String]()
         var prevIsZero = false
@@ -1118,7 +1118,7 @@ class IPSubnetCalc: NSObject {
         var prevNonZero = false
 
         //print("IP Address: \(ipAddress)")
-        ip4Hex = self.fullAddressIPv6(ipAddress: ipAddress).components(separatedBy: ":")
+        ip4Hex = IPSubnetCalc.fullAddressIPv6(ipAddress: ipAddress).components(separatedBy: ":")
         for index in 0...(ip4Hex.count - 1) {
             if (UInt16(ip4Hex[index], radix: 16)! == 0) {
                 if (!prevIsZero || prevCompactZero) {
@@ -1176,7 +1176,7 @@ class IPSubnetCalc: NSObject {
     func networkIPv6() -> String {
         var netID = [UInt16]()
         let numMask = IPSubnetCalc.digitizeMaskIPv6(maskbits: self.ipv6MaskBits)
-        let numIP = IPSubnetCalc.digitizeIPv6(ipAddress: fullAddressIPv6(ipAddress: self.ipv6Address))
+        let numIP = IPSubnetCalc.digitizeIPv6(ipAddress: self.ipv6Address)
 
         for index in 0...7 {
             //print("Index: \(index) IP: \(numIP[index]) Mask : \(numMask[index]) Result : \(numIP[index] & (numMask[index])) ")
@@ -1196,7 +1196,7 @@ class IPSubnetCalc: NSObject {
         var netID = [UInt16]()
         var netID2 = [UInt16]()
         let numMask = IPSubnetCalc.digitizeMaskIPv6(maskbits: self.ipv6MaskBits)
-        let numIP = IPSubnetCalc.digitizeIPv6(ipAddress: fullAddressIPv6(ipAddress: self.ipv6Address))
+        let numIP = IPSubnetCalc.digitizeIPv6(ipAddress: self.ipv6Address)
 
         for index in 0...7 {
             //print("Index: \(index) IP: \(numIP[index]) Mask : \(numMask[index]) Result : \(numIP[index] & (numMask[index])) ")
@@ -1236,7 +1236,7 @@ class IPSubnetCalc: NSObject {
     func dottedDecimalIPv6() -> String {
         var ipv4str = String()
 
-        let ip4Hex = fullAddressIPv6(ipAddress: self.ipv6Address).components(separatedBy: ":")
+        let ip4Hex = IPSubnetCalc.fullAddressIPv6(ipAddress: self.ipv6Address).components(separatedBy: ":")
         for index in (0...(ip4Hex.count - 1)) {
             if (index != 0) {
                 ipv4str.append(".")
@@ -1261,7 +1261,7 @@ class IPSubnetCalc: NSObject {
 
      */
     func ip6ARPA () -> String {
-        var ipARPA = fullAddressIPv6(ipAddress: self.ipv6Address)
+        var ipARPA = IPSubnetCalc.fullAddressIPv6(ipAddress: self.ipv6Address)
         let delimiter: Set<Character> = [":"]
 
         ipARPA.removeAll(where: { delimiter.contains($0) })
@@ -1286,9 +1286,9 @@ class IPSubnetCalc: NSObject {
     func resBlockIPv6() -> String? {
         var netID = networkIPv6()
 
-        netID = fullAddressIPv6(ipAddress: netID)
+        netID = IPSubnetCalc.fullAddressIPv6(ipAddress: netID)
         //print("NetID BEFORE compact : \(netID)")
-        netID = compactAddressIPv6(ipAddress: netID)
+        netID = IPSubnetCalc.compactAddressIPv6(ipAddress: netID)
         //print("NetID AFTER compact : \(netID)")
         netID.append("/\(self.ipv6MaskBits)")
 

SubnetCalcAppDelegate.swift

@@ -493,12 +493,12 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
             var typeConv: String
 
             if (ipv6Compact.state == NSControl.StateValue.on) {
-                ipv6Address.stringValue = ipsc!.compactAddressIPv6(ipAddress: ipsc!.ipv6Address)
-                ipv6Network.stringValue = ipsc!.compactAddressIPv6(ipAddress: ipsc!.networkIPv6())
+                ipv6Address.stringValue = IPSubnetCalc.compactAddressIPv6(ipAddress: ipsc!.ipv6Address)
+                ipv6Network.stringValue = IPSubnetCalc.compactAddressIPv6(ipAddress: ipsc!.networkIPv6())
             }
             else {
-                ipv6Address.stringValue = ipsc!.fullAddressIPv6(ipAddress: ipsc!.ipv6Address)
-                ipv6Network.stringValue = ipsc!.fullAddressIPv6(ipAddress: ipsc!.networkIPv6())
+                ipv6Address.stringValue = IPSubnetCalc.fullAddressIPv6(ipAddress: ipsc!.ipv6Address)
+                ipv6Network.stringValue = IPSubnetCalc.fullAddressIPv6(ipAddress: ipsc!.networkIPv6())
             }
             (ipv6to4Address.stringValue, typeConv) = IPSubnetCalc.convertIPv6toIPv4(ipAddress: ipsc!.ipv6Address)
             ipv6to4Box.title = "IPv4 conversion" + " (\(typeConv))"
@@ -1572,7 +1572,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
             let pb: NSPasteboard = NSPasteboard.general
             pb.clearContents()
             let ipv4Info = "IPv4 Address Class Type: \(ipsc!.netClass())\nIPv4 Address: \(ipsc!.ipv4Address)\nIPv4 Subnet ID: \(ipsc!.subnetId())\nIPv4 Subnet Mask: \(ipsc!.subnetMask())\nIPv4 Broadcast: \(ipsc!.subnetBroadcast())\nIPv4 Address Range: \(ipsc!.subnetRange())\nIPv4 Mask Bits: \(ipsc!.maskBits)\nIPv4 Subnet Bits: \(ipsc!.subnetBits())\nMax IPv4 Subnets: \(ipsc!.maxSubnets())\nIPv4 Max Hosts / Subnet: \(ipsc!.maxHosts())\nIPv4 Address Hexa: \(ipsc!.hexaMap())\nIPv4 Bit Map: \(ipsc!.bitMap())\nIPv4 Binary Map: \(ipsc!.binaryMap())\n"
-            let ipv6Info = "\nIPv6 Address: \(ipsc!.ipv6Address)\nLong IPv6 Address: \(ipsc!.fullAddressIPv6(ipAddress: ipsc!.ipv6Address))\nShort IPv6 Address: \(ipsc!.compactAddressIPv6(ipAddress: ipsc!.ipv6Address))\nIPv6-to-IPv4: \(IPSubnetCalc.convertIPv6toIPv4(ipAddress: ipsc!.ipv6Address))\nIPv6 Mask Bits: \(ipsc!.ipv6MaskBits)\nIPv6 Max Hosts / Subnet: \(ipsc!.totalIPAddrIPv6())\nNetwork: \(ipsc!.compactAddressIPv6(ipAddress: ipsc!.networkIPv6()))\nIPv6 Address Range: \(ipsc!.networkRangeIPv6())\nIPv6 Address Type: \(ipsc!.resBlockIPv6() ?? "None")\nIPv6 Address Hexa: \(ipsc!.hexaIDIPv6())\nIPv6 Address Dotted Decimal: \(ipsc!.dottedDecimalIPv6())\nIP6.ARPA: \(ipsc!.ip6ARPA())\n"
+            let ipv6Info = "\nIPv6 Address: \(ipsc!.ipv6Address)\nLong IPv6 Address: \(IPSubnetCalc.fullAddressIPv6(ipAddress: ipsc!.ipv6Address))\nShort IPv6 Address: \(IPSubnetCalc.compactAddressIPv6(ipAddress: ipsc!.ipv6Address))\nIPv6-to-IPv4: \(IPSubnetCalc.convertIPv6toIPv4(ipAddress: ipsc!.ipv6Address))\nIPv6 Mask Bits: \(ipsc!.ipv6MaskBits)\nIPv6 Max Hosts / Subnet: \(ipsc!.totalIPAddrIPv6())\nNetwork: \(IPSubnetCalc.compactAddressIPv6(ipAddress: ipsc!.networkIPv6()))\nIPv6 Address Range: \(ipsc!.networkRangeIPv6())\nIPv6 Address Type: \(ipsc!.resBlockIPv6() ?? "None")\nIPv6 Address Hexa: \(ipsc!.hexaIDIPv6())\nIPv6 Address Dotted Decimal: \(ipsc!.dottedDecimalIPv6())\nIP6.ARPA: \(ipsc!.ip6ARPA())\n"
             pb.setString(ipv4Info + ipv6Info, forType: NSPasteboard.PasteboardType.string)
         }
     }