/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/bridge

  • Committer: teddy at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
15
15
 
16
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
17
17
 
18
 
# Read config file, which must set "BRIDGE", "PORTS", and optionally
19
 
# "IPADDRS" and "ROUTES".
 
18
addrtoif(){
 
19
    grep -liFe "$1" /sys/class/net/*/address | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
 
20
}
 
21
 
 
22
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
 
23
# optionally "IPADDRS" and "ROUTES".
20
24
if [ -e "$CONFIG" ]; then
21
25
    . "$CONFIG"
22
26
fi
23
27
 
24
 
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
 
28
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
25
29
    exit
26
30
fi
27
31
 
29
33
    exit
30
34
fi
31
35
 
 
36
for b in /sbin/brctl /usr/sbin/brctl; do
 
37
    if [ -e "$b" ]; then
 
38
        brctl="$b"
 
39
        break
 
40
    fi
 
41
done
 
42
 
32
43
case "$1" in
33
44
    start)
34
 
        brctl addbr "$BRIDGE"
35
 
        for port in $PORTS; do
36
 
            brctl addif "$BRIDGE" "$port"
 
45
        "$brctl" addbr "$BRIDGE"
 
46
        for address in $PORT_ADDRESSES; do
 
47
            interface=`addrtoif "$address"`
 
48
            "$brctl" addif "$BRIDGE" "$interface"
 
49
            ip link set dev "$interface" up
37
50
        done
38
 
        ip link set up "$BRIDGE"
 
51
        ip link set dev "$BRIDGE" up
 
52
        sleep "$DELAY"
39
53
        if [ -n "$IPADDRS" ]; then
40
54
            for ipaddr in $IPADDRS; do
41
55
                ip addr add "$ipaddr" dev "$BRIDGE"
48
62
        fi
49
63
        ;;
50
64
    stop)
51
 
        ip link set down "$BRIDGE"
52
 
        for port in $PORTS; do
53
 
            brctl delif "$BRIDGE" "$port"
 
65
        ip link set dev "$BRIDGE" down
 
66
        for address in $PORT_ADDRESSES; do
 
67
            interface=`addrtoif "$address"`
 
68
            ip link set dev "$interface" down
 
69
            "$brctl" delif "$BRIDGE" "$interface"
54
70
        done
55
 
        brctl delbr "$BRIDGE"
 
71
        "$brctl" delbr "$BRIDGE"
56
72
        ;;
57
73
    files)
58
74
        echo /bin/ip
59
 
        echo /usr/bin/brctl
 
75
        echo "$brctl"
 
76
        ;;
 
77
    modules)
 
78
        echo bridge
60
79
        ;;
61
80
esac