Changeset 115 for trunk

Timestamp:

04/08/08 14:49:16 (17 years ago)

Author:

gkronber

Message:

improved the comment of the OS.version check

Location:

trunk/sources/HeuristicLab.Grid

Files:

• ClientForm.cs (modified) (1 diff)
• ServerForm.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Grid/ClientForm.cs

@@ -58 +58 @@
 
     private void startButton_Click(object sender, EventArgs e) {
-      //clientUrl = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[0] + ":8002/Grid/Client";
       string hostname = Dns.GetHostName();
       IPAddress[] addresses = Dns.GetHostAddresses(hostname);
 
-      // Thanks to Microsoft
+      // windows XP returns the external ip on index 0 while windows vista returns the external ip on index 2
       if (System.Environment.OSVersion.Version.Major >= 6) {
         clientUrl = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[2] + ":" + clientPort.Text +"/Grid/Client";

trunk/sources/HeuristicLab.Grid/ServerForm.cs

@@ -44 +44 @@
       InitializeComponent();
 
-      // Thanks to Microsoft
+      // windows XP returns the external ip on index 0 while windows vista returns the external ip on index 2
       if (System.Environment.OSVersion.Version.Major >= 6) {
         externalAddressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[2] + ":8000/Grid/Service";
+        internalAddressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[2] + ":8001/Grid/JobStore";
       } else {
         externalAddressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[0] + ":8000/Grid/Service";
-      }
-      if (System.Environment.OSVersion.Version.Major >= 6) {
-        internalAddressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[2] + ":8001/Grid/JobStore";
-      } else {
         internalAddressTextBox.Text = "net.tcp://" + Dns.GetHostAddresses(Dns.GetHostName())[0] + ":8001/Grid/JobStore";
       }