/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/wireless

  • Committer: teddy at recompile
  • Date: 2011-12-31 12:08:11 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231120811-pkvvjmqm53fx7w9x
* network-hooks.s/wireless (start): Wait until interface is up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,
23
20
 
24
21
CONFIG="$MANDOSNETHOOKDIR/wireless.conf"
25
22
 
26
 
addrtoif(){
27
 
    grep -liFe "$1" /sys/class/net/*/address \
28
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
29
 
}
30
 
 
31
23
# Read config file
32
24
if [ -e "$CONFIG" ]; then
33
25
    . "$CONFIG"
35
27
    exit
36
28
fi
37
29
 
38
 
ifkeys=`env | sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" \
39
 
    | sort -u`
 
30
interfaces="`env|sed -n -e 's/^\(MODULE\|IPADDRS\|ROUTES\|WPA_DRIVER\)_\([^=]*\)=.*/\2/p' \"$CONFIG\" |sort -u`"
40
31
 
41
32
# Exit if DEVICE is set and is not any of the wireless interfaces
42
33
if [ -n "$DEVICE" ]; then
43
34
    while :; do
44
 
        for KEY in $ifkeys; do
45
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
46
 
            INTERFACE=`addrtoif "$ADDRESS"`
47
 
            if [ "$INTERFACE" = "$DEVICE" ]; then
 
35
        for IF in $interfaces; do
 
36
            if [ "$IF" = "$DEVICE" ]; then
48
37
                break 2
49
38
            fi
50
39
        done
77
66
    start)
78
67
        mkdir -m u=rwx,go= -p "$CTRLDIR"
79
68
        "$wpa_supplicant" -B -g "$CTRL" -p "$CTRLDIR" $WPAS_OPTIONS
80
 
        for KEY in $ifkeys; do
81
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
82
 
            INTERFACE=`addrtoif "$ADDRESS"`
83
 
            DRIVER=`eval 'echo "$WPA_DRIVER_'"$KEY"\"`
84
 
            IFDELAY=`eval 'echo "$DELAY_'"$KEY"\"`
 
69
        for INTERFACE in $interfaces; do
 
70
            DRIVER=`eval 'echo "$WPA_DRIVER_'"$INTERFACE"\"`
 
71
            IFDELAY=`eval 'echo "$DELAY_'"$INTERFACE"\"`
85
72
            "$wpa_cli" -g "$CTRL" interface_add "$INTERFACE" "" \
86
73
                "${DRIVER:-wext}" "$CTRLDIR" > /dev/null \
87
74
                | sed -e '/^OK$/d'
88
 
            NETWORK=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" \
89
 
                add_network`
90
 
            eval wpa_interface_"$KEY"
 
75
            NETWORK=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" add_network`
 
76
            eval wpa_interface_"$INTERFACE"
91
77
            "$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" enable_network \
92
78
                "$NETWORK" | sed -e '/^OK$/d'
93
79
            sleep "${IFDELAY:-$DELAY}" &
94
80
            sleep=$!
95
81
            while :; do
96
82
                kill -0 $sleep 2>/dev/null || break
97
 
                STATE=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" \
98
 
                    status | sed -n -e 's/^wpa_state=//p'`
 
83
                STATE=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" status | sed -n -e 's/^wpa_state=//p'`
99
84
                if [ "$STATE" = COMPLETED ]; then
100
85
                    while :; do
101
86
                        kill -0 $sleep 2>/dev/null || break 2
110
95
                sleep 1
111
96
            done &
112
97
            wait $sleep || :
113
 
            IPADDRS=`eval 'echo "$IPADDRS_'"$KEY"\"`
 
98
            IPADDRS=`eval 'echo "$IPADDRS_'"$INTERFACE"\"`
114
99
            if [ -n "$IPADDRS" ]; then
115
100
                if [ "$IPADDRS" = dhcp ]; then
116
101
                    ipconfig -c dhcp -d "$INTERFACE" || :
121
106
                    done
122
107
                fi
123
108
            fi
124
 
            ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
 
109
            ROUTES=`eval 'echo "$ROUTES_'"$INTERFACE"\"`
125
110
            if [ -n "$ROUTES" ]; then
126
111
                for route in $ROUTES; do
127
112
                    "$ip" route add "$route" dev "$BRIDGE"
131
116
        ;;
132
117
    stop)
133
118
        "$wpa_cli" -g "$CTRL" terminate 2>&1 | sed -e '/^OK$/d'
134
 
        for KEY in $ifkeys; do
135
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
136
 
            INTERFACE=`addrtoif "$ADDRESS"`
 
119
        for INTERFACE in $interfaces; do
137
120
            "$ip" addr show scope global permanent dev "$INTERFACE" \
138
121
                | while read type addr rest; do
139
122
                case "$type" in