aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/main.c
Commit message (Collapse)AuthorAgeFilesLines
* Add interface matching support with -M, guarded by CONFIG_MATCH_IFACERoy Marples2016-03-221-1/+51
| | | | | | | | | The new wpa_supplicant command line argument -M can be used to describe matching rules with a wildcard interface name (e.g., "wlan*"). This is very useful for systems without udev (Linux) or devd (FreeBSD). Signed-off-by: Roy Marples <roy@marples.name>
* Sort options and reduce printf calls in wpa_supplicant usage textRoy Marples2016-01-151-22/+22
| | | | Signed-off-by: Roy Marples <roy@marples.name>
* FST: Integration into wpa_supplicantAnton Nayshtut2015-07-161-0/+14
| | | | | | This commit integrates the FST into the wpa_supplicant. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
* P2P: Handle P2P Device dedicated interface parent removalIlan Peer2015-06-191-1/+1
| | | | | | | | | | | | | | | | | In case of a network interface removal, check if the interface was also the parent interface of the P2P Device dedicated interface. If this is the case, then stop the P2P Device functionality, and remove the P2P Device dedicated interface. In case that the interface is added again and P2P Device functionality can be enabled again, add a new P2P Device dedicated interface and allow further P2P Device functionality. In case that the P2P Device dedicated interface is re-created, the original P2P Device configuration file is needed, so store it in the global params (instead in the wpa_interface configuration). Signed-off-by: Ilan Peer <ilan.peer@intel.com>
* wpa_supplicant: Remove trailing whitespaceAnton Nayshtut2015-06-021-1/+1
| | | | Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
* P2P: Fix interface deinit for failed group interface initializationJouni Malinen2015-03-011-1/+1
| | | | | | | | | | | wpa_supplicant_deinit_iface() ends up removing all P2P groups if the removed interface is the parent interface. This is correct behavior in general, but this resulted in issues in the new group interface initialization error path since wpa_s->parent was not assigned before hitting this check. Fix this by assigning wpa_s->parent as part of wpa_supplicant_add_iface(). Signed-off-by: Jouni Malinen <j@w1.fi>
* P2P: Support dynamic addition of P2P Device triggering interfaceJouni Malinen2014-10-211-8/+0
| | | | | | | | | This moves the addition of P2P Device interface into wpa_supplicant_add_iface() so that this operation can be done dynamically when adding an interface to an already running wpa_supplicant process. Signed-off-by: Jouni Malinen <j@w1.fi>
* P2P: Use only the -m config for P2P management deviceJouni Malinen2014-10-031-1/+2
| | | | | | | | | | | | | | | | | | Previously, the case of non-netdev P2P management device ended up pulling in both the main interface (e.g., wlan0) and P2P Device interface (from command line -m argument) as configuration. Similarly, the main interface ended up included both configuration files. This is not really helpful for various use cases, e.g., when permanent P2P group information is stored in the P2P Devince interface, but it gets duplicated in the main station interface configuration. Clean this up by changing the -m<file> argument to replace, not concatenate, configuration information. In other words, the main station interface will not read this configuration and the P2P Device interface (non-netdev) does not read parameters from the station interface configuration file. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
* wpa_supplicant: Add a configuration file for the P2P_DEVICE parametersIlan Peer2014-03-061-1/+12
| | | | | | | | | | | | | | | | | | | | | Add an option to specify a configuration file that can be used to hold the P2P_DEVICE configuration parameters. If this option is not used, the P2P_DEVICE configuration parameters will be read from interface configuration file. Note that it is advised to use this option in some cases such as: If a P2P_DEVICE is supported by the driver, the wpa_supplicant creates a dedicated P2P Device interface, where the configuration file used for the main interface is used. As a consequence, if the configuration file includes network definition etc., the wpa_supplicant will try to perform station specific flows on the P2P Device interface which will fail. If a P2P_DEVICE is supported by the driver and update_config is used, the P2P Device configuration data will override the main interface configuration data. Signed-hostap: Ilan Peer <ilan.peer@intel.com>
* wpa_supplicant: Fix usage text based on build optionsDan Williams2014-01-211-3/+14
| | | | Signed-hostap: Dan Williams <dcbw@redhat.com>
* Declare wpa_drivers in src/drivers/driver.hJouni Malinen2013-12-311-2/+0
| | | | | | This avoids some warnings from sparse. Signed-hostap: Jouni Malinen <j@w1.fi>
* Fix non-P2P build after the P2P_DEVICE changesJouni Malinen2013-06-301-0/+2
| | | | | | | | Commit c68f6200a72f2b33304f583859b09e57757b9d2a added a call to a function that exists only for P2P builds. Fix that with #ifdef CONFIG_P2P. Signed-hostap: Jouni Malinen <j@w1.fi>
* P2P: Create P2P Device interface if supportedArend van Spriel2013-06-301-1/+12
| | | | | | | | | | | | | | If the capability flag of the driver indicates a dedicated P2P Device is supported, a P2P Device interface is created. Create the P2P Device in main interface creation loop when the added interface flags support and P2P supplicant is not yet initialized avoiding recursion of add_interface. Do not register l2_packet for P2P Device interface (both for EAPOL and for TDLS). Signed-hostap: Arend van Spriel <arend@broadcom.com>
* wpa_supplicant: Add -G argument to specify global ctrl groupJouni Malinen2013-05-181-2/+7
| | | | | | | The optional -G<group> command line argument can be used to specify the group that can access the global control interface. Signed-hostap: Jouni Malinen <j@w1.fi>
* wpa_supplicant: Default to nl80211 instead of wextJouni Malinen2013-04-291-1/+1
| | | | | | | | | | nl80211 has obsoleted WEXT as the preferred kernel interface for controlling wireless drivers. Update wpa_supplicant driver interface list order so that nl80211 gets used first if both nl80211 and wext interfaces are included in the build. In addition, update README to reflect the fact that WEXT is obsolete. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
* wpa_supplicant: Add option -I for additional config fileDmitry Shmidt2013-04-231-2/+7
| | | | | | | | This option can be used only for global parameters that are not going to be changed from settings. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* Clean up the closed stdin/stdout/stderr workaround to close socketsJouni Malinen2012-08-191-8/+20
| | | | | | | Close the workaround sockets when wpa_supplicant exists to avoid hitting resource leak warnings. Signed-hostap: Jouni Malinen <j@w1.fi>
* Convert os_realloc() for an array to use os_realloc_array()Jouni Malinen2012-08-131-2/+2
| | | | Signed-hostap: Jouni Malinen <j@w1.fi>
* wpa_supplicant: Print initialization information on startupBen Greear2012-04-061-0/+3
| | | | | | | This lets someone know if they have a log file that properly starts at the beginning. Signed-hostap: Ben Greear <greearb@candelatech.com>
* debug: Add option to log to Linux tracingJohannes Berg2012-03-311-1/+11
| | | | | | | | | | | | Add the option (-T) to wpa_supplicant to log all debug messages into the kernel tracing, allowing to aggregate kernel debugging with wpa_supplicant debugging and recording all with trace-cmd. Since tracing has relatively low overhead and can be filtered afterwards, record all messages regardless of log level. However, it will honor the -K option and not record key material by default. Signed-hostap: Johannes Berg <johannes.berg@intel.com>
* Remove the GPL notification from files contributed by Jouni MalinenJouni Malinen2012-02-111-8/+2
| | | | | | | Remove the GPL notification text from the files that were initially contributed by myself. Signed-hostap: Jouni Malinen <j@w1.fi>
* Select the BSD license terms as the only license alternativeJouni Malinen2012-02-111-1/+1
| | | | | | | | | | | | | | | Simplify licensing terms for hostap.git by selecting the BSD license alternative for any future distribution. This drops the GPL v2 alternative from distribution terms and from contribution requirements. The BSD license alternative that has been used in hostap.git (the one with advertisement clause removed) is compatible with GPL and as such the software in hostap.git can still be used with GPL projects. In addition, any new contribution to hostap.git is expected to be licensed under the BSD terms that allow the changes to be merged into older hostap repositories that still include the GPL v2 alternative. Signed-hostap: Jouni Malinen <j@w1.fi>
* random: Add support for maintaining internal entropy store over restartsJouni Malinen2011-05-311-3/+8
| | | | | | | This can be used to avoid rejection of first two 4-way handshakes every time hostapd (or wpa_supplicant in AP/IBSS mode) is restarted. A new command line parameter, -e, can now be used to specify an entropy file that will be used to maintain the needed state.
* dbus: Use CONFIG_DBUS instead of old||newJouni Malinen2010-01-011-4/+4
|
* dbus: Enable -u option when only the new DBus API is includedWitold Sowa2009-12-031-4/+4
|
* Allow driver and ctrl_interface parameters to be overriddenJouni Malinen2009-11-041-1/+10
| | | | | | | | | | | New wpa_supplicant command line options -o<driver> and -O<ctrl> can now be used to override the parameters received in add interface command from dbus or global ctrl_interface. This can be used, e.g., to enable control interface when using NetworkManager (add -O/var/run/wpa_supplicant into the Exec parameter in /usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service). Similarly, this can be used to use another driver wrapper with NetworkManager (e.g., -onl80211 to replace WEXT with nl80211).
* Merge wpa_supplicant and hostapd driver wrapper implementationsJouni Malinen2009-04-091-6/+5
| | | | | | | | This commit merges the driver_ops structures and implementations from hostapd/driver*.[ch] into src/drivers. This is only an initial step and there is room for number of cleanups to share code between the hostapd and wpa_supplicant parts of the wrappers to avoid unnecessary source code duplication.
* Add preliminary hostapd data structure initialization for AP modeJouni Malinen2009-03-261-0/+3
| | | | | | | | wpa_supplicant can now initialize hostapd data structures when mode=2 is used to set up an AP. The hostapd configuration is not yet set based on wpa_supplicant network configuration block. In addition, the glue code for hostapd driver_ops needs number of functions that will be needed for AP functionality.
* Add support for wpa_supplicant syslog outputSam Leffler2009-03-021-5/+15
| | | | | Enable for build: CFLAGS += -DCONFIG_DEBUG_SYSLOG in .config Enable at runtime: -s on command line
* Avoid using #ifdef inside printf stringJouni Malinen2009-02-151-8/+8
| | | | This makes it easier to use a preprocessor macro for printf.
* Allow multiple driver wrappers to be specified on command lineJouni Malinen2009-02-141-1/+1
| | | | | | For example, -Dnl80211,wext could be used to automatically select between nl80211 and wext. The first driver wrapper that is able to initialize the interface will be used.
* Mark functions static if not used elsewhere and use proper prototypesJouni Malinen2009-01-031-13/+0
|
* Remove the -w option from help outputKel Modderman2008-03-311-1/+1
| | | | Signed-off-by: Kel Modderman <kel@otaku42.de>
* Re-initialize hostapd/wpa_supplicant git repository based on 0.6.3 releaseJouni Malinen2008-02-281-0/+277