/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

* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New
                                                           property.
* mandos (Client.last_checker_status): Use -2 instead of None to match
                                       D-Bus property.  All users
                                       changed.
  (Client.checked_ok): Remove "timeout" argument and call
                       "self.bump_timeout()" instead.
  (Client.bump_timeout): New; separated out from "checked_ok".
  (ClientDBus.last_checker_status): Hook to a D-Bus property.
  (ClientDBus.LastCheckerStatus_dbus_property): New D-Bus property.
  (ClientHandler.handle): Call client.bump_timeout() instead of
                          client.checked_ok().

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
 
9
# Copyright © 2011 Teddy Hogeborn
 
10
# Copyright © 2011 Björn Påhlsson
11
11
# 
12
12
# Copying and distribution of this file, with or without modification,
13
13
# are permitted in any medium without royalty provided the copyright
45
45
    fi
46
46
done
47
47
 
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}"
 
48
case "$1" in
 
49
    start)
 
50
        "$brctl" addbr "$BRIDGE"
 
51
        for address in $PORT_ADDRESSES; do
 
52
            interface=`addrtoif "$address"`
 
53
            "$brctl" addif "$BRIDGE" "$interface"
 
54
            ip link set dev "$interface" up
 
55
        done
 
56
        ip link set dev "$BRIDGE" up
 
57
        sleep "${DELAY%%.*}"
 
58
        if [ -n "$IPADDRS" ]; then
 
59
            for ipaddr in $IPADDRS; do
 
60
                ip addr add "$ipaddr" dev "$BRIDGE"
 
61
            done
 
62
        fi
 
63
        if [ -n "$ROUTES" ]; then
 
64
            for route in $ROUTES; do
 
65
                ip route add "$route" dev "$BRIDGE"
 
66
            done
 
67
        fi
 
68
        ;;
 
69
    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"
82
77
        ;;
83
78
    files)
84
79
        echo /bin/ip