From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: development@lists.ipfire.org Subject: [PATCH 3/4] network: Rename MACVTAP script Date: Thu, 29 Dec 2016 20:37:33 +0100 Message-ID: <1483040254-15683-3-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1483040254-15683-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8055707021891701036==" List-Id: --===============8055707021891701036== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This script is creating common bridges now, too and therefore needs a more generic name. Signed-off-by: Jonatan Schlag --- config/rootfiles/common/udev | 2 +- config/udev/60-net.rules | 4 +- config/udev/network-hotplug-bridges | 114 ++++++++++++++++++++++++++++++++++= ++ config/udev/network-hotplug-macvtap | 114 ----------------------------------= -- lfs/udev | 4 +- 5 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 config/udev/network-hotplug-bridges delete mode 100644 config/udev/network-hotplug-macvtap diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev index e1f4bd5..1ba82d0 100644 --- a/config/rootfiles/common/udev +++ b/config/rootfiles/common/udev @@ -28,7 +28,7 @@ lib/udev #lib/udev/hwdb.d/60-keyboard.hwdb #lib/udev/init-net-rules.sh #lib/udev/mtd_probe -#lib/udev/network-hotplug-macvtap +#lib/udev/network-hotplug-bridges #lib/udev/network-hotplug-rename #lib/udev/network-hotplug-vlan #lib/udev/rule_generator.functions diff --git a/config/udev/60-net.rules b/config/udev/60-net.rules index e031e7a..fff7513 100644 --- a/config/udev/60-net.rules +++ b/config/udev/60-net.rules @@ -6,5 +6,5 @@ ACTION=3D=3D"add", SUBSYSTEM=3D=3D"net", PROGRAM=3D"/lib/udev= /network-hotplug-rename", RES # that has just come up. ACTION=3D=3D"add", SUBSYSTEM=3D=3D"net", RUN+=3D"/lib/udev/network-hotplug-v= lan" =20 -# Call a script that will set up macvtap interfaces -ACTION=3D=3D"add", SUBSYSTEM=3D=3D"net", RUN+=3D"/lib/udev/network-hotplug-m= acvtap" +# Call a script that will set up zones as bridges +ACTION=3D=3D"add", SUBSYSTEM=3D=3D"net", RUN+=3D"/lib/udev/network-hotplug-b= ridges" diff --git a/config/udev/network-hotplug-bridges b/config/udev/network-hotplu= g-bridges new file mode 100644 index 0000000..ff6d20a --- /dev/null +++ b/config/udev/network-hotplug-bridges @@ -0,0 +1,114 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire Team = # +# # +############################################################################ + +[ -n "${INTERFACE}" ] || exit 2 + +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + +detect_zone() { + local intf=3D"${INTERFACE%0*}" + intf=3D"${intf^^}" + + local zone + for zone in GREEN BLUE ORANGE RED; do + # Try to find if INTERFACE is the *phys version of a zone + if [ "${intf}" =3D "${zone}" ]; then + echo "${zone}" + return 0 + fi + + # Try to find out if this INTERFACE is a slave of a zone + local slave + for slave in $(get_value "${zone}_SLAVES"); do + if [ "${INTERFACE}" =3D "${slave}" ]; then + echo "${zone}" + return 0 + fi + done + done + + return 1 +} + +get_value() { + echo "${!1}" +} + +random_mac_address() { + local address=3D"02" + + for i in $(seq 5); do + printf -v address "${address}:%02x" "$(( RANDOM % 256 ))" + done + + echo "${address}" +} + +# Try to detect which zone we are operating on +ZONE=3D$(detect_zone) + +# Cannot proceed if we could not find a zone +if [ -z "${ZONE}" ]; then + exit 0 +fi + +# Determine the mode of this zone +MODE=3D"$(get_value "${ZONE}_MODE")" + +# The name of the virtual bridge +BRIDGE=3D"$(get_value "${ZONE}_DEV")" + +case "${MODE}" in + bridge) + ADDRESS=3D"$(get_value "${ZONE}_MACADDR")" + [ -n "${ADDRESS}" ] || ADDRESS=3D"$(random_mac_address)" + + # We need to create the bridge if it doesn't exist, yet + if [ ! -d "/sys/class/net/${BRIDGE}" ]; then + ip link add "${BRIDGE}" address "${ADDRESS}" type bridge + #ip link set "${BRIDGE}" up + fi + + # Attach the physical device + ip link set dev "${INTERFACE}" master "${BRIDGE}" + ip link set dev "${INTERFACE}" up + ;; + + macvtap) + ADDRESS=3D"$( = # -# # -############################################################################ - -[ -n "${INTERFACE}" ] || exit 2 - -eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - -detect_zone() { - local intf=3D"${INTERFACE%0*}" - intf=3D"${intf^^}" - - local zone - for zone in GREEN BLUE ORANGE RED; do - # Try to find if INTERFACE is the *phys version of a zone - if [ "${intf}" =3D "${zone}" ]; then - echo "${zone}" - return 0 - fi - - # Try to find out if this INTERFACE is a slave of a zone - local slave - for slave in $(get_value "${zone}_SLAVES"); do - if [ "${INTERFACE}" =3D "${slave}" ]; then - echo "${zone}" - return 0 - fi - done - done - - return 1 -} - -get_value() { - echo "${!1}" -} - -random_mac_address() { - local address=3D"02" - - for i in $(seq 5); do - printf -v address "${address}:%02x" "$(( RANDOM % 256 ))" - done - - echo "${address}" -} - -# Try to detect which zone we are operating on -ZONE=3D$(detect_zone) - -# Cannot proceed if we could not find a zone -if [ -z "${ZONE}" ]; then - exit 0 -fi - -# Determine the mode of this zone -MODE=3D"$(get_value "${ZONE}_MODE")" - -# The name of the virtual bridge -BRIDGE=3D"$(get_value "${ZONE}_DEV")" - -case "${MODE}" in - bridge) - ADDRESS=3D"$(get_value "${ZONE}_MACADDR")" - [ -n "${ADDRESS}" ] || ADDRESS=3D"$(random_mac_address)" - - # We need to create the bridge if it doesn't exist, yet - if [ ! -d "/sys/class/net/${BRIDGE}" ]; then - ip link add "${BRIDGE}" address "${ADDRESS}" type bridge - #ip link set "${BRIDGE}" up - fi - - # Attach the physical device - ip link set dev "${INTERFACE}" master "${BRIDGE}" - ip link set dev "${INTERFACE}" up - ;; - - macvtap) - ADDRESS=3D"$(