mech_eap.git
10 years agoAndroid: wpa_supplicant: Use Ver 0.8.X as default
Dmitry Shmidt [Fri, 22 Nov 2013 18:37:07 +0000 (10:37 -0800)]
Android: wpa_supplicant: Use Ver 0.8.X as default

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: P2P: Remember country locale
Dmitry Shmidt [Thu, 12 Sep 2013 19:39:30 +0000 (12:39 -0700)]
Android: P2P: Remember country locale

This updates P2P modules based on the Android specific
DRIVER COUNTRY command.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add driver_cmd for arbitrary driver commands
Jouni Malinen [Thu, 7 Nov 2013 14:16:15 +0000 (16:16 +0200)]
Android: Add driver_cmd for arbitrary driver commands

This is a mechanism used in Android to extend driver interface in vendor
specific ways. This is included only for the purpose of Android
compatibility. Proper interface commands should be used for any new
functionality.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoAndroid: Add P2P/WPS wrappers for private lib
Jouni Malinen [Thu, 7 Nov 2013 14:18:44 +0000 (16:18 +0200)]
Android: Add P2P/WPS wrappers for private lib

Android uses a vendor specific library for implementing couple of driver
interface functions. Add the wrapper code to allow that mechanism to be
used.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoAndroid: Clean entire socket directory
Dmitry Shmidt [Thu, 5 Sep 2013 21:52:18 +0000 (14:52 -0700)]
Android: Clean entire socket directory

Despite interface (and group) related sockets are not used
for control, they are created and may be left.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agohostapd: Set proper VHT capabilities
Marek Kwaczynski [Thu, 21 Nov 2013 12:45:32 +0000 (13:45 +0100)]
hostapd: Set proper VHT capabilities

Set VHT capabilities defined in config file instead only supported
by the driver.

Signed-hostap: Marek Kwaczynski <marek.kwaczynski@tieto.com>

10 years agohostapd: Fix set beacon in multiple BSSID scenario
Marek Kwaczynski [Thu, 21 Nov 2013 12:33:09 +0000 (13:33 +0100)]
hostapd: Fix set beacon in multiple BSSID scenario

Check if the BSS interface has started before setting beacon.
Lack of this condition can cause segmantation fault.

Signed-hostap: Marek Kwaczynski <marek.kwaczynski@tieto.com>

10 years agoTDLS: Do not reenable TDLS link on retransmitted setup frame
Sunil Dutt [Thu, 21 Nov 2013 15:37:50 +0000 (21:07 +0530)]
TDLS: Do not reenable TDLS link on retransmitted setup frame

A reenable of the TDLS link while the host driver is already processing
the same (due to the retransmitted M2/M3 frames) might result in a
failed TDLS setup handshake due to some host driver's implementation.
Thus, issue enable link only when the peer's TDLS status signifies no
prior link (tpk_success=0).

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoVHT: Fix memory leak in STA entry
Jouni Malinen [Fri, 22 Nov 2013 11:48:02 +0000 (13:48 +0200)]
VHT: Fix memory leak in STA entry

Commit de3cdf354a30256ece16866ff5a283b66e1471ae adding copying of the
STA's VHT capabilities into the STA entry on the AP. This was done in
allocated memory, but that new memory allocation was not freed anywhere.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agotests: Verify that re-invoked P2P group is identified as persistent
Jouni Malinen [Thu, 21 Nov 2013 09:39:12 +0000 (11:39 +0200)]
tests: Verify that re-invoked P2P group is identified as persistent

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoUse monotonic clock for relative time for eloop if available
Johannes Berg [Wed, 20 Nov 2013 10:01:09 +0000 (11:01 +0100)]
Use monotonic clock for relative time for eloop if available

Relative time shouldn't be calculated based on gettimeofday
because that clock can jump (e.g., when the time is adjusted
by the system administrator.)

On systems where that is available, use CLOCK_BOOTTIME (on
fairly recent Linux systems, this clock takes into account
the time spend suspended) or CLOCK_MONOTONIC (on Linux and
some POSIX systems, this clock is just freely running with
no adjustments.)

Reported-by: Holger Schurig <holgerschurig@gmail.com>
Signed-hostap: Johannes Berg <johannes.berg@intel.com>

10 years agoFix and work around some MinGW compilation issues
Jouni Malinen [Wed, 20 Nov 2013 21:12:03 +0000 (23:12 +0200)]
Fix and work around some MinGW compilation issues

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoFix compiler warning for OpenSSL without HAVE_OCSP
Jouni Malinen [Wed, 20 Nov 2013 20:52:11 +0000 (22:52 +0200)]
Fix compiler warning for OpenSSL without HAVE_OCSP

Commit 080585c01a1e0ffc42577dd10d475f3ab01d0280 added ssl_ctx outside
ifdef HAVE_OCSP block that was the only user for this.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agohostapd: Fix interface enabling/disabling and DFS
Michal Kazior [Tue, 19 Nov 2013 10:08:47 +0000 (11:08 +0100)]
hostapd: Fix interface enabling/disabling and DFS

The 'started' state was tracked incorrectly. It also broke DFS
as it was using hostapd_enable/disable_iface() functions.

Signed-hostap: Michal Kazior <michal.kazior@tieto.com>

10 years agoSTA: Cancel sched_scan while initiating wps_reassoc
Jithu Jance [Wed, 20 Nov 2013 13:50:56 +0000 (19:20 +0530)]
STA: Cancel sched_scan while initiating wps_reassoc

Scan initiated from wps_nfc command context was ketp on
getting rescheduled due to an on-going scheduled scan. So
cancel sched_scan before issuing a reassociation scan.

Signed-hostap: Jithu Jance <jithu@broadcom.com>

10 years agoAdd Wi-Fi Direct to the build configuration example
Jouni Malinen [Wed, 20 Nov 2013 18:49:48 +0000 (20:49 +0200)]
Add Wi-Fi Direct to the build configuration example

In addition, include Wi-Fi Direct support for Android builds by
default.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agodbus_new: Add documentation for D-Bus TDLS methods
Paul Stewart [Mon, 18 Nov 2013 22:31:25 +0000 (14:31 -0800)]
dbus_new: Add documentation for D-Bus TDLS methods

Signed-hostap: Paul Stewart <pstew@chromium.org>

10 years agohwsim tests: Check kernel messages for lockdep complaints
Johannes Berg [Mon, 18 Nov 2013 15:38:06 +0000 (16:38 +0100)]
hwsim tests: Check kernel messages for lockdep complaints

Lockdep complaints are never good, so check for them in the
kernel messages, not just for warnings and bugs.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>

10 years agoP2P: Short scan wait to speed up the group re-invocation
Rashmi Ramanna [Tue, 12 Nov 2013 14:17:35 +0000 (19:47 +0530)]
P2P: Short scan wait to speed up the group re-invocation

The shorter 250 ms wait for the next scan request can be used also for
the case of persistent group re-invocation instead of just formation of
a new group. This speeds up the process and makes this more robust
especially in cases where the GO is using MCC.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoFix QoS Map Configure frame use
Jouni Malinen [Wed, 20 Nov 2013 10:08:09 +0000 (12:08 +0200)]
Fix QoS Map Configure frame use

The QoS Map Set element was passed in full to the driver instead of just
the payload of the element. This resulted in the updated QoS Map being
rejected. Validate the element id/len and send only the payload to the
driver.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Prefer U-NII-3 over U-NII-1 during channel selection
Jouni Malinen [Tue, 19 Nov 2013 11:04:21 +0000 (13:04 +0200)]
P2P: Prefer U-NII-3 over U-NII-1 during channel selection

Some devices disable use of U-NII-1 (channels 36-48) for P2P due to it
being indoor use only in number of locations. If U-NII-3 (channels
149-161) is available, try to pick a channel from that range first
during random channel selection to reduce likelihood of interoperability
issues.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Fix channel preference use for MCC p2p_connect
Jouni Malinen [Tue, 19 Nov 2013 10:39:29 +0000 (12:39 +0200)]
P2P: Fix channel preference use for MCC p2p_connect

Only force_freq was used in the wpas_p2p_set_own_freq_preference() call
which allowed the P2P module channel re-selection to ignore the
preference for using a channel we are already using. Fix this by setting
either force_freq or pref_freq as the preference based on which one is
set. This allows p2p_ignore_shared_freq parameter to be used whether to
prefer the shared frequency in this case.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Optimize default case for own freq preference setting
Jouni Malinen [Tue, 19 Nov 2013 10:29:25 +0000 (12:29 +0200)]
P2P: Optimize default case for own freq preference setting

There is no need to use wpas_p2p_num_unused_channels() here in the
default configuration of p2p_ignore_sahred_freq=0, so re-order the
conditions to skip that operation. This is a bit more efficient and the
debug log is also a bit cleaner in the default case.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Fix p2p_ignore_shared_freq=1 when inviting a peer
Jouni Malinen [Tue, 19 Nov 2013 10:26:16 +0000 (12:26 +0200)]
P2P: Fix p2p_ignore_shared_freq=1 when inviting a peer

p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to
ignore a preference for using the same channel on multiple interfaces.
However, it was not used when inviting a peer to re-invoke a persistent
group. This case needs special handling since the peer's channel list is
not available to perform channel reselection and the operating channel
indicated in the Invitation Request frames ends up getting used as the
operating channel if the transmitted of that frames becomes the GO.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Fix p2p_ignore_shared_freq=1 during invitation processing
Jouni Malinen [Tue, 19 Nov 2013 10:15:45 +0000 (12:15 +0200)]
P2P: Fix p2p_ignore_shared_freq=1 during invitation processing

p2p_ignore_shared_freq=1 was supposed to allow a MCC-capable device to
ignore a preference for using the same channel on multiple interfaces.
However, it was not used during processing of an Invitation Request. Fix
that case to use channel preference instead of channel forcing if free
channels are available. This allows p2p_ignore_shared_freq=1 case to
ignore the preference.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Clean up wpas_p2p_setup_freqs() debug message
Jouni Malinen [Mon, 18 Nov 2013 16:16:27 +0000 (18:16 +0200)]
P2P: Clean up wpas_p2p_setup_freqs() debug message

It is confusing to talk about current operating channels being
unavailable for P2P when there are no current operating channels. Make
the debug message easier to understand.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Clean up wpas_p2p_init_go_params()
Jouni Malinen [Mon, 18 Nov 2013 16:13:15 +0000 (18:13 +0200)]
P2P: Clean up wpas_p2p_init_go_params()

It is clearer if there is only a single loop of the channel list and
shared debug prints. In addition, the note about current operating
channels not being available is quite confusing if there are no
operating group, so make that part of the message conditional.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Prefer VHT channels for initial pick
Jouni Malinen [Mon, 18 Nov 2013 15:58:14 +0000 (17:58 +0200)]
P2P: Prefer VHT channels for initial pick

If there are no other preferences from local configuration or driver,
prefer a random VHT channel instead of falling back to the fixed
pre-configured channel or 5 GHz/HT40 channel preference.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Prefer HT40 channels for initial pick
Jouni Malinen [Mon, 18 Nov 2013 15:57:07 +0000 (17:57 +0200)]
P2P: Prefer HT40 channels for initial pick

If there are no other preferences from local configuration or driver,
prefer a random HT40 channel instead of falling back to the fixed
pre-configured channel or 5 GHz channel preference.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Prefer 5 GHz channels for initial pick
Jouni Malinen [Mon, 18 Nov 2013 15:55:04 +0000 (17:55 +0200)]
P2P: Prefer 5 GHz channels for initial pick

If there are no other preferences from local configuration or driver,
prefer a random 5 GHz channel instead of falling back to the fixed
pre-configured channel (which is selected by default to be 1, 6, or 11).

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Select VHT channel at random instead of using the first entry
Jouni Malinen [Mon, 18 Nov 2013 15:46:14 +0000 (17:46 +0200)]
P2P: Select VHT channel at random instead of using the first entry

Use the new p2p_channel_select() function to select a VHT channel
at random when no other preferences are in effect.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Select HT40 channel at random instead of using the first entry
Jouni Malinen [Mon, 18 Nov 2013 15:44:28 +0000 (17:44 +0200)]
P2P: Select HT40 channel at random instead of using the first entry

Use the new p2p_channel_select() function to select an HT40 channel
at random when no other preferences are in effect.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Move random channel selection into a helper function
Jouni Malinen [Mon, 18 Nov 2013 15:41:39 +0000 (17:41 +0200)]
P2P: Move random channel selection into a helper function

The new p2p_channel_select() function can be re-used to implement
random channel selection from a set of operating classes in all
places that need such functonality.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoP2P: Fix channel selection for MCC case
Jouni Malinen [Mon, 18 Nov 2013 14:53:44 +0000 (16:53 +0200)]
P2P: Fix channel selection for MCC case

Commit 0d08efa447a5c5fb20bbed18a2ced36a8afe9221 modified
wpas_p2p_setup_freqs() design to use number of MCC channels capability
from the driver. However, it resulted in regression on how the preferred
vs. forced channel selection is done in the case of a MCC device.
force_freq was set unconditionally even though this was supposed to be
done only if no additional channels are available. pref_freq needs to be
used when possible to avoid preventing connection.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoHandle legacy scan interruption of sched_scan/PNO
Jithu Jance [Thu, 17 Oct 2013 06:26:02 +0000 (11:56 +0530)]
Handle legacy scan interruption of sched_scan/PNO

While starting from PNO start context, the scheduled scan was not
setting the flag wpa_s->scanning. This was resulting in the subsequent
SCAN command to proceed further and send command to nl80211/cfg80211.
The expected behavior of cancelling sched_scan was not happening here.

While sched_scan is in progress and a legacy scan comes on the
cli/socket, the sched_scan is cancelled and normal scan is allowed to
continue. However, sometimes sched_scan cancelled event comes a bit
delayed and we will send out the scan command before the wpa_s->scanning
is cleared. Instead, reschedule the incoming scan req if the
wpa_s->scanning shows that it is still in progress.

Signed-hostap: Jithu Jance <jithu@broadcom.com>

10 years agowlantest: Add more pcapng notes on EAPOL processing
Jouni Malinen [Sun, 17 Nov 2013 21:43:11 +0000 (23:43 +0200)]
wlantest: Add more pcapng notes on EAPOL processing

Some of the MIC validation steps were not logged in the pcapng notes.
Add these to make the entries more consistent and to provide more
information to ease debugging.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agowlantest: Allow additional PTKs to be specified from a file
Jouni Malinen [Sun, 17 Nov 2013 20:52:15 +0000 (22:52 +0200)]
wlantest: Allow additional PTKs to be specified from a file

A text file with a hexdump of PTK (KCK|KEK=TK with 48 octets for CCMP or
64 octets for TKIP or alternative 16 or 32 octet TK for CCMP/TKIP) can
now be read from a file specified with the -T command line argument. If
the current known PTK fails to decrypt a frame (or if no current PTK is
known) all listed PTKs are iterated to see if any of them matches.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agotests: Use per-test case log/capture file from wlantest
Jouni Malinen [Sun, 17 Nov 2013 19:25:17 +0000 (21:25 +0200)]
tests: Use per-test case log/capture file from wlantest

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agowlantest: Add support for debug log timestamps
Jouni Malinen [Sun, 17 Nov 2013 19:44:53 +0000 (21:44 +0200)]
wlantest: Add support for debug log timestamps

The new command line argument -t can now be used to request wlantest to
include a timestamp in the log entries.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agowlantest: Add support for log output into a file
Jouni Malinen [Sun, 17 Nov 2013 19:16:29 +0000 (21:16 +0200)]
wlantest: Add support for log output into a file

This allows wlantest debug log output to be directed to a file so that
RELOG command can be used to rotate files more easily than stdout.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agowlantest: Add RELOG command to reopen log/capture files
Jouni Malinen [Sun, 17 Nov 2013 19:11:35 +0000 (21:11 +0200)]
wlantest: Add RELOG command to reopen log/capture files

This can be used similarly to the wpa_supplicant RELOG command to
rotate log and capture files.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoValidate P802.11ac test vector result
Jouni Malinen [Sun, 17 Nov 2013 18:32:32 +0000 (20:32 +0200)]
Validate P802.11ac test vector result

Verify the expected value against P802.11ac/D7.0 CCMP-256, GCMP-256,
BIP-GMAC-128, and BIP-GMAC-256 test vectors.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoExtend GCMP test vectors to include both MPDUs
Jouni Malinen [Sun, 17 Nov 2013 18:23:51 +0000 (20:23 +0200)]
Extend GCMP test vectors to include both MPDUs

IEEE Std 802.11ad-2012 includes two test vectors for GCMP. Verify both
of those and also verify that the results match the values in the
standard instead of just verifying that decrypted frame matches
original.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agotests: Verify GO channel switch behavior
Jouni Malinen [Sun, 17 Nov 2013 14:45:34 +0000 (16:45 +0200)]
tests: Verify GO channel switch behavior

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoAdd chan_switch to ctrl interface of wpa_supplicant and hostapd
Andrei Otcheretianski [Thu, 14 Nov 2013 10:28:32 +0000 (12:28 +0200)]
Add chan_switch to ctrl interface of wpa_supplicant and hostapd

Add chan_switch to the control interface of wpa_supplicant and hostapd,
and also to wpa_cli and hostapd_cli.

Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

10 years agoAdd AP channel switch mechanism
Andrei Otcheretianski [Thu, 14 Nov 2013 10:28:31 +0000 (12:28 +0200)]
Add AP channel switch mechanism

Build CSA settings and call the driver to perform the switch. Construct
Beacon, Probe Response, and (Re)Association Response frames both for CSA
period and for the new channel. These frames are built based on the
current configuration. Add CSA IE in Beacon and Probe Response frames.

Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

10 years agoMove AP parameter filling into a helper function
Andrei Otcheretianski [Thu, 14 Nov 2013 10:28:31 +0000 (12:28 +0200)]
Move AP parameter filling into a helper function

Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

10 years agonl80211: Add channel switch implementation
Andrei Otcheretianski [Thu, 14 Nov 2013 10:28:30 +0000 (12:28 +0200)]
nl80211: Add channel switch implementation

Implement nl80211 switch_channel() operation.
Publish flags indicating kernel support for channel switch.

Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

10 years agowpa_supplicant: Update channel switch driver interface
Andrei Otcheretianski [Thu, 14 Nov 2013 10:28:29 +0000 (12:28 +0200)]
wpa_supplicant: Update channel switch driver interface

Add csa_settings struct which holds parameters for CSA. Change driver
interface for switch_channel(), so that it will receive this struct and
not only the new frequency as it was before. This allows wpa_supplicant
to provide all the required parameters (beacons, proberesp, assocresp,
CSA IE) which are required by cfg80211 implementation.

Signed-hostap: Andrei Otcheretianski <andrei.otcheretianski@intel.com>

10 years agoeloop: Remove eloop_none.c
Jouni Malinen [Sun, 17 Nov 2013 13:51:28 +0000 (15:51 +0200)]
eloop: Remove eloop_none.c

This was supposed to be a minimal sample of eloop wrapper, but it is
unclear whether this is of that much use and the file has not been kept
up-to-date. Remove this file to reduce maintenance effort. The other
eloop*.c files can be used as a starting point if something new is
needed.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoSync with wireless-testing.git include/uapi/linux/nl80211.h
Jouni Malinen [Sun, 17 Nov 2013 10:30:44 +0000 (12:30 +0200)]
Sync with wireless-testing.git include/uapi/linux/nl80211.h

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoAndroid: Add state message sent after 'status' command
Dmitry Shmidt [Mon, 11 Nov 2013 20:52:59 +0000 (12:52 -0800)]
Android: Add state message sent after 'status' command

This triggers re-transmission of CTRL-EVENT-STATE-CHANGE and
CTRL-EVENT-CONNECTED events on STATUS command for Android framework
specific processing.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add SSID in supplicant change event
Dmitry Shmidt [Mon, 11 Nov 2013 20:25:17 +0000 (12:25 -0800)]
Android: Add SSID in supplicant change event

In addition, change wpa_s->pending_bssid to wpa_s->bssid for the BSSID
value in the event.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoSCARD: Clean up SIM/USIM selection
Masashi Honma [Sun, 17 Nov 2013 10:17:09 +0000 (12:17 +0200)]
SCARD: Clean up SIM/USIM selection

Commit eb324600295a570199a5e25eb64e60781a04fb74 left an unneeded
sim_type argument to scard_init(). Remove that unnecessary argument to
clean up the implementation.

Signed-hostap: Masashi Honma <masashi.honma@gmail.com>

10 years agodbus_new: Add DBus TDLS methods
Paul Stewart [Mon, 11 Nov 2013 20:13:55 +0000 (12:13 -0800)]
dbus_new: Add DBus TDLS methods

Add DBus methods for TDLS operations similar to those available
for the control interface. This includes Discover, Setup, and
Teardown commands. While here, add a method to query the TDLS
link status and add a DBus method for it.

Tested with CONFIG_TDLS enabled, on a TDLS-enabled host and
peer capable of TDLS:

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSStatus string:<peer-mac-address>

    yields: string "peer does not exist"

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSDiscover string:<peer-mac-address>

    yields no error

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSSetup string:<peer-mac-address>

    yields no error

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSStatus string:<peer-mac-address>

    yields: string "connected" after TDLS completes

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSTeardown string:<peer-mac-address>

    yields no error

    dbus-send --system --dest=fi.w1.wpa_supplicant1 --print-reply \
        /fi/w1/wpa_supplicant1/Interfaces/0 \
        fi.w1.wpa_supplicant1.Interface.TDLSStatus string:<peer-mac-address>

    yields: string "peer not connected"

Signed-hostap: Paul Stewart <pstew@chromium.org>

10 years agoRequest new scan only for the original interface
Jithu Jance [Sun, 17 Nov 2013 10:23:09 +0000 (12:23 +0200)]
Request new scan only for the original interface

Request new scan only for the interface for which the original scan
request and results has come. Otherwise while sharing scan results along
with P2P interfaces, the new scan will be requested on P2P interfaces.

Signed-hostap: Jithu Jance <jithu@broadcom.com>

10 years agoRemove old mechanism of skipping scan request rescheduling
Jouni Malinen [Sun, 17 Nov 2013 10:52:08 +0000 (12:52 +0200)]
Remove old mechanism of skipping scan request rescheduling

Since eloop_deplete_timeout() is doing practically same in
wpa_supplicant_req_scan(), revert the old mechanism from commit
7e1488494e0150ee7fdef83355266b5633c5c1b0 to avoid unnecessary work in
this function.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agoDeplete scan request if new time is less than remaining
Dmitry Shmidt [Mon, 11 Nov 2013 19:13:17 +0000 (11:13 -0800)]
Deplete scan request if new time is less than remaining

This avoids pushing out previous scheduled scan requests based on new
events.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agohwsim tests: Print failed tests nicer
Johannes Berg [Mon, 11 Nov 2013 16:19:33 +0000 (17:19 +0100)]
hwsim tests: Print failed tests nicer

There's no reason to format the failed tests as a python
list, just print a (space-separated) list of test names.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>

10 years agoP2P: Use negotiated channel from invitation for persistent GO
Vinay Krishna Eranna [Mon, 11 Nov 2013 08:03:54 +0000 (13:33 +0530)]
P2P: Use negotiated channel from invitation for persistent GO

During persistent group re-invocation, GO may end up using a different
channel as the operation channel compared to what was indicated in the
invitation frames. This may break the connection if the peer device ends
up scanning the GO only on the channel from the invitation frame. Fix
this by using the negotiated channel (if available) on the GO as the
operating channel instead of the channel that was provided in the
p2p_invite command to start negotiation.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoTDLS: Provide external control to specify the peers for setup
Sunil Dutt [Wed, 13 Nov 2013 11:35:44 +0000 (17:05 +0530)]
TDLS: Provide external control to specify the peers for setup

There are use cases requesting the host driver to initiate the TDLS
setup with the peer only when configured by the external applications.
Thus, enable this control by tdls_external_control=1 and pass the
requisite information for the specific TDLS operation to the driver
on the request from such use cases.

This operation mode expects the driver to initiate TDLS link
automatically based on signal strength and traffic to a peer and tear
down links whenever they are not used or suitable due to signal strength
etc. The list of peers with which such operations are to be performed
are provided with the TDLS driver operations.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agohostapd: Filter channel list updated events after country code change
Abhishek Singh [Wed, 13 Nov 2013 12:00:27 +0000 (17:30 +0530)]
hostapd: Filter channel list updated events after country code change

We were not filtering the EVENT_CHANNEL_LIST_CHANGED events based on the
regulatory hint initiator. So wait for EVENT_CHANNEL_LIST_CHANGED event
after our own change was triggered even when regulatory hint initiator
was the driver. This could result in the wait for the channel list to be
updated to be terminated before the real change has occurred and as
such, old channel list remaining in use when configuring
hostapd/wpa_supplicant country parameter. Fix this by filtering the
hints according to the initiator and only regulatory hints initiated by
user will be used to stop the wait.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agonl80211: Do not force interface down on deinit
Jouni Malinen [Sat, 9 Nov 2013 15:33:23 +0000 (17:33 +0200)]
nl80211: Do not force interface down on deinit

If wpa_supplicant or hostapd was started with the interface
already up, do not force interface down on deinit.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agonl80211: Do not for station mode on hostapd deinit
Jouni Malinen [Sat, 9 Nov 2013 15:29:32 +0000 (17:29 +0200)]
nl80211: Do not for station mode on hostapd deinit

If hostapd was started with the interface already in AP mode, leave the
interface in AP mode on deinit instead of unconditionally forcing it to
station mode.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agonl80211: Remove build time condition on HOSTAPD define
Jouni Malinen [Sat, 9 Nov 2013 15:22:49 +0000 (17:22 +0200)]
nl80211: Remove build time condition on HOSTAPD define

It is common to build wpa_supplicant with AP mode support and it is
justifiable to clean up driver_nl80211.c by removing the conditional
build blocks based on hostapd vs. wpa_supplicant builds.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agonl80211: Share more code between hostapd and wpa_supplicant
Jouni Malinen [Sat, 9 Nov 2013 14:18:39 +0000 (16:18 +0200)]
nl80211: Share more code between hostapd and wpa_supplicant

This gets rid of some ifdef HOSTAPD constructs and shares more
of the initialization code between hostapd and wpa_supplicant.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agonl80211: Remove read-only last_freq/last_freq_ht
Jouni Malinen [Sat, 9 Nov 2013 15:02:05 +0000 (17:02 +0200)]
nl80211: Remove read-only last_freq/last_freq_ht

These variables were originally used in hostapd to clear HT channel
information when exiting. However, that functionality was lost with
commit f019981aee20f53d29ee1079973e609517d6d7e6 when moving to a common
code for setting the channel. Taken into account that no one seems to
have missed this functionality over the last four years, it seems safe
to drop this rather than try to fix the old hostapd behavior.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agotests: Do not override existing .config from build.sh
Jouni Malinen [Sat, 9 Nov 2013 13:40:06 +0000 (15:40 +0200)]
tests: Do not override existing .config from build.sh

This allows the build.sh script to be used to rebuild binaries based on
existing configuration in addition to the initial case of preparing
suitable build configuration.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agotests: Remove duplicated mkdir for LOGDIR
Jouni Malinen [Sat, 9 Nov 2013 13:34:29 +0000 (15:34 +0200)]
tests: Remove duplicated mkdir for LOGDIR

LOGDIR directory is created automatically if LOGDIR variable was not
set. If the variable is set, that directory is expected to exist.

Signed-hostap: Jouni Malinen <j@w1.fi>

10 years agotests: Use proper admin group in start.sh
Michal Kazior [Fri, 8 Nov 2013 07:13:14 +0000 (08:13 +0100)]
tests: Use proper admin group in start.sh

wpa_supplicant configuration files had a hardcoded GROUP=admin. The
start.sh script failed on a system without admin group (some systems
have it named adm).

Generate configuration files with appropriate GROUP in the log dir
and use them.

Signed-hostap: Michal Kazior <michal.kazior@tieto.com>

10 years agoAndroid: Reset MD5OBJS value before += operation
Dmitry Shmidt [Sat, 9 Nov 2013 13:30:46 +0000 (15:30 +0200)]
Android: Reset MD5OBJS value before += operation

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Sync Android.mk with Makefile
Jouni Malinen [Fri, 8 Nov 2013 11:05:55 +0000 (13:05 +0200)]
Android: Sync Android.mk with Makefile

This brings in commit 0648c3b8f5c38bc2206758738278e074f6f5b11b changes
to add Linux tracing option for hostapd.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoAndroid: Sync Android.mk with Makefile
Jouni Malinen [Fri, 8 Nov 2013 11:00:32 +0000 (13:00 +0200)]
Android: Sync Android.mk with Makefile

This brings in commit fd2f2d0489635d590930bc0945fbc438ba1387e2 changes
to remove optional gnutls-extra dependency.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoAndroid: Sync Android.mk with Makefile
Jouni Malinen [Fri, 8 Nov 2013 10:57:19 +0000 (12:57 +0200)]
Android: Sync Android.mk with Makefile

This brings in commit 411f56705019ac5b13b4daf62f423fceb3c703e2 changes
to allow libdl to be linked in after OpenSSL.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoAndroid: Set proper path to keystore include dir
Dmitry Shmidt [Fri, 8 Nov 2013 02:17:26 +0000 (18:17 -0800)]
Android: Set proper path to keystore include dir

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add CONFIG_ACS option to makefile
Dmitry Shmidt [Fri, 8 Nov 2013 02:06:28 +0000 (18:06 -0800)]
Android: Add CONFIG_ACS option to makefile

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Fix CONFIG_EAP_PROXY option and move it to right place
Dmitry Shmidt [Fri, 8 Nov 2013 02:01:25 +0000 (18:01 -0800)]
Android: Fix CONFIG_EAP_PROXY option and move it to right place

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add CONFIG_IEEE80211AC option to makefile
Dmitry Shmidt [Fri, 8 Nov 2013 01:57:52 +0000 (17:57 -0800)]
Android: Add CONFIG_IEEE80211AC option to makefile

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add CONFIG_EAP_UNAUTH_TLS option to makefile
Dmitry Shmidt [Fri, 8 Nov 2013 01:54:48 +0000 (17:54 -0800)]
Android: Add CONFIG_EAP_UNAUTH_TLS option to makefile

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add liblog
Ying Wang [Thu, 7 Nov 2013 23:09:36 +0000 (15:09 -0800)]
Android: Add liblog

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Switch keystore to binder
Kenny Root [Thu, 7 Nov 2013 23:06:59 +0000 (15:06 -0800)]
Android: Switch keystore to binder

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Get rid of LOCAL_MODULE_TAGS := user
Joe Onorato [Tue, 22 May 2012 21:16:30 +0000 (14:16 -0700)]
Android: Get rid of LOCAL_MODULE_TAGS := user

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Restore OpenSSL ENGINE support
Kenny Root [Tue, 20 Mar 2012 20:05:25 +0000 (13:05 -0700)]
Android: Restore OpenSSL ENGINE support

We now use an OpenSSL ENGINE to support keystore functionality.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Remove obsolete keystore path
Kenny Root [Wed, 26 Jun 2013 21:57:31 +0000 (14:57 -0700)]
Android: Remove obsolete keystore path

It's not possible to get a raw private key from keystore anymore, so
this would fail every time anyway. Remove it so it doesn't confuse
anyone that looks at this code.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Use keystore ENGINE for private key operations
Kenny Root [Wed, 21 Mar 2012 00:00:47 +0000 (17:00 -0700)]
Android: Use keystore ENGINE for private key operations

The new keystore ENGINE is usable to perform private key operations when
we can't get the actual private key data. This is the case when hardware
crypto is enabled: the private key never leaves the hardware.

Subsequently, we need to be able to talk to OpenSSL ENGINEs that aren't
PKCS#11 or OpenSC. This just changes a few #define variables to allow us
to talk to our keystore engine without having one of those enabled and
without using a PIN.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Use correct header file path for capability.h
Nick Kralevich [Thu, 28 Feb 2013 21:55:41 +0000 (13:55 -0800)]
Android: Use correct header file path for capability.h

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agotests: Verify GAS query while associated
Jouni Malinen [Thu, 7 Nov 2013 22:26:16 +0000 (00:26 +0200)]
tests: Verify GAS query while associated

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agotests: Verify GAS fragmentation
Jouni Malinen [Thu, 7 Nov 2013 22:15:17 +0000 (00:15 +0200)]
tests: Verify GAS fragmentation

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agotests: Use only new scan results for Hotspot 2.0 test cases
Jouni Malinen [Thu, 7 Nov 2013 21:54:13 +0000 (23:54 +0200)]
tests: Use only new scan results for Hotspot 2.0 test cases

It looks like old scan results (different SSID for the same BSSID) could
cause test failures.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoGAS: Replenish AP station session timer to 5 seconds
Kyeyoon Park [Wed, 6 Nov 2013 21:20:28 +0000 (13:20 -0800)]
GAS: Replenish AP station session timer to 5 seconds

If remaining AP session timeout is less than 5 seconds
for an existing station, replenish the timeout to 5 seconds.
This allows stations to be able to recycle a dialog token
value beyond 5 seconds for GAS exchange.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoeloop: Add support for replenishing a registered timeout
Kyeyoon Park [Wed, 6 Nov 2013 08:11:35 +0000 (00:11 -0800)]
eloop: Add support for replenishing a registered timeout

eloop_replenish_timeout() finds a registered matching
<handler,eloop_data,user_data> timeout. If found, replenishes
the timeout if remaining time is less than the requested time.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agoAndroid: Remove obsolete WPA_UNICODE_SSID define
Dmitry Shmidt [Thu, 7 Nov 2013 21:57:59 +0000 (23:57 +0200)]
Android: Remove obsolete WPA_UNICODE_SSID define

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agohostapd: Allow hostapd_cli to work on Android
Jeff Johnson [Tue, 4 Sep 2012 05:12:17 +0000 (22:12 -0700)]
hostapd: Allow hostapd_cli to work on Android

Add definitions of the Android specific directories used for control
interface sockets so that hostapd_cli can connect to the Android
hostapd.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agonl80211: Work around nl_socket_set_nonblocking on Android
Jouni Malinen [Thu, 7 Nov 2013 14:02:23 +0000 (16:02 +0200)]
nl80211: Work around nl_socket_set_nonblocking on Android

system/core/libnl_2 does not include nl_socket_set_nonblocking(), so
need to implement that to fix the build.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

10 years agohostapd: Add option to send OBSS scan params
Paul Stewart [Wed, 4 Sep 2013 15:59:52 +0000 (08:59 -0700)]
hostapd: Add option to send OBSS scan params

Add a parameter to send the overlapping BSS scan parameter
information element. This will require clients to perform
background scans to check for neigbors overlapping this
HT40 BSS. Since the implementation is incomplete it should
only be used for testing.

Signed-hostap: Paul Stewart <pstew@chromium.org>

10 years agoAndroid: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER
Dmitry Shmidt [Mon, 11 Jun 2012 19:51:06 +0000 (12:51 -0700)]
Android: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoProhibit PNO start during assoc process and in connect state
Dmitry Shmidt [Wed, 6 Nov 2013 02:08:27 +0000 (18:08 -0800)]
Prohibit PNO start during assoc process and in connect state

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Add ANDROID_P2P define under BOARD_WLAN_DEVICE
Dmitry Shmidt [Wed, 6 Nov 2013 01:07:56 +0000 (17:07 -0800)]
Android: Add ANDROID_P2P define under BOARD_WLAN_DEVICE

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agoAndroid: Fix CFLAGS -> L_CFLAGS
Dmitry Shmidt [Wed, 6 Nov 2013 00:45:35 +0000 (16:45 -0800)]
Android: Fix CFLAGS -> L_CFLAGS

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
10 years agohwsim tests: Make channel configuration for VM tests easier
Johannes Berg [Wed, 6 Nov 2013 13:11:17 +0000 (14:11 +0100)]
hwsim tests: Make channel configuration for VM tests easier

Add a CHANNELS configuration to the script running the VM
that can be added to the vm-config file to allow running
the tests with hwsim devices supporting more than a single
channel.

Eventually, with the (hopefully) upcoming dynamic work in
mac80211_hwsim, this might go away entirely, but for now
this allows testing more code paths.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>