wpa_supplicant: Fix typos
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
This commit is contained in:
Yegor Yefremov
Jouni Malinen
parent
ac835ea092
commit
b439b21a2f
23 changed files with 50 additions and 50 deletions
|
|
@ -533,7 +533,7 @@ ChangeLog for wpa_supplicant
|
|||
* fixed MSCHAP UTF-8 to UCS-2 conversion for three-byte encoding;
|
||||
this fixes password with include UTF-8 characters that use
|
||||
three-byte encoding EAP methods that use NtPasswordHash
|
||||
* fixed couple of sequencies where radio work items could get stuck,
|
||||
* fixed couple of sequences where radio work items could get stuck,
|
||||
e.g., when rfkill blocking happens during scanning or when
|
||||
scan-for-auth workaround is used
|
||||
* P2P enhancements/fixes
|
||||
|
|
@ -627,7 +627,7 @@ ChangeLog for wpa_supplicant
|
|||
* added 'dup_network <id_s> <id_d> <name>' command; this can be used to
|
||||
clone the psk field without having toextract it from wpa_supplicant
|
||||
* fixed GSM authentication on USIM
|
||||
* added support for usin epoll in eloop (CONFIG_ELOOP_EPOLL=y)
|
||||
* added support for using epoll in eloop (CONFIG_ELOOP_EPOLL=y)
|
||||
* fixed some concurrent virtual interface cases with dedicated P2P
|
||||
management interface to not catch events from removed interface (this
|
||||
could result in the management interface getting disabled)
|
||||
|
|
@ -1113,7 +1113,7 @@ ChangeLog for wpa_supplicant
|
|||
workarounds.
|
||||
- Add support for AuthorizedMACs attribute.
|
||||
* TDLS:
|
||||
- Propogate TDLS related nl80211 capability flags from kernel and
|
||||
- Propagate TDLS related nl80211 capability flags from kernel and
|
||||
add them as driver capability flags. If the driver doesn't support
|
||||
capabilities, assume TDLS is supported internally. When TDLS is
|
||||
explicitly not supported, disable all user facing TDLS operations.
|
||||
|
|
@ -2221,7 +2221,7 @@ ChangeLog for wpa_supplicant
|
|||
* added support for EAP-SIM pseudonyms and fast re-authentication
|
||||
* added support for EAP-TLS/PEAP/TTLS fast re-authentication (TLS
|
||||
session resumption)
|
||||
* added support for EAP-SIM with two challanges
|
||||
* added support for EAP-SIM with two challenges
|
||||
(phase1="sim_min_num_chal=3" can be used to require three challenges)
|
||||
* added support for configuring DH/DSA parameters for an ephemeral DH
|
||||
key exchange (EAP-TLS/PEAP/TTLS) using new configuration parameters
|
||||
|
|
@ -2332,7 +2332,7 @@ ChangeLog for wpa_supplicant
|
|||
ctrl_interface_group can be used to select which group gets access to
|
||||
the control interface;
|
||||
wpa_cli: by default, try to connect to the first interface available
|
||||
in /var/run/wpa_supplicant; this path can be overriden with -p option
|
||||
in /var/run/wpa_supplicant; this path can be overridden with -p option
|
||||
and an interface can be selected with -i option (i.e., in most common
|
||||
cases, wpa_cli does not need to get any arguments)
|
||||
* added support for LEAP
|
||||
|
|
|
|||
|
|
@ -383,7 +383,7 @@ cp wpa_cli wpa_supplicant /usr/local/bin
|
|||
You will need to make a configuration file, e.g.,
|
||||
/etc/wpa_supplicant.conf, with network configuration for the networks
|
||||
you are going to use. Configuration file section below includes
|
||||
explanation fo the configuration file format and includes various
|
||||
explanation of the configuration file format and includes various
|
||||
examples. Once the configuration is ready, you can test whether the
|
||||
configuration work by first running wpa_supplicant with following
|
||||
command to start it on foreground with debugging enabled:
|
||||
|
|
@ -778,7 +778,7 @@ wpa_cli commands
|
|||
disconnect = disconnect and wait for reassociate command before connecting
|
||||
scan = request new BSS scan
|
||||
scan_results = get latest scan results
|
||||
get_capability <eap/pairwise/group/key_mgmt/proto/auth_alg> = get capabilies
|
||||
get_capability <eap/pairwise/group/key_mgmt/proto/auth_alg> = get capabilities
|
||||
terminate = terminate wpa_supplicant
|
||||
quit = exit wpa_cli
|
||||
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ hs20=1
|
|||
|
||||
# Parameters for controlling scanning
|
||||
|
||||
# Homogenous ESS identifier
|
||||
# Homogeneous ESS identifier
|
||||
# If this is set, scans will be used to request response only from BSSes
|
||||
# belonging to the specified Homogeneous ESS. This is used only if interworking
|
||||
# is enabled.
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ extern "C" {
|
|||
/**
|
||||
* This is the binder RPC interface entry point to the wpa_supplicant core.
|
||||
* This initializes the binder driver & BinderManager instance and then forwards
|
||||
* all the notifcations from the supplicant core to the BinderManager.
|
||||
* all the notifications from the supplicant core to the BinderManager.
|
||||
*/
|
||||
struct wpas_binder_priv;
|
||||
struct wpa_global;
|
||||
|
|
|
|||
|
|
@ -650,7 +650,7 @@ struct wpa_config {
|
|||
* This variable control whether wpa_supplicant is allow to re-write
|
||||
* its configuration with wpa_config_write(). If this is zero,
|
||||
* configuration data is only changed in memory and the external data
|
||||
* is not overriden. If this is non-zero, wpa_supplicant will update
|
||||
* is not overridden. If this is non-zero, wpa_supplicant will update
|
||||
* the configuration data (e.g., a file) whenever configuration is
|
||||
* changed. This update may replace the old configuration which can
|
||||
* remove comments from it in case of a text file configuration.
|
||||
|
|
|
|||
|
|
@ -10278,7 +10278,7 @@ static int wpas_ctrl_iface_mesh_pmksa_add(struct wpa_supplicant *wpa_s,
|
|||
char *cmd)
|
||||
{
|
||||
/*
|
||||
* We do not check mesh interface existance because PMKSA should be
|
||||
* We do not check mesh interface existence because PMKSA should be
|
||||
* stored before wpa_s->ifmsh creation to suppress commit message
|
||||
* creation.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1824,7 +1824,7 @@ void wpas_dbus_signal_p2p_peer_disconnected(struct wpa_supplicant *wpa_s,
|
|||
* @sa: station addr (p2p i/f) of the peer
|
||||
* @dialog_token: service discovery request dialog token
|
||||
* @update_indic: service discovery request update indicator
|
||||
* @tlvs: service discovery request genrated byte array of tlvs
|
||||
* @tlvs: service discovery request generated byte array of tlvs
|
||||
* @tlvs_len: service discovery request tlvs length
|
||||
*/
|
||||
void wpas_dbus_signal_p2p_sd_request(struct wpa_supplicant *wpa_s,
|
||||
|
|
@ -1893,7 +1893,7 @@ void wpas_dbus_signal_p2p_sd_request(struct wpa_supplicant *wpa_s,
|
|||
* @wpa_s: %wpa_supplicant network interface data
|
||||
* @sa: station addr (p2p i/f) of the peer
|
||||
* @update_indic: service discovery request update indicator
|
||||
* @tlvs: service discovery request genrated byte array of tlvs
|
||||
* @tlvs: service discovery request generated byte array of tlvs
|
||||
* @tlvs_len: service discovery request tlvs length
|
||||
*/
|
||||
void wpas_dbus_signal_p2p_sd_response(struct wpa_supplicant *wpa_s,
|
||||
|
|
|
|||
|
|
@ -2568,7 +2568,7 @@ wpas_dbus_handler_tdls_cancel_channel_switch(DBusMessage *message,
|
|||
* wpas_dbus_handler_save_config - Save configuration to configuration file
|
||||
* @message: Pointer to incoming dbus message
|
||||
* @wpa_s: wpa_supplicant structure for a network interface
|
||||
* Returns: NULL on Success, Otherwise errror message
|
||||
* Returns: NULL on Success, Otherwise error message
|
||||
*
|
||||
* Handler function for "SaveConfig" method call of network interface.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ fi
|
|||
if [ "$CMD" = "P2P-CROSS-CONNECT-ENABLE" ]; then
|
||||
GIFNAME=$3
|
||||
UPLINK=$4
|
||||
# enable NAT/masquarade $GIFNAME -> $UPLINK
|
||||
# enable NAT/masquerade $GIFNAME -> $UPLINK
|
||||
iptables -P FORWARD DROP
|
||||
iptables -t nat -A POSTROUTING -o $UPLINK -j MASQUERADE
|
||||
iptables -A FORWARD -i $UPLINK -o $GIFNAME -m state --state RELATED,ESTABLISHED -j ACCEPT
|
||||
|
|
@ -61,7 +61,7 @@ fi
|
|||
if [ "$CMD" = "P2P-CROSS-CONNECT-DISABLE" ]; then
|
||||
GIFNAME=$3
|
||||
UPLINK=$4
|
||||
# disable NAT/masquarade $GIFNAME -> $UPLINK
|
||||
# disable NAT/masquerade $GIFNAME -> $UPLINK
|
||||
sysctl net.ipv4.ip_forward=0
|
||||
iptables -t nat -D POSTROUTING -o $UPLINK -j MASQUERADE
|
||||
iptables -D FORWARD -i $UPLINK -o $GIFNAME -m state --state RELATED,ESTABLISHED -j ACCEPT
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ fi
|
|||
if [ "$CMD" = "P2P-CROSS-CONNECT-ENABLE" ]; then
|
||||
GIFNAME=$3
|
||||
UPLINK=$4
|
||||
# enable NAT/masquarade $GIFNAME -> $UPLINK
|
||||
# enable NAT/masquerade $GIFNAME -> $UPLINK
|
||||
iptables -P FORWARD DROP
|
||||
iptables -t nat -A POSTROUTING -o $UPLINK -j MASQUERADE
|
||||
iptables -A FORWARD -i $UPLINK -o $GIFNAME -m state --state RELATED,ESTABLISHED -j ACCEPT
|
||||
|
|
@ -88,7 +88,7 @@ fi
|
|||
if [ "$CMD" = "P2P-CROSS-CONNECT-DISABLE" ]; then
|
||||
GIFNAME=$3
|
||||
UPLINK=$4
|
||||
# disable NAT/masquarade $GIFNAME -> $UPLINK
|
||||
# disable NAT/masquerade $GIFNAME -> $UPLINK
|
||||
sysctl net.ipv4.ip_forward=0
|
||||
iptables -t nat -D POSTROUTING -o $UPLINK -j MASQUERADE
|
||||
iptables -D FORWARD -i $UPLINK -o $GIFNAME -m state --state RELATED,ESTABLISHED -j ACCEPT
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ class P2P_Connect():
|
|||
global wpas_dbus_interfaces_interface
|
||||
global wpas_dbus_interfaces_p2pdevice
|
||||
|
||||
# Dictionary of Arguements
|
||||
# Dictionary of Arguments
|
||||
global p2p_connect_arguements
|
||||
|
||||
# Constructor
|
||||
|
|
@ -146,9 +146,9 @@ class P2P_Connect():
|
|||
signal_name="WpsFailed")
|
||||
|
||||
|
||||
#Constructing all the arguements needed to connect
|
||||
#Constructing all the arguments needed to connect
|
||||
def constructArguements(self):
|
||||
# Adding required arguements
|
||||
# Adding required arguments
|
||||
self.p2p_connect_arguements = {'wps_method':self.wps_method,
|
||||
'peer':dbus.ObjectPath(self.path+'/Peers/'+self.addr)}
|
||||
|
||||
|
|
@ -198,7 +198,7 @@ class P2P_Connect():
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# Go_intent is optional for all arguements
|
||||
# Go_intent is optional for all arguments
|
||||
if (self.go_intent != None):
|
||||
self.p2p_connect_arguements.update(
|
||||
{'go_intent':dbus.Int32(self.go_intent)})
|
||||
|
|
@ -239,7 +239,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
@ -266,9 +266,9 @@ if __name__ == "__main__":
|
|||
else:
|
||||
assert False, "unhandled option"
|
||||
|
||||
# Required Arguements check
|
||||
# Required Arguments check
|
||||
if (interface_name == None or wps_method == None or addr == None):
|
||||
print("Error:\n Required arguements not specified")
|
||||
print("Error:\n Required arguments not specified")
|
||||
usage()
|
||||
quit()
|
||||
|
||||
|
|
@ -289,7 +289,7 @@ if __name__ == "__main__":
|
|||
addr,pin,wps_method,go_intent)
|
||||
|
||||
except:
|
||||
print("Error:\n Invalid Arguements")
|
||||
print("Error:\n Invalid Arguments")
|
||||
usage()
|
||||
quit()
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ def usage():
|
|||
print(" [-w <wpas_dbus_interface>]")
|
||||
print("Options:")
|
||||
print(" -i = interface name")
|
||||
print(" -p = persistant group = 0 (0=false, 1=true)")
|
||||
print(" -p = persistent group = 0 (0=false, 1=true)")
|
||||
print(" -f = frequency")
|
||||
print(" -o = persistent group object path")
|
||||
print(" -w = wpas dbus interface = fi.w1.wpa_supplicant1")
|
||||
|
|
@ -57,7 +57,7 @@ class P2P_Group_Add (threading.Thread):
|
|||
global wpas_dbus_interfaces_interface
|
||||
global wpas_dbus_interfaces_p2pdevice
|
||||
|
||||
# Arguements
|
||||
# Arguments
|
||||
global P2PDictionary
|
||||
|
||||
# Constructor
|
||||
|
|
@ -141,7 +141,7 @@ class P2P_Group_Add (threading.Thread):
|
|||
self.p2p_interface.GroupAdd(self.P2PDictionary)
|
||||
|
||||
except:
|
||||
print("Error:\n Could not preform group add")
|
||||
print("Error:\n Could not perform group add")
|
||||
usage()
|
||||
os._exit(0)
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
@ -213,7 +213,7 @@ if __name__ == "__main__":
|
|||
p2p_group_add_test = P2P_Group_Add(interface_name,wpas_dbus_interface,
|
||||
persistent,frequency,persistent_group_object)
|
||||
except:
|
||||
print("Error:\n Invalid Arguements")
|
||||
print("Error:\n Invalid Arguments")
|
||||
|
||||
p2p_group_add_test.constructArguements()
|
||||
p2p_group_add_test.start()
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ def usage():
|
|||
|
||||
# Required Signals
|
||||
def InvitationResult(invite_result):
|
||||
print("Inviation Result signal :")
|
||||
print("Invitation Result signal :")
|
||||
status = invite_result['status']
|
||||
print("status = ", status)
|
||||
if invite_result.has_key('BSSID'):
|
||||
|
|
@ -55,7 +55,7 @@ class P2P_Invite (threading.Thread):
|
|||
global wpas_dbus_interfaces_interface
|
||||
global wpas_dbus_interfaces_p2pdevice
|
||||
|
||||
# Arguements
|
||||
# Arguments
|
||||
global P2PDictionary
|
||||
|
||||
# Constructor
|
||||
|
|
@ -127,7 +127,7 @@ class P2P_Invite (threading.Thread):
|
|||
self.p2p_interface.Invite(self.P2PDictionary)
|
||||
|
||||
except:
|
||||
print("Error:\n Invalid Arguements")
|
||||
print("Error:\n Invalid Arguments")
|
||||
usage()
|
||||
os._exit(0)
|
||||
|
||||
|
|
@ -154,7 +154,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
@ -190,7 +190,7 @@ if __name__ == "__main__":
|
|||
P2P_Invite(interface_name,wpas_dbus_interface,
|
||||
addr,persistent_group_object)
|
||||
except:
|
||||
print("Error:\n Invalid Arguements")
|
||||
print("Error:\n Invalid Arguments")
|
||||
usage()
|
||||
os._exit(1)
|
||||
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ if __name__ == "__main__":
|
|||
usage()
|
||||
quit()
|
||||
|
||||
# If theres a switch, override default option
|
||||
# If there's a switch, override default option
|
||||
for key, value in options:
|
||||
# Help
|
||||
if (key == "-h"):
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ end 192.168.42.254 #default: 192.168.0.254
|
|||
interface wlan2 #default: eth0
|
||||
|
||||
|
||||
# The maximim number of leases (includes addressesd reserved
|
||||
# by OFFER's, DECLINE's, and ARP conficts
|
||||
# The maximum number of leases (includes addressesd reserved
|
||||
# by OFFER's, DECLINE's, and ARP conflicts
|
||||
|
||||
#max_leases 254 #default: 254
|
||||
|
||||
|
|
@ -52,12 +52,12 @@ interface wlan2 #default: eth0
|
|||
# If a lease to be given is below this value, the full lease time is
|
||||
# instead used (seconds).
|
||||
|
||||
#min_lease 60 #defult: 60
|
||||
#min_lease 60 #default: 60
|
||||
|
||||
|
||||
# The location of the leases file
|
||||
|
||||
#lease_file /var/lib/misc/udhcpd.leases #defualt: /var/lib/misc/udhcpd.leases
|
||||
#lease_file /var/lib/misc/udhcpd.leases #default: /var/lib/misc/udhcpd.leases
|
||||
|
||||
# The location of the pid file
|
||||
pidfile /var/run/udhcpd-wlan2.pid #default: /var/run/udhcpd.pid
|
||||
|
|
@ -77,7 +77,7 @@ pidfile /var/run/udhcpd-wlan2.pid #default: /var/run/udhcpd.pid
|
|||
|
||||
#boot_file /var/nfs_root #default: (none)
|
||||
|
||||
# The remainer of options are DHCP options and can be specifed with the
|
||||
# The remainder of options are DHCP options and can be specified with the
|
||||
# keyword 'opt' or 'option'. If an option can take multiple items, such
|
||||
# as the dns option, they can be listed on the same line, or multiple
|
||||
# lines. The only option with a default is 'lease'.
|
||||
|
|
|
|||
|
|
@ -2532,7 +2532,7 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s)
|
|||
(selected_cred == NULL ||
|
||||
cred_prio_cmp(selected_home_cred, selected_cred) >= 0)) {
|
||||
/* Prefer network operated by the Home SP */
|
||||
wpa_printf(MSG_DEBUG, "Interworking: Overrided selected with selected_home");
|
||||
wpa_printf(MSG_DEBUG, "Interworking: Overrode selected with selected_home");
|
||||
selected = selected_home;
|
||||
selected_cred = selected_home_cred;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ static void sme_auth_handle_rrm(struct wpa_supplicant *wpa_s,
|
|||
*pos++ = WLAN_EID_RRM_ENABLED_CAPABILITIES;
|
||||
*pos++ = rrm_ie_len;
|
||||
|
||||
/* Set supported capabilites flags */
|
||||
/* Set supported capabilities flags */
|
||||
if (wpa_s->drv_rrm_flags & WPA_DRIVER_FLAGS_TX_POWER_INSERTION)
|
||||
*pos |= WLAN_RRM_CAPS_LINK_MEASUREMENT;
|
||||
|
||||
|
|
|
|||
|
|
@ -400,7 +400,7 @@ static int wmm_ac_ts_req_is_valid(struct wpa_supplicant *wpa_s,
|
|||
|
||||
req_ac = up_to_ac[params->user_priority];
|
||||
|
||||
/* Requested accesss category must have acm */
|
||||
/* Requested access category must have acm */
|
||||
if (!wpa_s->wmm_ac_assoc_info->ac_params[req_ac].acm) {
|
||||
wpa_printf(MSG_DEBUG, "WMM AC: AC %d is not ACM", req_ac);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -526,7 +526,7 @@ fast_reauth=1
|
|||
#go_venue_group=7
|
||||
#go_venue_type=1
|
||||
|
||||
# Homogenous ESS identifier
|
||||
# Homogeneous ESS identifier
|
||||
# If this is set, scans will be used to request response only from BSSes
|
||||
# belonging to the specified Homogeneous ESS. This is used only if interworking
|
||||
# is enabled.
|
||||
|
|
|
|||
Loading…
Reference in a new issue