Changeset 2895

Timestamp:

10/11/08 06:46:46 (17 months ago)

Author:

kris

Message:

Updated the wifi selection dialog to fix a few bugs.

1. Fixed issues with long SSIDs and SSID's with multiple spaces in the name
being detected and used properly.

2. Fixed an issue of connecting to non-WEP wlans, when using ssid with a space in the name.

Needs a bit of testing still :)

Location:

pcbsd

Files:

• branches/7.0/wificonfig/wificonfigwidgetbase.cpp (modified) (3 diffs)
• branches/7.0/wificonfig/wifiselectiondialog.cpp (modified) (5 diffs)
• branches/7.0/wificonfig/wifiselectiondialog.ui (modified) (1 diff)
• trunk/wificonfig/wificonfigwidgetbase.cpp (modified) (3 diffs)
• trunk/wificonfig/wifiselectiondialog.cpp (modified) (5 diffs)
• trunk/wificonfig/wifiselectiondialog.ui (modified) (1 diff)

pcbsd/branches/7.0/wificonfig/wificonfigwidgetbase.cpp

@@ -78 +78 @@
      if ( radioSecurityDisabled->isChecked() )
     {
-        if ( checkBSSID->isChecked() ) {
-             saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"" + ifConfigLine + " bssid " + lineBSSID->text() + "\"", -1);
-        } else {
-                    saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"" + ifConfigLine + " ssid " + lineSSID->text() + "\"", -1);
-              }
+        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 << "}\n";
+          fileout.close();
+
+        }
      } else if (radioSecurityWEP->isChecked() ) {
         // Write the settings with WEP enabled
@@ -1005 +1019 @@
                    }
         
-                   if ( line.find("key_mgmt=") != -1 )
-                   {
-                        tmp2 = line.remove(0, line.find("=") +1 );
-                        if ( tmp2 == "NONE" ) {
-                                radioSecurityWEP->setChecked(TRUE);
-                        }
-                        
-                   }
+                   // Check if we are using a WEP key for this network
                    if ( line.find("wep_key") != -1 )
                    {                   
@@ -1020 +1027 @@
                         radioSecurityWEP->setChecked(TRUE);     
                    }
-                    if ( line.find("wep_tx_keyidx") != -1 )
+
+                   // Check for the WEP tx key id
+                   if ( line.find("wep_tx_keyidx") != -1 )
                    {                   
                         tmp2 = line.remove(0, line.find("wep_tx_keyidx") +1 );

pcbsd/branches/7.0/wificonfig/wifiselectiondialog.cpp

@@ -46 +46 @@
     
     // Start the scan and get the output
-    line = getLineFromCommandOutput("ifconfig " + DeviceName + " up list scan >/tmp/.wifilist 2>/tmp/.wifilist");
+    line = getLineFromCommandOutput("ifconfig -v " + DeviceName + " up list scan >/tmp/.wifilist 2>/tmp/.wifilist");
 
     // Now read the output file
@@ -60 +60 @@
                  tmp = line;
                  tmp = tmp.simplified();
-                 tmp.truncate(tmp.find(":"));
-                 tmp.truncate(tmp.findRev(" "));
+                 tmp.remove(0, tmp.indexOf("SSID<") + 5);
+                 tmp.truncate(tmp.indexOf(">"));
                  ssid = tmp;
-                 
+
                  // Get the signal strength of this device
                  tmp = line;
@@ -72 +72 @@
                   
                  // Now find the strength section
-                 tmp = tmp.section(" ", 3, 3);
-                 tmp.truncate(tmp.find(":"));
+                 tmp.truncate(tmp.findRev("SSID<"));
+                 tmp.truncate(tmp.findRev(":"));
+                 tmp.remove(0, tmp.findRev(" "));
                  strength = tmp;
                                 
+                 //QMessageBox::warning( this, "Testing", "SSID:" + ssid + " STR:" + strength );
                  // Add the device to the list box
                  strength.toInt(&ok);
-                 if ( ok ) {
+                 if ( ok && !ssid.isEmpty() && ssid != " " ) {
                      newStrength = tmp.toInt(&ok);
                      if ( newStrength < 25 )
@@ -100 +102 @@
                  
              } else {
+                  if ( ! ssid.isEmpty() && ssid != " " ) {
                        // If we didn't get the signal strength, still display the SSID
                        FileLoad="/PCBSD/networkmanager/pics/tray_wifi.png";
@@ -108 +111 @@
                        
                        foundItem = 1;
+                  }
              }
             

pcbsd/branches/7.0/wificonfig/wifiselectiondialog.ui

@@ -6 +6 @@
     <x>0</x>
     <y>0</y>
-    <width>292</width>
-    <height>274</height>
+    <width>420</width>
+    <height>314</height>
    </rect>
   </property>

pcbsd/trunk/wificonfig/wificonfigwidgetbase.cpp

@@ -78 +78 @@
      if ( radioSecurityDisabled->isChecked() )
     {
-        if ( checkBSSID->isChecked() ) {
-             saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"" + ifConfigLine + " bssid " + lineBSSID->text() + "\"", -1);
-        } else {
-                    saveValue( "/etc/rc.conf", "ifconfig_" + DeviceName, "ifconfig_" + DeviceName + "=\"" + ifConfigLine + " ssid " + lineSSID->text() + "\"", -1);
-              }
+        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 << "}\n";
+          fileout.close();
+
+        }
      } else if (radioSecurityWEP->isChecked() ) {
         // Write the settings with WEP enabled
@@ -1005 +1019 @@
                    }
         
-                   if ( line.find("key_mgmt=") != -1 )
-                   {
-                        tmp2 = line.remove(0, line.find("=") +1 );
-                        if ( tmp2 == "NONE" ) {
-                                radioSecurityWEP->setChecked(TRUE);
-                        }
-                        
-                   }
+                   // Check if we are using a WEP key for this network
                    if ( line.find("wep_key") != -1 )
                    {                   
@@ -1020 +1027 @@
                         radioSecurityWEP->setChecked(TRUE);     
                    }
-                    if ( line.find("wep_tx_keyidx") != -1 )
+
+                   // Check for the WEP tx key id
+                   if ( line.find("wep_tx_keyidx") != -1 )
                    {                   
                         tmp2 = line.remove(0, line.find("wep_tx_keyidx") +1 );

pcbsd/trunk/wificonfig/wifiselectiondialog.cpp

@@ -46 +46 @@
     
     // Start the scan and get the output
-    line = getLineFromCommandOutput("ifconfig " + DeviceName + " up list scan >/tmp/.wifilist 2>/tmp/.wifilist");
+    line = getLineFromCommandOutput("ifconfig -v " + DeviceName + " up list scan >/tmp/.wifilist 2>/tmp/.wifilist");
 
     // Now read the output file
@@ -60 +60 @@
                  tmp = line;
                  tmp = tmp.simplified();
-                 tmp.truncate(tmp.find(":"));
-                 tmp.truncate(tmp.findRev(" "));
+                 tmp.remove(0, tmp.indexOf("SSID<") + 5);
+                 tmp.truncate(tmp.indexOf(">"));
                  ssid = tmp;
-                 
+
                  // Get the signal strength of this device
                  tmp = line;
@@ -72 +72 @@
                   
                  // Now find the strength section
-                 tmp = tmp.section(" ", 3, 3);
-                 tmp.truncate(tmp.find(":"));
+                 tmp.truncate(tmp.findRev("SSID<"));
+                 tmp.truncate(tmp.findRev(":"));
+                 tmp.remove(0, tmp.findRev(" "));
                  strength = tmp;
                                 
+                 //QMessageBox::warning( this, "Testing", "SSID:" + ssid + " STR:" + strength );
                  // Add the device to the list box
                  strength.toInt(&ok);
-                 if ( ok ) {
+                 if ( ok && !ssid.isEmpty() && ssid != " " ) {
                      newStrength = tmp.toInt(&ok);
                      if ( newStrength < 25 )
@@ -100 +102 @@
                  
              } else {
+                  if ( ! ssid.isEmpty() && ssid != " " ) {
                        // If we didn't get the signal strength, still display the SSID
                        FileLoad="/PCBSD/networkmanager/pics/tray_wifi.png";
@@ -108 +111 @@
                        
                        foundItem = 1;
+                  }
              }
             

pcbsd/trunk/wificonfig/wifiselectiondialog.ui

@@ -6 +6 @@
     <x>0</x>
     <y>0</y>
-    <width>292</width>
-    <height>274</height>
+    <width>420</width>
+    <height>314</height>
    </rect>
   </property>