fixed native wireguard config import if there is no port in the Endpoint field
This commit is contained in:
parent
259eff3fea
commit
3f7e7f2601
3 changed files with 10 additions and 2 deletions
|
@ -225,12 +225,17 @@ QJsonObject ImportController::extractWireGuardConfig(const QString &data)
|
||||||
QJsonObject lastConfig;
|
QJsonObject lastConfig;
|
||||||
lastConfig[config_key::config] = data;
|
lastConfig[config_key::config] = data;
|
||||||
|
|
||||||
const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*):([0-9]*)");
|
const static QRegularExpression hostNameAndPortRegExp("Endpoint = (.*)(?::([0-9]*))?");
|
||||||
QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
|
QRegularExpressionMatch hostNameAndPortMatch = hostNameAndPortRegExp.match(data);
|
||||||
QString hostName;
|
QString hostName;
|
||||||
QString port;
|
QString port;
|
||||||
if (hostNameAndPortMatch.hasMatch()) {
|
if (hostNameAndPortMatch.hasCaptured(1)) {
|
||||||
hostName = hostNameAndPortMatch.captured(1);
|
hostName = hostNameAndPortMatch.captured(1);
|
||||||
|
} /*else {
|
||||||
|
qDebug() << "send error?"
|
||||||
|
}*/
|
||||||
|
|
||||||
|
if (hostNameAndPortMatch.hasCaptured(2)) {
|
||||||
port = hostNameAndPortMatch.captured(2);
|
port = hostNameAndPortMatch.captured(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,10 @@ PageController::PageController(const QSharedPointer<ServersModel> &serversModel,
|
||||||
});
|
});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined Q_OS_MACX
|
||||||
connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
|
connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); });
|
||||||
connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
|
connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); });
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
QString PageController::getInitialPage()
|
QString PageController::getInitialPage()
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include <QStandardPaths>
|
#include <QStandardPaths>
|
||||||
|
|
||||||
#include "fileUtilites.h"
|
#include "fileUtilites.h"
|
||||||
|
#include "utilities.h"
|
||||||
|
|
||||||
SitesController::SitesController(const std::shared_ptr<Settings> &settings,
|
SitesController::SitesController(const std::shared_ptr<Settings> &settings,
|
||||||
const QSharedPointer<VpnConnection> &vpnConnection,
|
const QSharedPointer<VpnConnection> &vpnConnection,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue