From 74a9c597ba625e05adebc5b57e98b2f65fc047e9 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <0xFEEDC0DE64@gmail.com>
Date: Thu, 20 Sep 2018 18:46:13 +0200
Subject: [PATCH] Now using parseHostAddress from dbnetworklib

---
 DbSerialServer.pro |  2 +-
 main.cpp           | 33 +++++++--------------------------
 serialserver.ini   |  2 +-
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/DbSerialServer.pro b/DbSerialServer.pro
index e930b8a..2cece4e 100644
--- a/DbSerialServer.pro
+++ b/DbSerialServer.pro
@@ -1,7 +1,7 @@
 QT += core network serialport
 QT -= gui widgets
 
-DBLIBS +=
+DBLIBS += dbnetwork
 
 TARGET = serialserver
 
diff --git a/main.cpp b/main.cpp
index dc2a2cd..fc4f252 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,8 @@
 #include <QSerialPort>
 #include <QTcpServer>
 
+#include "utils/netutils.h"
+
 #include "master.h"
 
 int main(int argc, char *argv[])
@@ -30,33 +32,12 @@ int main(int argc, char *argv[])
     qDebug() << "Starting tcp server...";
     auto server = new QTcpServer;
 
+    if(!server->listen(parseHostAddress(settings.value("server/address", "Any").toString()),
+                       (quint16)settings.value("server/port", 1234).toUInt()))
     {
-        auto listenAddress = settings.value("server/address", "Any").toString();
-        QHostAddress hostAddress;
-
-        if(listenAddress == "Null")
-            hostAddress = QHostAddress::Null;
-        else if(listenAddress == "Broadcast")
-            hostAddress = QHostAddress::Broadcast;
-        else if(listenAddress == "LocalHost")
-            hostAddress = QHostAddress::LocalHost;
-        else if(listenAddress == "LocalHostIPv6")
-            hostAddress = QHostAddress::LocalHostIPv6;
-        else if(listenAddress == "Any")
-            hostAddress = QHostAddress::Any;
-        else if(listenAddress == "AnyIPv6")
-            hostAddress = QHostAddress::AnyIPv6;
-        else if(listenAddress == "AnyIPv4")
-            hostAddress = QHostAddress::AnyIPv4;
-        else
-            hostAddress = QHostAddress(listenAddress);
-
-        if(!server->listen(hostAddress, (quint16)settings.value("server/port", 1234).toUInt()))
-        {
-            qWarning() << server->errorString();
-            qFatal("could not start listening");
-            return -2;
-        }
+        qWarning() << server->errorString();
+        qFatal("could not start listening");
+        return -2;
     }
 
     new Master(serialPort, server, &app);
diff --git a/serialserver.ini b/serialserver.ini
index d455868..9c1df7c 100644
--- a/serialserver.ini
+++ b/serialserver.ini
@@ -3,5 +3,5 @@ port = COM3
 baudrate = 9600
 
 [server]
-address = Any
+address = QHostAddress::Any
 port = 1234