Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvements to wg-quick output for linux.bash. #11

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Improvements to wg-quick output for linux.bash. #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2365fe2
Improvements to wg-quick output for linux.bash.
pete4abw Nov 10, 2021
4ce3749
Merge branch 'WireGuard:master' into wg-quick-linux
pete4abw Feb 14, 2023
4049c63
Merge branch 'master' of https://github.com/WireGuard/wireguard-tools…
pete4abw Dec 5, 2023
2434355
Reorder two commands to sync with upstream.
pete4abw May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/wg-quick/linux.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ remove_firewall() {
while read -r table; do
[[ $table == *" wg-quick-$INTERFACE" ]] && printf -v nftcmd '%sdelete %s\n' "$nftcmd" "$table"
done < <(nft list tables 2>/dev/null)
[[ -z $nftcmd ]] || cmd nft -f <(echo -n "$nftcmd")
[[ -z $nftcmd ]] || cmd nft "$nftcmd"
fi
if type -p iptables >/dev/null; then
local line iptables found restore
Expand Down Expand Up @@ -220,9 +220,9 @@ add_default() {
fi
local proto=-4 iptables=iptables pf=ip
[[ $1 == *:* ]] && proto=-6 iptables=ip6tables pf=ip6
cmd ip $proto route add "$1" dev "$INTERFACE" table $table
cmd ip $proto rule add not fwmark $table table $table
cmd ip $proto rule add table main suppress_prefixlength 0
cmd ip $proto route add "$1" dev "$INTERFACE" table $table

local marker="-m comment --comment \"wg-quick(8) rule for $INTERFACE\"" restore=$'*raw\n' nftable="wg-quick-$INTERFACE" nftcmd
printf -v nftcmd '%sadd table %s %s\n' "$nftcmd" "$pf" "$nftable"
Expand All @@ -239,7 +239,7 @@ add_default() {
printf -v nftcmd '%sadd rule %s %s premangle meta l4proto udp meta mark set ct mark \n' "$nftcmd" "$pf" "$nftable"
[[ $proto == -4 ]] && cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1
if type -p nft >/dev/null; then
cmd nft -f <(echo -n "$nftcmd")
cmd nft "$nftcmd"
else
echo -n "$restore" | cmd $iptables-restore -n
fi
Expand All @@ -248,7 +248,10 @@ add_default() {
}

set_config() {
local WG_CONFIGTMP
WG_CONFIGTMP=$(echo "wg configuration\n$WG_CONFIG" | sed -e 's/\(PrivateKey = \|PresharedKey = \).*$/\1(hidden)/')
cmd wg setconf "$INTERFACE" <(echo "$WG_CONFIG")
echo -e "$WG_CONFIGTMP"
}

save_config() {
Expand Down Expand Up @@ -327,8 +330,8 @@ cmd_up() {
local i
[[ -z $(ip link show dev "$INTERFACE" 2>/dev/null) ]] || die "\`$INTERFACE' already exists"
trap 'del_if; exit' INT TERM EXIT
add_if
execute_hooks "${PRE_UP[@]}"
add_if
set_config
for i in "${ADDRESSES[@]}"; do
add_addr "$i"
Expand Down