Merge pull request #6 from mulot/developpement

mulot · web-flow · commit 5cc46aa1585e · 2021-07-12T08:52:26.000+02:00
Developpement
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,5 @@ iOSInjectionProject/
 
 __MACOSX
 .DS_Store
+.zhistory
+
diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
diff --git a/IPSubnetcalc.swift b/IPSubnetcalc.swift
@@ -502,6 +502,19 @@ class IPSubnetCalc: NSObject {
         return (bitMap)
     }
     
+    // return maskbits and number of max hosts for this mask
+    static func fittingSubnet(hosts: UInt) -> (Int, UInt) {
+        var maxHosts: UInt
+        
+        for index in 1...31 {
+            maxHosts = UInt(truncating: NSDecimalNumber(decimal: pow(2, index))) - 2
+            if (hosts <= maxHosts) {
+                return (32 - index, maxHosts)
+            }
+        }
+        return (0, 0)
+    }
+    
     func displayIPInfo() {
         print("IP Host : " + self.ipv4Address)
         print("Mask bits : \(self.maskBits)")
@@ -548,39 +561,39 @@ class IPSubnetCalc: NSObject {
         
         ip4Hex = ipAddress.components(separatedBy: ":")
         if (ip4Hex == nil) {
-            print("\(ipAddress) invalid")
+            //print("\(ipAddress) invalid")
             return false
         }
         if (ip4Hex!.count != 8) {
-            print("no 8 hex")
+            //print("no 8 hex")
             if (ipAddress.contains("::"))
             {
                 if (ipAddress.components(separatedBy: "::").count > 2) {
-                    print("too many '::'")
+                    //print("too many '::'")
                     return false
                 }
             }
             else {
-                print("IPv6 \(ipAddress) bad format")
+                //print("IPv6 \(ipAddress) bad format")
                 return false
             }
         }
         for index in 0...(ip4Hex!.count - 1) {
             //print("Index : \(index) IPHex : \(ip4Hex[index]) Dec : \(String(UInt16(ip4Hex[index], radix: 16)!, radix: 16))")
             if (ip4Hex![index].count > 4 && ip4Hex![index].count != 0) {
-                print("\(ip4Hex![index]) too large")
+                //print("\(ip4Hex![index]) too large")
                 return false
             }
             hex = UInt16(ip4Hex![index], radix: 16)
             if hex != nil {
                 if (hex! < 0 || hex! > 0xFFFF) {
-                    print("\(hex!) is invalid")
+                    //print("\(hex!) is invalid")
                     return false
                 }
             }
             else {
                 if (ip4Hex![index] != "") {
-                    print("\(ip4Hex![index]) not an integer")
+                    //print("\(ip4Hex![index]) not an integer")
                     return false
                 }
             }
diff --git a/README.md b/README.md
@@ -1,14 +1,11 @@
 # SubnetCalc
 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
-- Fix bugs
+What's New in version 2.1:
+- FLSM (Fixed Length Subnet Mask) support
+- VLSM (Variable Length Subnet Mask) support
+- Export FSLM result in a CSV file
+- Export VSLM result in a CSV file
 
 
 For more information: http://subnetcalc.mulot.org
diff --git a/SubnetCalc-Info.plist b/SubnetCalc-Info.plist
@@ -15,17 +15,17 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>JMUL</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2020 Julien Mulot</string>
+	<string>Copyright 2021 Julien Mulot</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/SubnetCalc.xcodeproj/project.pbxproj b/SubnetCalc.xcodeproj/project.pbxproj
@@ -36,7 +36,7 @@
 		8D1107310486CEB800E47090 /* SubnetCalc-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SubnetCalc-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* SubnetCalc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SubnetCalc.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		945E62EF25658A9500CDC9C7 /* SubnetCalc.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SubnetCalc.xctestplan; sourceTree = "<group>"; };
-		945E62F525658DBF00CDC9C7 /* SubnetCalcUITests-Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SubnetCalcUITests-Runner.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		945E62F525658DBF00CDC9C7 /* SubnetCalcUITests-Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = "SubnetCalcUITests-Runner.app"; path = SubnetCalcUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		945E62F925658DBF00CDC9C7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9482A32625765B30008D2C56 /* SubnetCalcUITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubnetCalcUITest.swift; sourceTree = "<group>"; };
 		949420B712D3C62A00E2F57D /* License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = License.txt; sourceTree = "<group>"; };
@@ -401,6 +401,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = VNLK894MAE;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -428,6 +429,7 @@
 				CODE_SIGN_ENTITLEMENTS = SubnetCalc.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = VNLK894MAE;
 				ENABLE_HARDENED_RUNTIME = YES;
diff --git a/SubnetCalcAppDelegate.swift b/SubnetCalcAppDelegate.swift

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,19 @@ class IPSubnetCalc: NSObject {`
`502`	`502`	`return (bitMap)`
`503`	`503`	`}`
`504`	`504`
	`505`	`+ // return maskbits and number of max hosts for this mask`
	`506`	`+ static func fittingSubnet(hosts: UInt) -> (Int, UInt) {`
	`507`	`+ var maxHosts: UInt`
	`508`	`+`
	`509`	`+ for index in 1...31 {`
	`510`	`+ maxHosts = UInt(truncating: NSDecimalNumber(decimal: pow(2, index))) - 2`
	`511`	`+ if (hosts <= maxHosts) {`
	`512`	`+ return (32 - index, maxHosts)`
	`513`	`+ }`
	`514`	`+ }`
	`515`	`+ return (0, 0)`
	`516`	`+ }`
	`517`	`+`
`505`	`518`	`func displayIPInfo() {`
`506`	`519`	`print("IP Host : " + self.ipv4Address)`
`507`	`520`	`print("Mask bits : \(self.maskBits)")`
`@@ -548,39 +561,39 @@ class IPSubnetCalc: NSObject {`
`548`	`561`
`549`	`562`	`ip4Hex = ipAddress.components(separatedBy: ":")`
`550`	`563`	`if (ip4Hex == nil) {`
`551`		`- print("\(ipAddress) invalid")`
	`564`	`+ //print("\(ipAddress) invalid")`
`552`	`565`	`return false`
`553`	`566`	`}`
`554`	`567`	`if (ip4Hex!.count != 8) {`
`555`		`- print("no 8 hex")`
	`568`	`+ //print("no 8 hex")`
`556`	`569`	`if (ipAddress.contains("::"))`
`557`	`570`	`{`
`558`	`571`	`if (ipAddress.components(separatedBy: "::").count > 2) {`
`559`		`- print("too many '::'")`
	`572`	`+ //print("too many '::'")`
`560`	`573`	`return false`
`561`	`574`	`}`
`562`	`575`	`}`
`563`	`576`	`else {`
`564`		`- print("IPv6 \(ipAddress) bad format")`
	`577`	`+ //print("IPv6 \(ipAddress) bad format")`
`565`	`578`	`return false`
`566`	`579`	`}`
`567`	`580`	`}`
`568`	`581`	`for index in 0...(ip4Hex!.count - 1) {`
`569`	`582`	`//print("Index : \(index) IPHex : \(ip4Hex[index]) Dec : \(String(UInt16(ip4Hex[index], radix: 16)!, radix: 16))")`
`570`	`583`	`if (ip4Hex![index].count > 4 && ip4Hex![index].count != 0) {`
`571`		`- print("\(ip4Hex![index]) too large")`
	`584`	`+ //print("\(ip4Hex![index]) too large")`
`572`	`585`	`return false`
`573`	`586`	`}`
`574`	`587`	`hex = UInt16(ip4Hex![index], radix: 16)`
`575`	`588`	`if hex != nil {`
`576`	`589`	`if (hex! < 0 \|\| hex! > 0xFFFF) {`
`577`		`- print("\(hex!) is invalid")`
	`590`	`+ //print("\(hex!) is invalid")`
`578`	`591`	`return false`
`579`	`592`	`}`
`580`	`593`	`}`
`581`	`594`	`else {`
`582`	`595`	`if (ip4Hex![index] != "") {`
`583`		`- print("\(ip4Hex![index]) not an integer")`
	`596`	`+ //print("\(ip4Hex![index]) not an integer")`
`584`	`597`	`return false`
`585`	`598`	`}`
`586`	`599`	`}`