author | benmeyer <benmeyer> | 2002-11-22 16:22:08 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-22 16:22:08 (UTC) |
commit | 85af9693eaa9d7ed1651883ba078d1622bd88639 (patch) (side-by-side diff) | |
tree | 8e3ba452d927883995f137d4e6ea6f8eda6d69fc /noncore/net/networksetup/wlan | |
parent | 3b5b10771415ef0a4cf7e4e02805e64238171f52 (diff) | |
download | opie-85af9693eaa9d7ed1651883ba078d1622bd88639.zip opie-85af9693eaa9d7ed1651883ba078d1622bd88639.tar.gz opie-85af9693eaa9d7ed1651883ba078d1622bd88639.tar.bz2 |
Fixed WEP bugs
-rw-r--r-- | noncore/net/networksetup/wlan/wlan.pro | 2 | ||||
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 74 |
2 files changed, 34 insertions, 42 deletions
diff --git a/noncore/net/networksetup/wlan/wlan.pro b/noncore/net/networksetup/wlan/wlan.pro index 23fc39a..396dd4a 100644 --- a/noncore/net/networksetup/wlan/wlan.pro +++ b/noncore/net/networksetup/wlan/wlan.pro @@ -3,3 +3,3 @@ CONFIG += qt warn_on release #CONFIG += qt warn_on debug -DESTDIR = $(OPIEDIR)/plugins/networksetup +#DESTDIR = $(OPIEDIR)/plugins/networksetup HEADERS = wlanimp.h infoimp.h wlanmodule.h wextensions.h diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index 87a9716..488911b 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -92,32 +92,16 @@ void WLANImp::parseSettingFile(){ } + if(line.contains("KEY0=")) + keyLineEdit0->setText(line.mid(5, line.length())); + if(line.contains("KEY1=")) + keyLineEdit1->setText(line.mid(5, line.length())); + if(line.contains("KEY2=")) + keyLineEdit2->setText(line.mid(5, line.length())); + if(line.contains("KEY3=")) + keyLineEdit3->setText(line.mid(5, line.length())); + if(line.contains("KEY=")){ - line.at(0) != '#' ? wepEnabled->setChecked(true) : wepEnabled->setChecked(false); - int s = line.find("KEY="); - line = line.mid(s+4, line.length()); - // Find first Key - s = line.find("[1]"); - if(s != -1){ - keyLineEdit0->setText(line.mid(0, s)); - line = line.mid(s+3, line.length()); - } - s = line.find("[2]"); - if(s != -1){ - keyLineEdit1->setText(line.mid(0, s)); - line = line.mid(s+3, line.length()); - } - s = line.find("[3]"); - if(s != -1){ - keyLineEdit2->setText(line.mid(0, s)); - line = line.mid(s+3, line.length()); - } - s = line.find("[4]"); - if(s != -1){ - keyLineEdit3->setText(line.mid(0, s)); - line = line.mid(s+3, line.length()); - } - if(line.contains("key [1]")) keyRadio0->setChecked(true); - if(line.contains("key [2]")) keyRadio1->setChecked(true); - if(line.contains("key [3]")) keyRadio2->setChecked(true); - if(line.contains("key [4]")) keyRadio3->setChecked(true); - if(line.contains("open")){ + wepEnabled->setChecked(true); + QString key; + if(line.right(5) == (" open")){ + key = line.mid(4, line.length()-5); authOpen->setChecked(true); @@ -128,3 +112,8 @@ void WLANImp::parseSettingFile(){ authShared->setChecked(true); + key = line.mid(4, line.length()); } + if(key == keyLineEdit0->text()) keyRadio0->setChecked(true); + if(key == keyLineEdit1->text()) keyRadio1->setChecked(true); + if(key == keyLineEdit2->text()) keyRadio2->setChecked(true); + if(key == keyLineEdit3->text()) keyRadio3->setChecked(true); } @@ -169,17 +158,18 @@ void WLANImp::changeAndSaveSettingFile(){ stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; - stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "AdHoc") << '\n'; - if(!wepEnabled->isChecked()) - stream << "#"; + stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; + + stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; + stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; + stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; + stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; + + if(wepEnabled->isChecked()){ stream << "\tKEY="; - stream << keyLineEdit0->text() << " [1]"; - stream << keyLineEdit1->text() << " [2]"; - stream << keyLineEdit2->text() << " [3]"; - stream << keyLineEdit3->text() << " [4]"; - stream << " key ["; - if(keyRadio0->isChecked()) stream << "1]"; - if(keyRadio1->isChecked()) stream << "2]"; - if(keyRadio2->isChecked()) stream << "3]"; - if(keyRadio3->isChecked()) stream << "4]"; + if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); + if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); + if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); + if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); if(authOpen->isChecked()) stream << " open"; stream << "\n"; + } stream << "\tCHANNEL=" << networkChannel->value() << "\n"; @@ -217,2 +207,4 @@ void WLANImp::accept(){ + QDialog::accept(); + return; // Restart the device now that the settings have changed |