30 and 31 Mask bits support

mulot · mulot · commit 96c25b093b90 · 2020-12-23T11:19:24.000+01:00
change MaxHosts return value to 0 for 32 mask bits
Change SubnetRange return value  for 32 and 31 mask bits
Enable SWIFT_COMPILATION_MODE = wholemodule
diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
@@ -154,7 +154,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="335" y="326" width="670" height="694"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1080"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
             <value key="minSize" type="size" width="670" height="694"/>
             <view key="contentView" id="372">
                 <rect key="frame" x="0.0" y="0.0" width="670" height="694"/>
@@ -565,9 +565,9 @@
                                                         </textFieldCell>
                                                     </textField>
                                                     <slider verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="708">
-                                                        <rect key="frame" x="112" y="0.0" width="360" height="24"/>
+                                                        <rect key="frame" x="112" y="0.0" width="360" height="28"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                        <sliderCell key="cell" continuous="YES" state="on" baseWritingDirection="leftToRight" alignment="left" minValue="1" maxValue="30" doubleValue="1" tickMarkPosition="above" numberOfTickMarks="30" allowsTickMarkValuesOnly="YES" sliderType="linear" id="709"/>
+                                                        <sliderCell key="cell" continuous="YES" state="on" baseWritingDirection="leftToRight" alignment="left" minValue="1" maxValue="32" doubleValue="1" tickMarkPosition="above" numberOfTickMarks="32" allowsTickMarkValuesOnly="YES" sliderType="linear" id="709"/>
                                                         <connections>
                                                             <action selector="subnetBitsSlide:" target="b7w-M5-ti7" id="NME-GB-bJ8"/>
                                                         </connections>
diff --git a/IPSubnetcalc.swift b/IPSubnetcalc.swift
@@ -267,7 +267,7 @@ class IPSubnetCalc: NSObject {
         var maxHosts: UInt32 = 0
         
         if (self.maskBits == 32) {
-            return (1)
+            return (0)
         }
         maxHosts = (Constants.addr32Full >> self.maskBits) - 1
         return (Int(maxHosts))
@@ -311,8 +311,14 @@ class IPSubnetCalc: NSObject {
         var firstIP: UInt32 = 0
         var lastIP: UInt32 = 0
         
-        firstIP = IPSubnetCalc.numerize(ipAddress: subnetId()) + 1
-        lastIP = IPSubnetCalc.numerize(ipAddress: subnetBroadcast()) - 1
+        if (maskBits == 31 || maskBits == 32) {
+            firstIP = IPSubnetCalc.numerize(ipAddress: subnetId())
+            lastIP = IPSubnetCalc.numerize(ipAddress: subnetBroadcast())
+        }
+        else {
+            firstIP = IPSubnetCalc.numerize(ipAddress: subnetId()) + 1
+            lastIP = IPSubnetCalc.numerize(ipAddress: subnetBroadcast()) - 1
+        }
         range = IPSubnetCalc.digitize(ipAddress: firstIP) + " - " + IPSubnetCalc.digitize(ipAddress: lastIP)
         return (range)
     }
diff --git a/README.md b/README.md
@@ -3,6 +3,8 @@ Subnet Calculator for MacOS
 
 What's New in version 2.0:
 - IPv6 support!
+- Address Class D (Multicast) and Class E (Reserved) support
+- 31 and 32 mask bits support
 - New Tab presentation
 - Recoded in Swift
 - Add alerts for bad IP or mask format
diff --git a/SubnetCalc.xcodeproj/project.pbxproj b/SubnetCalc.xcodeproj/project.pbxproj
@@ -203,7 +203,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1220;
+				LastUpgradeCheck = 1230;
 				TargetAttributes = {
 					8D1107260486CEB800E47090 = {
 						LastSwiftMigration = 1220;
@@ -534,6 +534,7 @@
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
 				STRIP_INSTALLED_PRODUCT = YES;
+				SWIFT_COMPILATION_MODE = wholemodule;
 			};
 			name = Release;
 		};
diff --git a/SubnetCalc.xcodeproj/xcshareddata/xcschemes/SubnetCalc.xcscheme b/SubnetCalc.xcodeproj/xcshareddata/xcschemes/SubnetCalc.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1230"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/SubnetCalcAppDelegate.swift b/SubnetCalcAppDelegate.swift
@@ -78,43 +78,43 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
     
     //Private IPv4 functions
     private func initCIDRTab() {
-        for bits in (1...30) {
+        for bits in (1...32) {
             supernetMaskBitsCombo.addItem(withObjectValue: String(bits))
         }
         
-        for index in (2...31).reversed() {
+        for index in (0...31).reversed() {
             supernetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))
         }
-        for index in (0...29) {
+        for index in (0...31) {
             supernetMaxCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)
         }
         for index in (1...31) {
             supernetMaxAddr.addItem(withObjectValue: NSDecimalNumber(decimal: (pow(2, index) - 2)).stringValue)
         }
-        for index in (0...31) {
+        for index in (0...32) {
             supernetMaxSubnetsCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)
         }
     }
     
     private func initSubnetsTab() {
-        for index in (2...24).reversed() {
+        for index in (0...24).reversed() {
             if (wildcard.state == NSControl.StateValue.on) {
                 subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: ~(IPSubnetCalc.Constants.addr32Full << index)))
             }
             else {
                 subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))
             }
         }
-        for bits in (8...30) {
+        for bits in (8...32) {
             maskBitsCombo.addItem(withObjectValue: String(bits))
         }
-        for bits in (0...22) {
+        for bits in (0...24) {
             subnetBitsCombo.addItem(withObjectValue: String(bits))
         }
-        for index in (2...24) {
+        for index in (1...24) {
             maxHostsBySubnetCombo.addItem(withObjectValue: NSDecimalNumber(decimal: (pow(2, index) - 2)).stringValue)
         }
-        for index in (0...22) {
+        for index in (0...24) {
             maxSubnetsCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)
         }
         classBitMap.stringValue = "nnnnnnnn.hhhhhhhh.hhhhhhhh.hhhhhhhh"
@@ -489,7 +489,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
             ipsc = IPSubnetCalc(Constants.defaultIP)
         }
         if (sender.indexOfSelectedItem != -1) {
-            ipsc!.maskBits = 30 - sender.indexOfSelectedItem()
+            ipsc!.maskBits = 31 - sender.indexOfSelectedItem()
             self.doIPSubnetCalc()
         }
         else {
@@ -699,7 +699,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
             ipsc = IPSubnetCalc(Constants.defaultIP)
         }
         if (sender.indexOfSelectedItem != -1) {
-            if ((32 - sender.indexOfSelectedItem) < 32) {
+            if ((32 - sender.indexOfSelectedItem) <= 32) {
                 doCIDR(maskbits: (32 - sender.indexOfSelectedItem))
             }
             else {
@@ -793,15 +793,15 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,
     {
         subnetMaskCombo.removeAllItems()
         if (wildcard.state == NSControl.StateValue.on) {
-            for index in (2...24).reversed() {
+            for index in (0...24).reversed() {
                 subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: ~(IPSubnetCalc.Constants.addr32Full << index)))
             }
             if (ipsc != nil) {
                 subnetMaskCombo.selectItem(withObjectValue: ipsc!.wildcardMask())
             }
         }
         else {
-            for index in (2...24).reversed() {
+            for index in (0...24).reversed() {
                 subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))
             }
             if (ipsc != nil) {

Original file line number	Diff line number	Diff line change
`@@ -78,43 +78,43 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,`
`78`	`78`
`79`	`79`	`//Private IPv4 functions`
`80`	`80`	`private func initCIDRTab() {`
`81`		`- for bits in (1...30) {`
	`81`	`+ for bits in (1...32) {`
`82`	`82`	`supernetMaskBitsCombo.addItem(withObjectValue: String(bits))`
`83`	`83`	`}`
`84`	`84`
`85`		`- for index in (2...31).reversed() {`
	`85`	`+ for index in (0...31).reversed() {`
`86`	`86`	`supernetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))`
`87`	`87`	`}`
`88`		`- for index in (0...29) {`
	`88`	`+ for index in (0...31) {`
`89`	`89`	`supernetMaxCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)`
`90`	`90`	`}`
`91`	`91`	`for index in (1...31) {`
`92`	`92`	`supernetMaxAddr.addItem(withObjectValue: NSDecimalNumber(decimal: (pow(2, index) - 2)).stringValue)`
`93`	`93`	`}`
`94`		`- for index in (0...31) {`
	`94`	`+ for index in (0...32) {`
`95`	`95`	`supernetMaxSubnetsCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private func initSubnetsTab() {`
`100`		`- for index in (2...24).reversed() {`
	`100`	`+ for index in (0...24).reversed() {`
`101`	`101`	`if (wildcard.state == NSControl.StateValue.on) {`
`102`	`102`	`subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: ~(IPSubnetCalc.Constants.addr32Full << index)))`
`103`	`103`	`}`
`104`	`104`	`else {`
`105`	`105`	`subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))`
`106`	`106`	`}`
`107`	`107`	`}`
`108`		`- for bits in (8...30) {`
	`108`	`+ for bits in (8...32) {`
`109`	`109`	`maskBitsCombo.addItem(withObjectValue: String(bits))`
`110`	`110`	`}`
`111`		`- for bits in (0...22) {`
	`111`	`+ for bits in (0...24) {`
`112`	`112`	`subnetBitsCombo.addItem(withObjectValue: String(bits))`
`113`	`113`	`}`
`114`		`- for index in (2...24) {`
	`114`	`+ for index in (1...24) {`
`115`	`115`	`maxHostsBySubnetCombo.addItem(withObjectValue: NSDecimalNumber(decimal: (pow(2, index) - 2)).stringValue)`
`116`	`116`	`}`
`117`		`- for index in (0...22) {`
	`117`	`+ for index in (0...24) {`
`118`	`118`	`maxSubnetsCombo.addItem(withObjectValue: NSDecimalNumber(decimal: pow(2, index)).stringValue)`
`119`	`119`	`}`
`120`	`120`	`classBitMap.stringValue = "nnnnnnnn.hhhhhhhh.hhhhhhhh.hhhhhhhh"`
`@@ -489,7 +489,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,`
`489`	`489`	`ipsc = IPSubnetCalc(Constants.defaultIP)`
`490`	`490`	`}`
`491`	`491`	`if (sender.indexOfSelectedItem != -1) {`
`492`		`- ipsc!.maskBits = 30 - sender.indexOfSelectedItem()`
	`492`	`+ ipsc!.maskBits = 31 - sender.indexOfSelectedItem()`
`493`	`493`	`self.doIPSubnetCalc()`
`494`	`494`	`}`
`495`	`495`	`else {`
`@@ -699,7 +699,7 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,`
`699`	`699`	`ipsc = IPSubnetCalc(Constants.defaultIP)`
`700`	`700`	`}`
`701`	`701`	`if (sender.indexOfSelectedItem != -1) {`
`702`		`- if ((32 - sender.indexOfSelectedItem) < 32) {`
	`702`	`+ if ((32 - sender.indexOfSelectedItem) <= 32) {`
`703`	`703`	`doCIDR(maskbits: (32 - sender.indexOfSelectedItem))`
`704`	`704`	`}`
`705`	`705`	`else {`
`@@ -793,15 +793,15 @@ class SubnetCalcAppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate,`
`793`	`793`	`{`
`794`	`794`	`subnetMaskCombo.removeAllItems()`
`795`	`795`	`if (wildcard.state == NSControl.StateValue.on) {`
`796`		`- for index in (2...24).reversed() {`
	`796`	`+ for index in (0...24).reversed() {`
`797`	`797`	`subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: ~(IPSubnetCalc.Constants.addr32Full << index)))`
`798`	`798`	`}`
`799`	`799`	`if (ipsc != nil) {`
`800`	`800`	`subnetMaskCombo.selectItem(withObjectValue: ipsc!.wildcardMask())`
`801`	`801`	`}`
`802`	`802`	`}`
`803`	`803`	`else {`
`804`		`- for index in (2...24).reversed() {`
	`804`	`+ for index in (0...24).reversed() {`
`805`	`805`	`subnetMaskCombo.addItem(withObjectValue: IPSubnetCalc.digitize(ipAddress: (IPSubnetCalc.Constants.addr32Full << index)))`
`806`	`806`	`}`
`807`	`807`	`if (ipsc != nil) {`