github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-22 17:48:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tor: update to 0.4.5.5-rc, build fixes

Browse Source
This commit is contained in:
tobtoht
2021-02-05 13:55:37 +01:00
parent 0f9cd68b97
commit 23eb71e337
7 changed files with 117 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/tor.cpp
+30 -9
View File
@@ -4,9 +4,11 @@
#include <QScreen>
#include <QDesktopWidget>
#include <QDesktopServices>
#include <QRegularExpression>
#include "utils/utils.h"
#include "utils/tor.h"
#include "appcontext.h"
#include "config-feather.h"
QString Tor::torHost = "127.0.0.1";
quint16 Tor::torPort = 9050;
@@ -200,10 +202,19 @@ bool Tor::unpackBins() {
QFile f(torFile);
QFileInfo fileInfo(f);
this->torPath = QDir(this->torDir).filePath(fileInfo.fileName());
#if defined(Q_OS_WIN)
if(!this->torPath.endsWith(".exe"))
this->torPath += ".exe";
#endif
TorVersion embeddedVersion = this->stringToVersion(QString(TOR_VERSION));
TorVersion filesystemVersion = this->getVersion(torPath);
qDebug() << QString("Tor versions: embedded %1, filesystem %2").arg(embeddedVersion.toString(), filesystemVersion.toString());
if (embeddedVersion > filesystemVersion) {
QFile::remove(torPath);
}
qDebug() << "Writing Tor executable to " << this->torPath;
f.copy(torPath);
f.close();
@@ -215,7 +226,7 @@ bool Tor::unpackBins() {
return true;
}
QString Tor::getVersion() {
TorVersion Tor::getVersion(const QString &fileName) {
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
process.start(this->torPath, QStringList() << "--version");
@@ -224,13 +235,23 @@ QString Tor::getVersion() {
if(output.isEmpty()) {
qWarning() << "Could not grab Tor version";
return "";
}
QString version = output.split('\n').at(0);
if(version.startsWith("Tor version")){
return version;
} else {
qWarning() << "Could not parse Tor version";
return "";
return TorVersion();
}
return this->stringToVersion(output);
}
TorVersion Tor::stringToVersion(const QString &version) {
QRegularExpression re("(?<major>\\d)\\.(?<minor>\\d)\\.(?<patch>\\d)\\.(?<release>\\d)");
QRegularExpressionMatch match = re.match(version);
if (!match.hasMatch()) {
qWarning() << "Could not parse Tor version";
return TorVersion();
}
return TorVersion(match.captured("major").toInt(),
match.captured("minor").toInt(),
match.captured("patch").toInt(),
match.captured("release").toInt());
}