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

fix: server address cannot be network address

Browse source
This commit is contained in:
Peter Galonza 2025-03-28 09:34:05 +03:00
parent 2a6e6a1e24
commit 61f229b5df
No known key found for this signature in database
GPG key ID: C85D94460DBECFA2
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/configurators/wireguard_configurator.cpp
View file

@ -131,6 +131,7 @@ 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,10 +9,12 @@ 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/')
cat > /opt/amnezia/awg/wg0.conf <<EOF cat > /opt/amnezia/awg/wg0.conf <<EOF
[Interface] [Interface]
PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
Address = $AWG_SUBNET_IP/$WIREGUARD_SUBNET_CIDR Address = $AWG_SERVER_IP/$WIREGUARD_SUBNET_CIDR
ListenPort = $AWG_SERVER_PORT ListenPort = $AWG_SERVER_PORT
Jc = $JUNK_PACKET_COUNT Jc = $JUNK_PACKET_COUNT
Jmin = $JUNK_PACKET_MIN_SIZE Jmin = $JUNK_PACKET_MIN_SIZE

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

@ -9,9 +9,11 @@ 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/')
cat > /opt/amnezia/wireguard/wg0.conf <<EOF cat > /opt/amnezia/wireguard/wg0.conf <<EOF
[Interface] [Interface]
PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR Address = $WIREGUARD_SERVER_IP/$WIREGUARD_SUBNET_CIDR
ListenPort = $WIREGUARD_SERVER_PORT ListenPort = $WIREGUARD_SERVER_PORT
EOF EOF