diff --git a/network/dhcpcd.enter-hook-defaults b/network/dhcpcd.enter-hook-defaults new file mode 100644 index 0000000000000000000000000000000000000000..3554202d990198f86a65b32ea90f8d62bd358a1b --- /dev/null +++ b/network/dhcpcd.enter-hook-defaults @@ -0,0 +1,34 @@ + +if [ "$ifssid" == MS-KAM-GUESTS ] +then + conntrack_hack + route6 default via 2001:718:1e03:81a::1 dev w metric 3004 +fi + +if [ "$ifssid" == blatto-jk-5g ] || [ "$ifssid" == blatto-jk-2g ] +then + conntrack_hack + route6 default via 2a01:510:d504:751a::1 dev w metric 3004 +fi + +if [ "$ifssid" == samet-5G ] +then + conntrack_hack +fi + +if [ "$ifssid" == CDWiFi ] +then + mtu 1340 + if [ "$reason" == BOUND ] + then + CDWIFI_IFACE=$interface cdwifi-autologin + fi +fi +if [ "$ifssid" == Onboard-WiFi ] +then + mtu 1340 +fi +if [ "$ifssid" == OEBB ] +then + mtu 1340 +fi diff --git a/network/dhcpcd.enter-hook-defs b/network/dhcpcd.enter-hook-defs new file mode 100644 index 0000000000000000000000000000000000000000..8d62420ac99f8e615c26b9f861d120700ab2e995 --- /dev/null +++ b/network/dhcpcd.enter-hook-defs @@ -0,0 +1,56 @@ +msg_prefix="$interface: dhcpd.enter-hook:" + +echo $msg_prefix $reason $interface $if_up $ifssid + +mtu_wg_blatto(){ + ip link set wg-blatto mtu $1 +} +mtu_limit(){ + if [ "$reason" == CARRIER ] + then + if [[ $3 -le $2 ]] + then + $1 $3 + else + $1 $2 + fi + fi + if [ "$reason" == NOCARRIER ] + then + $1 $2 + fi +} +mtu(){ + mtu_limit mtu_wg_blatto 1432 $(( $1 - 60 )) +} +conntrack_hack(){ + if [ "$reason" == CARRIER ] + then + echo $msg_prefix 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 +} diff --git a/network/hopik/dhcpcd.enter-hook b/network/hopik/dhcpcd.enter-hook index 3cf9d901f44662fb404d0a68ba2a7bfd50697941..a35dc129be6bf83855e90c0783dd70c3b94e94a2 100644 --- a/network/hopik/dhcpcd.enter-hook +++ b/network/hopik/dhcpcd.enter-hook @@ -1,95 +1,10 @@ #!/bin/sh -msg_prefix="$interface: dhcpd.enter-hook:" - -echo $msg_prefix $reason $interface $if_up $ifssid - -mtu_wg_blatto(){ - ip link set wg-blatto mtu $1 -} -mtu_limit(){ - if [ "$reason" == CARRIER ] - then - if [[ $3 -le $2 ]] - then - $1 $3 - else - $1 $2 - fi - fi - if [ "$reason" == NOCARRIER ] - then - $1 $2 - fi -} -mtu(){ - mtu_limit mtu_wg_blatto 1432 $(( $1 - 60 )) -} -conntrack_hack(){ - if [ "$reason" == CARRIER ] - then - echo $msg_prefix 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 -} +. /etc/dhcpcd.enter-hook-defs if [[ "$interface" == w ]] then - - if [ "$ifssid" == MS-KAM-GUESTS ] - then - conntrack_hack - route6 default via 2001:718:1e03:81a::1 dev w metric 3004 - fi - - if [ "$ifssid" == blatto-jk-5g ] || [ "$ifssid" == blatto-jk-2g ] - then - conntrack_hack - route6 default via 2a01:510:d504:751a::1 dev w metric 3004 - fi - - if [ "$ifssid" == samet-5G ] - then - conntrack_hack - fi - - if [ "$ifssid" == CDWiFi ] - then - mtu 1340 - if [ "$reason" == BOUND ] - then - CDWIFI_IFACE=$interface cdwifi-autologin - fi - fi - if [ "$ifssid" == Onboard-WiFi ] - then - mtu 1340 - fi - + . /etc/dhcpcd.enter-hook-defaults if [ "$reason" == CARRIER ] then diff --git a/network/init.sh b/network/init.sh index 0046a29cf55f9601b40b5f206b93b74fff05e8f0..57550c517848e9d1a3802c6d4181994e1c6de0d0 100755 --- a/network/init.sh +++ b/network/init.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$(dirname "$0")" . ../userconfig-lib.sh -version 8 +version 9 need_root install_begin @@ -24,7 +24,12 @@ do done [ -f $h/dhcpcd.conf ] && confln $h/dhcpcd.conf /etc/ cr -[ -f $h/dhcpcd.enter-hook ] && confln $h/dhcpcd.enter-hook /etc/ cr +if [ -f $h/dhcpcd.enter-hook ] +then + confln dhcpcd.enter-hook-defaults /etc/ cr + confln dhcpcd.enter-hook-defs /etc/ cr + confln $h/dhcpcd.enter-hook /etc/ cr +fi r udevadm control --reload-rules r udevadm trigger