Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adjust the wifiQuickConnect function in libpcbsd to take an additiona…

…l "WEPHex" bool, set to true by default to maintain compatibility with previous usage. This will allow apps to manually set whether it is actually a plaintext WEP key if necessary.
  • Loading branch information...
commit bc008ad75a4a5119f60f9e29dc3e0f45c7d054c7 1 parent bf6b163
@beanpole135 beanpole135 authored
View
4 src-qt4/libpcbsd/utils/netif.cpp
@@ -436,7 +436,7 @@ QString NetworkInterface::getWifiParent(QString dev)
return Utils::sysctl("net.wlan." + DevNum + ".%parent");
}
-void NetworkInterface::wifiQuickConnect(QString SSID, QString netKey, QString DeviceName){
+void NetworkInterface::wifiQuickConnect(QString SSID, QString netKey, QString DeviceName, bool WEPHex){
/*
This function uses a set of defaults to connect to a wifi access point with a minimum
of information from the user. It does *NOT* (currently) support the WPA-Enterprise encryption
@@ -536,7 +536,7 @@ void NetworkInterface::wifiQuickConnect(QString SSID, QString netKey, QString De
} else if ( SecType.contains("WEP") ) {
//Set WEP Defaults
int WEPIndex = 0;
- bool WEPHex = true; //Use Hex WEP key
+ //bool WEPHex = true; //Use Hex WEP key
streamout << " key_mgmt=NONE\n";
streamout << " wep_tx_keyidx=" + tmp.setNum(WEPIndex) + "\n";
View
2  src-qt4/libpcbsd/utils/pcbsd-netif.h
@@ -54,7 +54,7 @@ class NetworkInterface
static QStringList parseWifiScanLine(QString linein, bool isverbose);
static QString getWifiSecurity(QString SSID,QString deviceName);
static QString parseWifiSecurity( QString caps, QString etc );
- static void wifiQuickConnect(QString SSID, QString netKey, QString DeviceName);
+ static void wifiQuickConnect(QString SSID, QString netKey, QString DeviceName, bool WEPHex = true);
static QString getFirstWiredDevice();
static QString getWifiParent(QString dev);
static void enableLagg(QString dev);
View
2  src-qt4/libpcbsd/utils/pcbsd-sysFlags.h
@@ -13,7 +13,7 @@
#include "pcbsd-utils.h"
// DEFINE THE FLAG FILES
-#define FLAGDIR QString("/tmp/pcbsdflags")
+#define FLAGDIR QString("/tmp/.pcbsdflags")
#define NETWORKRESTARTED QString("network-restarted")
#define PKGUPDATEAVAILABLE QString("pkg-update-available")
#define SYSUPDATEAVAILABLE QString("sys-update-available")
Please sign in to comment.
Something went wrong with that request. Please try again.