/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: 2012-02-26 11:47:19 UTC
  • mto: This revision was merged to the branch mainline in revision 561.
  • Revision ID: teddy@recompile.se-20120226114719-m3odq4s34ebt6hg8
Add facilities for D-Bus interface annotations and use them to mark
the old D-Bus interfaces as deprecated.

* mandos (dbus_interface_annotations): New decorator.
  (DBusObjectWithProperties._is_dbus_property): Removed.  All callers
                                                changed.
  (DBusObjectWithProperties._is_dbus_thing): New; generalized version
                                             of "_is_dbus_property".
  (DBusObjectWithProperties._get_all_dbus_properties): Removed.  All
                                                       callers
                                                       changed.
  (DBusObjectWithProperties._get_all_dbus_things): New; generalized
                                                   version of
                                                   "_get_all_dbus_properties".
  (DBusObjectWithProperties.Introspect): Also add interface
                                         annotation tags.
  (AlternateDBusNamesMetaclass.__new__): Also copy interface
                                         annotations.  Add
                                         "deprecated" annotation on
                                         old interface.
  (ClientDBus._foo): New interface annotation to mark non-compliance
                     with the standard property change signal
                     interface.
  (MandosDBusService): Inherit from DBusObjectWithProperties to get
                       interface annotation support.
  (MandosDBusService._foo): New interface annotation to mark
                            non-compliance with the standard property
                            change signal interface.

Show diffs side-by-side

added added

removed removed

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