/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.conf

  • Committer: Teddy Hogeborn
  • Date: 2012-05-12 15:45:57 UTC
  • Revision ID: teddy@recompile.se-20120512154557-r1yzcb8su8byp4us
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call
                    self.send_changedstate() after change, not before.
  (Client.disable): Bug fix: Handle disable_initiator_tag and
                    checker_initiator_tag of 0.
  (Client.init_checker): Bug fix: Remove old checker_initiator_tag and
                         disable_initiator_tag, if any.
  (Client.bump_timeout): Bug fix: Remove old disable_initiator_tag, if
                         any.
  (ClientDBus.Timeout_dbus_property): Bug fix: Use self.expires.
  (ClientHandler.handle): Bug fix: timedelta_to_milliseconds is a
                          global function, not a class method.
* mandos-monitor (MandosClientWidget._update_timer_callback_lock):
  Removed.  All users changed.
  (MandosClientWidget.last_checked_ok): Removed (unused).
  (MandosClientWidget.__init__): Don't call self.using_timer().
  (MandosClientWidget.property_changed): Removed unused version.
  (MandosClientWidget.using_timer): Stop using the counter
                                    self._update_timer_callback_lock;
                                    be strictly boolean.
  (MandosClientWidget.need_approval): Don't call self.using_timer().
  (MandosClientWidget.update): Call self.using_timer() throughout.
                               Bug fix: Never show negative timers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/wireless.conf
 
1
# Extra options for wpa_supplicant, if any
 
2
#WPAS_OPTIONS=""
 
3
 
 
4
# wlan0
 
5
ADDRESS_0=00:11:22:33:44:55
 
6
MODULE_0=ath9k
 
7
#WPA_DRIVER_0=wext
 
8
wpa_interface_0(){
 
9
    # Use this format to set simple things:
 
10
    wpa_cli_set ssid home
 
11
    wpa_cli_set psk "secret passphrase"
 
12
    # Use this format to do more complex things with wpa_cli:
 
13
    #"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" bssid "$NETWORK" 00:11:22:33:44:55
 
14
    #"$wpa_cli" -g "$CTRL" ping
 
15
}
 
16
#DELAY_0=10
 
17
IPADDRS_0=dhcp
 
18
#IPADDRS_0="192.0.2.3/24 2001:DB8::aede:48ff:fe71:f6f2/32"
 
19
#ROUTES_0="192.0.2.0/24 2001:DB8::/32"
 
20
 
 
21
#ADDRESS_1=11:22:33:44:55:66
 
22
#MODULE_1=...
 
23
#...