moved the configuration of new parameters for awg to addInterface()
This commit is contained in:
parent
b55313527e
commit
423305c35a
4 changed files with 37 additions and 40 deletions
|
@ -100,6 +100,19 @@ bool WireguardUtilsLinux::addInterface(const InterfaceConfig& config) {
|
|||
QTextStream out(&message);
|
||||
out << "private_key=" << QString(privateKey.toHex()) << "\n";
|
||||
out << "replace_peers=true\n";
|
||||
|
||||
if (config.m_junkPacketCount != "") {
|
||||
out << "jc=" << config.m_junkPacketCount << "\n";
|
||||
out << "jmin=" << config.m_junkPacketMinSize << "\n";
|
||||
out << "jmax=" << config.m_junkPacketMaxSize << "\n";
|
||||
out << "s1=" << config.m_initPacketJunkSize << "\n";
|
||||
out << "s2=" << config.m_responsePacketJunkSize << "\n";
|
||||
out << "h1=" << config.m_initPacketMagicHeader << "\n";
|
||||
out << "h2=" << config.m_responsePacketMagicHeader << "\n";
|
||||
out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
|
||||
out << "h4=" << config.m_transportPacketMagicHeader << "\n";
|
||||
}
|
||||
|
||||
int err = uapiErrno(uapiCommand(message));
|
||||
if (err != 0) {
|
||||
logger.error() << "Interface configuration failed:" << strerror(err);
|
||||
|
@ -161,16 +174,6 @@ bool WireguardUtilsLinux::updatePeer(const InterfaceConfig& config) {
|
|||
out << "allowed_ip=" << ip.toString() << "\n";
|
||||
}
|
||||
|
||||
out << "jc=" << config.m_junkPacketCount << "\n";
|
||||
out << "jmin=" << config.m_junkPacketMinSize << "\n";
|
||||
out << "jmax=" << config.m_junkPacketMaxSize << "\n";
|
||||
out << "s1=" << config.m_initPacketJunkSize << "\n";
|
||||
out << "s2=" << config.m_responsePacketJunkSize << "\n";
|
||||
out << "h1=" << config.m_initPacketMagicHeader << "\n";
|
||||
out << "h2=" << config.m_responsePacketMagicHeader << "\n";
|
||||
out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
|
||||
out << "h4=" << config.m_transportPacketMagicHeader << "\n";
|
||||
|
||||
// Exclude the server address, except for multihop exit servers.
|
||||
if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
|
||||
(m_rtmonitor != nullptr)) {
|
||||
|
|
|
@ -100,6 +100,19 @@ bool WireguardUtilsMacos::addInterface(const InterfaceConfig& config) {
|
|||
QTextStream out(&message);
|
||||
out << "private_key=" << QString(privateKey.toHex()) << "\n";
|
||||
out << "replace_peers=true\n";
|
||||
|
||||
if (config.m_junkPacketCount != "") {
|
||||
out << "jc=" << config.m_junkPacketCount << "\n";
|
||||
out << "jmin=" << config.m_junkPacketMinSize << "\n";
|
||||
out << "jmax=" << config.m_junkPacketMaxSize << "\n";
|
||||
out << "s1=" << config.m_initPacketJunkSize << "\n";
|
||||
out << "s2=" << config.m_responsePacketJunkSize << "\n";
|
||||
out << "h1=" << config.m_initPacketMagicHeader << "\n";
|
||||
out << "h2=" << config.m_responsePacketMagicHeader << "\n";
|
||||
out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
|
||||
out << "h4=" << config.m_transportPacketMagicHeader << "\n";
|
||||
}
|
||||
|
||||
int err = uapiErrno(uapiCommand(message));
|
||||
if (err != 0) {
|
||||
logger.error() << "Interface configuration failed:" << strerror(err);
|
||||
|
@ -163,17 +176,6 @@ bool WireguardUtilsMacos::updatePeer(const InterfaceConfig& config) {
|
|||
out << "allowed_ip=" << ip.toString() << "\n";
|
||||
}
|
||||
|
||||
|
||||
out << "jc=" << config.m_junkPacketCount << "\n";
|
||||
out << "jmin=" << config.m_junkPacketMinSize << "\n";
|
||||
out << "jmax=" << config.m_junkPacketMaxSize << "\n";
|
||||
out << "s1=" << config.m_initPacketJunkSize << "\n";
|
||||
out << "s2=" << config.m_responsePacketJunkSize << "\n";
|
||||
out << "h1=" << config.m_initPacketMagicHeader << "\n";
|
||||
out << "h2=" << config.m_responsePacketMagicHeader << "\n";
|
||||
out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
|
||||
out << "h4=" << config.m_transportPacketMagicHeader << "\n";
|
||||
|
||||
// Exclude the server address, except for multihop exit servers.
|
||||
if ((config.m_hopType != InterfaceConfig::MultiHopExit) &&
|
||||
(m_rtmonitor != nullptr)) {
|
||||
|
|
|
@ -165,16 +165,6 @@ bool WireguardUtilsWindows::updatePeer(const InterfaceConfig& config) {
|
|||
out << "allowed_ip=" << ip.toString() << "\n";
|
||||
}
|
||||
|
||||
out << "jc=" << config.m_junkPacketCount << "\n";
|
||||
out << "jmin=" << config.m_junkPacketMinSize << "\n";
|
||||
out << "jmax=" << config.m_junkPacketMaxSize << "\n";
|
||||
out << "s1=" << config.m_initPacketJunkSize << "\n";
|
||||
out << "s2=" << config.m_responsePacketJunkSize << "\n";
|
||||
out << "h1=" << config.m_initPacketMagicHeader << "\n";
|
||||
out << "h2=" << config.m_responsePacketMagicHeader << "\n";
|
||||
out << "h3=" << config.m_underloadPacketMagicHeader << "\n";
|
||||
out << "h4=" << config.m_transportPacketMagicHeader << "\n";
|
||||
|
||||
// Exclude the server address, except for multihop exit servers.
|
||||
if (config.m_hopType != InterfaceConfig::MultiHopExit) {
|
||||
m_routeMonitor.addExclusionRoute(IPAddress(config.m_serverIpv4AddrIn));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue