AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Macos route delete fix

Browse source
This commit is contained in:
pokamest 2021-04-19 14:34:47 +03:00
parent 85b6b06cc9
commit f9affb083b
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/server/router.cpp
View file

@ -39,7 +39,7 @@ bool Router::routeDelete(const QString &ip, const QString &gw)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return RouterWin::Instance().routeDelete(ip, gw); return RouterWin::Instance().routeDelete(ip, gw);
#elif defined (Q_OS_MAC) #elif defined (Q_OS_MAC)
return RouterMac::Instance().routeDelete(ip); return RouterMac::Instance().routeDelete(ip, gw);
#endif #endif
} }

4
service/server/router_mac.cpp
View file

@ -45,13 +45,13 @@ bool RouterMac::clearSavedRoutes()
// return (cnt == m_addedRoutes.count()); // return (cnt == m_addedRoutes.count());
} }
bool RouterMac::routeDelete(const QString &ip) bool RouterMac::routeDelete(const QString &ip, const QString &gw)
{ {
// route delete ip gw // route delete ip gw
QProcess p; QProcess p;
p.setProcessChannelMode(QProcess::MergedChannels); p.setProcessChannelMode(QProcess::MergedChannels);
p.start("route", QStringList() << "delete" << ip); p.start("route", QStringList() << "delete" << ip << gw);
p.waitForFinished(); p.waitForFinished();
qDebug().noquote() << "OUTPUT routeDelete: " + p.readAll(); qDebug().noquote() << "OUTPUT routeDelete: " + p.readAll();

2
service/server/router_mac.h
View file

@ -21,7 +21,7 @@ public:
bool routeAdd(const QString &ip, const QString &gw, QString mask = QString()); bool routeAdd(const QString &ip, const QString &gw, QString mask = QString());
int routeAddList(const QString &gw, const QStringList &ips); int routeAddList(const QString &gw, const QStringList &ips);
bool clearSavedRoutes(); bool clearSavedRoutes();
bool routeDelete(const QString &ip); bool routeDelete(const QString &ip, const QString &gw);
void flushDns(); void flushDns();
public slots: public slots: