Fixed bug in MAC address generator which caused a crash

nefarius · Dec 14, 2015 · 4a81c9d · 4a81c9d
1 parent 1574374
commit 4a81c9d
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 52 deletions.
diff --git a/Installer/ScpToolkit Setup.aip b/Installer/ScpToolkit Setup.aip
@@ -14,10 +14,10 @@
     <ROW Property="ARPURLUPDATEINFO" Value="https://github.com/nefarius/ScpServer/releases"/>
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="Nefarius Software Solutions"/>
-    <ROW Property="ProductCode" Value="1033:{661E9DB3-3A7F-40C2-BABC-3E779DB6679C} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{CDF94DE2-B29B-4858-BBB8-CC8403FC1920} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ScpToolkit"/>
-    <ROW Property="ProductVersion" Value="1.6.202.15347" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.6.204.15348" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{541750FB-F05E-4F6A-AB9A-69A633D3D681}"/>

diff --git a/ScpCleanWipe/Properties/CommonInfo.cs b/ScpCleanWipe/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpControl/Properties/CommonInfo.cs b/ScpControl/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpControl/ScpControl.csproj b/ScpControl/ScpControl.csproj
@@ -23,7 +23,7 @@
     <AssemblyInfoVersionSettings>
     </AssemblyInfoVersionSettings>
     <PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
-    <AssemblyVersion>1.6.202.15347</AssemblyVersion>
+    <AssemblyVersion>1.6.204.15348</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/ScpControl/Utilities/MacAddressGenerator.cs b/ScpControl/Utilities/MacAddressGenerator.cs
@@ -22,34 +22,13 @@ public static string NewMacAddress
                     var b = Convert.ToByte(number);
                     if (i == 0)
                     {
-                        b = SetBit(b, 6); //--> set locally administered
-                        b = UnsetBit(b, 7); // --> set unicast 
+                        b = (byte) ((b & 0xFE) | 0x02); //-->set locally administered and unicast
                     }
-                    sBuilder.Append(string.Format("{0}:", number.ToString("X2")));
+                    sBuilder.Append(string.Format("{0}", number.ToString("X2")));
                 }
 
-                return sBuilder.ToString().ToUpper().TrimEnd(':');
+                return sBuilder.ToString();
             }
         }
-
-        private static byte SetBit(byte b, int bitNumber)
-        {
-            if (bitNumber < 8 && bitNumber > -1)
-            {
-                return (byte) (b | (byte) (0x01 << bitNumber));
-            }
-
-            throw new ArgumentOutOfRangeException(bitNumber.ToString());
-        }
-
-        private static byte UnsetBit(byte b, int bitNumber)
-        {
-            if (bitNumber < 8 && bitNumber > -1)
-            {
-                return (byte) (b | (byte) (0x00 << bitNumber));
-            }
-
-            throw new ArgumentOutOfRangeException(bitNumber.ToString());
-        }
     }
-}
+}
diff --git a/ScpDebugInfoCollector/Properties/CommonInfo.cs b/ScpDebugInfoCollector/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpDriverInstaller/Properties/CommonInfo.cs b/ScpDriverInstaller/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpGamepadAnalyzer/Properties/CommonInfo.cs b/ScpGamepadAnalyzer/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpMonitor/Properties/CommonInfo.cs b/ScpMonitor/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpPair/Properties/CommonInfo.cs b/ScpPair/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpProfiler/Properties/CommonInfo.cs b/ScpProfiler/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpServer/Properties/CommonInfo.cs b/ScpServer/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpService/Properties/CommonInfo.cs b/ScpService/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpSettings/Properties/CommonInfo.cs b/ScpSettings/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]
diff --git a/ScpXInputBridge/Properties/CommonInfo.cs b/ScpXInputBridge/Properties/CommonInfo.cs
@@ -12,5 +12,5 @@
 
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.6.202.15347")]
-[assembly: AssemblyFileVersion("1.6.202.15347")]
+[assembly: AssemblyVersion("1.6.204.15348")]
+[assembly: AssemblyFileVersion("1.6.204.15348")]