/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/wireless

  • 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/wireless
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,
21
24
CONFIG="$MANDOSNETHOOKDIR/wireless.conf"
22
25
 
23
26
addrtoif(){
24
 
    grep -liFe "$1" /sys/class/net/*/address | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
 
27
    grep -liFe "$1" /sys/class/net/*/address \
 
28
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
25
29
}
26
30
 
27
31
# Read config file
31
35
    exit
32
36
fi
33
37
 
34
 
ifkeys="`env | sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' \"$CONFIG\" | sort -u`"
 
38
ifkeys=`sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" | sort -u`
35
39
 
36
40
# Exit if DEVICE is set and is not any of the wireless interfaces
37
41
if [ -n "$DEVICE" ]; then
68
72
    WPAS_OPTIONS="-P$PIDFILE $WPAS_OPTIONS"
69
73
fi
70
74
 
71
 
case "${MODE:-$1}" in
72
 
    start)
73
 
        mkdir -m u=rwx,go= -p "$CTRLDIR"
74
 
        "$wpa_supplicant" -B -g "$CTRL" -p "$CTRLDIR" $WPAS_OPTIONS
75
 
        for KEY in $ifkeys; do
76
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
77
 
            INTERFACE=`addrtoif "$ADDRESS"`
78
 
            DRIVER=`eval 'echo "$WPA_DRIVER_'"$KEY"\"`
79
 
            IFDELAY=`eval 'echo "$DELAY_'"$KEY"\"`
80
 
            "$wpa_cli" -g "$CTRL" interface_add "$INTERFACE" "" \
81
 
                "${DRIVER:-wext}" "$CTRLDIR" > /dev/null \
82
 
                | sed -e '/^OK$/d'
83
 
            NETWORK=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" add_network`
84
 
            eval wpa_interface_"$KEY"
85
 
            "$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" enable_network \
86
 
                "$NETWORK" | sed -e '/^OK$/d'
87
 
            sleep "${IFDELAY:-$DELAY}" &
88
 
            sleep=$!
89
 
            while :; do
90
 
                kill -0 $sleep 2>/dev/null || break
91
 
                STATE=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" status | sed -n -e 's/^wpa_state=//p'`
92
 
                if [ "$STATE" = COMPLETED ]; then
93
 
                    while :; do
94
 
                        kill -0 $sleep 2>/dev/null || break 2
95
 
                        UP=`cat /sys/class/net/"$INTERFACE"/operstate`
96
 
                        if [ "$UP" = up ]; then
97
 
                            kill $sleep 2>/dev/null
98
 
                            break 2
99
 
                        fi
100
 
                        sleep 1
101
 
                    done
102
 
                fi
103
 
                sleep 1
104
 
            done &
105
 
            wait $sleep || :
106
 
            IPADDRS=`eval 'echo "$IPADDRS_'"$KEY"\"`
107
 
            if [ -n "$IPADDRS" ]; then
108
 
                if [ "$IPADDRS" = dhcp ]; then
109
 
                    ipconfig -c dhcp -d "$INTERFACE" || :
110
 
                    #dhclient "$INTERFACE"
111
 
                else
112
 
                    for ipaddr in $IPADDRS; do
113
 
                        "$ip" addr add "$ipaddr" dev "$INTERFACE"
114
 
                    done
115
 
                fi
116
 
            fi
117
 
            ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
118
 
            if [ -n "$ROUTES" ]; then
119
 
                for route in $ROUTES; do
120
 
                    "$ip" route add "$route" dev "$BRIDGE"
121
 
                done
122
 
            fi
123
 
        done
124
 
        ;;
125
 
    stop)
126
 
        "$wpa_cli" -g "$CTRL" terminate 2>&1 | sed -e '/^OK$/d'
127
 
        for KEY in $ifkeys; do
128
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
129
 
            INTERFACE=`addrtoif "$ADDRESS"`
130
 
            "$ip" addr show scope global permanent dev "$INTERFACE" \
131
 
                | while read type addr rest; do
 
75
do_start(){
 
76
    mkdir -m u=rwx,go= -p "$CTRLDIR"
 
77
    "$wpa_supplicant" -B -g "$CTRL" -p "$CTRLDIR" $WPAS_OPTIONS
 
78
    for KEY in $ifkeys; do
 
79
        ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
 
80
        INTERFACE=`addrtoif "$ADDRESS"`
 
81
        DRIVER=`eval 'echo "$WPA_DRIVER_'"$KEY"\"`
 
82
        IFDELAY=`eval 'echo "$DELAY_'"$KEY"\"`
 
83
        "$wpa_cli" -g "$CTRL" interface_add "$INTERFACE" "" \
 
84
            "${DRIVER:-wext}" "$CTRLDIR" > /dev/null \
 
85
            | sed -e '/^OK$/d'
 
86
        NETWORK=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" add_network`
 
87
        eval wpa_interface_"$KEY"
 
88
        "$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" enable_network \
 
89
            "$NETWORK" | sed -e '/^OK$/d'
 
90
        sleep "${IFDELAY:-$DELAY}" &
 
91
        sleep=$!
 
92
        while :; do
 
93
            kill -0 $sleep 2>/dev/null || break
 
94
            STATE=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" status \
 
95
                | sed -n -e 's/^wpa_state=//p'`
 
96
            if [ "$STATE" = COMPLETED ]; then
 
97
                while :; do
 
98
                    kill -0 $sleep 2>/dev/null || break 2
 
99
                    UP=`cat /sys/class/net/"$INTERFACE"/operstate`
 
100
                    if [ "$UP" = up ]; then
 
101
                        kill $sleep 2>/dev/null
 
102
                        break 2
 
103
                    fi
 
104
                    sleep 1
 
105
                done
 
106
            fi
 
107
            sleep 1
 
108
        done &
 
109
        wait $sleep || :
 
110
        IPADDRS=`eval 'echo "$IPADDRS_'"$KEY"\"`
 
111
        if [ -n "$IPADDRS" ]; then
 
112
            if [ "$IPADDRS" = dhcp ]; then
 
113
                ipconfig -c dhcp -d "$INTERFACE" || :
 
114
                #dhclient "$INTERFACE"
 
115
            else
 
116
                for ipaddr in $IPADDRS; do
 
117
                    "$ip" addr add "$ipaddr" dev "$INTERFACE"
 
118
                done
 
119
            fi
 
120
        fi
 
121
        ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
 
122
        if [ -n "$ROUTES" ]; then
 
123
            for route in $ROUTES; do
 
124
                "$ip" route add "$route" dev "$BRIDGE"
 
125
            done
 
126
        fi
 
127
    done
 
128
}
 
129
 
 
130
do_stop(){
 
131
    "$wpa_cli" -g "$CTRL" terminate 2>&1 | sed -e '/^OK$/d'
 
132
    for KEY in $ifkeys; do
 
133
        ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
 
134
        INTERFACE=`addrtoif "$ADDRESS"`
 
135
        "$ip" addr show scope global permanent dev "$INTERFACE" \
 
136
            | while read type addr rest; do
132
137
                case "$type" in
133
138
                    inet|inet6)
134
139
                        "$ip" addr del "$addr" dev "$INTERFACE"
135
140
                        ;;
136
141
                esac
137
142
            done
138
 
            "$ip" link set dev "$INTERFACE" down
139
 
        done
 
143
        "$ip" link set dev "$INTERFACE" down
 
144
    done
 
145
}
 
146
 
 
147
case "${MODE:-$1}" in
 
148
    start|stop)
 
149
        do_"${MODE:-$1}"
140
150
        ;;
141
151
    files)
142
152
        echo "$wpa_supplicant"