2ae521fa83
and ipv6_ifconfig_<interface> options have already been deprecated, these changes do not alter that. With these changes any value set for ipv6_enable will emit a warning. In order to avoid a POLA violation for the deprecation of the option ipv6_enable=NO will still disable configuration for all interfaces other than lo0. ipv6_enable=YES will not have any effect, but will emit an additional warning. Support and warnings for this option will be removed in FreeBSD 10.x. Consistent with the current code, in order for IPv6 to be configured on an interface (other than lo0) an ifconfig_<interface>_ipv6 option will have to be added to /etc/rc.conf[.local]. 1. Clean up and minor optimizations for the following functions: ifconfig_up (the ipv6 elements) ipv6if ipv6_autoconfif get_if_var _ifconfig_getargs The cleanups generally were to move the "easy" tests earlier in the functions, and consolidate duplicate code. 2. Stop overloading ipv6_prefer with the ability to disable IPv6 configuration. 3. Remove noafif() which was only ever called from ipv6_autoconfif. Instead, simplify and integrate the tests into that function, and convert the test to use is_wired_interface() instead of listing wireless interfaces explicitly. 4. Integrate backwards compatibility for ipv6_ifconfig_<interface> into _ifconfig_getargs. This dramatically simplifies the code in all of the callers, and avoids a lot of other code duplication. 5. In rc.d/netoptions, add code for an ipv6_privacy option to use RFC 4193 style pseudo-random addresses (this is what windows does by default, FYI). 6. Add support for the [NO]RTADV options in ifconfig_getargs() and ipv6_autoconfif(). In the latter, include support for the explicit addition of [-]accept_rtadv in ifconfig_<interface>_ipv6 as is done in the current code. 7. In rc.d/netif add a warning if $ipv6_enable is set, and remove the set_rcvar_obsolete for it. Also remove the latter from rc.d/ip6addrctl. 8. In /etc/defaults/rc.conf: Add an example for RTADV configuration. Set ipv6_network_interfaces to AUTO. Switch ipv6_prefer to YES. If ipv6_enable is not set this will have no effect. Add a default for ipv6_privacy (NO). 9. Document all of this in rc.conf.5.
165 lines
3.8 KiB
Bash
Executable File
165 lines
3.8 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2003 The FreeBSD Project. All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in the
|
|
# documentation and/or other materials provided with the distribution.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE PROJECT ``AS IS'' AND ANY EXPRESS OR
|
|
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
# IN NO EVENT SHALL THE PROJECT BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
# $FreeBSD$
|
|
#
|
|
|
|
# PROVIDE: netif
|
|
# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
|
|
# REQUIRE: ipfilter ipfs
|
|
# KEYWORD: nojail
|
|
|
|
. /etc/rc.subr
|
|
. /etc/network.subr
|
|
|
|
name="network"
|
|
start_precmd="network_prestart"
|
|
start_cmd="network_start"
|
|
stop_cmd="network_stop"
|
|
cloneup_cmd="clone_up"
|
|
clonedown_cmd="clone_down"
|
|
extra_commands="cloneup clonedown"
|
|
cmdifn=
|
|
|
|
network_prestart()
|
|
{
|
|
if [ -n "$ipv6_enable" ]; then
|
|
warn 'The ipv6_enable option is deprecated.'
|
|
warn 'See rc.conf(5) for information on disabling IPv6.'
|
|
fi
|
|
}
|
|
|
|
network_start()
|
|
{
|
|
# Set the list of interfaces to work on.
|
|
#
|
|
cmdifn=$*
|
|
|
|
if [ -z "$cmdifn" ]; then
|
|
#
|
|
# We're operating as a general network start routine.
|
|
#
|
|
|
|
# disable SIGINT (Ctrl-c) when running at startup
|
|
trap : 2
|
|
|
|
# Create cloned interfaces
|
|
clone_up
|
|
|
|
# Create Fast EtherChannel interfaces
|
|
fec_up
|
|
|
|
# Create IPv6<-->IPv4 tunnels
|
|
gif_up
|
|
|
|
# Rename interfaces.
|
|
ifnet_rename
|
|
fi
|
|
|
|
# Configure the interface(s).
|
|
network_common ifn_start
|
|
|
|
if [ -f /etc/rc.d/ipfilter ] ; then
|
|
# Resync ipfilter
|
|
/etc/rc.d/ipfilter quietresync
|
|
fi
|
|
if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then
|
|
/etc/rc.d/bridge start $cmdifn
|
|
fi
|
|
}
|
|
|
|
network_stop()
|
|
{
|
|
# Set the list of interfaces to work on.
|
|
#
|
|
cmdifn=$*
|
|
|
|
# Deconfigure the interface(s)
|
|
network_common ifn_stop
|
|
}
|
|
|
|
# network_common routine
|
|
# Common configuration subroutine for network interfaces. This
|
|
# routine takes all the preparatory steps needed for configuriing
|
|
# an interface and then calls $routine.
|
|
network_common()
|
|
{
|
|
local _cooked_list _fail _func _ok _str
|
|
|
|
_func=
|
|
|
|
if [ -z "$1" ]; then
|
|
err 1 "network_common(): No function name specified."
|
|
else
|
|
_func="$1"
|
|
fi
|
|
|
|
# Set the scope of the command (all interfaces or just one).
|
|
#
|
|
_cooked_list=
|
|
if [ -n "$cmdifn" ]; then
|
|
# Don't check that the interface(s) exist. We need to run
|
|
# the down code even when the interface doesn't exist to
|
|
# kill off wpa_supplicant.
|
|
# XXXBED: is this really true or does wpa_supplicant die?
|
|
# if so, we should get rid of the devd entry
|
|
_cooked_list="$cmdifn"
|
|
else
|
|
_cooked_list="`list_net_interfaces`"
|
|
fi
|
|
|
|
_fail=
|
|
_ok=
|
|
for ifn in ${_cooked_list}; do
|
|
if ${_func} ${ifn} $2; then
|
|
_ok="${_ok} ${ifn}"
|
|
else
|
|
_fail="${_fail} ${ifn}"
|
|
fi
|
|
done
|
|
|
|
_str=
|
|
if [ -n "${_ok}" ]; then
|
|
case ${_func} in
|
|
ifn_start)
|
|
_str='Starting'
|
|
;;
|
|
ifn_stop)
|
|
_str='Stopping'
|
|
;;
|
|
esac
|
|
echo "${_str} Network:${_ok}."
|
|
if check_startmsgs; then
|
|
for ifn in ${_ok}; do
|
|
/sbin/ifconfig ${ifn}
|
|
done
|
|
fi
|
|
fi
|
|
|
|
debug "The following interfaces were not configured: $_fail"
|
|
}
|
|
|
|
load_rc_config $name
|
|
run_rc_command $*
|