Changeset 2669

Timestamp:

09/02/08 07:50:25 (3 months ago)

Author:

kris

Message:

Fixed the wifi tool to now properly work with SSID's that have a space in the
name

Location:

pcbsd/trunk/wificonfig

Files:

• wificonfig.pro (modified) (1 diff)
• wificonfigwidgetbase.cpp (modified) (2 diffs)
• wifiselectiondialog.cpp (modified) (3 diffs)

pcbsd/trunk/wificonfig/wificonfig.pro

@@ -33 +33 @@
 TARGET  = wificonfig
 
+QMAKE_LIBDIR    = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+
 DESTDIR = /PCBSD/networkmanager/bin/
 

pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp

@@ -94 +94 @@
       }    
             
-            
-    // If we are using WEP security, write the ifconfig line
-      QString confLine = "ifconfig_" + DeviceName + "=\"";
-      confLine += ifConfigLine;
-      if ( checkBSSID->isChecked() ) {
-          confLine += " bssid " + lineBSSID->text() + " wepmode on";  
-      } else {
-          confLine += " ssid \"" + lineSSID->text() + "\" wepmode on";
-      }
-
-      if ( WEPHex ) {
-      confLine += " wepkey 0x" + WEPKey + " weptxkey " + tmp.setNum(WEPIndex);
-      } else {
-      confLine += " wepkey \"" + WEPKey + "\" weptxkey " + tmp.setNum(WEPIndex);
-      }
-
-      confLine += "\"";
-     saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, confLine, -1);
+     // Indicate that we are using WPA supplicant
+     saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"WPA " + ifConfigLine + "\"", -1);
+
+     // Now create the wpa_supplicant file based on saved configuration
+    QFile fileout( "/etc/wpa_supplicant.conf" );
+    if ( fileout.open( IO_WriteOnly ) ) {
+        QTextStream streamout( &fileout );
+        if ( checkBSSID->isChecked() ) {
+            streamout << "network={\n bssid=\"" + lineBSSID->text() + "\"\n";
+        } else {
+            streamout << "network={\n ssid=\"" + lineSSID->text() + "\"\n";
+        }
+
+        streamout << " scan_ssid=1\n";
+        streamout << " key_mgmt=NONE\n";
+        streamout << " wep_tx_keyidx=" + tmp.setNum(WEPIndex -1) + "\n";
+        streamout << " wep_key" + tmp.setNum(WEPIndex -1) + "=" + WEPKey + "\n";
+        streamout << "}\n";
+        fileout.close();
+    }
+
             
     } else if (radioSecurityWPAPersonal->isChecked() ) {
@@ -1025 +1028 @@
                         if ( ok ) {
                             WEPIndex = tmp2.toInt(&ok);
+                            WEPIndex++;
                         }
                         radioSecurityWEP->setChecked(TRUE);     

pcbsd/trunk/wificonfig/wifiselectiondialog.cpp

@@ -60 +60 @@
                  tmp = line;
                  tmp = tmp.simplified();
-                 tmp.truncate(tmp.find(" "));
+                 tmp.truncate(tmp.find(":"));
+                 tmp.truncate(tmp.findRev(" "));
                  ssid = tmp;
                  
@@ -66 +67 @@
                  tmp = line;
                  tmp = tmp.simplified();
-                 tmp = tmp.section(" ", 4, 4);
+
+                 // First remove the SSID which may have spaces in it
+                 tmp.remove(0, tmp.find(":"));
+                  
+                 // Now find the strength section
+                 tmp = tmp.section(" ", 3, 3);
                  tmp.truncate(tmp.find(":"));
                  strength = tmp;
@@ -166 +172 @@
     
     selectedSSID = listWifi->text(sel);
-    selectedSSID.truncate( selectedSSID.find(" ") );
+    selectedSSID.truncate( selectedSSID.find("(") - 1 );
     
     // Emit the new network SSID the user selected