Unterstützung für WPA/WPA2 in der Cipherstringanzeige.

src/qappctrl.h

@@ -912,6 +912,7 @@ public:
 		QString freqStr;
 		QString qualStr;
 		QString cipherStr;
+		QString cipherStrWpa;
 		uint32_t qualPerc;
 		int32_t qualBars;
 	}WLAN_SCAN_RESULT;
@@ -937,6 +938,7 @@ public:
 	    WLR_QUALITY_BARS,
 	    WLR_IS_CONNECTED,
 	    WLR_CIPHER_STR,
+	    WLR_CIPHER_STR_WPA,
 	    WLR_LAST
 	};
 	Q_ENUM(WlanModelRoles)

src/qwlaninfo.cpp

@@ -28,7 +28,8 @@ const QGfaWlanMonSchemaModel::WLAN_MON_ROLES QGfaWlanMonSchemaModel::m_roles[] =
 	{WLR_QUALITY_PERC,	"QualPerc"},
 	{WLR_QUALITY_BARS,	"QualBars"},
 	{WLR_IS_CONNECTED,	"Connected"},
-	{WLR_CIPHER_STR,	"CipherStr"}
+	{WLR_CIPHER_STR,	"CipherStr"},
+	{WLR_CIPHER_STR_WPA,"CipherStrWpa"}
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -106,6 +107,9 @@ QVariant QGfaWlanMonSchemaModel::data(const QModelIndex &index, int role) const
 	case WLR_CIPHER_STR:
 		val = wsr.cipherStr;
 		break;
+	case WLR_CIPHER_STR_WPA:
+		val = wsr.cipherStrWpa;
+		break;
 	}
 
 	return val;
@@ -154,7 +158,6 @@ void QGfaWlanMonSchemaModel::updateModel(void)
 	for(uint32_t i = 0; i < nCells; ++i)
 	{
 		WLAN_SCAN_RESULT wsr;
-
 		wsr.nwID	= m_wlMon.GetNWID(i);
 		wsr.channel	= m_wlMon.GetChannel(i);
 		wsr.freqHz	= m_wlMon.GetFreqHz(i);
@@ -166,12 +169,9 @@ void QGfaWlanMonSchemaModel::updateModel(void)
 		wsr.qualPerc = m_wlMon.GetQualityPercent(i);
 		wsr.qualBars = m_wlMon.GetQualityBars(i);
 		wsr.connected = m_wlMon.GetConnected(i);
-		wsr.cipherStr	= QString::fromStdString(m_wlMon.GetWPAPairwiseCiphers(i));
-
+		wsr.cipherStr = QString::fromStdString(m_wlMon.GetWPAPairwiseCiphers(i));
+		wsr.cipherStrWpa = QString::fromStdString(m_wlMon.GetWPAPairwiseCiphersWPA(i));
 		m_scanRes.push_back(wsr);
-
-//		QModelIndex qi = createIndex(i, 0);
-//		emit dataChanged(qi, qi, {WLR_NWID, WLR_CHANNEL, WLR_FREQ_HZ, WLR_ENCRYPTED, WLR_FREQ_STR, WLR_ESSID, WLR_MAC_ADDR_STR, WLR_QUALITY_BARS});
 	}
 	endResetModel();
 }