AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature: improved increase of the last octet of the address for wireguard

Browse source
This commit is contained in:
Peter Galonza 2025-04-02 23:55:27 +03:00
parent 61f229b5df
commit e74d607a52
No known key found for this signature in database
GPG key ID: C85D94460DBECFA2
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/configurators/wireguard_configurator.cpp
View file

@ -124,6 +124,7 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
.toObject() .toObject()
.value(config_key::subnet_address) .value(config_key::subnet_address)
.toString(protocols::wireguard::defaultSubnetAddress)); .toString(protocols::wireguard::defaultSubnetAddress));
lastIp.setAddress(lastIp.toIPv4Address() + 1);
} else { } else {
lastIp = ips.last(); lastIp = ips.last();
} }
@ -131,7 +132,6 @@ WireguardConfigurator::ConnectionData WireguardConfigurator::prepareWireguardCon
switch (lastOctet) { switch (lastOctet) {
case 254: result.setAddress(lastIp.toIPv4Address() + 3); break; case 254: result.setAddress(lastIp.toIPv4Address() + 3); break;
case 255: result.setAddress(lastIp.toIPv4Address() + 2); break; case 255: result.setAddress(lastIp.toIPv4Address() + 2); break;
case 0: result.setAddress(lastIp.toIPv4Address() + 2); break;
default: result.setAddress(lastIp.toIPv4Address() + 1); break; default: result.setAddress(lastIp.toIPv4Address() + 1); break;
} }

4
client/server_scripts/awg/configure_container.sh
View file

@ -9,7 +9,9 @@ echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/awg/wireguard_server_public_key
WIREGUARD_PSK=$(wg genpsk) WIREGUARD_PSK=$(wg genpsk)
echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key echo $WIREGUARD_PSK > /opt/amnezia/awg/wireguard_psk.key
AWG_SERVER_IP=$(echo $AWG_SUBNET_IP | sed 's/\.0$/\.1/') IFS='.' read -r a b c d <<< "$WIREGUARD_SUBNET_IP"
((d++))
WIREGUARD_SERVER_IP="${a}.${b}.${c}.${d}"
cat > /opt/amnezia/awg/wg0.conf <<EOF cat > /opt/amnezia/awg/wg0.conf <<EOF
[Interface] [Interface]

4
client/server_scripts/wireguard/configure_container.sh
View file

@ -9,7 +9,9 @@ echo $WIREGUARD_SERVER_PUBLIC_KEY > /opt/amnezia/wireguard/wireguard_server_publ
WIREGUARD_PSK=$(wg genpsk) WIREGUARD_PSK=$(wg genpsk)
echo $WIREGUARD_PSK > /opt/amnezia/wireguard/wireguard_psk.key echo $WIREGUARD_PSK > /opt/amnezia/wireguard/wireguard_psk.key
WIREGUARD_SERVER_IP=$(echo $WIREGUARD_SUBNET_IP | sed 's/\.0$/\.1/') IFS='.' read -r a b c d <<< "$WIREGUARD_SUBNET_IP"
((d++))
WIREGUARD_SERVER_IP="${a}.${b}.${c}.${d}"
cat > /opt/amnezia/wireguard/wg0.conf <<EOF cat > /opt/amnezia/wireguard/wg0.conf <<EOF
[Interface] [Interface]