diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-03-15 09:49:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-15 09:49:33 +0000 |
commit | 864d2b9aeed2ee736de2b7c8d9dc765290e62e1e (patch) | |
tree | eb49ba004dc787510baa7de9d48f3f9557755c55 /package | |
parent | fe29d066d54e2baa717c7464aad72c3343dff6ff (diff) | |
download | master-187ad058-864d2b9aeed2ee736de2b7c8d9dc765290e62e1e.tar.gz master-187ad058-864d2b9aeed2ee736de2b7c8d9dc765290e62e1e.tar.bz2 master-187ad058-864d2b9aeed2ee736de2b7c8d9dc765290e62e1e.zip |
6to4: add netifd support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30949 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r-- | package/6to4/Makefile | 17 | ||||
-rw-r--r-- | package/6to4/files.old/6to4.hotplug | 34 | ||||
-rwxr-xr-x | package/6to4/files.old/6to4.sh | 273 | ||||
-rw-r--r-- | package/6to4/files/6to4.hotplug | 13 | ||||
-rwxr-xr-x | package/6to4/files/6to4.sh | 208 |
5 files changed, 411 insertions, 134 deletions
diff --git a/package/6to4/Makefile b/package/6to4/Makefile index 8cf66c0a28..45639646cc 100644 --- a/package/6to4/Makefile +++ b/package/6to4/Makefile @@ -34,11 +34,20 @@ endef define Build/Configure endef -define Package/6to4/install - $(INSTALL_DIR) $(1)/lib/network - $(INSTALL_DATA) ./files/6to4.sh $(1)/lib/network/6to4.sh +ifneq ($(CONFIG_PACKAGE_netifd),) + define Package/6to4/install + $(INSTALL_DIR) $(1)/lib/netifd/proto + $(INSTALL_BIN) ./files/6to4.sh $(1)/lib/netifd/proto/6to4.sh $(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_DATA) ./files/6to4.hotplug $(1)/etc/hotplug.d/iface/91-6to4 -endef + endef +else + define Package/6to4/install + $(INSTALL_DIR) $(1)/lib/network + $(INSTALL_DATA) ./files.old/6to4.sh $(1)/lib/network/6to4.sh + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files.old/6to4.hotplug $(1)/etc/hotplug.d/iface/91-6to4 + endef +endif $(eval $(call BuildPackage,6to4)) diff --git a/package/6to4/files.old/6to4.hotplug b/package/6to4/files.old/6to4.hotplug new file mode 100644 index 0000000000..1e3d26c418 --- /dev/null +++ b/package/6to4/files.old/6to4.hotplug @@ -0,0 +1,34 @@ +#!/bin/sh + +if [ "$ACTION" = ifup ]; then + . /etc/functions.sh + + include /lib/network + scan_interfaces + + update_tunnel() { + local cfg="$1" + + local proto + config_get proto "$cfg" proto + [ "$proto" = 6to4 ] || return 0 + + local wandev + config_get wandev "$cfg" wan_device "$(find_6to4_wanif)" + [ "$wandev" = "$DEVICE" ] || return 0 + + local wanip=$(find_6to4_wanip "$wandev") + + [ -n "$wanip" ] && { + lsmod | grep -q ^sit || { + logger -t 6to4 "Tunneling driver not loaded yet, deferring action" + exit 0 + } + + uci_set_state network "$cfg" ipaddr "$wanip" + ( ifup "$cfg" )& + } + } + + config_foreach update_tunnel interface +fi diff --git a/package/6to4/files.old/6to4.sh b/package/6to4/files.old/6to4.sh new file mode 100755 index 0000000000..f7f48e5ba4 --- /dev/null +++ b/package/6to4/files.old/6to4.sh @@ -0,0 +1,273 @@ +# 6to4.sh - IPv6-in-IPv4 tunnel backend +# Copyright (c) 2010-2011 OpenWrt.org + +find_6to4_wanif() { + local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}" + [ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if" +} + +find_6to4_wanip() { + local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }" + echo "${ip%%[^0-9.]*}" +} + +find_6to4_prefix() { + local ip4="$1" + local oIFS="$IFS"; IFS="."; set -- $ip4; IFS="$oIFS" + + printf "2002:%02x%02x:%02x%02x\n" $1 $2 $3 $4 +} + +test_6to4_rfc1918() +{ + local oIFS="$IFS"; IFS="."; set -- $1; IFS="$oIFS" + [ $1 -eq 10 ] && return 0 + [ $1 -eq 192 ] && [ $2 -eq 168 ] && return 0 + [ $1 -eq 172 ] && [ $2 -ge 16 ] && [ $2 -le 31 ] && return 0 + return 1 +} + +set_6to4_radvd_interface() { + local cfgid="$1" + local lanif="${2:-lan}" + local ifmtu="${3:-1280}" + local ifsection="" + + find_ifsection() { + local net + local cfg="$1" + config_get net "$cfg" interface + + [ "$net" = "$lanif" ] && { + ifsection="$cfg" + return 1 + } + } + + config_foreach find_ifsection interface + + [ -z "$ifsection" ] && { + ifsection="iface_$sid" + uci_set_state radvd "$ifsection" "" interface + uci_set_state radvd "$ifsection" interface "$lanif" + } + + uci_set_state radvd "$ifsection" ignore 0 + uci_set_state radvd "$ifsection" IgnoreIfMissing 1 + uci_set_state radvd "$ifsection" AdvSendAdvert 1 + uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30 + uci_set_state radvd "$ifsection" AdvLinkMTU "$ifmtu" +} + +set_6to4_radvd_prefix() { + local cfgid="$1" + local lanif="${2:-lan}" + local wanif="${3:-wan}" + local prefix="${4:-0:0:0:1::/64}" + local vlt="${5:-300}" + local plt="${6:-120}" + local pfxsection="" + + find_pfxsection() { + local net base + local cfg="$1" + config_get net "$cfg" interface + config_get base "$cfg" Base6to4Interface + + [ "$net" = "$lanif" ] && [ "$base" = "$wanif" ] && { + pfxsection="$cfg" + return 1 + } + } + + config_foreach find_pfxsection prefix + + [ -z "$pfxsection" ] && { + pfxsection="prefix_${sid}_${lanif}" + uci_set_state radvd "$pfxsection" "" prefix + uci_set_state radvd "$pfxsection" ignore 0 + uci_set_state radvd "$pfxsection" interface "$lanif" + uci_set_state radvd "$pfxsection" prefix "$prefix" + uci_set_state radvd "$pfxsection" AdvOnLink 1 + uci_set_state radvd "$pfxsection" AdvAutonomous 1 + uci_set_state radvd "$pfxsection" AdvValidLifetime "$vlt" + uci_set_state radvd "$pfxsection" AdvPreferredLifetime "$plt" + uci_set_state radvd "$pfxsection" Base6to4Interface "$wanif" + } +} + + +# Hook into scan_interfaces() to synthesize a .device option +# This is needed for /sbin/ifup to properly dispatch control +# to setup_interface_6to4() even if no .ifname is set in +# the configuration. +scan_6to4() { + config_set "$1" device "6to4-$1" +} + +coldplug_interface_6to4() { + setup_interface_6to4 "6to4-$1" "$1" +} + +setup_interface_6to4() { + local iface="$1" + local cfg="$2" + local link="6to4-$cfg" + + local local4=$(uci_get network "$cfg" ipaddr) + + local mtu + config_get mtu "$cfg" mtu + + local ttl + config_get ttl "$cfg" ttl + + local metric + config_get metric "$cfg" metric + + local defaultroute + config_get_bool defaultroute "$cfg" defaultroute 1 + + local wanif=$(find_6to4_wanif) + [ -z "$wanif" ] && { + logger -t "$link" "Cannot find wan interface - aborting" + return + } + + local wancfg=$(find_config "$wanif") + [ -z "$wancfg" ] && { + logger -t "$link" "Cannot find wan network - aborting" + return + } + + # If local4 is unset, guess local IPv4 address from the + # interface used by the default route. + [ -z "$local4" ] && { + [ -n "$wanif" ] && { + local4=$(find_6to4_wanip "$wanif") + uci_set_state network "$cfg" wan_device "$wanif" + } + } + + test_6to4_rfc1918 "$local4" && { + logger -t "$link" "Local wan ip $local4 is private - aborting" + return + } + + [ -n "$local4" ] && { + logger -t "$link" "Starting ..." + + # creating the tunnel below will trigger a net subsystem event + # prevent it from touching or iface by disabling .auto here + uci_set_state network "$cfg" ifname $link + uci_set_state network "$cfg" auto 0 + + # find our local prefix + local prefix6=$(find_6to4_prefix "$local4") + local local6="$prefix6::1/16" + + logger -t "$link" " * IPv4 address is $local4" + logger -t "$link" " * IPv6 address is $local6" + ip tunnel add $link mode sit remote any local $local4 ttl ${ttl:-64} + ip link set $link up + ip link set mtu ${mtu:-1280} dev $link + ip addr add $local6 dev $link + + uci_set_state network "$cfg" ipaddr $local4 + uci_set_state network "$cfg" ip6addr $local6 + + [ "$defaultroute" = 1 ] && { + logger -t "$link" " * Adding default route" + ip -6 route add ::/0 via ::192.88.99.1 metric ${metric:-1} dev $link + uci_set_state network "$cfg" defaultroute 1 + } + + [ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && { + local sid="6to4_$cfg" + + uci_revert_state radvd + config_load radvd + + # find delegation target + local adv_interface + config_get adv_interface "$cfg" adv_interface + + local adv_subnet=$(uci_get network "$cfg" adv_subnet) + adv_subnet=$((0x${adv_subnet:-1})) + + local adv_subnets="" + + for adv_interface in ${adv_interface:-lan}; do + local adv_ifname + config_get adv_ifname "${adv_interface:-lan}" ifname + + grep -qs "^ *$adv_ifname:" /proc/net/dev && { + local adv_valid_lifetime adv_preferred_lifetime + config_get adv_valid_lifetime "$cfg" adv_valid_lifetime + config_get adv_preferred_lifetime "$cfg" adv_preferred_lifetime + + local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)" + + logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)" + ip -6 addr add $subnet6 dev $adv_ifname + + set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu" + set_6to4_radvd_prefix "$sid" "$adv_interface" \ + "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)" \ + "$adv_valid_lifetime" "$adv_preferred_lifetime" + + adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6" + adv_subnet=$(($adv_subnet + 1)) + } + done + + uci_set_state network "$cfg" adv_subnets "$adv_subnets" + + /etc/init.d/radvd restart + } + + logger -t "$link" "... started" + + env -i ACTION="ifup" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" & + } || { + echo "Cannot determine local IPv4 address for 6to4 tunnel $cfg - skipping" + } +} + +stop_interface_6to4() { + local cfg="$1" + local link="6to4-$cfg" + + local local6=$(uci_get_state network "$cfg" ip6addr) + local defaultroute=$(uci_get_state network "$cfg" defaultroute) + + local adv_subnets=$(uci_get_state network "$cfg" adv_subnets) + + grep -qs "^ *$link:" /proc/net/dev && { + logger -t "$link" "Shutting down ..." + env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" & + + [ -n "$adv_subnets" ] && { + uci_revert_state radvd + /etc/init.d/radvd enabled && /etc/init.d/radvd restart + + local adv_subnet + for adv_subnet in $adv_subnets; do + local ifname="${adv_subnet%%:*}" + local subnet="${adv_subnet#*:}" + + logger -t "$link" " * Removing IPv6 subnet $subnet from interface $ifname" + ip -6 addr del $subnet dev $ifname + done + } + + [ "$defaultroute" = "1" ] && \ + ip -6 route del ::/0 via ::192.88.99.1 dev $link + + ip addr del $local6 dev $link + ip link set $link down + ip tunnel del $link + + logger -t "$link" "... stopped" + } +} diff --git a/package/6to4/files/6to4.hotplug b/package/6to4/files/6to4.hotplug index 1e3d26c418..202a3c737c 100644 --- a/package/6to4/files/6to4.hotplug +++ b/package/6to4/files/6to4.hotplug @@ -3,6 +3,9 @@ if [ "$ACTION" = ifup ]; then . /etc/functions.sh + INCLUDE_ONLY=1 + . /lib/netifd/proto/6to4.sh + include /lib/network scan_interfaces @@ -19,15 +22,7 @@ if [ "$ACTION" = ifup ]; then local wanip=$(find_6to4_wanip "$wandev") - [ -n "$wanip" ] && { - lsmod | grep -q ^sit || { - logger -t 6to4 "Tunneling driver not loaded yet, deferring action" - exit 0 - } - - uci_set_state network "$cfg" ipaddr "$wanip" - ( ifup "$cfg" )& - } + [ -n "$wanip" ] && ifup "$cfg" } config_foreach update_tunnel interface diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh index f7f48e5ba4..a4ec918c45 100755 --- a/package/6to4/files/6to4.sh +++ b/package/6to4/files/6to4.sh @@ -1,5 +1,12 @@ +#!/bin/sh # 6to4.sh - IPv6-in-IPv4 tunnel backend -# Copyright (c) 2010-2011 OpenWrt.org +# Copyright (c) 2010-2012 OpenWrt.org + +[ -n "$INCLUDE_ONLY" ] || { + . /etc/functions.sh + . ../netifd-proto.sh + init_proto "$@" +} find_6to4_wanif() { local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}" @@ -96,178 +103,137 @@ set_6to4_radvd_prefix() { } } +tun_error() { + local cfg="$1"; shift; -# Hook into scan_interfaces() to synthesize a .device option -# This is needed for /sbin/ifup to properly dispatch control -# to setup_interface_6to4() even if no .ifname is set in -# the configuration. -scan_6to4() { - config_set "$1" device "6to4-$1" -} - -coldplug_interface_6to4() { - setup_interface_6to4 "6to4-$1" "$1" + [ -n "$1" ] && proto_notify_error "$cfg" "$@" + proto_block_restart "$cfg" } -setup_interface_6to4() { - local iface="$1" - local cfg="$2" +proto_6to4_setup() { + local cfg="$1" + local iface="$2" local link="6to4-$cfg" - local local4=$(uci_get network "$cfg" ipaddr) - - local mtu - config_get mtu "$cfg" mtu - - local ttl - config_get ttl "$cfg" ttl - - local metric - config_get metric "$cfg" metric + json_get_var mtu mtu + json_get_var ttl ttl + json_get_var local4 ipaddr - local defaultroute - config_get_bool defaultroute "$cfg" defaultroute 1 + json_get_var adv_subnet adv_subnet + json_get_var adv_interface adv_interface + json_get_var adv_valid_lifetime adv_valid_lifetime + json_get_var adv_preferred_lifetime adv_preferred_lifetime local wanif=$(find_6to4_wanif) [ -z "$wanif" ] && { - logger -t "$link" "Cannot find wan interface - aborting" + tun_error "NO_WAN_LINK" return } - local wancfg=$(find_config "$wanif") + . /lib/network/config.sh + local wancfg="$(find_config "$wanif")" [ -z "$wancfg" ] && { - logger -t "$link" "Cannot find wan network - aborting" + tun_error "NO_WAN_LINK" return } # If local4 is unset, guess local IPv4 address from the # interface used by the default route. [ -z "$local4" ] && { - [ -n "$wanif" ] && { - local4=$(find_6to4_wanip "$wanif") - uci_set_state network "$cfg" wan_device "$wanif" - } + [ -n "$wanif" ] && local4=$(find_6to4_wanip "$wanif") } - test_6to4_rfc1918 "$local4" && { - logger -t "$link" "Local wan ip $local4 is private - aborting" + [ -z "$local4" ] && { + tun_error "NO_WAN_LINK" return } - [ -n "$local4" ] && { - logger -t "$link" "Starting ..." - - # creating the tunnel below will trigger a net subsystem event - # prevent it from touching or iface by disabling .auto here - uci_set_state network "$cfg" ifname $link - uci_set_state network "$cfg" auto 0 - - # find our local prefix - local prefix6=$(find_6to4_prefix "$local4") - local local6="$prefix6::1/16" - - logger -t "$link" " * IPv4 address is $local4" - logger -t "$link" " * IPv6 address is $local6" - ip tunnel add $link mode sit remote any local $local4 ttl ${ttl:-64} - ip link set $link up - ip link set mtu ${mtu:-1280} dev $link - ip addr add $local6 dev $link - - uci_set_state network "$cfg" ipaddr $local4 - uci_set_state network "$cfg" ip6addr $local6 - - [ "$defaultroute" = 1 ] && { - logger -t "$link" " * Adding default route" - ip -6 route add ::/0 via ::192.88.99.1 metric ${metric:-1} dev $link - uci_set_state network "$cfg" defaultroute 1 - } + test_6to4_rfc1918 "$local4" && { + tun_error "INVALID_LOCAL_ADDRESS" + return + } - [ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && { - local sid="6to4_$cfg" + # find our local prefix + local prefix6=$(find_6to4_prefix "$local4") + local local6="$prefix6::1" - uci_revert_state radvd - config_load radvd + proto_init_update "$link" 1 + proto_add_ipv6_address "$local6" 16 + proto_add_ipv6_route "::" 0 - # find delegation target - local adv_interface - config_get adv_interface "$cfg" adv_interface + proto_add_tunnel + json_add_string mode sit + json_add_int mtu "${mtu:-1280}" + json_add_int ttl "${ttl:-64}" + json_add_string local "$local4" + json_add_string remote "192.88.99.1" + proto_close_tunnel - local adv_subnet=$(uci_get network "$cfg" adv_subnet) - adv_subnet=$((0x${adv_subnet:-1})) + proto_send_update "$cfg" - local adv_subnets="" + [ -f /etc/config/radvd ] && /etc/init.d/radvd enabled && { + local sid="6to4_$cfg" - for adv_interface in ${adv_interface:-lan}; do - local adv_ifname - config_get adv_ifname "${adv_interface:-lan}" ifname + uci_revert_state radvd + config_load radvd - grep -qs "^ *$adv_ifname:" /proc/net/dev && { - local adv_valid_lifetime adv_preferred_lifetime - config_get adv_valid_lifetime "$cfg" adv_valid_lifetime - config_get adv_preferred_lifetime "$cfg" adv_preferred_lifetime + adv_subnet=$((0x${adv_subnet:-1})) - local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)" + local adv_subnets="" - logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)" - ip -6 addr add $subnet6 dev $adv_ifname + for adv_interface in ${adv_interface:-lan}; do + local adv_ifname + config_get adv_ifname "${adv_interface:-lan}" ifname - set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu" - set_6to4_radvd_prefix "$sid" "$adv_interface" \ - "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)" \ - "$adv_valid_lifetime" "$adv_preferred_lifetime" + grep -qs "^ *$adv_ifname:" /proc/net/dev && { + local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)" - adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6" - adv_subnet=$(($adv_subnet + 1)) - } - done + logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)" + ip -6 addr add $subnet6 dev $adv_ifname - uci_set_state network "$cfg" adv_subnets "$adv_subnets" + set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu" + set_6to4_radvd_prefix "$sid" "$adv_interface" \ + "$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)" \ + "$adv_valid_lifetime" "$adv_preferred_lifetime" - /etc/init.d/radvd restart - } + adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6" + adv_subnet=$(($adv_subnet + 1)) + } + done - logger -t "$link" "... started" + uci_set_state network "$cfg" adv_subnets "$adv_subnets" - env -i ACTION="ifup" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" & - } || { - echo "Cannot determine local IPv4 address for 6to4 tunnel $cfg - skipping" + /etc/init.d/radvd restart } } -stop_interface_6to4() { +proto_6to4_teardown() { local cfg="$1" local link="6to4-$cfg" - local local6=$(uci_get_state network "$cfg" ip6addr) - local defaultroute=$(uci_get_state network "$cfg" defaultroute) - local adv_subnets=$(uci_get_state network "$cfg" adv_subnets) grep -qs "^ *$link:" /proc/net/dev && { - logger -t "$link" "Shutting down ..." - env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6to4 /sbin/hotplug-call "iface" & - [ -n "$adv_subnets" ] && { uci_revert_state radvd /etc/init.d/radvd enabled && /etc/init.d/radvd restart - - local adv_subnet - for adv_subnet in $adv_subnets; do - local ifname="${adv_subnet%%:*}" - local subnet="${adv_subnet#*:}" - - logger -t "$link" " * Removing IPv6 subnet $subnet from interface $ifname" - ip -6 addr del $subnet dev $ifname - done } + } +} - [ "$defaultroute" = "1" ] && \ - ip -6 route del ::/0 via ::192.88.99.1 dev $link - - ip addr del $local6 dev $link - ip link set $link down - ip tunnel del $link +proto_6to4_init_config() { + no_device=1 + available=1 + + proto_config_add_string "ipaddr" + proto_config_add_int "mtu" + proto_config_add_int "ttl" + proto_config_add_string "adv_interface" + proto_config_add_string "adv_subnet" + proto_config_add_int "adv_valid_lifetime" + proto_config_add_int "adv_preferred_lifetime" +} - logger -t "$link" "... stopped" - } +[ -n "$INCLUDE_ONLY" ] || { + add_protocol 6to4 } |