/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 Hogeborn
  • Date: 2012-05-12 15:45:57 UTC
  • Revision ID: teddy@recompile.se-20120512154557-r1yzcb8su8byp4us
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
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,
17
20
 
18
21
addrtoif(){
19
22
    grep -liFe "$1" /sys/class/net/*/address \
20
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
 
23
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
21
24
}
22
25
 
23
26
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
34
37
    exit
35
38
fi
36
39
 
37
 
for b in /sbin/brctl /usr/sbin/brctl; do
 
40
brctl="/sbin/brctl"
 
41
for b in "$brctl" /usr/sbin/brctl; do
38
42
    if [ -e "$b" ]; then
39
43
        brctl="$b"
40
44
        break
41
45
    fi
42
46
done
43
47
 
44
 
case "$1" in
45
 
    start)
46
 
        "$brctl" addbr "$BRIDGE"
47
 
        for address in $PORT_ADDRESSES; do
48
 
            interface=`addrtoif "$address"`
49
 
            "$brctl" addif "$BRIDGE" "$interface"
50
 
            ip link set dev "$interface" up
51
 
        done
52
 
        ip link set dev "$BRIDGE" up
53
 
        sleep "$DELAY"
54
 
        if [ -n "$IPADDRS" ]; then
55
 
            for ipaddr in $IPADDRS; do
56
 
                ip addr add "$ipaddr" dev "$BRIDGE"
57
 
            done
58
 
        fi
59
 
        if [ -n "$ROUTES" ]; then
60
 
            for route in $ROUTES; do
61
 
                ip route add "$route" dev "$BRIDGE"
62
 
            done
63
 
        fi
64
 
        ;;
65
 
    stop)
66
 
        ip link set dev "$BRIDGE" down
67
 
        for address in $PORT_ADDRESSES; do
68
 
            interface=`addrtoif "$address"`
69
 
            ip link set dev "$interface" down
70
 
            "$brctl" delif "$BRIDGE" "$interface"
71
 
        done
72
 
        "$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}"
73
82
        ;;
74
83
    files)
75
84
        echo /bin/ip