feat: Add manual setting of network interface

Author: Ferhat Aslan

bin/EtaNetServerV0_9_4.zip

@@ -2,13 +2,17 @@
 #include <QtNetwork>
 
 #include <stdlib.h>
-
+#include <QDebug>
 #include "dialog.h"
 #include "server.h"
 
 Dialog::Dialog(QWidget *parent)
     : QWidget(parent)
 {
+    hostCombo = new QComboBox;
+    portLineEdit = new QLineEdit();
+    setIpPortButton = new QPushButton(tr("Set Interface"));
+
     messageLabel = new QLabel;
     messageLabel->setWordWrap(true);
     statusLabel = new QLabel;
@@ -18,51 +22,62 @@ Dialog::Dialog(QWidget *parent)
     dqButton = new QPushButton(tr("Save Data"));
     dqButton->setAutoDefault(false);
     dqButton->setCheckable(true);
+    hostLabel = new QLabel(tr("Network Interface:"));
+    hostLabel->setBuddy(hostCombo);
+    portLabel = new QLabel(tr("Server port:"));
+    portLabel->setBuddy(portLineEdit);
 
-    QString ipAddress;
+    hostCombo->setEditable(true);
+    // find out name of this machine
+    QString name = QHostInfo::localHostName();
+
+    if (name != QLatin1String("localhost"))
+        hostCombo->addItem(QString("localhost"));
+    // find out IP addresses of this machine
     QList<QHostAddress> ipAddressesList = QNetworkInterface::allAddresses();
-    // use the first non-localhost IPv4 address
+    // add non-localhost addresses
     for (int i = 0; i < ipAddressesList.size(); ++i) {
         if (ipAddressesList.at(i) != QHostAddress::LocalHost &&
             ipAddressesList.at(i).toIPv4Address()) {
-            ipAddress = ipAddressesList.at(i).toString();
-            break;
+            hostCombo->addItem(ipAddressesList.at(i).toString());
         }
-    }
-
-    QHostAddress ipAddressQ(ipAddress);
 
-
-    if (!server.listen(ipAddressQ, 50005)) {
-        QMessageBox::critical(this, tr("\u03B7Net Server"),
-                              tr("Unable to start the server: %1.")
-                              .arg(server.errorString()));
-        this->close();
-        return;
     }
+    // add localhost addresses
+    for (int i = 0; i < ipAddressesList.size(); ++i) {
+        if (ipAddressesList.at(i).isLoopback())
+            hostCombo->addItem(ipAddressesList.at(i).toString());
+    }
+    portLineEdit->setText("50005");
+    setIpPortButton->setEnabled(!hostCombo->currentText().isEmpty() &&
+                                !portLineEdit->text().isEmpty());
 
-    // if we did not find one, use IPv4 localhost
-    if (ipAddress.isEmpty())
-        ipAddress = QHostAddress(QHostAddress::LocalHost).toString();
-    statusLabel->setText(tr("The \u03B7Net server is running on\n\nIP: %1\nport: %2\n\n"
-                            "Run the \u03B7Net Clients now.")
-                         .arg(ipAddress).arg(server.serverPort()));
-    messageLabel->setText(tr("Wait for data from \u03B7Net clients..."));
+    statusLabel->setText(tr("The \u03B7Net server ready to start."));
+    messageLabel->setText(tr("Please select the network interface."));
 
-    connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(quitButton, &QAbstractButton::clicked, this, &Dialog::close);
+    connect(hostCombo, &QComboBox::currentTextChanged, this, &Dialog::networkInterface);
+    connect(setIpPortButton, &QAbstractButton::clicked, this, &Dialog::setNetworkInterface);
+    connect(portLineEdit, &QLineEdit::textChanged, this, &Dialog::networkInterface);
 
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch(1);
+    buttonLayout->addWidget(setIpPortButton);
     buttonLayout->addWidget(dqButton);
     buttonLayout->addWidget(quitButton);
     buttonLayout->addStretch(1);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
+    //QGridLayout *mainLayout = new QGridLayout;
     mainLayout->addWidget(statusLabel);
     mainLayout->addWidget(messageLabel);
+    mainLayout->addWidget(hostLabel);
+    mainLayout->addWidget(hostCombo);
+    mainLayout->addWidget(portLabel);
+    mainLayout->addWidget(portLineEdit);
     mainLayout->addLayout(buttonLayout);
     setLayout(mainLayout);
-    setWindowTitle(tr("\u03B7Net Server"));
+    setWindowTitle(tr("\u03B7Net Server v0.9.4"));
 }
 
 Dialog& Dialog::getInstance()
@@ -81,3 +96,59 @@ bool  Dialog::getDQButtonState(void)
    qDebug() << "ButtonState: " << dqButton->isChecked();
    return dqButton->isChecked();
 }
+
+void Dialog::networkInterface()
+{
+    if (!this->server.isListening())
+    {
+        setIpPortButton->setEnabled(!hostCombo->currentText().isEmpty() &&
+                                !portLineEdit->text().isEmpty());
+
+    }
+
+}
+
+void Dialog::setNetworkInterface()
+{
+    setIpPortButton->setEnabled(false);
+    hostCombo->setVisible(false);
+    portLineEdit->setVisible(false);
+    portLabel->setVisible(false);
+    hostLabel->setVisible(false);
+
+
+
+    QString ipAddress;
+
+    ipAddress = hostCombo->currentText();
+    qDebug() << ipAddress;
+    QHostAddress ipAddressQ(ipAddress);
+
+
+    if (!this->server.listen(ipAddressQ, portLineEdit->text().toInt())) {
+        QMessageBox::critical(this, tr("\u03B7Net Server"),
+                              tr("Unable to start the server: %1.")
+                              .arg(this->server.errorString()));
+        this->close();
+        return;
+    }
+
+//    // if we did not find one, use IPv4 localhost
+//    if (ipAddress.isEmpty())
+//        ipAddress = QHostAddress(QHostAddress::LocalHost).toString();
+    statusLabel->setText(tr("The \u03B7Net server is running on\n\nIP: %1\nport: %2\n\n"
+                            "Run the \u03B7Net Clients now.")
+                         .arg(ipAddress).arg(server.serverPort()));
+    messageLabel->setText(tr("Wait for data from \u03B7Net clients..."));
+}
+
+void Dialog::close()
+{
+    hostCombo->deleteLater();
+    portLineEdit->deleteLater();
+    hostLabel->deleteLater();
+    portLabel->deleteLater();
+    QWidget::close();
+}
+
+

dialog.cpp

@@ -4,9 +4,13 @@
 #include <QWidget>
 #include "server.h"
 
+
 QT_BEGIN_NAMESPACE
+class QComboBox;
+class QLineEdit;
 class QLabel;
 class QPushButton;
+
 QT_END_NAMESPACE
 
 /**
@@ -56,8 +60,18 @@ class Dialog : public QWidget
      */
     Dialog(const Dialog&);
 
+ //slots:
+    void networkInterface(void);
+    void setNetworkInterface(void);
+    void close(void);
+
 
 private:
+    QComboBox *hostCombo;
+    QLineEdit *portLineEdit;
+    QPushButton *setIpPortButton;
+    QLabel *hostLabel;
+    QLabel *portLabel;
     /**
      * @brief label - is used for displaying text
      */
@@ -78,6 +92,7 @@ class Dialog : public QWidget
      * @brief server - creates the server instance
      */
     EtaNetServer server;
+
 };
 
 #endif

dialog.h

@@ -2,7 +2,7 @@ QT += network widgets
 
 QT += core sql
 
-TARGET = EtaNetServerV0_9_3
+TARGET = EtaNetServerV0_9_4
 
 HEADERS       = dialog.h \
                 dbhandler.h \