/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

Remove se.recompile.Mandos.NewRequest signal - its implemetation was
buggy and its utility was questionable.

* DBUS-API (se.recompile.Mandos.NewRequest): Removed.
* mandos (ClientDBus.NewRequest): Removed.  All emitters altered.

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