/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

  • Committer: Teddy Hogeborn
  • Date: 2012-05-26 22:21:17 UTC
  • mto: (237.7.139 trunk)
  • mto: This revision was merged to the branch mainline in revision 301.
  • Revision ID: teddy@recompile.se-20120526222117-2n4oeb3hqyq4rjdh
* mandos: Implement "--socket" option.
  (IPv6_TCPServer.__init__): Take new "socketfd" parameter; use it.
  (MandosServer.__init__): Take new "socketfd" parameter.  Pass it on
                           to IPv6_TCPServer constructor.
  (main): Take new "--socket" option.  Also take "socket" parameter in
          "mandos.conf" configuration file.  If set, pass the value to
          MandosServer constructor.
* mandos-options.xml (socket): Document new "socket" option.
* mandos-conf.xml (OPTIONS): - '' -
* mandos.xml (SYNOPSIS, OPTIONS): Document new "--socket" option.

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 © 2011 Teddy Hogeborn
10
 
# Copyright © 2011 Björn Påhlsson
 
9
# Copyright © 2012 Teddy Hogeborn
 
10
# Copyright © 2012 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,'
 
23
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
24
24
}
25
25
 
26
26
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
37
37
    exit
38
38
fi
39
39
 
40
 
for b in /sbin/brctl /usr/sbin/brctl; do
 
40
brctl="/sbin/brctl"
 
41
for b in "$brctl" /usr/sbin/brctl; do
41
42
    if [ -e "$b" ]; then
42
43
        brctl="$b"
43
44
        break
44
45
    fi
45
46
done
46
47
 
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"
 
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}"
76
82
        ;;
77
83
    files)
78
84
        echo /bin/ip