andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: key xray worker per tunnel via ifname-scoped IPC

Browse Source
This commit is contained in:
cd-amn
2026-06-03 13:27:24 +04:00
parent 99e6c18f15
commit d528a241d8
4 changed files with 101 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipc/ipcserver.h
+12 -9
View File
@@ -55,8 +55,8 @@ public:
virtual bool refreshKillSwitch( bool enabled ) override;
virtual bool updateResolvers(const QString& ifname, const QList<QHostAddress>& resolvers) override;
virtual bool restoreResolvers() override;
virtual bool xrayStart(const QString& cfg) override;
virtual bool xrayStop() override;
virtual bool xrayStart(const QString& ifname, const QString& cfg) override;
virtual bool xrayStop(const QString& ifname) override;
virtual bool startNetworkCheck(const QString& serverIpv4Gateway, const QString& deviceIpv4Address) override;
virtual bool stopNetworkCheck() override;
@@ -78,16 +78,19 @@ private:
QMap<int, ProcessDescriptor> m_processes;
PingHelper m_pingHelper;
QSharedPointer<QProcess> m_xrayProcess;
QByteArray m_xrayStdoutBuf;
QPointer<QEventLoop> m_xrayStartLoop;
bool m_xrayStartResult = false;
struct XrayWorker {
QSharedPointer<QProcess> process;
QByteArray stdoutBuf;
QPointer<QEventLoop> startLoop;
bool startResult = false;
#ifdef Q_OS_MAC
QString m_xrayUplinkIface;
QString m_xrayUplinkGateway;
QString uplinkIface;
QString uplinkGateway;
#endif
};
QHash<QString, XrayWorker> m_xrayWorkers;
void onXrayWorkerLine(const QByteArray& line);
void onXrayWorkerLine(const QString& ifname, const QByteArray& line);
};
#endif // IPCSERVER_H