opensourcemirror
/
ipfire-2.x
mirror of git://git.ipfire.org/ipfire-2.x.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'ms/wifi-fixes'

This commit is contained in:
Michael Tremer 2021-02-16 17:36:41 +00:00
parent 08c83af39f 55209df391
commit 9aa6f9a89f
13 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/language_issues.de
View File

@ -889,6 +889,7 @@ WARNING: untranslated string: smb daemon = SMB Daemon
WARNING: untranslated string: user management = User Management
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wlan client encryption wpa3 = WPA3
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional

1
doc/language_issues.en
View File

@ -2132,6 +2132,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
WARNING: untranslated string: wlan client group key algorithm = GKA
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client invalid key length = Invalid key length.
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
WARNING: untranslated string: wlan client new network = New network

1
doc/language_issues.es
View File

@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
WARNING: untranslated string: wlan client group key algorithm = GKA
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client invalid key length = Invalid key length.
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
WARNING: untranslated string: wlan client new network = New network

1
doc/language_issues.fr
View File

@ -919,3 +919,4 @@ WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: token = Token:
WARNING: untranslated string: token not set = No Token has been given.
WARNING: untranslated string: wlan client encryption wpa3 = WPA3
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection

1
doc/language_issues.it
View File

@ -1197,6 +1197,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status
WARNING: untranslated string: wlan client encryption eap = EAP
WARNING: untranslated string: wlan client encryption wpa3 = WPA3
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client password = Password
WARNING: untranslated string: wlan client tls cipher = TLS Cipher

1
doc/language_issues.nl
View File

@ -1237,6 +1237,7 @@ WARNING: untranslated string: wlan client eap state = EAP Status
WARNING: untranslated string: wlan client encryption eap = EAP
WARNING: untranslated string: wlan client encryption wpa3 = WPA3
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client password = Password
WARNING: untranslated string: wlan client tls cipher = TLS Cipher

1
doc/language_issues.pl
View File

@ -1509,6 +1509,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
WARNING: untranslated string: wlan client group key algorithm = GKA
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client invalid key length = Invalid key length.
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
WARNING: untranslated string: wlan client new network = New network

1
doc/language_issues.ru
View File

@ -1502,6 +1502,7 @@ WARNING: untranslated string: wlan client group cipher = Group cipher
WARNING: untranslated string: wlan client group key algorithm = GKA
WARNING: untranslated string: wlan client identity = Identity
WARNING: untranslated string: wlan client invalid key length = Invalid key length.
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlan client method = Method
WARNING: untranslated string: wlan client new entry = Create new wireless client configuration
WARNING: untranslated string: wlan client new network = New network

1
doc/language_issues.tr
View File

@ -1067,6 +1067,7 @@ WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wlan client encryption wpa3 = WPA3
WARNING: untranslated string: wlan client management frame protection = Management Frame Protection
WARNING: untranslated string: wlanap 802.11w disabled = Disabled
WARNING: untranslated string: wlanap 802.11w enforced = Enforced
WARNING: untranslated string: wlanap 802.11w optional = Optional

8
doc/language_missings
View File

@ -65,6 +65,7 @@
< wlanap 802.11w enforced
< wlanap 802.11w optional
< wlan client encryption wpa3
< wlan client management frame protection
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
@ -927,6 +928,7 @@
< wlan client group key algorithm
< wlan client identity
< wlan client invalid key length
< wlan client management frame protection
< wlan client method
< wlan client new entry
< wlan client new network
@ -974,6 +976,7 @@
< token not set
< upload fcdsl.o
< wlan client encryption wpa3
< wlan client management frame protection
############################################################################
# Checking cgi-bin translations for language: it #
############################################################################
@ -1339,6 +1342,7 @@
< wlan client encryption eap
< wlan client encryption wpa3
< wlan client identity
< wlan client management frame protection
< wlan client method
< wlan client password
< wlan client tls cipher
@ -1777,6 +1781,7 @@
< wlan client encryption eap
< wlan client encryption wpa3
< wlan client identity
< wlan client management frame protection
< wlan client method
< wlan client password
< wlan client tls cipher
@ -2643,6 +2648,7 @@
< wlan client group key algorithm
< wlan client identity
< wlan client invalid key length
< wlan client management frame protection
< wlan client method
< wlan client new entry
< wlan client new network
@ -3529,6 +3535,7 @@
< wlan client group key algorithm
< wlan client identity
< wlan client invalid key length
< wlan client management frame protection
< wlan client method
< wlan client new entry
< wlan client new network
@ -3738,6 +3745,7 @@
< wlanap neighbor scan warning
< wlanap ssid
< wlan client encryption wpa3
< wlan client management frame protection
< working
< zoneconf access native
< zoneconf access none

30
html/cgi-bin/wirelessclient.cgi
View File

@ -324,6 +324,8 @@ END
$encryption_mode = $Lang::tr{'wlan client encryption wpa'};
} elsif ($config[3] eq "WPA2") {
$encryption_mode = $Lang::tr{'wlan client encryption wpa2'};
} elsif ($config[3] eq "WPA3") {
$encryption_mode = $Lang::tr{'wlan client encryption wpa3'};
} elsif ($config[3] eq "EAP") {
$encryption_mode = $Lang::tr{'wlan client encryption eap'};
}
@ -682,6 +684,19 @@ sub ShowStatus() {
</tr>
END
if ($status{'pmf'} eq "1") {
print <<END;
<tr>
<td width='20%'>
$Lang::tr{'wlan client management frame protection'}
</td>
<td width='80%'>
$Lang::tr{'active'}
</td>
</tr>
END
}
if ($status{'EAP state'}) {
my $selected_method = $status{'selectedMethod'};
$selected_method =~ s/\d+ \((.*)\)/$1/e;
@ -736,12 +751,25 @@ END
}
if (($status{'pairwise_cipher'} ne "NONE") || ($status{'group_cipher'} ne "NONE")) {
print <<END;
if ($status{'key_mgmt'} eq "SAE") {
print <<END;
<tr>
<td colspan='2'>
<strong>$Lang::tr{'wlan client encryption wpa3'}</strong>
</td>
</tr>
END
} else {
print <<END;
<tr>
<td colspan='2'>
<strong>$Lang::tr{'wlan client encryption wpa'}</strong>
</td>
</tr>
END
}
print <<END;
<tr>
<td width='20%'>
$Lang::tr{'wlan client pairwise cipher'}

1
langs/en/cgi-bin/en.pl
View File

@ -2956,6 +2956,7 @@
'wlan client group key algorithm' => 'GKA',
'wlan client identity' => 'Identity',
'wlan client invalid key length' => 'Invalid key length.',
'wlan client management frame protection' => 'Management Frame Protection',
'wlan client method' => 'Method',
'wlan client new entry' => 'Create new wireless client configuration',
'wlan client new network' => 'New network',

4
src/initscripts/system/wlanclient
View File

@ -275,9 +275,7 @@ function wpa_supplicant_start() {
# Build wpa_supplicant command line.
local wpa_suppl_cmd="wpa_supplicant -B -qqq -i${device} -c${config}"
if device_is_wireless ${device}; then
wpa_suppl_cmd="${wpa_suppl_cmd} -Dwext"
else
if ! device_is_wireless ${device}; then
wpa_suppl_cmd="${wpa_suppl_cmd} -Dwired"
fi