jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_gui: Only move to WPS tab if inactive/disconnect and AP ready

Browse source 
This removes many of the cases where moving to the WPS tab can be
undesired. It is really only useful if we are not currently connected
and there is an AP available that would likely be able to provide us
network connectivity with use of WPS (active PBC more or selected
registrar set).
This commit is contained in:
Jouni Malinen 2009-11-21 20:52:55 +02:00
parent 55d0b0831e
commit 19019a84a2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/wpa_gui-qt4/wpagui.cpp
View file

@ -869,7 +869,9 @@ void WpaGui::processMsg(char *msg)
"Wi-Fi Protected Setup (WPS) AP\n" "Wi-Fi Protected Setup (WPS) AP\n"
"in active PBC mode found."); "in active PBC mode found.");
wpsStatusText->setText("WPS AP in active PBC mode found"); wpsStatusText->setText("WPS AP in active PBC mode found");
wpaguiTab->setCurrentWidget(wpsTab); if (textStatus->text() == "INACTIVE" ||
textStatus->text() == "DISCONNECTED")
wpaguiTab->setCurrentWidget(wpsTab);
wpsInstructions->setText("Press the PBC button on the screen " wpsInstructions->setText("Press the PBC button on the screen "
"to start registration"); "to start registration");
} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) { } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {
@ -878,13 +880,14 @@ void WpaGui::processMsg(char *msg)
" in active PIN mode found."); " in active PIN mode found.");
wpsStatusText->setText("WPS AP with recently selected " wpsStatusText->setText("WPS AP with recently selected "
"registrar"); "registrar");
wpaguiTab->setCurrentWidget(wpsTab); if (textStatus->text() == "INACTIVE" ||
textStatus->text() == "DISCONNECTED")
wpaguiTab->setCurrentWidget(wpsTab);
} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) { } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) {
showTrayMessage(QSystemTrayIcon::Information, 3, showTrayMessage(QSystemTrayIcon::Information, 3,
"Wi-Fi Protected Setup (WPS)\n" "Wi-Fi Protected Setup (WPS)\n"
"AP detected."); "AP detected.");
wpsStatusText->setText("WPS AP detected"); wpsStatusText->setText("WPS AP detected");
wpaguiTab->setCurrentWidget(wpsTab);
} else if (str_match(pos, WPS_EVENT_OVERLAP)) { } else if (str_match(pos, WPS_EVENT_OVERLAP)) {
showTrayMessage(QSystemTrayIcon::Information, 3, showTrayMessage(QSystemTrayIcon::Information, 3,
"Wi-Fi Protected Setup (WPS)\n" "Wi-Fi Protected Setup (WPS)\n"