shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WifiConfig changes.

Browse Source
This commit is contained in:
Robin Davies
2022-04-17 21:08:30 -04:00
parent 98ac223428
commit 216f97aec4
1 changed files with 118 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SetWifiConfig.cpp
+87 -23
View File
@@ -32,6 +32,54 @@ using namespace pipedal;
#define PIPEDAL_NETWORK PIPEDAL_IP "/24"
#define SYSTEMCTL_BIN "/usr/bin/systemctl"
static void restoreDhcpcdConfFile()
{
// remove the interface wlan0 section.
std::filesystem::path dhcpcdConfig("/etc/dhcpcd.conf");
if (std::filesystem::exists(dhcpcdConfig))
{
SystemConfigFile dhcpcd(dhcpcdConfig);
int line = dhcpcd.GetLineThatStartsWith("hostname");
std::string hostNameLine;
hostNameLine = "hostname"; // the default value.
if (line != -1)
{
dhcpcd.SetLineValue(line, hostNameLine);
}
line = dhcpcd.GetLineNumber("interface wlan0");
if (line != -1)
{
dhcpcd.EraseLine(line);
while (line < dhcpcd.GetLineCount())
{
const std::string &lineValue = dhcpcd.GetLineValue(line);
if (lineValue.length() > 0 && (lineValue[0] == ' ' || lineValue[0] == '\t'))
{
dhcpcd.EraseLine(line);
}
else
{
break;
}
}
}
dhcpcd.Save(dhcpcdConfig);
}
}
static void restoreDnsmasqConfFile()
{
std::filesystem::path path("/etc/dnsmasq.c/pipedal.conf");
if (std::filesystem::exists(path))
{
std::filesystem::remove(path);
}
}
void pipedal::SetWifiConfig(const WifiConfigSettings &settings)
{
char band;
@@ -43,10 +91,15 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
sysExec(SYSTEMCTL_BIN " stop dnsmasq");
sysExec(SYSTEMCTL_BIN " disable dnsmasq");
restoreDhcpcdConfFile();
restoreDnsmasqConfFile();
sysExec(SYSTEMCTL_BIN " unmask wpa_supplicant");
sysExec(SYSTEMCTL_BIN " enable wpa_supplicant");
sysExec(SYSTEMCTL_BIN " start wpa_supplicant");
} else {
}
else
{
std::filesystem::path path("/etc/hostapd/hostapd.conf");
SystemConfigFile apdConfig;
if (std::filesystem::exists(path))
@@ -63,7 +116,6 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
apdConfig.SetDefault("ieee80211d", "1");
apdConfig.Set("ht_capab", "[HT40][SHORT-GI-20][DSSS_CCK-40]");
apdConfig.Set("wmm_enabled", "1", "Authentication options");
apdConfig.Set("auth_algs", "1");
apdConfig.Set("wpa", "2");
@@ -72,21 +124,29 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
apdConfig.SetDefault("rsn_pairwise", "CCMP");
std::string hwMode = "g";
if (settings.channel_.length() > 0 && settings.channel_[0] == 'a') {
if (settings.channel_.length() > 0 && settings.channel_[0] == 'a')
{
hwMode = "a"; // 5G
} else {
}
else
{
hwMode = "g"; // 2.4G
}
std::string channel;
if (settings.channel_[0] > '9' || settings.channel_[0] < '0')
{
channel = settings.channel_.substr(1);
} else {
}
else
{
channel = settings.channel_;
int iChannel = std::stoi(channel);
if (iChannel <= 14) {
if (iChannel <= 14)
{
hwMode = "g";
} else {
}
else
{
hwMode = "a";
}
}
@@ -100,17 +160,18 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
apdConfig.Set("channel", channel);
// ******************** dsnmasq ******
std::filesystem::path dnsMasqPath("/etc/dnsmasq.conf");
std::filesystem::path dnsMasqPath("/etc/dnsmasq.d/pipedal.conf");
SystemConfigFile dnsMasq;
try {
try
{
dnsMasq.Load(dnsMasqPath);
} catch (const std::exception &)
}
catch (const std::exception &)
{
// ignore.
}
dnsMasq.Set("interface", "wlan0", "Name of the Wi-Fi interface");
dnsMasq.Set("listen-address", PIPEDAL_IP);
@@ -131,16 +192,22 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
if (settings.mdnsName_ != "")
{
hostNameLine = "hostname " + settings.mdnsName_;
} else {
}
else
{
hostNameLine = "hostname"; // the default value.
}
if (line != -1) {
if (line != -1)
{
dhcpcd.SetLineValue(line, hostNameLine);
} else {
}
else
{
dhcpcd.AppendLine(hostNameLine);
}
line = dhcpcd.GetLineNumber("interface wlan0");
if (line != -1) {
if (line != -1)
{
dhcpcd.EraseLine(line);
while (line < dhcpcd.GetLineCount())
{
@@ -148,12 +215,15 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
if (lineValue.length() > 0 && (lineValue[0] == ' ' || lineValue[0] == '\t'))
{
dhcpcd.EraseLine(line);
} else {
}
else
{
break;
}
}
}
if (line == -1) {
if (line == -1)
{
dhcpcd.AppendLine("");
line = dhcpcd.GetLineCount();
}
@@ -168,8 +238,6 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
apdConfig.Save(path);
dnsMasq.Save(dnsMasqPath);
// **************** start services ************
sysExec("rfkill unblock wlan");
sysExec(SYSTEMCTL_BIN " daemon-reload");
@@ -181,7 +249,6 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
if (sysExec(SYSTEMCTL_BIN " restart hostapd") != 0)
{
throw PiPedalException("Unable to start the access point.");
}
if (sysExec("systemctl is-active --quiet hostapd") != 0)
{
@@ -194,8 +261,5 @@ void pipedal::SetWifiConfig(const WifiConfigSettings&settings)
sysExec(SYSTEMCTL_BIN " restart dnsmasq");
sysExec(SYSTEMCTL_BIN " enable dnsmasq");
}
}