author | benmeyer <benmeyer> | 2002-11-22 16:22:08 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-22 16:22:08 (UTC) |
commit | 85af9693eaa9d7ed1651883ba078d1622bd88639 (patch) (unidiff) | |
tree | 8e3ba452d927883995f137d4e6ea6f8eda6d69fc /noncore | |
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 | 82 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.pro | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 82 |
4 files changed, 76 insertions, 92 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 | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/plugins/networksetup | 4 | #DESTDIR = $(OPIEDIR)/plugins/networksetup |
5 | HEADERS = wlanimp.h infoimp.h wlanmodule.h wextensions.h | 5 | HEADERS = wlanimp.h infoimp.h wlanmodule.h wextensions.h |
6 | SOURCES = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp | 6 | SOURCES = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ | 7 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe -L../interfaces/ -linterfaces | 9 | LIBS += -lqpe -L../interfaces/ -linterfaces |
10 | INTERFACES= wlan.ui info.ui | 10 | INTERFACES= wlan.ui info.ui |
11 | TARGET = wlanplugin | 11 | TARGET = wlanplugin |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
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 | |||
@@ -1,234 +1,226 @@ | |||
1 | #include "wlanimp.h" | 1 | #include "wlanimp.h" |
2 | #include "interfacesetupimp.h" | 2 | #include "interfacesetupimp.h" |
3 | 3 | ||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qtextstream.h> | 6 | #include <qtextstream.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <qlineedit.h> | 8 | #include <qlineedit.h> |
9 | #include <qspinbox.h> | 9 | #include <qspinbox.h> |
10 | #include <qradiobutton.h> | 10 | #include <qradiobutton.h> |
11 | #include <qcheckbox.h> | 11 | #include <qcheckbox.h> |
12 | #include <qtabwidget.h> | 12 | #include <qtabwidget.h> |
13 | 13 | ||
14 | /* system() */ | 14 | /* system() */ |
15 | #include <stdlib.h> | 15 | #include <stdlib.h> |
16 | 16 | ||
17 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 17 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
18 | 18 | ||
19 | /** | 19 | /** |
20 | * Constructor, read in the wireless.opts file for parsing later. | 20 | * Constructor, read in the wireless.opts file for parsing later. |
21 | */ | 21 | */ |
22 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { | 22 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { |
23 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); | 23 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); |
24 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 24 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
25 | 25 | ||
26 | // Read in the config file. | 26 | // Read in the config file. |
27 | QString wlanFile = WIRELESS_OPTS; | 27 | QString wlanFile = WIRELESS_OPTS; |
28 | QFile file(wlanFile); | 28 | QFile file(wlanFile); |
29 | if (file.open(IO_ReadOnly)){ | 29 | if (file.open(IO_ReadOnly)){ |
30 | QTextStream stream( &file ); | 30 | QTextStream stream( &file ); |
31 | QString line = ""; | 31 | QString line = ""; |
32 | while ( !stream.eof() ) { | 32 | while ( !stream.eof() ) { |
33 | line += stream.readLine(); | 33 | line += stream.readLine(); |
34 | line += "\n"; | 34 | line += "\n"; |
35 | } | 35 | } |
36 | file.close(); | 36 | file.close(); |
37 | settingsFileText = QStringList::split("\n", line, true); | 37 | settingsFileText = QStringList::split("\n", line, true); |
38 | parseSettingFile(); | 38 | parseSettingFile(); |
39 | } | 39 | } |
40 | else | 40 | else |
41 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); | 41 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Change the profile for both wireless settings and network settings. | 45 | * Change the profile for both wireless settings and network settings. |
46 | */ | 46 | */ |
47 | void WLANImp::setProfile(const QString &profile){ | 47 | void WLANImp::setProfile(const QString &profile){ |
48 | interfaceSetup->setProfile(profile); | 48 | interfaceSetup->setProfile(profile); |
49 | parseSettingFile(); | 49 | parseSettingFile(); |
50 | } | 50 | } |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Parses the settings file that was read in and gets any setting from it. | 53 | * Parses the settings file that was read in and gets any setting from it. |
54 | */ | 54 | */ |
55 | void WLANImp::parseSettingFile(){ | 55 | void WLANImp::parseSettingFile(){ |
56 | bool foundCase = false; | 56 | bool foundCase = false; |
57 | bool found = false; | 57 | bool found = false; |
58 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { | 58 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { |
59 | QString line = (*it).simplifyWhiteSpace(); | 59 | QString line = (*it).simplifyWhiteSpace(); |
60 | if(line.contains("case")) | 60 | if(line.contains("case")) |
61 | foundCase = true; | 61 | foundCase = true; |
62 | // See if we found our scheme to write or the sceme couldn't be found | 62 | // See if we found our scheme to write or the sceme couldn't be found |
63 | if((foundCase && line.contains("esac")) || | 63 | if((foundCase && line.contains("esac")) || |
64 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')) | 64 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')) |
65 | found = true; | 65 | found = true; |
66 | 66 | ||
67 | if(line.contains(";;")) | 67 | if(line.contains(";;")) |
68 | found = false; | 68 | found = false; |
69 | if(found){ | 69 | if(found){ |
70 | // write out scheme | 70 | // write out scheme |
71 | if(line.contains("ESSID=")){ | 71 | if(line.contains("ESSID=")){ |
72 | QString id = line.mid(line.find("ESSID=")+6, line.length()); | 72 | QString id = line.mid(line.find("ESSID=")+6, line.length()); |
73 | if(id == "any"){ | 73 | if(id == "any"){ |
74 | essNon->setChecked(true); | 74 | essNon->setChecked(true); |
75 | essSpecific->setChecked(false); | 75 | essSpecific->setChecked(false); |
76 | }else{ | 76 | }else{ |
77 | essSpecific->setChecked(true); | 77 | essSpecific->setChecked(true); |
78 | essSpecificLineEdit->setText(id); | 78 | essSpecificLineEdit->setText(id); |
79 | essNon->setChecked(false); | 79 | essNon->setChecked(false); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | if(line.contains("MODE=")){ | 82 | if(line.contains("MODE=")){ |
83 | QString mode = line.mid(line.find("MODE=")+5, line.length()); | 83 | QString mode = line.mid(line.find("MODE=")+5, line.length()); |
84 | if(mode == "Managed"){ | 84 | if(mode == "Managed"){ |
85 | network802->setChecked( false ); | 85 | network802->setChecked( false ); |
86 | networkInfrastructure->setChecked( true ); | 86 | networkInfrastructure->setChecked( true ); |
87 | } | 87 | } |
88 | else{ | 88 | else{ |
89 | network802->setChecked( true ); | 89 | network802->setChecked( true ); |
90 | networkInfrastructure->setChecked( false ); | 90 | networkInfrastructure->setChecked( false ); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | if(line.contains("KEY0=")) | ||
94 | keyLineEdit0->setText(line.mid(5, line.length())); | ||
95 | if(line.contains("KEY1=")) | ||
96 | keyLineEdit1->setText(line.mid(5, line.length())); | ||
97 | if(line.contains("KEY2=")) | ||
98 | keyLineEdit2->setText(line.mid(5, line.length())); | ||
99 | if(line.contains("KEY3=")) | ||
100 | keyLineEdit3->setText(line.mid(5, line.length())); | ||
101 | |||
93 | if(line.contains("KEY=")){ | 102 | if(line.contains("KEY=")){ |
94 | line.at(0) != '#' ? wepEnabled->setChecked(true) : wepEnabled->setChecked(false); | 103 | wepEnabled->setChecked(true); |
95 | int s = line.find("KEY="); | 104 | QString key; |
96 | line = line.mid(s+4, line.length()); | 105 | if(line.right(5) == (" open")){ |
97 | // Find first Key | 106 | key = line.mid(4, line.length()-5); |
98 | s = line.find("[1]"); | ||
99 | if(s != -1){ | ||
100 | keyLineEdit0->setText(line.mid(0, s)); | ||
101 | line = line.mid(s+3, line.length()); | ||
102 | } | ||
103 | s = line.find("[2]"); | ||
104 | if(s != -1){ | ||
105 | keyLineEdit1->setText(line.mid(0, s)); | ||
106 | line = line.mid(s+3, line.length()); | ||
107 | } | ||
108 | s = line.find("[3]"); | ||
109 | if(s != -1){ | ||
110 | keyLineEdit2->setText(line.mid(0, s)); | ||
111 | line = line.mid(s+3, line.length()); | ||
112 | } | ||
113 | s = line.find("[4]"); | ||
114 | if(s != -1){ | ||
115 | keyLineEdit3->setText(line.mid(0, s)); | ||
116 | line = line.mid(s+3, line.length()); | ||
117 | } | ||
118 | if(line.contains("key [1]")) keyRadio0->setChecked(true); | ||
119 | if(line.contains("key [2]")) keyRadio1->setChecked(true); | ||
120 | if(line.contains("key [3]")) keyRadio2->setChecked(true); | ||
121 | if(line.contains("key [4]")) keyRadio3->setChecked(true); | ||
122 | if(line.contains("open")){ | ||
123 | authOpen->setChecked(true); | 107 | authOpen->setChecked(true); |
124 | authShared->setChecked(false); | 108 | authShared->setChecked(false); |
125 | } | 109 | } |
126 | else{ | 110 | else{ |
127 | authOpen->setChecked(false); | 111 | authOpen->setChecked(false); |
128 | authShared->setChecked(true); | 112 | authShared->setChecked(true); |
113 | key = line.mid(4, line.length()); | ||
129 | } | 114 | } |
115 | if(key == keyLineEdit0->text()) keyRadio0->setChecked(true); | ||
116 | if(key == keyLineEdit1->text()) keyRadio1->setChecked(true); | ||
117 | if(key == keyLineEdit2->text()) keyRadio2->setChecked(true); | ||
118 | if(key == keyLineEdit3->text()) keyRadio3->setChecked(true); | ||
130 | } | 119 | } |
131 | if(line.contains("CHANNEL=")){ | 120 | if(line.contains("CHANNEL=")){ |
132 | networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt()); | 121 | networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt()); |
133 | } | 122 | } |
134 | } | 123 | } |
135 | } | 124 | } |
136 | } | 125 | } |
137 | 126 | ||
138 | /** | 127 | /** |
139 | * Saves settings to the wireless.opts file using the current profile | 128 | * Saves settings to the wireless.opts file using the current profile |
140 | */ | 129 | */ |
141 | void WLANImp::changeAndSaveSettingFile(){ | 130 | void WLANImp::changeAndSaveSettingFile(){ |
142 | QString wlanFile = WIRELESS_OPTS; | 131 | QString wlanFile = WIRELESS_OPTS; |
143 | QFile::remove(wlanFile); | 132 | QFile::remove(wlanFile); |
144 | QFile file(wlanFile); | 133 | QFile file(wlanFile); |
145 | 134 | ||
146 | if (!file.open(IO_ReadWrite)){ | 135 | if (!file.open(IO_ReadWrite)){ |
147 | qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1()); | 136 | qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1()); |
148 | return; | 137 | return; |
149 | } | 138 | } |
150 | 139 | ||
151 | QTextStream stream( &file ); | 140 | QTextStream stream( &file ); |
152 | bool foundCase = false; | 141 | bool foundCase = false; |
153 | bool found = false; | 142 | bool found = false; |
154 | bool output = true; | 143 | bool output = true; |
155 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { | 144 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { |
156 | QString line = (*it).simplifyWhiteSpace(); | 145 | QString line = (*it).simplifyWhiteSpace(); |
157 | if(line.contains("case")) | 146 | if(line.contains("case")) |
158 | foundCase = true; | 147 | foundCase = true; |
159 | // See if we found our scheme to write or the sceme couldn't be found | 148 | // See if we found our scheme to write or the sceme couldn't be found |
160 | if((foundCase && line.contains("esac") && !found) || | 149 | if((foundCase && line.contains("esac") && !found) || |
161 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){ | 150 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){ |
162 | // write out scheme | 151 | // write out scheme |
163 | found = true; | 152 | found = true; |
164 | output = false; | 153 | output = false; |
165 | 154 | ||
166 | if(!line.contains("esac")) | 155 | if(!line.contains("esac")) |
167 | stream << line << "\n"; | 156 | stream << line << "\n"; |
168 | 157 | ||
169 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; | 158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; |
170 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "AdHoc") << '\n'; | 159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; |
171 | if(!wepEnabled->isChecked()) | 160 | |
172 | stream << "#"; | 161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; |
173 | stream << "\tKEY="; | 162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; |
174 | stream << keyLineEdit0->text() << " [1]"; | 163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; |
175 | stream << keyLineEdit1->text() << " [2]"; | 164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; |
176 | stream << keyLineEdit2->text() << " [3]"; | 165 | |
177 | stream << keyLineEdit3->text() << " [4]"; | 166 | if(wepEnabled->isChecked()){ |
178 | stream << " key ["; | 167 | stream << "\tKEY="; |
179 | if(keyRadio0->isChecked()) stream << "1]"; | 168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); |
180 | if(keyRadio1->isChecked()) stream << "2]"; | 169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); |
181 | if(keyRadio2->isChecked()) stream << "3]"; | 170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); |
182 | if(keyRadio3->isChecked()) stream << "4]"; | 171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); |
183 | if(authOpen->isChecked()) stream << " open"; | 172 | if(authOpen->isChecked()) stream << " open"; |
184 | stream << "\n"; | 173 | stream << "\n"; |
174 | } | ||
185 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; | 175 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; |
186 | stream << "\tRATE=auto\n"; | 176 | stream << "\tRATE=auto\n"; |
187 | if(line.contains("esac")) | 177 | if(line.contains("esac")) |
188 | stream << line << "\n"; | 178 | stream << line << "\n"; |
189 | } | 179 | } |
190 | if(line.contains(";;")) | 180 | if(line.contains(";;")) |
191 | output = true; | 181 | output = true; |
192 | if(output) | 182 | if(output) |
193 | stream << (*it) << '\n'; | 183 | stream << (*it) << '\n'; |
194 | } | 184 | } |
195 | file.close(); | 185 | file.close(); |
196 | } | 186 | } |
197 | 187 | ||
198 | /** | 188 | /** |
199 | * Check to see if the current config is valid | 189 | * Check to see if the current config is valid |
200 | * Save wireless.opts, save interfaces | 190 | * Save wireless.opts, save interfaces |
201 | */ | 191 | */ |
202 | void WLANImp::accept(){ | 192 | void WLANImp::accept(){ |
203 | if(wepEnabled->isChecked()){ | 193 | if(wepEnabled->isChecked()){ |
204 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) | 194 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) |
205 | { | 195 | { |
206 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); | 196 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); |
207 | return; | 197 | return; |
208 | } | 198 | } |
209 | } | 199 | } |
210 | 200 | ||
211 | // Ok settings are good here, save | 201 | // Ok settings are good here, save |
212 | changeAndSaveSettingFile(); | 202 | changeAndSaveSettingFile(); |
213 | 203 | ||
214 | // Try to save the interfaces settings. | 204 | // Try to save the interfaces settings. |
215 | if(!interfaceSetup->saveChanges()) | 205 | if(!interfaceSetup->saveChanges()) |
216 | return; | 206 | return; |
217 | 207 | ||
208 | QDialog::accept(); | ||
209 | return; | ||
218 | // Restart the device now that the settings have changed | 210 | // Restart the device now that the settings have changed |
219 | QString initpath; | 211 | QString initpath; |
220 | if( QDir("/etc/rc.d/init.d").exists() ) | 212 | if( QDir("/etc/rc.d/init.d").exists() ) |
221 | initpath = "/etc/rc.d/init.d"; | 213 | initpath = "/etc/rc.d/init.d"; |
222 | else if( QDir("/etc/init.d").exists() ) | 214 | else if( QDir("/etc/init.d").exists() ) |
223 | initpath = "/etc/init.d"; | 215 | initpath = "/etc/init.d"; |
224 | if( initpath ) | 216 | if( initpath ) |
225 | system(QString("%1/pcmcia stop").arg(initpath)); | 217 | system(QString("%1/pcmcia stop").arg(initpath)); |
226 | if( initpath ) | 218 | if( initpath ) |
227 | system(QString("%1/pcmcia start").arg(initpath)); | 219 | system(QString("%1/pcmcia start").arg(initpath)); |
228 | 220 | ||
229 | // Close out the dialog | 221 | // Close out the dialog |
230 | QDialog::accept(); | 222 | QDialog::accept(); |
231 | } | 223 | } |
232 | 224 | ||
233 | // wlanimp.cpp | 225 | // wlanimp.cpp |
234 | 226 | ||
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro index 23fc39a..396dd4a 100644 --- a/noncore/settings/networksettings/wlan/wlan.pro +++ b/noncore/settings/networksettings/wlan/wlan.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/plugins/networksetup | 4 | #DESTDIR = $(OPIEDIR)/plugins/networksetup |
5 | HEADERS = wlanimp.h infoimp.h wlanmodule.h wextensions.h | 5 | HEADERS = wlanimp.h infoimp.h wlanmodule.h wextensions.h |
6 | SOURCES = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp | 6 | SOURCES = wlanimp.cpp infoimp.cpp wlanmodule.cpp wextensions.cpp |
7 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ | 7 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe -L../interfaces/ -linterfaces | 9 | LIBS += -lqpe -L../interfaces/ -linterfaces |
10 | INTERFACES= wlan.ui info.ui | 10 | INTERFACES= wlan.ui info.ui |
11 | TARGET = wlanplugin | 11 | TARGET = wlanplugin |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 87a9716..488911b 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -1,234 +1,226 @@ | |||
1 | #include "wlanimp.h" | 1 | #include "wlanimp.h" |
2 | #include "interfacesetupimp.h" | 2 | #include "interfacesetupimp.h" |
3 | 3 | ||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qtextstream.h> | 6 | #include <qtextstream.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <qlineedit.h> | 8 | #include <qlineedit.h> |
9 | #include <qspinbox.h> | 9 | #include <qspinbox.h> |
10 | #include <qradiobutton.h> | 10 | #include <qradiobutton.h> |
11 | #include <qcheckbox.h> | 11 | #include <qcheckbox.h> |
12 | #include <qtabwidget.h> | 12 | #include <qtabwidget.h> |
13 | 13 | ||
14 | /* system() */ | 14 | /* system() */ |
15 | #include <stdlib.h> | 15 | #include <stdlib.h> |
16 | 16 | ||
17 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 17 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
18 | 18 | ||
19 | /** | 19 | /** |
20 | * Constructor, read in the wireless.opts file for parsing later. | 20 | * Constructor, read in the wireless.opts file for parsing later. |
21 | */ | 21 | */ |
22 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { | 22 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { |
23 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); | 23 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); |
24 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 24 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
25 | 25 | ||
26 | // Read in the config file. | 26 | // Read in the config file. |
27 | QString wlanFile = WIRELESS_OPTS; | 27 | QString wlanFile = WIRELESS_OPTS; |
28 | QFile file(wlanFile); | 28 | QFile file(wlanFile); |
29 | if (file.open(IO_ReadOnly)){ | 29 | if (file.open(IO_ReadOnly)){ |
30 | QTextStream stream( &file ); | 30 | QTextStream stream( &file ); |
31 | QString line = ""; | 31 | QString line = ""; |
32 | while ( !stream.eof() ) { | 32 | while ( !stream.eof() ) { |
33 | line += stream.readLine(); | 33 | line += stream.readLine(); |
34 | line += "\n"; | 34 | line += "\n"; |
35 | } | 35 | } |
36 | file.close(); | 36 | file.close(); |
37 | settingsFileText = QStringList::split("\n", line, true); | 37 | settingsFileText = QStringList::split("\n", line, true); |
38 | parseSettingFile(); | 38 | parseSettingFile(); |
39 | } | 39 | } |
40 | else | 40 | else |
41 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); | 41 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Change the profile for both wireless settings and network settings. | 45 | * Change the profile for both wireless settings and network settings. |
46 | */ | 46 | */ |
47 | void WLANImp::setProfile(const QString &profile){ | 47 | void WLANImp::setProfile(const QString &profile){ |
48 | interfaceSetup->setProfile(profile); | 48 | interfaceSetup->setProfile(profile); |
49 | parseSettingFile(); | 49 | parseSettingFile(); |
50 | } | 50 | } |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Parses the settings file that was read in and gets any setting from it. | 53 | * Parses the settings file that was read in and gets any setting from it. |
54 | */ | 54 | */ |
55 | void WLANImp::parseSettingFile(){ | 55 | void WLANImp::parseSettingFile(){ |
56 | bool foundCase = false; | 56 | bool foundCase = false; |
57 | bool found = false; | 57 | bool found = false; |
58 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { | 58 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { |
59 | QString line = (*it).simplifyWhiteSpace(); | 59 | QString line = (*it).simplifyWhiteSpace(); |
60 | if(line.contains("case")) | 60 | if(line.contains("case")) |
61 | foundCase = true; | 61 | foundCase = true; |
62 | // See if we found our scheme to write or the sceme couldn't be found | 62 | // See if we found our scheme to write or the sceme couldn't be found |
63 | if((foundCase && line.contains("esac")) || | 63 | if((foundCase && line.contains("esac")) || |
64 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')) | 64 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')) |
65 | found = true; | 65 | found = true; |
66 | 66 | ||
67 | if(line.contains(";;")) | 67 | if(line.contains(";;")) |
68 | found = false; | 68 | found = false; |
69 | if(found){ | 69 | if(found){ |
70 | // write out scheme | 70 | // write out scheme |
71 | if(line.contains("ESSID=")){ | 71 | if(line.contains("ESSID=")){ |
72 | QString id = line.mid(line.find("ESSID=")+6, line.length()); | 72 | QString id = line.mid(line.find("ESSID=")+6, line.length()); |
73 | if(id == "any"){ | 73 | if(id == "any"){ |
74 | essNon->setChecked(true); | 74 | essNon->setChecked(true); |
75 | essSpecific->setChecked(false); | 75 | essSpecific->setChecked(false); |
76 | }else{ | 76 | }else{ |
77 | essSpecific->setChecked(true); | 77 | essSpecific->setChecked(true); |
78 | essSpecificLineEdit->setText(id); | 78 | essSpecificLineEdit->setText(id); |
79 | essNon->setChecked(false); | 79 | essNon->setChecked(false); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | if(line.contains("MODE=")){ | 82 | if(line.contains("MODE=")){ |
83 | QString mode = line.mid(line.find("MODE=")+5, line.length()); | 83 | QString mode = line.mid(line.find("MODE=")+5, line.length()); |
84 | if(mode == "Managed"){ | 84 | if(mode == "Managed"){ |
85 | network802->setChecked( false ); | 85 | network802->setChecked( false ); |
86 | networkInfrastructure->setChecked( true ); | 86 | networkInfrastructure->setChecked( true ); |
87 | } | 87 | } |
88 | else{ | 88 | else{ |
89 | network802->setChecked( true ); | 89 | network802->setChecked( true ); |
90 | networkInfrastructure->setChecked( false ); | 90 | networkInfrastructure->setChecked( false ); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | if(line.contains("KEY0=")) | ||
94 | keyLineEdit0->setText(line.mid(5, line.length())); | ||
95 | if(line.contains("KEY1=")) | ||
96 | keyLineEdit1->setText(line.mid(5, line.length())); | ||
97 | if(line.contains("KEY2=")) | ||
98 | keyLineEdit2->setText(line.mid(5, line.length())); | ||
99 | if(line.contains("KEY3=")) | ||
100 | keyLineEdit3->setText(line.mid(5, line.length())); | ||
101 | |||
93 | if(line.contains("KEY=")){ | 102 | if(line.contains("KEY=")){ |
94 | line.at(0) != '#' ? wepEnabled->setChecked(true) : wepEnabled->setChecked(false); | 103 | wepEnabled->setChecked(true); |
95 | int s = line.find("KEY="); | 104 | QString key; |
96 | line = line.mid(s+4, line.length()); | 105 | if(line.right(5) == (" open")){ |
97 | // Find first Key | 106 | key = line.mid(4, line.length()-5); |
98 | s = line.find("[1]"); | ||
99 | if(s != -1){ | ||
100 | keyLineEdit0->setText(line.mid(0, s)); | ||
101 | line = line.mid(s+3, line.length()); | ||
102 | } | ||
103 | s = line.find("[2]"); | ||
104 | if(s != -1){ | ||
105 | keyLineEdit1->setText(line.mid(0, s)); | ||
106 | line = line.mid(s+3, line.length()); | ||
107 | } | ||
108 | s = line.find("[3]"); | ||
109 | if(s != -1){ | ||
110 | keyLineEdit2->setText(line.mid(0, s)); | ||
111 | line = line.mid(s+3, line.length()); | ||
112 | } | ||
113 | s = line.find("[4]"); | ||
114 | if(s != -1){ | ||
115 | keyLineEdit3->setText(line.mid(0, s)); | ||
116 | line = line.mid(s+3, line.length()); | ||
117 | } | ||
118 | if(line.contains("key [1]")) keyRadio0->setChecked(true); | ||
119 | if(line.contains("key [2]")) keyRadio1->setChecked(true); | ||
120 | if(line.contains("key [3]")) keyRadio2->setChecked(true); | ||
121 | if(line.contains("key [4]")) keyRadio3->setChecked(true); | ||
122 | if(line.contains("open")){ | ||
123 | authOpen->setChecked(true); | 107 | authOpen->setChecked(true); |
124 | authShared->setChecked(false); | 108 | authShared->setChecked(false); |
125 | } | 109 | } |
126 | else{ | 110 | else{ |
127 | authOpen->setChecked(false); | 111 | authOpen->setChecked(false); |
128 | authShared->setChecked(true); | 112 | authShared->setChecked(true); |
113 | key = line.mid(4, line.length()); | ||
129 | } | 114 | } |
115 | if(key == keyLineEdit0->text()) keyRadio0->setChecked(true); | ||
116 | if(key == keyLineEdit1->text()) keyRadio1->setChecked(true); | ||
117 | if(key == keyLineEdit2->text()) keyRadio2->setChecked(true); | ||
118 | if(key == keyLineEdit3->text()) keyRadio3->setChecked(true); | ||
130 | } | 119 | } |
131 | if(line.contains("CHANNEL=")){ | 120 | if(line.contains("CHANNEL=")){ |
132 | networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt()); | 121 | networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt()); |
133 | } | 122 | } |
134 | } | 123 | } |
135 | } | 124 | } |
136 | } | 125 | } |
137 | 126 | ||
138 | /** | 127 | /** |
139 | * Saves settings to the wireless.opts file using the current profile | 128 | * Saves settings to the wireless.opts file using the current profile |
140 | */ | 129 | */ |
141 | void WLANImp::changeAndSaveSettingFile(){ | 130 | void WLANImp::changeAndSaveSettingFile(){ |
142 | QString wlanFile = WIRELESS_OPTS; | 131 | QString wlanFile = WIRELESS_OPTS; |
143 | QFile::remove(wlanFile); | 132 | QFile::remove(wlanFile); |
144 | QFile file(wlanFile); | 133 | QFile file(wlanFile); |
145 | 134 | ||
146 | if (!file.open(IO_ReadWrite)){ | 135 | if (!file.open(IO_ReadWrite)){ |
147 | qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1()); | 136 | qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1()); |
148 | return; | 137 | return; |
149 | } | 138 | } |
150 | 139 | ||
151 | QTextStream stream( &file ); | 140 | QTextStream stream( &file ); |
152 | bool foundCase = false; | 141 | bool foundCase = false; |
153 | bool found = false; | 142 | bool found = false; |
154 | bool output = true; | 143 | bool output = true; |
155 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { | 144 | for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) { |
156 | QString line = (*it).simplifyWhiteSpace(); | 145 | QString line = (*it).simplifyWhiteSpace(); |
157 | if(line.contains("case")) | 146 | if(line.contains("case")) |
158 | foundCase = true; | 147 | foundCase = true; |
159 | // See if we found our scheme to write or the sceme couldn't be found | 148 | // See if we found our scheme to write or the sceme couldn't be found |
160 | if((foundCase && line.contains("esac") && !found) || | 149 | if((foundCase && line.contains("esac") && !found) || |
161 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){ | 150 | (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){ |
162 | // write out scheme | 151 | // write out scheme |
163 | found = true; | 152 | found = true; |
164 | output = false; | 153 | output = false; |
165 | 154 | ||
166 | if(!line.contains("esac")) | 155 | if(!line.contains("esac")) |
167 | stream << line << "\n"; | 156 | stream << line << "\n"; |
168 | 157 | ||
169 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; | 158 | stream << "\tESSID=" << (essNon->isChecked() == true ? QString("any") : essSpecificLineEdit->text()) << '\n'; |
170 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "AdHoc") << '\n'; | 159 | stream << "\tMODE=" << (networkInfrastructure->isChecked() == true ? "Managed" : "ad-hoc") << '\n'; |
171 | if(!wepEnabled->isChecked()) | 160 | |
172 | stream << "#"; | 161 | stream << "\tKEY0=" << keyLineEdit0->text() << "\n"; |
173 | stream << "\tKEY="; | 162 | stream << "\tKEY1=" << keyLineEdit1->text() << "\n"; |
174 | stream << keyLineEdit0->text() << " [1]"; | 163 | stream << "\tKEY2=" << keyLineEdit2->text() << "\n"; |
175 | stream << keyLineEdit1->text() << " [2]"; | 164 | stream << "\tKEY3=" << keyLineEdit3->text() << "\n"; |
176 | stream << keyLineEdit2->text() << " [3]"; | 165 | |
177 | stream << keyLineEdit3->text() << " [4]"; | 166 | if(wepEnabled->isChecked()){ |
178 | stream << " key ["; | 167 | stream << "\tKEY="; |
179 | if(keyRadio0->isChecked()) stream << "1]"; | 168 | if(keyRadio0->isChecked()) stream << keyLineEdit0->text(); |
180 | if(keyRadio1->isChecked()) stream << "2]"; | 169 | if(keyRadio1->isChecked()) stream << keyLineEdit1->text(); |
181 | if(keyRadio2->isChecked()) stream << "3]"; | 170 | if(keyRadio2->isChecked()) stream << keyLineEdit2->text(); |
182 | if(keyRadio3->isChecked()) stream << "4]"; | 171 | if(keyRadio3->isChecked()) stream << keyLineEdit3->text(); |
183 | if(authOpen->isChecked()) stream << " open"; | 172 | if(authOpen->isChecked()) stream << " open"; |
184 | stream << "\n"; | 173 | stream << "\n"; |
174 | } | ||
185 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; | 175 | stream << "\tCHANNEL=" << networkChannel->value() << "\n"; |
186 | stream << "\tRATE=auto\n"; | 176 | stream << "\tRATE=auto\n"; |
187 | if(line.contains("esac")) | 177 | if(line.contains("esac")) |
188 | stream << line << "\n"; | 178 | stream << line << "\n"; |
189 | } | 179 | } |
190 | if(line.contains(";;")) | 180 | if(line.contains(";;")) |
191 | output = true; | 181 | output = true; |
192 | if(output) | 182 | if(output) |
193 | stream << (*it) << '\n'; | 183 | stream << (*it) << '\n'; |
194 | } | 184 | } |
195 | file.close(); | 185 | file.close(); |
196 | } | 186 | } |
197 | 187 | ||
198 | /** | 188 | /** |
199 | * Check to see if the current config is valid | 189 | * Check to see if the current config is valid |
200 | * Save wireless.opts, save interfaces | 190 | * Save wireless.opts, save interfaces |
201 | */ | 191 | */ |
202 | void WLANImp::accept(){ | 192 | void WLANImp::accept(){ |
203 | if(wepEnabled->isChecked()){ | 193 | if(wepEnabled->isChecked()){ |
204 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) | 194 | if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) |
205 | { | 195 | { |
206 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); | 196 | QMessageBox::information(this, "", "Please enter a key for WEP.", QMessageBox::Ok); |
207 | return; | 197 | return; |
208 | } | 198 | } |
209 | } | 199 | } |
210 | 200 | ||
211 | // Ok settings are good here, save | 201 | // Ok settings are good here, save |
212 | changeAndSaveSettingFile(); | 202 | changeAndSaveSettingFile(); |
213 | 203 | ||
214 | // Try to save the interfaces settings. | 204 | // Try to save the interfaces settings. |
215 | if(!interfaceSetup->saveChanges()) | 205 | if(!interfaceSetup->saveChanges()) |
216 | return; | 206 | return; |
217 | 207 | ||
208 | QDialog::accept(); | ||
209 | return; | ||
218 | // Restart the device now that the settings have changed | 210 | // Restart the device now that the settings have changed |
219 | QString initpath; | 211 | QString initpath; |
220 | if( QDir("/etc/rc.d/init.d").exists() ) | 212 | if( QDir("/etc/rc.d/init.d").exists() ) |
221 | initpath = "/etc/rc.d/init.d"; | 213 | initpath = "/etc/rc.d/init.d"; |
222 | else if( QDir("/etc/init.d").exists() ) | 214 | else if( QDir("/etc/init.d").exists() ) |
223 | initpath = "/etc/init.d"; | 215 | initpath = "/etc/init.d"; |
224 | if( initpath ) | 216 | if( initpath ) |
225 | system(QString("%1/pcmcia stop").arg(initpath)); | 217 | system(QString("%1/pcmcia stop").arg(initpath)); |
226 | if( initpath ) | 218 | if( initpath ) |
227 | system(QString("%1/pcmcia start").arg(initpath)); | 219 | system(QString("%1/pcmcia start").arg(initpath)); |
228 | 220 | ||
229 | // Close out the dialog | 221 | // Close out the dialog |
230 | QDialog::accept(); | 222 | QDialog::accept(); |
231 | } | 223 | } |
232 | 224 | ||
233 | // wlanimp.cpp | 225 | // wlanimp.cpp |
234 | 226 | ||