Changeset 804 for trunk/sources

Timestamp:

11/23/08 00:11:22 (16 years ago)

Author:

kgrading

Message:

quick fixed the IPv6 problem (#384)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Core/Core.cs (modified) (3 diffs)
• HeuristicLab.Hive.Server/HiveServerApplication.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -35 +35 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using HeuristicLab.Hive.Contracts;
+using System.Runtime.Remoting.Messaging;
 
 
 namespace HeuristicLab.Hive.Client.Core {
   public class Core {
+
+    public delegate string GetASnapshotDelegate();
 
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
@@ -120 +123 @@
           break;
         case MessageContainer.MessageType.SnapshotReady:
-          engines[container.JobId].GetSnapshot();
+          //Grabbing of the snapshot will need some time, so let's make this functun async
+          GetASnapshotDelegate ssd = new GetASnapshotDelegate(engines[container.JobId].GetSnapshot);
+          ssd.BeginInvoke(new AsyncCallback(SnapshotReceived), null);
+          //engines[container.JobId].GetSnapshot();
           break;
 
@@ -138 +144 @@
           break;
       }
+    }
+
+    void SnapshotReceived(IAsyncResult res) {
+      AsyncResult ar = (AsyncResult) res;
+      GetASnapshotDelegate gss = (GetASnapshotDelegate) ar.AsyncDelegate;
+      String objectRepr = gss.EndInvoke(res);
     }
 

trunk/sources/HeuristicLab.Hive.Server/HiveServerApplication.cs

@@ -119 +119 @@
 
     public override void Run() {
-      string externalIP =
-        Dns.GetHostEntry(Dns.GetHostName()).AddressList[0].ToString();
+        IPAddress[] addresses = Dns.GetHostAddresses(Dns.GetHostName());
+        int index = 0;
+        if (System.Environment.OSVersion.Version.Major >= 6) {
+          for (index = addresses.Length - 1; index >= 0; index--)
+            if (addresses[index].AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+              break;
+        }
 
       Uri uriTcp =
-          new Uri("net.tcp://" + externalIP + ":" + port + "/HiveServer/");
+          new Uri("net.tcp://" + addresses[index] + ":" + port + "/HiveServer/");
 
       ServiceHost clientCommunicator = 
@@ -129 +134 @@
 
       uriTcp =
-        new Uri("net.tcp://" + externalIP + ":" + port + "/HiveServerConsole/");
+        new Uri("net.tcp://" + addresses[index] + ":" + port + "/HiveServerConsole/");
 
       ServiceHost serverConsoleFacade =