set timelimit for flushDns

service/server/router.cpp

@@ -42,14 +42,14 @@ int Router::routeDeleteList(const QString &gw, const QStringList &ips)
 #endif
 }
 
-void Router::flushDns()
+bool Router::flushDns()
 {
 #ifdef Q_OS_WIN
-    RouterWin::Instance().flushDns();
+    return RouterWin::Instance().flushDns();
 #elif defined (Q_OS_MAC)
-    RouterMac::Instance().flushDns();
+    return RouterMac::Instance().flushDns();
 #elif defined Q_OS_LINUX
-    RouterLinux::Instance().flushDns();
+    return RouterLinux::Instance().flushDns();
 #endif
 }
 

service/server/router.h

@@ -19,7 +19,7 @@ public:
     static int routeAddList(const QString &gw, const QStringList &ips);
     static bool clearSavedRoutes();
     static int routeDeleteList(const QString &gw, const QStringList &ips);
-    static void flushDns();
+    static bool flushDns();
     static void resetIpStack();
     static bool createTun(const QString &dev, const QString &subnet);
     static bool deleteTun(const QString &dev);

service/server/router_linux.cpp

@@ -160,7 +160,7 @@ bool RouterLinux::isServiceActive(const QString &serviceName) {
     return process.exitCode() == 0;
 }
 
-void RouterLinux::flushDns()
+bool RouterLinux::flushDns()
 {
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
@@ -174,7 +174,7 @@ void RouterLinux::flushDns()
         p.start("systemctl", { "restart", "systemd-resolved" });
     } else {
         qDebug() << "No suitable DNS manager found.";
-        return;
+        return false;
     }
 
     p.waitForFinished();
@@ -183,6 +183,8 @@ void RouterLinux::flushDns()
         qDebug().noquote() << "Flush dns completed";
     else
         qDebug().noquote() << "OUTPUT systemctl restart nscd/systemd-resolved: " + output;
+
+    return true;
 }
 
 bool RouterLinux::createTun(const QString &dev, const QString &subnet) {

service/server/router_linux.h

@@ -30,7 +30,7 @@ public:
     bool routeDelete(const QString &ip, const QString &gw, const int &sock);
     bool routeDeleteList(const QString &gw, const QStringList &ips);
     QString getgatewayandiface();
-    void flushDns();
+    bool flushDns();
     bool createTun(const QString &dev, const QString &subnet);
     bool deleteTun(const QString &dev);
     void StartRoutingIpv6();

service/server/router_mac.cpp

@@ -166,7 +166,7 @@ bool RouterMac::deleteTun(const QString &dev)
     return true;
 }
 
-void RouterMac::flushDns()
+bool RouterMac::flushDns()
 {
     // sudo killall -HUP mDNSResponder
     QProcess p;
@@ -174,5 +174,7 @@ void RouterMac::flushDns()
 
     p.start("killall", QStringList() << "-HUP" << "mDNSResponder");
     p.waitForFinished();
+    
     qDebug().noquote() << "OUTPUT killall -HUP mDNSResponder: " + p.readAll();
+    return true;
 }

service/server/router_mac.h

@@ -29,7 +29,7 @@ public:
     bool clearSavedRoutes();
     bool routeDelete(const QString &ip, const QString &gw);
     bool routeDeleteList(const QString &gw, const QStringList &ips);
-    void flushDns();
+    bool flushDns();
     bool createTun(const QString &dev, const QString &subnet);
     bool deleteTun(const QString &dev);
     bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers);

service/server/router_win.cpp

@@ -273,7 +273,7 @@ int RouterWin::routeDeleteList(const QString &gw, const QStringList &ips)
     return success_count;
 }
 
-void RouterWin::flushDns()
+bool RouterWin::flushDns()
 {
     QProcess p;
     p.setProcessChannelMode(QProcess::MergedChannels);
@@ -281,6 +281,7 @@ void RouterWin::flushDns()
 
     p.start(command);
     p.waitForFinished();
+    return true;
     //qDebug().noquote() << "OUTPUT ipconfig /flushdns: " + p.readAll();
 }
 

service/server/router_win.h

@@ -39,7 +39,7 @@ public:
     int routeAddList(const QString &gw, const QStringList &ips);
     bool clearSavedRoutes();
     int routeDeleteList(const QString &gw, const QStringList &ips);
-    void flushDns();
+    bool flushDns();
     void resetIpStack();
 
     void StartRoutingIpv6();