/mandos/release

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

« back to all changes in this revision

Viewing changes to network-hooks.d/wireless.conf

  • Committer: Teddy Hogeborn
  • Date: 2015-08-10 07:34:37 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150810073437-3m8jgt13nqric6vf
Revert change to D-Bus API.

The D-Bus API signal CheckerCompleted is documented to provide a
wait(2) status value.  Since the server switched to using subprocess
to run checkers, it no longer has access to a wait(2) status value.  A
previous change to work around this made the D-Bus API incompatible.
Revert this change by constructing a fake wait(2) status value; this
keeps the D-Bus API stable.

* DBUS-API (CheckerCompleted): Revert incompatible change.
* mandos (ClientDBus.checker_callback): Construct fake wait(2) status.
* mandos-monitor (MandosClientWidget.checker_completed): Revert to
                                                         using
                                                         original API
                                                         with wait(2)
                                                         condition
                                                         value.

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
#...