feat: amneziawg 1.5 support (#1692)
* Version bump 4.2.1.0 * feat: add special handshake params to ui * feat: finish adding params * feat: android/ios & fix qml * chore: fix android impl & update 3rd-prebuilt branch * chore: trigger build with windows build * fix: special handshake params to client * chore: update submodule * feat: s3, s4 * chore: update submodule * feat: s3 s4 cont * fix: kt set * chore: update submodule * feat: add default values for s3, s4 * fix: make new parameters optional * chore: update submodules * chore: restore translation files * fix: fixed awg native config import with new junk * chore: restore translation files * AWG v1.5 Build * refactoring: removed s3 s4 fileds from ui part * chore: update link to amneziawg-apple --------- Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mark Puha <p.mark95@gmail.com> Co-authored-by: albexk <albexk@proton.me> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com>
This commit is contained in:
parent
42661618dc
commit
2380cd5cfb
27 changed files with 758 additions and 186 deletions
|
@ -6,9 +6,12 @@
|
|||
|
||||
#include "containers/containers_defs.h"
|
||||
|
||||
namespace AwgConstant {
|
||||
namespace AwgConstant
|
||||
{
|
||||
const int messageInitiationSize = 148;
|
||||
const int messageResponseSize = 92;
|
||||
const int messageCookieReplySize = 64;
|
||||
const int messageTransportSize = 32;
|
||||
}
|
||||
|
||||
struct AwgConfig
|
||||
|
@ -22,12 +25,23 @@ struct AwgConfig
|
|||
QString clientJunkPacketCount;
|
||||
QString clientJunkPacketMinSize;
|
||||
QString clientJunkPacketMaxSize;
|
||||
QString clientSpecialJunk1;
|
||||
QString clientSpecialJunk2;
|
||||
QString clientSpecialJunk3;
|
||||
QString clientSpecialJunk4;
|
||||
QString clientSpecialJunk5;
|
||||
QString clientControlledJunk1;
|
||||
QString clientControlledJunk2;
|
||||
QString clientControlledJunk3;
|
||||
QString clientSpecialHandshakeTimeout;
|
||||
|
||||
QString serverJunkPacketCount;
|
||||
QString serverJunkPacketMinSize;
|
||||
QString serverJunkPacketMaxSize;
|
||||
QString serverInitPacketJunkSize;
|
||||
QString serverResponsePacketJunkSize;
|
||||
QString serverCookieReplyPacketJunkSize;
|
||||
QString serverTransportPacketJunkSize;
|
||||
QString serverInitPacketMagicHeader;
|
||||
QString serverResponsePacketMagicHeader;
|
||||
QString serverUnderloadPacketMagicHeader;
|
||||
|
@ -35,7 +49,6 @@ struct AwgConfig
|
|||
|
||||
bool hasEqualServerSettings(const AwgConfig &other) const;
|
||||
bool hasEqualClientSettings(const AwgConfig &other) const;
|
||||
|
||||
};
|
||||
|
||||
class AwgConfigModel : public QAbstractListModel
|
||||
|
@ -51,16 +64,28 @@ public:
|
|||
ClientJunkPacketCountRole,
|
||||
ClientJunkPacketMinSizeRole,
|
||||
ClientJunkPacketMaxSizeRole,
|
||||
ClientSpecialJunk1Role,
|
||||
ClientSpecialJunk2Role,
|
||||
ClientSpecialJunk3Role,
|
||||
ClientSpecialJunk4Role,
|
||||
ClientSpecialJunk5Role,
|
||||
ClientControlledJunk1Role,
|
||||
ClientControlledJunk2Role,
|
||||
ClientControlledJunk3Role,
|
||||
ClientSpecialHandshakeTimeoutRole,
|
||||
|
||||
ServerJunkPacketCountRole,
|
||||
ServerJunkPacketMinSizeRole,
|
||||
ServerJunkPacketMaxSizeRole,
|
||||
ServerInitPacketJunkSizeRole,
|
||||
ServerResponsePacketJunkSizeRole,
|
||||
ServerCookieReplyPacketJunkSizeRole,
|
||||
ServerTransportPacketJunkSizeRole,
|
||||
|
||||
ServerInitPacketMagicHeaderRole,
|
||||
ServerResponsePacketMagicHeaderRole,
|
||||
ServerUnderloadPacketMagicHeaderRole,
|
||||
ServerTransportPacketMagicHeaderRole
|
||||
ServerTransportPacketMagicHeaderRole,
|
||||
};
|
||||
|
||||
explicit AwgConfigModel(QObject *parent = nullptr);
|
||||
|
@ -75,7 +100,7 @@ public slots:
|
|||
QJsonObject getConfig();
|
||||
|
||||
bool isHeadersEqual(const QString &h1, const QString &h2, const QString &h3, const QString &h4);
|
||||
bool isPacketSizeEqual(const int s1, const int s2);
|
||||
bool isPacketSizeEqual(const int s1, const int s2/*, const int s3, const int s4*/);
|
||||
|
||||
bool isServerSettingsEqual();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue