shinobu/router: Add ability to bypass HE tunnel

This commit is contained in:
Simon Bruder 2024-08-27 16:37:48 +02:00
parent 4e84140d53
commit eea16ca276
Signed by: simon
GPG key ID: 347FF8699CDA0776
3 changed files with 58 additions and 0 deletions

View file

@ -110,6 +110,19 @@ in
UseDNS = "no"; UseDNS = "no";
UseGateway = false; # should not be used by default for routing (wg-he takes precendence) UseGateway = false; # should not be used by default for routing (wg-he takes precendence)
}; };
routingPolicyRules = lib.singleton {
routingPolicyRuleConfig = {
Family = "ipv6";
FirewallMark = 31092; # 0x7974
Table = 31092; # 0x7974
};
};
routes = lib.singleton {
routeConfig = {
Gateway = "_ipv6ra";
Table = 31092; # 0x7974
};
};
}; };
physical-lan = { physical-lan = {
name = "enp2s0"; name = "enp2s0";

View file

@ -5,6 +5,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let
cfg = pkgs.callPackage ./common.nix { }; cfg = pkgs.callPackage ./common.nix { };
bypassHe = [
"googlevideo.com"
"youtube.com"
];
in in
{ {
services.dnsmasq = { services.dnsmasq = {
@ -51,6 +56,10 @@ in
]) ])
cfg.vlan); cfg.vlan);
nftset = [
"/${lib.concatStringsSep "/" bypassHe}/6#ip6#he-bypass#addresses"
];
server = [ server = [
"127.0.0.1#5053" "127.0.0.1#5053"
]; ];

View file

@ -41,6 +41,42 @@ table ip nat {
} }
} }
# Bypass HE tunnel by setting a firewall mark.
# This acts in two places that are handled separatly by nftables:
# Packets from the local host (output hook) and forwared packets (prerouting hook).
# To simplify the handling,
# there is a single chain that handles both,
# which is jumped to from the specific chains.
# Additionally, masquerading is allowed for all packages with a destination of the dynamic set.
table ip6 he-bypass {
# Dynamically managed by dnsmasq (based on resolved addresses).
set addresses {
type ipv6_addr
comment "IPv6 addresses for which the HE tunnel should be bypassed by using NAT on wan instead"
}
# This must be of type route, otherwise no route lookup will be performed
chain output {
type route hook output priority mangle
jump common
}
# This does not need to be of type route
chain prerouting {
type filter hook prerouting priority mangle
jump common
}
chain common {
ip6 daddr @addresses mark set 0x7974 counter
}
chain postrouting {
type nat hook postrouting priority filter; policy accept
oifname $NAT_WAN_IFACES ip6 daddr @addresses masquerade
}
}
table ip6 public-access { table ip6 public-access {
chain input { chain input {
type filter hook input priority filter; policy accept type filter hook input priority filter; policy accept