Merge remote-tracking branch 'uncool/cst-next'

This need buildfixes and some functional updates...
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
320 changed files with 21291 additions and 13199 deletions

View File

@@ -290,10 +290,14 @@ void CNetworkConfig::saveWpaConfig()
out << "ctrl_interface=/var/run/wpa_supplicant\n";
out << "network={\n";
out << " ssid=\"" + ssid + "\"\n";
out << " psk=\"" + key + "\"\n";;
out << " proto=WPA WPA2\n";
out << " key_mgmt=WPA-PSK\n";
out << " pairwise=CCMP TKIP\n";
out << " group=CCMP TKIP\n";
if (!key.empty()) {
out << " psk=\"" + key + "\"\n";;
out << " proto=WPA WPA2\n";
out << " key_mgmt=WPA-PSK\n";
out << " pairwise=CCMP TKIP\n";
out << " group=CCMP TKIP\n";
} else {
out << " key_mgmt=NONE\n";
}
out << "}\n";
}