comparison mainwindow.cpp @ 24:bb93f0593aeb

Fixed findMyIp().

 *************************************************************************************/
 
 #include <QtGui>
 #include <QStringList>
 #include <QDir>
+#include <QNetworkInterface>
 #include <QHostAddress>
 #include <QHostInfo>
 
 #include "mainwindow.h"
 #include "settingsdialog.h"

         runningAction = ACT_PUSH;
     }
 }
 
 
-QString MainWindow::findMyIp(bool& isAddrIpV6)
-{
-    QString ret;
-    QHostInfo info = QHostInfo::fromName(QHostInfo::localHostName());
-    QList <QHostAddress> ipList = info.addresses();
+QString MainWindow::findMyIp()
+{
+    QString ipAddr;
+
+    QList <QHostAddress> ipList = QNetworkInterface::allAddresses();
 
 
     if (!ipList.isEmpty())
     {
-        QHostAddress addr = ipList.at(0);
-
-        if (QAbstractSocket::IPv6Protocol == addr.protocol())
-        {
-            isAddrIpV6 = true;
-        }
-        else
-        {
-            isAddrIpV6 = false;
-        }
-
-        ret = addr.toString();
-    }
-    else
-    {
-        //This won't help your teammate much, but is funny ;-)
-        ret = "127.0.0.1";
-        isAddrIpV6 = false;
-    }
-
-    return ret;
+        for(int i = 0; i < ipList.size(); i++)
+        {
+            QHostAddress addr = ipList.at(i);
+
+            if (QAbstractSocket::IPv4Protocol == addr.protocol())
+            {
+                if (addr != QHostAddress::LocalHost)
+                {
+                    return addr.toString();
+                }
+            }
+        }
+    }
+
+    //This won't help your teammate much but is funny ;-)
+    return "127.0.0.1";
 }
 
 void MainWindow::hgServe()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString msg;
-        bool isIpv6;
-
-        QString addr = findMyIp(isIpv6);
-        if (isIpv6)
-        {
-            QTextStream(&msg) << "Server running on http://[" << addr << "]:8000/";
-            params << "serve" << "--ipv6";
-        }
-        else
-        {
-            QTextStream(&msg) << "Server running on http://" << addr << ":8000/";
-            params << "serve";
-        }
+
+        QString addr = findMyIp();
+        QTextStream(&msg) << "Server running on http://" << addr << ":8000/";
+        params << "serve";
 
         runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
         runningAction = ACT_SERVE;
 
         QMessageBox::information(this, "Serve", msg, QMessageBox::Close);