/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

* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
  (add_argument): Added "nonnull" attribute on the "arg" argument.
  (add_environment): Added "nonnull" attribute on the "def" argument.
  (print_out_password, free_plugin): Added "nonnull" attribute.
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/mandos-client.c (perror_plus): Bug fix; restore errno
                                           after fprintf().
* plugins.d/password-prompt.c (fprintf_plus): New.
 (conflict_detection/is_plymouth, main/parse_opt): Added "nonnull"
                                                   attribute.
 (conflict_detection/is_plymouth, conflict_detection, main): Bug fix;
                                                             Call
                                                             error_plus()
                                                             instead
                                                             of
                                                             error().
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/plymouth.c (exec_and_wait): Added "nonnull" attribute on
                                        the "path" and "argv"
                                        arguments.
  (is_plymouth): Added "nonnull" attribute.

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
 
# 
12
9
# Copying and distribution of this file, with or without modification,
13
10
# are permitted in any medium without royalty provided the copyright
14
11
# notice and this notice are preserved.  This file is offered as-is,
18
15
 
19
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
20
17
 
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".
 
18
# Read config file, which must set "BRIDGE", "PORTS", and optionally
 
19
# "IPADDRS" and "ROUTES".
28
20
if [ -e "$CONFIG" ]; then
29
21
    . "$CONFIG"
30
22
fi
31
23
 
32
 
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
 
24
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
33
25
    exit
34
26
fi
35
27
 
37
29
    exit
38
30
fi
39
31
 
40
 
brctl="/sbin/brctl"
41
 
for b in "$brctl" /usr/sbin/brctl; do
 
32
for b in /sbin/brctl /usr/sbin/brctl; do
42
33
    if [ -e "$b" ]; then
43
34
        brctl="$b"
44
35
        break
45
36
    fi
46
37
done
47
38
 
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}"
 
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"
82
66
        ;;
83
67
    files)
84
68
        echo /bin/ip