diff --git a/network/hopik/dhcpcd.conf b/network/hopik/dhcpcd.conf index c79a18a5111b77d48df91a57e7a90c9acd87a578..30d5460f466368525bb51e1de7538d0ad378e86e 100644 --- a/network/hopik/dhcpcd.conf +++ b/network/hopik/dhcpcd.conf @@ -68,7 +68,7 @@ noipv6rs ssid blatto-jk-5g static ip_address=10.12.11.22/24 -static ip6_address=2a01:510:d504:7510::22/64 +static ip6_address=2a01:510:d504:751a::22/64 static routers=10.12.11.1 static domain_name_servers=10.12.11.1 static domain_name=jk.blatto.eu diff --git a/network/hopik/dhcpcd.enter-hook b/network/hopik/dhcpcd.enter-hook index 1cb398213deefa37d6053e69213bb15219c60cc2..34a1fb5fae97ee9263be72a7640c11a06d9d0072 100644 --- a/network/hopik/dhcpcd.enter-hook +++ b/network/hopik/dhcpcd.enter-hook @@ -11,6 +11,30 @@ conntrack_hack(){ (echo R | socat unix:/run/conntrack_hack - ) & fi } +route6(){ + if [ "$reason" == STATIC6 ] + then + echo $msg_prefix add ip route: $@ + ip -6 route add $@ + fi + if [ "$reason" == NOCARRIER ] + then + echo $msg_prefix del ip route: $@ + ip -6 route del $@ + fi +} +route(){ + if [ "$reason" == STATIC ] + then + echo $msg_prefix add ip route: $@ + ip -4 route add $@ + fi + if [ "$reason" == NOCARRIER ] + then + echo $msg_prefix del ip route: $@ + ip -4 route del $@ + fi +} if [[ "$interface" == w ]] then @@ -21,7 +45,7 @@ then if [ "$reason" == STATIC6 ] then echo $msg_prefix set ipv6 default route - ip -6 route add default via 2001:718:1e03:81a::1 + route6 default via 2001:718:1e03:81a::1 dev w fi fi @@ -30,8 +54,8 @@ then conntrack_hack if [ "$reason" == STATIC6 ] then - echo $msg_prefix set ipv6 default route - ip -6 route add default via 2a01:510:d504:7510::1 + route6 default via 2a01:510:d504:7510::1 dev w + route 10.12.0.0/16 via 10.12.11.1 dev wg-blatto fi fi diff --git a/network/hopik/scripts/con-sm b/network/hopik/scripts/con-sm index 8c1b8f9b930bac107011d6c34e2299a8d4441a19..c19100c2813467499d1ef165840e258022742a77 100755 --- a/network/hopik/scripts/con-sm +++ b/network/hopik/scripts/con-sm @@ -8,7 +8,9 @@ interface=sm echo R | socat unix:/run/conntrack_hack - ip link set $interface up ip addres add 10.12.11.22/24 dev $interface -ip addres add 2a01:510:d504:7510::22/64 dev $interface +ip addres add 2a01:510:d504:751a::22/64 dev $interface +ip route add 10.12.0.0/16 via 10.12.11.1 dev $interface +ip route add 2a01:510:d504:7500::0/56 via 2a01:510:d504:751a::1 dev wg-blatto metric 1000 ip route add default via 10.12.11.1 dev $interface -ip route add default via 2a01:510:d504:7510::1 dev $interface +ip route add default via 2a01:510:d504:751a::1 dev $interface (echo domain jk.blatto.eu; echo nameserver 10.12.11.1 ) | resolvconf -a $interface