v2.0.3.5 release - fixed a bug when checking IPv6 addresses for same …

…network
swsch · May 29, 2010 · fc293f9 · fc293f9
1 parent 96e4a20
commit fc293f9
Show file tree

Hide file tree

Showing 19 changed files with 233 additions and 240 deletions.
diff --git a/Growl Connectors/NET/libraries/Growl.Connector.dll b/Growl Connectors/NET/libraries/Growl.Connector.dll
diff --git a/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll b/Growl Connectors/NET/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll b/Growl Extras/Growl Display SDK/libraries/Growl.CoreLibrary.dll
diff --git a/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll b/Growl Extras/Growl Display SDK/libraries/Growl.DisplayStyle.dll
diff --git a/Growl/Growl.Connector/Properties/AssemblyInfo.cs b/Growl/Growl.Connector/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.CoreLibrary/IPUtilities.cs b/Growl/Growl.CoreLibrary/IPUtilities.cs
@@ -12,10 +12,24 @@ public class IPUtilities
 
         public static bool IsInSameSubnet(IPAddress localAddress, IPAddress otherAddress)
         {
-            IPAddress subnetMask = GetLocalSubnetMask(localAddress);
-            IPAddress network1 = GetNetworkAddress(localAddress, subnetMask);
-            IPAddress network2 = GetNetworkAddress(otherAddress, subnetMask);
-            return network1.Equals(network2);
+            try
+            {
+                // handle loopback addresses and IPv6 local addresses
+                if (IPAddress.IsLoopback(otherAddress)
+                    || otherAddress.IsIPv6LinkLocal
+                    || otherAddress.IsIPv6SiteLocal)
+                    return true;
+
+                IPAddress subnetMask = GetLocalSubnetMask(localAddress);
+                IPAddress network1 = GetNetworkAddress(localAddress, subnetMask);
+                IPAddress network2 = GetNetworkAddress(otherAddress, subnetMask);
+                return network1.Equals(network2);
+            }
+            catch
+            {
+                DebugInfo.WriteLine(String.Format("Could not determine subnet. Local address: {0} - Remote Address: {1}", localAddress, otherAddress));
+            }
+            return false;
         }
 
         public static IPAddress GetLocalSubnetMask(IPAddress ipaddress)

diff --git a/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs b/Growl/Growl.CoreLibrary/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Daemon/Properties/AssemblyInfo.cs b/Growl/Growl.Daemon/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Destinations/Properties/AssemblyInfo.cs b/Growl/Growl.Destinations/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Growl/Growl.DisplayStyle/Properties/AssemblyInfo.cs b/Growl/Growl.DisplayStyle/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Displays.Plain/Properties/AssemblyInfo.cs b/Growl/Growl.Displays.Plain/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Displays.Smokestack/Properties/AssemblyInfo.cs b/Growl/Growl.Displays.Smokestack/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Displays.Standard/Properties/AssemblyInfo.cs b/Growl/Growl.Displays.Standard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.Displays.Visor/Properties/AssemblyInfo.cs b/Growl/Growl.Displays.Visor/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl.UDPLegacy/Properties/AssemblyInfo.cs b/Growl/Growl.UDPLegacy/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
diff --git a/Growl/Growl/Properties/AssemblyInfo.cs b/Growl/Growl/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //      Revision
 //
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.3.4")]
+[assembly: AssemblyFileVersion("2.0.3.5")]
 [assembly: AssemblyInformationalVersion("2.0.3")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/Growl/Growl/release_notes.txt b/Growl/Growl/release_notes.txt
@@ -1,3 +1,7 @@
+2.0.3v2 changes (v2.0.3.5)
+------------------------------
+- fixed a but in the IPv6 same-subnet handling
+
 2.0.3 changes (v2.0.3.4)
 ------------------------------
 - added support for multiple monitors (Display SDK, built-in displays, and most additional displays)

diff --git a/Growl/Growl/update.manifest b/Growl/Growl/update.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
-  <version>2.0.3.4</version>
+  <version>2.0.3.5</version>
   <required>True</required>
   <updateLocation>http://www.growlforwindows.com/gfw/updates/gfw.manifest</updateLocation>
-  <installerLocation>http://www.growlforwindows.com/gfw/d.ashx?f=Growl_v2.0.3.4.zip</installerLocation>
+  <installerLocation>http://www.growlforwindows.com/gfw/d.ashx?f=Growl_v2.0.3.5.zip</installerLocation>
 </manifest>