/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 Hogeborn
  • Date: 2012-05-06 16:13:00 UTC
  • Revision ID: teddy@recompile.se-20120506161300-43rls2rr4qub3zhw
* mandos: Use a class decorator instead of a metaclass to provide
          alternate D-Bus interface names on D-Bus object attributes.
  (alternate_dbus_interfaces): New class decorator.
  (AlternateDBusNamesMetaclass, ClientDBusTransitional,
   MandosDBusServiceTransitional): Removed; all users changed.
  (ClientDbus, MandosDBusService): Use new "alternate_dbus_interfaces"
                                   class decorator.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
    exit
36
36
fi
37
37
 
38
 
ifkeys=`sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" | sort -u`
 
38
ifkeys=`env | sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" \
 
39
    | sort -u`
39
40
 
40
41
# Exit if DEVICE is set and is not any of the wireless interfaces
41
42
if [ -n "$DEVICE" ]; then
43
44
        for KEY in $ifkeys; do
44
45
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
45
46
            INTERFACE=`addrtoif "$ADDRESS"`
46
 
            
47
 
            case "$DEVICE" in
48
 
                *,"$INTERFACE"|*,"$INTERFACE",*|"$INTERFACE",*|"$INTERFACE")
49
 
                    break 2;;
50
 
            esac
 
47
            if [ "$INTERFACE" = "$DEVICE" ]; then
 
48
                break 2
 
49
            fi
51
50
        done
52
51
        exit
53
52
    done
123
122
        ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
124
123
        if [ -n "$ROUTES" ]; then
125
124
            for route in $ROUTES; do
126
 
                "$ip" route add "$route" dev "$INTERFACE"
 
125
                "$ip" route add "$route" dev "$BRIDGE"
127
126
            done
128
127
        fi
129
128
    done