Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Simplify ieee802_1x_mka_sak_use_body_present()
to_use_sak is a Boolean variable, so there is no need for an if
statement to figure out whether to return TRUE or FALSE.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Reorganize loops in number of KaY functions
Use for loop to remove unnecessary goto use and similar cleanup to
simplify the loops in ieee802_1x_mka_i_in_peerlist(),
ieee802_1x_mka_decode_live_peer_body(), and
ieee802_1x_kay_decode_mkpdu().
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Remove unused body_peer incrementation
Each loop iteration resets body_peer in the beginning, so there is no
need to increment this pointer in the end.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Add reset_participant_mi() helper
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Clean up printf formats
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Use named initializers for static structs
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Fri, 12 Aug 2016 13:07:33 +0000 (15:07 +0200)]
mka: Add MKA_ALIGN_LENGTH macro
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Add helper functions for dumping and creating peer
This allows more code reuse for creating live/potential peer and dumping
peer entries.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Clean up ieee802_1x_kay_get_cipher_suite() lookup function
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Refactor the get_*_peer() functions
Add ieee802_1x_kay_get_potential_peer() similarly to the previously used
ieee802_1x_kay_get_live_peer() and use these helper functions more
consistently to avoid multiple implementations of peer lookups.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Fix a typo in mka_body_handler (mak to mka)
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Add a helper function, sci_equal(), for sci comparison
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Use less bitfields in the IEEE 802.1X-2010 structs
This splits the u32 bitfields into u8 variables and using bitfields only
for the cases where under 8-bit fields are used.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Mon, 15 Aug 2016 09:43:41 +0000 (11:43 +0200)]
mka: Fix a typo in macsec_capbility
Spell "capability" correctly in the variable name.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Jouni Malinen [Mon, 22 Aug 2016 16:22:01 +0000 (19:22 +0300)]
tests: Allow regdb missing some op classes in mbo_supp_oper_classes
Not all installed regdb files include channels for global operating
classes 121-123, and 129.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Mon, 22 Aug 2016 10:17:44 +0000 (13:17 +0300)]
tests: Make FST kill_pid() more robust
It looks like the attempt to read the process id from a PID file can
return empty data. This resulted in kill_pid() failing to kill the
process and all the following FST test cases using the extra interface
failing. While the PID file is really supposed to have a valid PID value
when we get this far, it is better to try multiple times to avoid
failing large number of test cases.
The current os_daemonize() implementation ends up calling daemon() first
and then writing the PID file from the remaining process that is running
in the background. This leaves a short race condition where an external
process that started hostapd/wpa_supplicant could end up trying to read
the PID file before it has been written.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Fri, 19 Aug 2016 13:31:03 +0000 (16:31 +0300)]
tests: hostapd and ctrl_iface commands when BSS not yet fully enabled
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Fri, 19 Aug 2016 13:29:22 +0000 (16:29 +0300)]
Initialize hapd->nr_db in hostapd_alloc_bss_data()
Previously, this was initialized in hostapd_setup_bss() which made it
possible for a REMOVE_NEIGHBOR control interface command to be issued
prior to the list head pointers having been set. That resulted in a NULL
pointer dereference. Fix this by initializing the list head at the time
the data structure gets allocated.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Fri, 19 Aug 2016 13:26:48 +0000 (16:26 +0300)]
Fix TRACK_STA_LIST before BSS enabled
This hostapd control interface command could hit a NULL pointer
dereference if issued before the BSS was enabled.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Fri, 19 Aug 2016 09:24:15 +0000 (12:24 +0300)]
Check for driver initialization before doing driver operations
Number of hostapd control interface commands (e.g., STATUS-DRIVER) could
result in NULL pointer dereference when issued on not yet enabled BSS.
Fix this by checking that the driver interface has been initialized
before calling the driver_ops function.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Eduardo Abinader [Wed, 17 Aug 2016 17:29:39 +0000 (19:29 +0200)]
radius: Sanity check for NULL pointer segfault
When the RADIUS client has not yet been fully enabled, MIB command was
segfaulting hostapd.
Signed-off-by: Eduardo Abinader <eduardoabinader@gmail.com>
Roshan Pius [Tue, 19 Jul 2016 17:44:22 +0000 (10:44 -0700)]
Move network add/remove operations to a common function
All the 3 control interfaces: socket based, dbus & binder needs to
perform the same sequence of steps for network add/remove. So, move
these to a common utility method in |wpa_supplicant.c| instead of
duplicating the code everywhere.
Signed-off-by: Roshan Pius <rpius@google.com>
Masashi Honma [Fri, 5 Aug 2016 08:35:31 +0000 (17:35 +0900)]
mesh: Report HT operation mode to kernel
Report HT operation mode to kernel to broadcast correct IE in beacon
(for example HT operation IE).
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 5 Aug 2016 08:35:30 +0000 (17:35 +0900)]
mesh: Use WPA_DRIVER_MESH_CONF_FLAG_* as modification flag
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 5 Aug 2016 08:35:29 +0000 (17:35 +0900)]
mesh: Do NL80211_MESHCONF_* setting in single function
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 5 Aug 2016 08:35:28 +0000 (17:35 +0900)]
mesh: Move max_peer_links parameter to appropriate struct
Accoding to the comment of struct wpa_driver_mesh_bss_params, the
max_peer_links parameter should be under that struct.
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Jouni Malinen [Thu, 18 Aug 2016 17:06:09 +0000 (20:06 +0300)]
tests: IAPP and multiple BSSes
This verifies IAPP socket registration from multiple hostapd interfaces.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Petko Bordjukov [Mon, 8 Aug 2016 15:46:28 +0000 (18:46 +0300)]
IAPP: Set SO_REUSEADDR on listening socket
Make it possible for several instances of hostapd to listen on the same
network interface.
Signed-off-by: Petko Bordjukov <bordjukov@gmail.com>
Christopher Wiley [Wed, 17 Aug 2016 17:21:01 +0000 (17:21 +0000)]
Add init fragment for hostapd on Android
This fragment defines how the Android init system should start hostapd
as a standalone service. Previously, hostapd was fork/exec'd from
Android's netd. This left hostapd with some dangling file descriptors
and a process parent minimally interested in acting as init for child
processes.
Signed-off-by: Christopher Wiley <wiley@google.com>
Masashi Honma [Thu, 18 Aug 2016 01:06:44 +0000 (10:06 +0900)]
mesh: Simplify HT40 check code
The ht40 variable can only have values -1 or 1 here, so need to try to
address ht40 == 0 case.
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Thu, 18 Aug 2016 01:06:43 +0000 (10:06 +0900)]
mesh: Set correct secondary channel offset if HT40 is disabled
Previously, secondary channel offset could be non zero even though
disable_ht40=1. This patch fixes it.
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Jouni Malinen [Thu, 18 Aug 2016 07:42:56 +0000 (10:42 +0300)]
tests: hostapd and MIB ctrl_iface command with open network
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Johannes Berg [Tue, 16 Aug 2016 13:06:59 +0000 (15:06 +0200)]
ap: Use is_multicast_ether_addr() more
Various checks should use is_multicast_ether_addr() instead
of hardcoding the equivalent, change it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Eduardo Abinader [Tue, 16 Aug 2016 15:43:04 +0000 (17:43 +0200)]
nl80211: Remove duplicated check in nl80211_setup_ap()
Just removing a duplicated condition.
Signed-off-by: Eduardo Abinader <eduardoabinader@gmail.com>
Jouni Malinen [Tue, 16 Aug 2016 19:40:03 +0000 (22:40 +0300)]
tests: IEEE 802.1X + WEP reauthentication
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Johannes Berg [Wed, 17 Aug 2016 09:40:25 +0000 (11:40 +0200)]
nl80211: Fix control port protocol no-encrypt setting
Previously, driver_nl80211 sets NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT in
AP mode, to get EAPOL frames out unencrypted when using IEEE 802.1X/WEP.
However, due to the way nl80211/cfg80211 is implemented, this attribute
is ignored by the kernel if NL80211_ATTR_CONTROL_PORT_ETHERTYPE isn't
specified as well. Fix this by including
NL80211_ATTR_CONTROL_PORT_ETHERTYPE set to ETH_P_PAE. This can be done
unconditionally, since the kernel will allow ETH_P_PAE to be set even
when the driver didn't advertise support for arbitrary ethertypes.
Additionally, the params->pairwise_ciphers appear to not be set at
this point, so relax the check and allow them to be zero.
In client mode, this whole thing was missing, so add it. Again, the
pairwise suite can be WPA_CIPHER_NONE, so allow that case as well.
This fixed IEEE 802.1X/WEP EAP reauthentication and rekeying to use
unencrypted EAPOL frames which is the de facto way of implementing this
in wireless networks.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Jouni Malinen [Wed, 17 Aug 2016 09:24:59 +0000 (12:24 +0300)]
tests: Fix ap_wps_er_http_proto max concurrent requests case
Commit
2d6a526ac3885605f34df4037fc79ad330565b23 ('tests: Make
ap_wps_er_http_proto more robust') tried to work around the timeouts
here, but that was not really the best approach since the one second
timeout that was used here for connect() ended up being very close to
the limit even before the kernel change. The longer connect() time is
caused by a sequence where the listen() backlog ignores the connection
instead of accept() followed by close() within the wpa_supplicant ER
HTTP connection handling. The time to retransmit the SYN changed a bit
in the kernel from 1.0 sec to about 1.03 sec. This was enough to push
that over the one second timeout.
Fix this by using a sufficiently long timeout (10 sec) to allow SYN
retransmission to occur to recover from the listen() backlog case.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Sat, 13 Aug 2016 18:48:04 +0000 (21:48 +0300)]
tests: More coverage for IBSS RSN OOM
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 13 Aug 2016 18:29:53 +0000 (21:29 +0300)]
IBSS: Fix a memory leak on RSN error path
Signed-off-by: Jouni Malinen <j@w1.fi>
Roshan Pius [Wed, 10 Aug 2016 16:35:34 +0000 (09:35 -0700)]
Move disconnect command handling to a common place
Move out the disconnect command handling from |ctrl_iface.c| to
|wpa_supplicant.c| so that it can be reused across the different
control interfaces (socket, dbus & binder).
Signed-off-by: Roshan Pius <rpius@google.com>
David Benjamin [Wed, 10 Aug 2016 17:28:45 +0000 (13:28 -0400)]
OpenSSL: Fix OpenSSL 1.1.0 compatibility functions
To be consistent with OpenSSL 1.1.0, the free functions should
internally check for NULL. EVP_MD_CTX_free also was missing an
EVP_MD_CTX_cleanup, so this leaked a little.
OpenSSL 1.1.0 also has given get_rfc3526_prime_1536 a better namespace
with get_rfc3526_prime_1536 as a compatibility-only name. Use that
instead in 1.1.0.
Signed-off-by: David Benjamin <davidben@google.com>
Jouni Malinen [Sat, 13 Aug 2016 13:22:44 +0000 (16:22 +0300)]
tests: IBSS RSN group rekeying
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 13 Aug 2016 13:22:53 +0000 (16:22 +0300)]
Add group_rekey parameter for IBSS
The new network profile parameter group_rekey can now be used to specify
the group rekeying internal in seconds for IBSS.
Signed-off-by: Jouni Malinen <j@w1.fi>
Felix Fietkau [Tue, 26 Jul 2016 11:29:37 +0000 (13:29 +0200)]
hostapd: Fix parsing the das_client option
The musl implementation of inet_aton() returns an error if there are any
characters left after the IP address. When parsing the das_client, split
the string at the whitespace separator to be able to parse the address
successfully.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Felix Fietkau [Tue, 26 Jul 2016 11:29:36 +0000 (13:29 +0200)]
nl80211: Do not switch interface to station mode when using mesh
This fixes issues with adding mesh interfaces to a bridge.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Nick Lowe [Mon, 8 Aug 2016 13:19:57 +0000 (14:19 +0100)]
Do not include NAS-Port attribute with AID 0
Do not include a NAS-Port attribute in Access-Request and
Accounting-Request packets where the Association ID (AID) is 0, i.e.,
not yet assigned or known.
Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
Manish Shukla [Thu, 11 Aug 2016 13:08:30 +0000 (16:08 +0300)]
atheros: Accept Public Action frames sent to Wildcard BSSID
Previously, the check for mgmt->bssid matching own address (= BSSID)
ended up rejecting the case where Public Action frames are using
Wildcard BSSID in the Address 3 field. This could result in GAS queries
being dropped. Fix this by allowing both the own address (= AP BSSID)
and Wildcard BSSID in Action frame Address 3 field.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Wed, 10 Aug 2016 20:51:21 +0000 (23:51 +0300)]
Fix EAP state machine reset with offloaded roaming and authorization
If the driver indicates a roamed event with already completed
authorization, altAccept = TRUE could have resulted in the EAP state
machine ending up in the FAILURE state from the INITIALIZE state. This
is not correct behavior and similar cases were already addressed for FT
and WPA-PSK. Fix the offloaded roamed+authorized (EAP/PMKSA caching)
case by doing similar changes to EAPOL/EAP state variable updates during
association event handling.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Thu, 11 Aug 2016 12:58:13 +0000 (15:58 +0300)]
tests: Make ap_wps_er_http_proto more robust
It looks like connect() for a TCP socket can time out at least with a
recent kernel. Handle that case more gracefully by ignoring that socket
while allowing the test to continue.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Wed, 10 Aug 2016 14:55:20 +0000 (17:55 +0300)]
tests: Make FST config tests more robust and easier to debug
It looks like it is possible for the separate started wpa_supplicant
process to remain running after a test case like fst_sta_config_default.
This would result in failures to run any following test case that uses
the wlan5 interface. Try to kill the process more thoroughly by waiting
for the PID file to show up and write more details into the logs to make
it easier to debug issues in this area.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Yingying Tang [Wed, 10 Aug 2016 13:49:46 +0000 (16:49 +0300)]
QCA vendor command to get hardware capabilities
This commit introduces a new vendor sub command
QCA_NL80211_VENDOR_SUBCMD_GET_HW_CAPABILITY and the associated
attributes to get Wi-Fi hardware capabilities.
Signed-off-by: Yingying Tang <yintang@qti.qualcomm.com>
Sunil Dutt [Tue, 9 Aug 2016 04:58:35 +0000 (10:28 +0530)]
Define an attribute QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER
This can be used to enable/disable QPOWER.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Nick Lowe [Tue, 26 Jul 2016 18:17:09 +0000 (19:17 +0100)]
Add a require_message_authenticator configuration option
This can be used to mandate the presence of the Message-Authenticator
attribute on CoA/Disconnect-Request packets.
Signed-off-by: Nick Lowe <nick.lowe@lugatech.com>
Jouke Witteveen [Thu, 28 Jul 2016 17:24:26 +0000 (19:24 +0200)]
roboswitch: Add support for BCM63xx
These devices do not properly identify themselves.
Signed-off-by: Jouke Witteveen <j.witteveen@gmail.com>
Rahul Bedarkar [Wed, 27 Jul 2016 16:47:53 +0000 (22:17 +0530)]
utils: os_unix: Use access() for checking file existence
Trying to open file for checking file existence seems to be too much.
Instead use access system call which is meant for the same.
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:58 +0000 (11:56 +0200)]
mka: Fix use after free
We must cancel the timer when we delete an MKA instance.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:57 +0000 (11:56 +0200)]
mka: Add check for body length when decoding peers
The standard says that the body length must be a multiple of 16B.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:56 +0000 (11:56 +0200)]
mka: Avoid reading past the end of mka_body_handler
body_type, used to index in mka_body_handler, can be any u8 value, but
we have only ARRAY_SIZE(mka_body_handler) elements.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Jouni Malinen [Sun, 7 Aug 2016 08:40:55 +0000 (11:40 +0300)]
mka: Return u8 from get_mka_param_body_type()
This uses a more accurate variable type for body_type and makes it
cleaner to compare this to other unsigned values.
Signed-off-by: Jouni Malinen <j@w1.fi>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:55 +0000 (11:56 +0200)]
mka: Add error handling around ieee802_1x_kay_move_live_peer()
ieee802_1x_kay_move_live_peer() can fail. In that case, we should not
proceed.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:54 +0000 (11:56 +0200)]
mka: Avoid inconsistent state in ieee802_1x_kay_move_live_peer()
If the memory allocation in ieee802_1x_kay_init_receive_sc() fails, we
end up in an inconsistent state where the peer is moved to the live
peers list and its sci is setup, but we don't have an rxsc.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:53 +0000 (11:56 +0200)]
mka: Fix length when encoding SAK-use
The room we actually use is length. This could also mess up the
receiver, since it will advance by the actual length (as indicated by
the parameter body's length), which could differ from the offset at
which we stored the next item.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:52 +0000 (11:56 +0200)]
mka: Fix memory leak in ieee802_1x_kay_create_live_peer() error path
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Sabrina Dubroca [Tue, 19 Jul 2016 09:56:51 +0000 (11:56 +0200)]
mka: Fix multiple key server election bugs
1. The comparison between SCI's of two servers with identical priority
is broken, and would always return TRUE. Just use os_memcmp(), which
provides the ordering we need.
2. If no peer can be key server but this instance can, then become the
key server.
3. The ordering of blocks between peer as key server and ourself as key
server overwrites settings. Simple reordering fixes this.
4. Default to being the key server, so that we advertise our ability in
the MKPDUs we send. That's the only way peers can know we can be key
server. Cleared automatically as soon as we find a better peer.
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Roshan Pius [Thu, 7 Jul 2016 16:48:58 +0000 (09:48 -0700)]
binder: Clang format the source code
Add a ".clang-format" file which is pretty close to the rest of
wpa_supplicant code base and reformat the binder codebase.
Signed-off-by: Roshan Pius <rpius@google.com>
Roshan Pius [Thu, 7 Jul 2016 16:48:00 +0000 (09:48 -0700)]
binder: Expose an aidl interface module
Restructure the binder related makefile sections to expose a separate
|libwpa_binder_interface| which can be imported by clients/tests.
While there,
Change the name of the binder service to the name used in the selinux
permissions.
Signed-off-by: Roshan Pius <rpius@google.com>
Arran Cudbard-Bell [Sat, 2 Jul 2016 19:57:39 +0000 (15:57 -0400)]
Link to, and adjust types for, the PCSC framework included with OSX
Signed-off-by: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Johannes Berg [Fri, 5 Aug 2016 11:31:54 +0000 (13:31 +0200)]
ap: Use is_broadcast_ether_addr()
There's no need to have a separate variable and open-code a more
complicated version of this, just use is_broadcast_ether_addr().
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Jouni Malinen [Sat, 6 Aug 2016 09:46:39 +0000 (12:46 +0300)]
cli: Share a common tokenize_cmd() implementation
wpa_cli and hostapd_cli had identical copies of this function.
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 6 Aug 2016 09:44:51 +0000 (12:44 +0300)]
wpa_cli: Replace str_match() with common str_starts()
str_match() was identical in behavior to str_starts().
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 6 Aug 2016 09:41:56 +0000 (12:41 +0300)]
cli: Share a common write_cmd() implementation
wpa_cli and hostapd_cli had identical copies of this function.
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 6 Aug 2016 09:39:56 +0000 (12:39 +0300)]
cli: Share a common get_cmd_arg_num() implementation
wpa_cli and hostapd_cli had identical copies of this function.
Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen [Sat, 6 Aug 2016 09:38:21 +0000 (12:38 +0300)]
Share a single str_starts() implementation
No need to define this as a static function in multiple files.
Signed-off-by: Jouni Malinen <j@w1.fi>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:38 +0000 (14:04 +0200)]
Use a common license string for hostapd_cli and wpa_cli
Move the license strings for hostapd_cli and wpa_cli to common.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:37 +0000 (14:04 +0200)]
hostapd_cli: Completion for interface command
Implement command completion for interface command
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:36 +0000 (14:04 +0200)]
hostapd_cli: Completion for disassociate and deauthenticate
Command completion routine for disassociate and deauthenticate
commands implemented. Tracks AP-STA-CONNECTED/AP-STA-DISCONNECTED
events for easy station MAC address lookup.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:35 +0000 (14:04 +0200)]
hostapd_cli: Implement event handler
Add an empty event handler in preparation for additional command
completion routines that will need to dynamically build parameters
based on events received.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:34 +0000 (14:04 +0200)]
Move parts of wpa_cli to a new common file
In preparation for adding further command completion support
to hostapd_cli move some cli related utility functions out of
wpa_cli into a new common cli file.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:33 +0000 (14:04 +0200)]
hostapd_cli: Add completion for help command
Implement command completion support for help command.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:32 +0000 (14:04 +0200)]
hostapd_cli: Replace static usage string with print_help() function
Replace the static commands usage string with a print_help() function
that reads commands and help text from the array of defined cli
commands.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:31 +0000 (14:04 +0200)]
hostapd_cli: Add command completion support
Add command completion support for hostapd_cli. Only completion
for available commands and basic building blocks in preparation for
per command parameter completion.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Mikael Kanstrup [Thu, 7 Jul 2016 12:04:30 +0000 (14:04 +0200)]
wpa_cli: Implement completion routine for get_capability
Add command completion routine for get_capability command.
Signed-off-by: Mikael Kanstrup <mikael.kanstrup@sonymobile.com>
Sunil Dutt [Thu, 4 Aug 2016 16:52:21 +0000 (22:22 +0530)]
Define an attribute QCA_WLAN_VENDOR_ATTR_CONFIG_IFINDEX
This can be used to set the configuration parameters per netdev (instead
of wiphy).
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Sunil Dutt [Thu, 4 Aug 2016 10:01:31 +0000 (15:31 +0530)]
Define vendor command to support IE based access control
This commit defines QCA vendor subcommand and attributes for IE based
access control, i.e., the specific configured IE (full IE) is matched
with the frames originated by the Wi-Fi STA / AP to accept or deny the
connection. A specific IE can either be a whitelist or blacklist.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Vikram Kandukuri [Mon, 1 Aug 2016 17:17:35 +0000 (22:47 +0530)]
QCA vendor command to configure GPIO pins
This commit introduces a new vendor sub command
QCA_NL80211_VENDOR_SUBCMD_GPIO_CONFIG_COMMAND and associated
attributes to configure GPIO pins.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Vikram Kandukuri [Mon, 1 Aug 2016 17:00:39 +0000 (22:30 +0530)]
Assign QCA vendor attributes for generic commands
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Tue, 2 Aug 2016 20:47:38 +0000 (23:47 +0300)]
P2P: Fix D-Bus persistent parameter in group started event
wpas_p2p_persistent_group() returns non-zero for persistent groups. This
value happens to be 2 instead of 1 due to the
P2P_GROUP_CAPAB_PERSISTENT_GROUP value. This ended up with D-Bus code
trying to encode 2 as a DBUS_TYPE_BOOLEAN value which results in an
assert from the library. Fix this by modifying
wpas_p2p_persistent_group() to return 0 or 1 instead of 0 or an
arbitrary non-zero.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
vamsi krishna [Tue, 19 Jul 2016 07:11:15 +0000 (12:41 +0530)]
Set default scan IEs to the driver (QCA vendor extension)
This makes wpa_supplicant set default scan IEs to the driver (if the
vendor command is supported). The driver can use these IEs in the scan
requests initiated by the driver itself. Also the driver can merge these
IEs into further scan requests that it receives, in case if the scan
request doesn't carry any of the IEs sent in this command.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Tue, 2 Aug 2016 18:11:25 +0000 (21:11 +0300)]
Fix a typo in QCA vendor attribution documentation
The previously used subcommand names in the comment did not match the
ones defined above.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
vamsi krishna [Tue, 2 Aug 2016 16:45:56 +0000 (22:15 +0530)]
Define QCA vendor config attribute to set default scan IEs to the driver
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Tue, 2 Aug 2016 14:43:38 +0000 (17:43 +0300)]
tests: HT/VHT values in STATUS
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Tue, 2 Aug 2016 14:42:47 +0000 (17:42 +0300)]
tests: WEP with HT/VHT
Verify that HT/VHT gets disabled in WEP configuration.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen [Tue, 2 Aug 2016 14:41:01 +0000 (17:41 +0300)]
Show disabled HT/VHT properly in AP mode STATUS command
Previously, HT/VHT state was shown in STATUS based on the configuration
parameter instead of the runtime operational parameters. This could
result in claiming HT/VHT to be enabled even when it was forced to be
disabled due to an incompatible configuration. Clear HT/VHT information
in the STATUS output if HT/VHT has been disabled.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Wu Gao [Tue, 2 Aug 2016 14:31:48 +0000 (17:31 +0300)]
AP: Disable VHT in WEP configuration
This was already done for HT, but VHT has the same constraint on not
allowing WEP.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Rahul Bedarkar [Mon, 25 Jul 2016 18:23:01 +0000 (23:53 +0530)]
doc: Correct spelling mistake
s/availibility/availability
Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Chaitanya T K [Thu, 14 Jul 2016 16:50:40 +0000 (22:20 +0530)]
nl80211: Fix segfault when params->freq is NULL for AP mode start
If params->freq is NULL here, it leads to a segfault. Do not initialize
bss->bandwidth if params->freq is NULL.
Signed-off-by: Chaitanya T K <Chaitanya.Mgit@gmail.com>
Masashi Honma [Thu, 21 Jul 2016 23:52:55 +0000 (08:52 +0900)]
mesh: Remove HT IEs if HT is disabled
Previously, HT capability IE and HT information IE were included in
Beacon and Mesh Peering Open/Confirm frames even if HT is disabled with
disable_ht=1. This patch removes these.
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 8 Jul 2016 05:42:48 +0000 (14:42 +0900)]
mesh: Make DTIM period configurable
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 8 Jul 2016 02:39:13 +0000 (11:39 +0900)]
mesh: Stop joining to different frequency network
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Masashi Honma [Fri, 8 Jul 2016 02:39:12 +0000 (11:39 +0900)]
mesh: Join an existing MBSS instead of creating a new one
If scan results show a matching existing MBSS, join it instead of
creating a new MBSS.
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>