octoleo/wireguard-install
1
1
Fork 0
mirror of https://github.com/angristan/wireguard-install.git synced 2024-11-21 20:25:14 +00:00
Code Issues Releases Activity

Create client: fix check for existing IP and name

Browse Source 
Fix https://github.com/angristan/wireguard-install/issues/371
This commit is contained in:
Stanislas Lange 2023-01-22 12:30:06 +01:00
parent 77185dcdf8
commit 0a612774ac
No known key found for this signature in database
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wireguard-install.sh
View File

@ -284,9 +284,9 @@ function newClient() {
read -rp "Client name: " -e CLIENT_NAME read -rp "Client name: " -e CLIENT_NAME
CLIENT_EXISTS=$(grep -c -E "^### Client ${CLIENT_NAME}\$" "/etc/wireguard/${SERVER_WG_NIC}.conf") CLIENT_EXISTS=$(grep -c -E "^### Client ${CLIENT_NAME}\$" "/etc/wireguard/${SERVER_WG_NIC}.conf")
if [[ ${CLIENT_EXISTS} == '1' ]]; then if [[ ${CLIENT_EXISTS} != 0 ]]; then
echo "" echo ""
echo "A client with the specified name was already created, please choose another name." echo -e "${ORANGE}A client with the specified name was already created, please choose another name.${NC}"
echo "" echo ""
fi fi
done done
@ -308,11 +308,11 @@ function newClient() {
until [[ ${IPV4_EXISTS} == '0' ]]; do until [[ ${IPV4_EXISTS} == '0' ]]; do
read -rp "Client WireGuard IPv4: ${BASE_IP}." -e -i "${DOT_IP}" DOT_IP read -rp "Client WireGuard IPv4: ${BASE_IP}." -e -i "${DOT_IP}" DOT_IP
CLIENT_WG_IPV4="${BASE_IP}.${DOT_IP}" CLIENT_WG_IPV4="${BASE_IP}.${DOT_IP}"
IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4/24" "/etc/wireguard/${SERVER_WG_NIC}.conf") IPV4_EXISTS=$(grep -c "$CLIENT_WG_IPV4/32" "/etc/wireguard/${SERVER_WG_NIC}.conf")
if [[ ${IPV4_EXISTS} == '1' ]]; then if [[ ${IPV4_EXISTS} != 0 ]]; then
echo "" echo ""
echo "A client with the specified IPv4 was already created, please choose another IPv4." echo -e "${ORANGE}A client with the specified IPv4 was already created, please choose another IPv4.${NC}"
echo "" echo ""
fi fi
done done
@ -321,11 +321,11 @@ function newClient() {
until [[ ${IPV6_EXISTS} == '0' ]]; do until [[ ${IPV6_EXISTS} == '0' ]]; do
read -rp "Client WireGuard IPv6: ${BASE_IP}::" -e -i "${DOT_IP}" DOT_IP read -rp "Client WireGuard IPv6: ${BASE_IP}::" -e -i "${DOT_IP}" DOT_IP
CLIENT_WG_IPV6="${BASE_IP}::${DOT_IP}" CLIENT_WG_IPV6="${BASE_IP}::${DOT_IP}"
IPV6_EXISTS=$(grep -c "${CLIENT_WG_IPV6}/64" "/etc/wireguard/${SERVER_WG_NIC}.conf") IPV6_EXISTS=$(grep -c "${CLIENT_WG_IPV6}/128" "/etc/wireguard/${SERVER_WG_NIC}.conf")
if [[ ${IPV6_EXISTS} == '1' ]]; then if [[ ${IPV6_EXISTS} != 0 ]]; then
echo "" echo ""
echo "A client with the specified IPv6 was already created, please choose another IPv6." echo -e "${ORANGE}A client with the specified IPv6 was already created, please choose another IPv6.${NC}"
echo "" echo ""
fi fi
done done