/mandos/release

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

« back to all changes in this revision

Viewing changes to network-hooks.d/bridge

* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

Show diffs side-by-side

added added

removed removed

Lines of Context:
6
6
# configuration file(s) should be copied into the
7
7
# /etc/mandos/network-hooks.d directory.
8
8
 
9
# Copyright © 2012 Teddy Hogeborn
 
10
# Copyright © 2012 Björn Påhlsson
 
11
9
12
# Copying and distribution of this file, with or without modification,
10
13
# are permitted in any medium without royalty provided the copyright
11
14
# notice and this notice are preserved.  This file is offered as-is,
15
18
 
16
19
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
17
20
 
18
 
# Read config file, which must set "BRIDGE", "PORTS", and optionally
19
 
# "IPADDRS" and "ROUTES".
 
21
addrtoif(){
 
22
    grep -liFe "$1" /sys/class/net/*/address \
 
23
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
 
24
}
 
25
 
 
26
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
 
27
# optionally "IPADDRS" and "ROUTES".
20
28
if [ -e "$CONFIG" ]; then
21
29
    . "$CONFIG"
22
30
fi
23
31
 
24
 
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
 
32
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
25
33
    exit
26
34
fi
27
35
 
29
37
    exit
30
38
fi
31
39
 
32
 
for b in /sbin/brctl /usr/sbin/brctl; do
 
40
brctl="/sbin/brctl"
 
41
for b in "$brctl" /usr/sbin/brctl; do
33
42
    if [ -e "$b" ]; then
34
43
        brctl="$b"
35
44
        break
36
45
    fi
37
46
done
38
47
 
39
 
case "$1" in
40
 
    start)
41
 
        "$brctl" addbr "$BRIDGE"
42
 
        for port in $PORTS; do
43
 
            "$brctl" addif "$BRIDGE" "$port"
44
 
            ip link set up "$port"
45
 
        done
46
 
        ip link set up "$BRIDGE"
47
 
        sleep "$DELAY"
48
 
        if [ -n "$IPADDRS" ]; then
49
 
            for ipaddr in $IPADDRS; do
50
 
                ip addr add "$ipaddr" dev "$BRIDGE"
51
 
            done
52
 
        fi
53
 
        if [ -n "$ROUTES" ]; then
54
 
            for route in $ROUTES; do
55
 
                ip route add "$route" dev "$BRIDGE"
56
 
            done
57
 
        fi
58
 
        ;;
59
 
    stop)
60
 
        ip link set down "$BRIDGE"
61
 
        for port in $PORTS; do
62
 
            ip link set down "$port"
63
 
            "$brctl" delif "$BRIDGE" "$port"
64
 
        done
65
 
        "$brctl" delbr "$BRIDGE"
 
48
do_start(){
 
49
    "$brctl" addbr "$BRIDGE"
 
50
    for address in $PORT_ADDRESSES; do
 
51
        interface=`addrtoif "$address"`
 
52
        "$brctl" addif "$BRIDGE" "$interface"
 
53
        ip link set dev "$interface" up
 
54
    done
 
55
    ip link set dev "$BRIDGE" up
 
56
    sleep "${DELAY%%.*}"
 
57
    if [ -n "$IPADDRS" ]; then
 
58
        for ipaddr in $IPADDRS; do
 
59
            ip addr add "$ipaddr" dev "$BRIDGE"
 
60
        done
 
61
    fi
 
62
    if [ -n "$ROUTES" ]; then
 
63
        for route in $ROUTES; do
 
64
            ip route add "$route" dev "$BRIDGE"
 
65
        done
 
66
    fi
 
67
}
 
68
 
 
69
do_stop(){
 
70
    ip link set dev "$BRIDGE" down
 
71
    for address in $PORT_ADDRESSES; do
 
72
        interface=`addrtoif "$address"`
 
73
        ip link set dev "$interface" down
 
74
        "$brctl" delif "$BRIDGE" "$interface"
 
75
    done
 
76
    "$brctl" delbr "$BRIDGE"
 
77
}
 
78
 
 
79
case "${MODE:-$1}" in
 
80
    start|stop)
 
81
        do_"${MODE:-$1}"
66
82
        ;;
67
83
    files)
68
84
        echo /bin/ip