support ipv6 hosts

paukr · Jan 4, 2018 · fd066d7 · fd066d7
1 parent 76e2ca5
commit fd066d7
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/Auremo/Properties/AssemblyInfo.cs b/Auremo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.0.0")]
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.1.0")]
+[assembly: AssemblyFileVersion("0.8.1.0")]
diff --git a/Auremo/Threads/ServerSessionThread.cs b/Auremo/Threads/ServerSessionThread.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
@@ -161,32 +162,35 @@ private void Connect()
         {
             while (!Terminating && m_Connection == null)
             {
-                m_Connection = new TcpClient();
-                m_Connection.SendTimeout = m_Timeout;
-                m_Connection.ReceiveTimeout = m_Timeout;
                 bool fatal = false;
-
                 try
                 {
-                    m_DataModel.NetworkLog?.LogMessage("Trying to connect to server");
-                    m_Parent.OnConnectionStateChanged(ServerSession.SessionState.Connecting);
-                    m_Parent.OnActivityChanged("");
-                    IAsyncResult connectResult = m_Connection.BeginConnect(m_Host, m_Port, null, null);
-
-                    while (!connectResult.IsCompleted && !Terminating)
+                    foreach (var address in Dns.GetHostAddresses(m_Host))
                     {
-                        Thread.Sleep(100);
-                    }
+                        m_Connection = new TcpClient(address.AddressFamily);
+                        m_Connection.SendTimeout = m_Timeout;
+                        m_Connection.ReceiveTimeout = m_Timeout;
+                        m_DataModel.NetworkLog?.LogMessage("Trying to connect to server");
+                        m_Parent.OnConnectionStateChanged(ServerSession.SessionState.Connecting);
+                        m_Parent.OnActivityChanged("");
+                        IAsyncResult connectResult = m_Connection.BeginConnect(address, m_Port, null, null);
 
-                    if (Terminating)
-                    {
-                        m_Connection = null;
-                    }
-                    else
-                    {
-                        m_Connection.EndConnect(connectResult);
-                        m_Stream = m_Connection.GetStream();
-                        m_DataModel.NetworkLog?.LogMessage("Connected to server");
+                        while (!connectResult.IsCompleted && !Terminating)
+                        {
+                            Thread.Sleep(100);
+                        }
+
+                        if (Terminating)
+                        {
+                            m_Connection = null;
+                        }
+                        else
+                        {
+                            m_Connection.EndConnect(connectResult);
+                            m_Stream = m_Connection.GetStream();
+                            m_DataModel.NetworkLog?.LogMessage("Connected to server");
+                        }
+                        break;
                     }
                 }
                 catch (Exception e)