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

Fix some warnings, fix installation scripts (macOS)

Browse source
This commit is contained in:
michael 2021-01-10 16:50:38 +03:00
parent 0b8c8835c4
commit dd46d8cf99
8 changed files with 97 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/core/openvpnconfigurator.cpp
View file

@ -134,6 +134,7 @@ OpenVpnConfigurator::ConnectionData OpenVpnConfigurator::createCertRequest()
initPKI(path); initPKI(path);
ErrorCode errorCode = genReq(path, connData.clientId); ErrorCode errorCode = genReq(path, connData.clientId);
Q_UNUSED(errorCode)
QFile req(path + "/pki/reqs/" + connData.clientId + ".req"); QFile req(path + "/pki/reqs/" + connData.clientId + ".req");
req.open(QIODevice::ReadOnly); req.open(QIODevice::ReadOnly);

20
client/core/router.cpp
View file

@ -11,13 +11,12 @@ Router &Router::Instance()
bool Router::routeAdd(const QString &ip, const QString &gw, QString mask) bool Router::routeAdd(const QString &ip, const QString &gw, QString mask)
{ {
#ifdef Q_OS_WIN
qDebug().noquote() << QString("ROUTE ADD: IP:%1 %2 GW %3") qDebug().noquote() << QString("ROUTE ADD: IP:%1 %2 GW %3")
.arg(ip) .arg(ip)
.arg(mask) .arg(mask)
.arg(gw); .arg(gw);
#ifdef Q_OS_WIN
if (mask == "") { if (mask == "") {
mask = "255.255.255.255"; mask = "255.255.255.255";
if (ip.endsWith(".0")) mask = "255.255.255.0"; if (ip.endsWith(".0")) mask = "255.255.255.0";
@ -108,7 +107,9 @@ bool Router::routeAdd(const QString &ip, const QString &gw, QString mask)
free(pIpForwardTable); free(pIpForwardTable);
return (dwStatus == NO_ERROR); return (dwStatus == NO_ERROR);
#else
// Not implemented yet
return false;
#endif #endif
} }
@ -229,7 +230,9 @@ int Router::routeAddList(const QString &gw, const QStringList &ips)
qDebug() << "Router::routeAddList finished, success: " << success_count << "/" << ips.size(); qDebug() << "Router::routeAddList finished, success: " << success_count << "/" << ips.size();
return success_count; return success_count;
#else
// Not implemented yet
return false;
#endif #endif
} }
@ -283,12 +286,16 @@ bool Router::clearSavedRoutes()
ipForwardRows.clear(); ipForwardRows.clear();
return true; return true;
#else
// Not implemented yet
return false;
#endif #endif
} }
bool Router::routeDelete(const QString &ip) bool Router::routeDelete(const QString &ip)
{ {
qDebug().noquote() << QString("ROUTE DELETE, IP: %1").arg(ip);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QProcess p; QProcess p;
p.setProcessChannelMode(QProcess::MergedChannels); p.setProcessChannelMode(QProcess::MergedChannels);
@ -300,6 +307,9 @@ bool Router::routeDelete(const QString &ip)
qDebug().noquote() << "OUTPUT route delete: " + p.readAll(); qDebug().noquote() << "OUTPUT route delete: " + p.readAll();
return true; return true;
#else
// Not implemented yet
return false;
#endif #endif
} }

2
client/core/servercontroller.cpp
View file

@ -290,6 +290,8 @@ ErrorCode ServerController::setupOpenVpnServer(const ServerCredentials &credenti
ErrorCode ServerController::setupShadowSocksServer(const ServerCredentials &credentials) ErrorCode ServerController::setupShadowSocksServer(const ServerCredentials &credentials)
{ {
Q_UNUSED(credentials)
return ErrorCode::NotImplementedError; return ErrorCode::NotImplementedError;
} }

4
client/ui/mainwindow.cpp
View file

@ -33,8 +33,8 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
#endif #endif
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
m_settings(new Settings), m_vpnConnection(nullptr),
m_vpnConnection(nullptr) m_settings(new Settings)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->widget_tittlebar->installEventFilter(this); ui->widget_tittlebar->installEventFilter(this);

0
deploy/data/macos/openvpn Normal file → Executable file
View file

0
deploy/data/macos/post_install.sh Normal file → Executable file
View file

0
deploy/data/macos/post_uninstall.sh Normal file → Executable file
View file

3
deploy/macos.sh
View file

@ -44,6 +44,9 @@ cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.
cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME
rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh
chmod a+x $INSTALLER_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_uninstall.sh
cd $BUNDLE_DIR cd $BUNDLE_DIR
tar czf $INSTALLER_DATA_DIR/$APP_NAME.tar.gz ./ tar czf $INSTALLER_DATA_DIR/$APP_NAME.tar.gz ./