From f9affb083b9c77d1097ae89bf2c3af44460341fa Mon Sep 17 00:00:00 2001 From: pokamest Date: Mon, 19 Apr 2021 14:34:47 +0300 Subject: [PATCH] Macos route delete fix --- service/server/router.cpp | 2 +- service/server/router_mac.cpp | 4 ++-- service/server/router_mac.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/service/server/router.cpp b/service/server/router.cpp index bcd99014..c5497153 100644 --- a/service/server/router.cpp +++ b/service/server/router.cpp @@ -39,7 +39,7 @@ bool Router::routeDelete(const QString &ip, const QString &gw) #ifdef Q_OS_WIN return RouterWin::Instance().routeDelete(ip, gw); #elif defined (Q_OS_MAC) - return RouterMac::Instance().routeDelete(ip); + return RouterMac::Instance().routeDelete(ip, gw); #endif } diff --git a/service/server/router_mac.cpp b/service/server/router_mac.cpp index 097311e6..a16e7b61 100644 --- a/service/server/router_mac.cpp +++ b/service/server/router_mac.cpp @@ -45,13 +45,13 @@ bool RouterMac::clearSavedRoutes() // return (cnt == m_addedRoutes.count()); } -bool RouterMac::routeDelete(const QString &ip) +bool RouterMac::routeDelete(const QString &ip, const QString &gw) { // route delete ip gw QProcess p; p.setProcessChannelMode(QProcess::MergedChannels); - p.start("route", QStringList() << "delete" << ip); + p.start("route", QStringList() << "delete" << ip << gw); p.waitForFinished(); qDebug().noquote() << "OUTPUT routeDelete: " + p.readAll(); diff --git a/service/server/router_mac.h b/service/server/router_mac.h index 07b7112c..53a0f35e 100644 --- a/service/server/router_mac.h +++ b/service/server/router_mac.h @@ -21,7 +21,7 @@ public: bool routeAdd(const QString &ip, const QString &gw, QString mask = QString()); int routeAddList(const QString &gw, const QStringList &ips); bool clearSavedRoutes(); - bool routeDelete(const QString &ip); + bool routeDelete(const QString &ip, const QString &gw); void flushDns(); public slots: