/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: 2014-10-08 21:07:10 UTC
  • Revision ID: teddy@recompile.se-20141008210710-x0rg80z2aabdg05d
Handle local Zeroconf service name collisions.

Service name collisions from other servers have always been handled,
but not *local* name collisions from services on the same host.

* mandos (AvahiService/rename): Handle local Zeroconf service name
                                collision.
  (AvahiServiceToSyslog.rename): Pass on any extra arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/wireless
43
43
        for KEY in $ifkeys; do
44
44
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
45
45
            INTERFACE=`addrtoif "$ADDRESS"`
46
 
            if [ "$INTERFACE" = "$DEVICE" ]; then
47
 
                break 2
48
 
            fi
 
46
            
 
47
            case "$DEVICE" in
 
48
                *,"$INTERFACE"|*,"$INTERFACE",*|"$INTERFACE",*|"$INTERFACE")
 
49
                    break 2;;
 
50
            esac
49
51
        done
50
52
        exit
51
53
    done
121
123
        ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
122
124
        if [ -n "$ROUTES" ]; then
123
125
            for route in $ROUTES; do
124
 
                "$ip" route add "$route" dev "$BRIDGE"
 
126
                "$ip" route add "$route" dev "$INTERFACE"
125
127
            done
126
128
        fi
127
129
    done