mirror/wireguard-install
1
0
Fork 0
mirror of https://github.com/angristan/wireguard-install.git synced 2024-11-24 05:56:02 +03:00
Code Issues Projects Releases Wiki Activity

Fix substitution for the server IP

Browse Source 
Previously it wouldn't work when the HOST BIT was more than 1 digit https://github.com/angristan/wireguard-install/pull/92#discussion_r460073438
This commit is contained in:
randomshell 2020-09-06 08:19:15 +00:00
parent ee99d5b3c3
commit 6188c4ee1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wireguard-install.sh
View File

@ -270,9 +270,9 @@ function newClient() {
until [[ ${IPV4_EXISTS} == '0' ]]; do until [[ ${IPV4_EXISTS} == '0' ]]; do
until [[ ${CLIENT_DOT} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do until [[ ${CLIENT_DOT} =~ ^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ ]]; do
read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4::-1}" -e -i "${CLIENT_DOT}" CLIENT_DOT read -rp "Client's WireGuard Host ID (valid for both IPv4 and IPv6): ${SERVER_WG_IPV4%.*}." -e -i "${CLIENT_DOT}" CLIENT_DOT
done done
CLIENT_WG_IPV4="${SERVER_WG_IPV4::-1}${CLIENT_DOT}" CLIENT_WG_IPV4="${SERVER_WG_IPV4%.*}.${CLIENT_DOT}"
IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf") IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4" "/etc/wireguard/${SERVER_WG_NIC}.conf")
if [[ ${IPV4_EXISTS} == '1' ]]; then if [[ ${IPV4_EXISTS} == '1' ]]; then
@ -282,7 +282,7 @@ function newClient() {
exit 1 exit 1
fi fi
done done
CLIENT_WG_IPV6="${SERVER_WG_IPV6::-1}${CLIENT_DOT}" CLIENT_WG_IPV6="${SERVER_WG_IPV6%:*}:${CLIENT_DOT}"
# Generate key pair for the client # Generate key pair for the client
CLIENT_PRIV_KEY=$(wg genkey) CLIENT_PRIV_KEY=$(wg genkey)