Index: denali.pro.user =================================================================== diff -u -rd71990c79c75c613d781890c6f77505d409d6c64 -r091bc0425b84f094cbd863865a5edac2477208eb --- denali.pro.user (.../denali.pro.user) (revision d71990c79c75c613d781890c6f77505d409d6c64) +++ denali.pro.user (.../denali.pro.user) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -1,6 +1,6 @@ - + EnvironmentId Index: denali.qrc =================================================================== diff -u -rc77365fa76422bc2150e58d483c446325b50f4b8 -r091bc0425b84f094cbd863865a5edac2477208eb --- denali.qrc (.../denali.qrc) (revision c77365fa76422bc2150e58d483c446325b50f4b8) +++ denali.qrc (.../denali.qrc) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -14,7 +14,7 @@ sources/gui/qml/dialogs/AlarmListDialog.qml sources/gui/qml/dialogs/Alert.qml sources/gui/qml/dialogs/VitalsEntry.qml - sources/gui/qml/dialogs/JoinNetwork.qml + sources/gui/qml/dialogs/WifiJoinDisconnect.qml sources/gui/qml/dialogs/DisconnectNetwork.qml Index: scripts/wifi_reset_interface.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -r091bc0425b84f094cbd863865a5edac2477208eb --- scripts/wifi_reset_interface.sh (.../wifi_reset_interface.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/wifi_reset_interface.sh (.../wifi_reset_interface.sh) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -6,5 +6,5 @@ exit 0 fi -ifdown $1 -ifup $1 +ip link set $1 down +ip link set $1 up Index: scripts/wifi_set_dns.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -r091bc0425b84f094cbd863865a5edac2477208eb --- scripts/wifi_set_dns.sh (.../wifi_set_dns.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/wifi_set_dns.sh (.../wifi_set_dns.sh) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -6,5 +6,4 @@ exit 0 fi -dns=$1 -echo "nameserver $dns" >> /etc/resolv.conf +echo "nameserver $1" >> /etc/resolv.conf Fisheye: Tag 13ac42cf8bdc5038dedd3302ba79dc387e5704b4 refers to a dead (removed) revision in file `scripts/wifi_set_static_ip.sh'. Fisheye: No comparison available. Pass `N' to diff? Index: scripts/wifi_set_subnetmask.sh =================================================================== diff -u --- scripts/wifi_set_subnetmask.sh (revision 0) +++ scripts/wifi_set_subnetmask.sh (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ $# -eq 0 ]; then + currentFile=$(basename "$0") + echo "Usage: ./$currentFile " + exit 0 +fi + +ifconfig $1 netmask $2 \ No newline at end of file Fisheye: Tag 091bc0425b84f094cbd863865a5edac2477208eb refers to a dead (removed) revision in file `sources/gui/qml/dialogs/JoinNetwork.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/dialogs/WifiJoinDisconnect.qml =================================================================== diff -u --- sources/gui/qml/dialogs/WifiJoinDisconnect.qml (revision 0) +++ sources/gui/qml/dialogs/WifiJoinDisconnect.qml (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -0,0 +1,103 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file Alert.qml + * \author (last) Peter Lucia + * \date (last) 30-Nov-2020 + * \author (original) Peter Lucia + * \date (original) 30-Nov-2019 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Contains the Vitals Entry Implementation + */ +ModalDialog { id: _root + property string ssid : "" + property string macAddress : "" + property bool isJoin : true + objectName : "WifiJoinDisconnect" // SquishQt testability + contentItem.objectName : "WifiJoinDisconnectContent" + modal : false + + onVisibleChanged: { + if (!visible) { + _password.textInput.focus = false + } + } + + Item { id: _titleBar + height: _root.height / 4 + width: _root.width + + Text { id: _titleBarText + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + text: _root.isJoin ? qsTr("Join " + ssid) : qsTr("Disconnect " + ssid) + anchors.centerIn: _titleBar + } + } + + TextEntry { id: _password + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + horizontalCenter: parent.horizontalCenter + top: _titleBar.bottom + topMargin: Variables.settingsWIFIMargin + } + visible: _root.isJoin + textInput.inputMethodHints: Qt.ImhNone + textInput.echoMode: TextInput.Password + labelText: qsTr("Password: ") + onEnterPressed: { + _keyboard.setVisible(false) + textInput.focus = false + } + } + + Row { id: _buttons + spacing: Variables.buttonSpacing + anchors { + horizontalCenter: parent.horizontalCenter + bottom: parent.bottom + bottomMargin: Variables.dialogMargin / 2 + } + + TouchRect { id: _confirm + objectName: "_wifiJoinDisconnectConfirm" + width: _root.width / 3 + text.text: qsTr("CONFIRM") + button.onPressed: { + if (_root.isJoin) { + vNetworkModel.doJoinNetwork(macAddress, _password.textInput.text) + } else { + vNetworkModel.doDisconnectNetwork(macAddress) + } + close() + } + } + + TouchRect { id: _cancel + objectName: "_wifiJoinDisconnectCancel" + width: _root.width / 3 + text.text: qsTr("CANCEL") + button.onPressed: { + close() + } + } + } +} Index: sources/gui/qml/main.qml =================================================================== diff -u -r5600d2133dd0ea6dc1f733aa78bd26e2a4892a38 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/gui/qml/main.qml (.../main.qml) (revision 5600d2133dd0ea6dc1f733aa78bd26e2a4892a38) +++ sources/gui/qml/main.qml (.../main.qml) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -301,7 +301,7 @@ Alert { id: _alert } VitalsEntry { id: _vitalsEntry } - JoinNetwork { id: _joinNetwork } + WifiJoinDisconnect { id: _wifiJoinDisconnect } Keyboard { id: _keyboard } Connections { target: vPowerOff Index: sources/gui/qml/pages/SettingsWifi.qml =================================================================== diff -u -rd71990c79c75c613d781890c6f77505d409d6c64 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision d71990c79c75c613d781890c6f77505d409d6c64) +++ sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -49,7 +49,6 @@ left: parent.left topMargin: Variables.settingsWIFIMargin } - text: qsTr("Wifi Settings") } @@ -79,6 +78,7 @@ onEnterPressed: { console.log("IP Address: Enter pressed") _keyboard.setVisible(false) + vNetworkModel.doSetIPAddress(textInput.text) } } @@ -96,6 +96,7 @@ textInput.text: vNetworkModel.gateway onEnterPressed: { _keyboard.setVisible(false) + vNetworkModel.doSetGateway(textInput.text) } } @@ -113,6 +114,7 @@ textInput.text: vNetworkModel.subnetMask onEnterPressed: { _keyboard.setVisible(false) + vNetworkModel.doSetSubnetMask(textInput.text) } } @@ -130,6 +132,7 @@ textInput.text: vNetworkModel.dns onEnterPressed: { _keyboard.setVisible(false) + vNetworkModel.doSetDNS(textInput.text) } } @@ -146,9 +149,6 @@ } labelText: qsTr("SSID: ") textInput.text: vNetworkModel.ssid - onEnterPressed: { - _keyboard.setVisible(false) - } } TouchRect { id: _scan @@ -223,8 +223,12 @@ anchors { centerIn: parent } + width: parent.width + horizontalAlignment: Text.AlignHCenter font.pixelSize: Fonts.fontPixelTextRectExtra text: ssid + clip: true + elide: Text.ElideRight color: Colors.textMain } @@ -240,15 +244,29 @@ color: Colors.textMain } + Text { + id: _isConnected + anchors { + right: parent.right + rightMargin: 10 + bottom: parent.bottom + } + font.pixelSize: Fonts.fontPixelDialogText + text: vNetworkModel.macAddress === macAddress ? qsTr("Connected") : qsTr("") + color: Colors.textMain + } + onClicked: { - console.debug("Clicked " + ssid + " with macAddress: " + macAddress); - if (vNetworkModel.doCheckIfConnected(macAddress)) { - // TODO: show alert to confirm disconnect + if (vNetworkModel.macAddress === macAddress) { + _wifiJoinDisconnect.isJoin = false + _wifiJoinDisconnect.macAddress = macAddress + _wifiJoinDisconnect.visible = true } else { // initiate connection to this network, as for password - _joinNetwork.ssid = ssid - _joinNetwork.macAddress = macAddress - _joinNetwork.visible = true + _wifiJoinDisconnect.isJoin = true + _wifiJoinDisconnect.ssid = ssid + _wifiJoinDisconnect.macAddress = macAddress + _wifiJoinDisconnect.visible = true } } } Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rc77365fa76422bc2150e58d483c446325b50f4b8 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision c77365fa76422bc2150e58d483c446325b50f4b8) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -67,5 +67,7 @@ const char *Wifi_Set_Auto_Assigned_IP = "wifi_set_auto_assigned_ip.sh"; const char *Wifi_Set_DNS = "wifi_set_dns.sh"; const char *Wifi_Set_Static_IP = "wifi_set_static_ip.sh"; + const char *Wifi_Set_Gateway = "wifi_set_gateway.sh"; + const char *Wifi_Set_SubnetMask = "wifi_set_subnetmask.sh"; const char *Wifi_Start_WPA_Supplicant = "wifi_start_wpa_supplicant.sh"; } Index: sources/storage/StorageGlobals.h =================================================================== diff -u -rc77365fa76422bc2150e58d483c446325b50f4b8 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision c77365fa76422bc2150e58d483c446325b50f4b8) +++ sources/storage/StorageGlobals.h (.../StorageGlobals.h) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -53,5 +53,7 @@ extern const char *Wifi_Set_Auto_Assigned_IP; extern const char *Wifi_Set_DNS; extern const char *Wifi_Set_Static_IP; + extern const char *Wifi_Set_Gateway; + extern const char *Wifi_Set_SubnetMask; extern const char *Wifi_Start_WPA_Supplicant; } Index: sources/view/VNetworkModel.cpp =================================================================== diff -u -rd71990c79c75c613d781890c6f77505d409d6c64 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/view/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision d71990c79c75c613d781890c6f77505d409d6c64) +++ sources/view/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -34,6 +34,19 @@ connect(&_WifiInterface, SIGNAL(didStatusChanged(const QString)), this, SLOT(onStatusChanged(const QString))); + // incoming - static IP address assignment + connect(&_WifiInterface, SIGNAL(didSetStaticIPAddress()), + this, SLOT(onSetIPAddressSuccess())); + + connect(&_WifiInterface, SIGNAL(didSetGateway()), + this, SLOT(onSetGatewaySuccess())); + + connect(&_WifiInterface, SIGNAL(didSetSubnetMask()), + this, SLOT(onSetSubnetMaskSuccess())); + + connect(&_WifiInterface, SIGNAL(didSetDNS()), + this, SLOT(onSetDNSSuccess())); + // outgoing connect(this, SIGNAL(didScan()), &_WifiInterface, SLOT(doScan())); @@ -47,7 +60,7 @@ connect(this, SIGNAL(didRequestIPSettings()), &_WifiInterface, SLOT(doRequestIPSettings())); - // static IP address assignment + // outgoing - static IP address assignment connect(this, SIGNAL(didRequestSetIPAddress(const QString)), &_WifiInterface, SLOT(doRequestSetIPAddress(const QString))); @@ -199,11 +212,8 @@ */ bool VNetworkModel::doCheckIfConnected(const QString &vMacAddress) { - for (const Network &network : _networks) - { - if (network.macAddress() == vMacAddress && network.status() == Network::CONNECTED) - return true; - } + if (vMacAddress == macAddress()) + return true; return false; } @@ -215,11 +225,7 @@ */ void VNetworkModel::doJoinNetwork(const QString &vMacAddress, const QString &vPassword) { - ipAddress(""); - gateway(""); - subnetMask(""); - dns(""); - ssid(""); + clearSelectedNetwork(); for (const Network &network : _networks) { if (network.macAddress() == vMacAddress) @@ -263,6 +269,7 @@ subnetMask(vNetwork.mIPSettings.mSubnetMask); dns(vNetwork.mIPSettings.mDNS); ssid(vNetwork.ssid()); + macAddress(vNetwork.macAddress()); status(tr("Connected to %1.").arg(vNetwork.ssid())); } @@ -275,6 +282,7 @@ { LOG_DEBUG(QString("VNetworkModel::%1 %2").arg(__FUNCTION__).arg(QThread::currentThread()->objectName())); LOG_DEBUG(QString("Disconnected from %1.").arg(vNetwork.ssid())); + clearSelectedNetwork(); status(tr("Disconnected from %1.").arg(vNetwork.ssid())); } @@ -300,7 +308,7 @@ /*! * \brief VNetworkModel::doSetIPAddress - * \param vIPAddress + * \param vIPAddress (QString) the ip address */ void VNetworkModel::doSetIPAddress(const QString &vIPAddress) { @@ -309,7 +317,7 @@ /*! * \brief VNetworkModel::doSetGateway - * \param vGateway + * \param vGateway (QString) the gateway */ void VNetworkModel::doSetGateway(const QString &vGateway) { @@ -318,7 +326,7 @@ /*! * \brief VNetworkModel::doSetSubnetMask - * \param vSubnetMask + * \param vSubnetMask (QString) the subnet mask */ void VNetworkModel::doSetSubnetMask(const QString &vSubnetMask) { @@ -327,9 +335,59 @@ /*! * \brief VNetworkModel::doSetDNS - * \param vDNS + * \param vDNS (QString) the DNS */ void VNetworkModel::doSetDNS(const QString &vDNS) { emit didRequestSetDNS(vDNS); } + +/*! + * \brief VNetworkModel::clearWifiSettings + * Clears the selected network settings + */ +void VNetworkModel::clearSelectedNetwork() +{ + ipAddress(""); + gateway(""); + subnetMask(""); + dns(""); + ssid(""); + macAddress(""); +} + +/*! + * \brief VNetworkModel::onSetIPAddressSuccess + * Called when the IP address has been set + */ +void VNetworkModel::onSetIPAddressSuccess() +{ + status(tr("Successfully set the IP address.")); +} + +/*! + * \brief VNetworkModel::onSetGatewaySuccess + * Called when the gateway has been set + */ +void VNetworkModel::onSetGatewaySuccess() +{ + status(tr("Successfully set the gateway.")); +} + +/*! + * \brief VNetworkModel::onSetSubnetMaskSuccess + * Called when the subnet mask has been set + */ +void VNetworkModel::onSetSubnetMaskSuccess() +{ + status(tr("Successfully set the subnet mask.")); +} + +/*! + * \brief VNetworkModel::onSetDNSSuccess + * Called when the DNS has been set + */ +void VNetworkModel::onSetDNSSuccess() +{ + status(tr("Successfully set the DNS.")); +} Index: sources/view/VNetworkModel.h =================================================================== diff -u -rd71990c79c75c613d781890c6f77505d409d6c64 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision d71990c79c75c613d781890c6f77505d409d6c64) +++ sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -33,6 +33,7 @@ PROPERTY(QString, subnetMask , "") PROPERTY(QString, dns , "") PROPERTY(QString, ssid , "") + PROPERTY(QString, macAddress , "") public: // Note: VIEW_DEC_CLASS(VNetworkModel) requires QObject as the parent, so it's necessary to define it here @@ -81,6 +82,7 @@ QHash roleNames() const; private: void initConnections(); + void clearSelectedNetwork(); QList _networks; @@ -90,5 +92,10 @@ void onConnectedToNetwork(const Network &vNetwork); void onDisconnectedNetwork(const Network &vNetwork); + // static IP address assignment confirmation + void onSetIPAddressSuccess(); + void onSetGatewaySuccess(); + void onSetSubnetMaskSuccess(); + void onSetDNSSuccess(); }; } Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -26,7 +26,7 @@ _processSetStaticIPAddress.setParent(this); _processSetStaticGateway.setParent(this); _processSetStaticSubnetMask.setParent(this); - _processSetStaticDNS.setParent(this); + _processSetDNS.setParent(this); } void WifiInterface::initConnections() @@ -74,7 +74,7 @@ connect(&_processSetStaticSubnetMask, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(onProcessFinishedSetSubnetMask(int,QProcess::ExitStatus))); - connect(&_processSetStaticDNS, SIGNAL(finished(int, QProcess::ExitStatus)), + connect(&_processSetDNS, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(onProcessFinishedSetDNS(int,QProcess::ExitStatus))); } @@ -649,7 +649,17 @@ void WifiInterface::doRequestSetIPAddress(const QString &vIPAddress) { Q_UNUSED(vIPAddress) - // TODO + LOG_DEBUG(QString("WifiInterface::%1 %2").arg(__FUNCTION__).arg(QThread::currentThread()->objectName())); + LOG_DEBUG(QString("Handling request to set static IP address: %1").arg(vIPAddress)); + if (_processSetStaticIPAddress.state() != QProcess::NotRunning) + { + LOG_DEBUG(QString("Rejecting request for %1. %2 is already running.") + .arg(__FUNCTION__) + .arg(_processSetStaticIPAddress.objectName())); + return; + } + _processSetStaticIPAddress.start(Wifi_Set_Static_IP, + QStringList() << _iface); } /*! @@ -660,9 +670,13 @@ */ void WifiInterface::onProcessFinishedSetIPAddress(int vExitCode, QProcess::ExitStatus vExitStatus) { - Q_UNUSED(vExitCode) Q_UNUSED(vExitStatus) - // TODO + if (vExitCode != 0) + { + emit didError(tr("Failed to set static IP Address for %1").arg(_network.ssid())); + return; + } + emit didSetStaticIPAddress(); } /*! @@ -673,7 +687,17 @@ void WifiInterface::doRequestSetGateway(const QString &vGateway) { Q_UNUSED(vGateway) - // TODO + LOG_DEBUG(QString("WifiInterface::%1 %2").arg(__FUNCTION__).arg(QThread::currentThread()->objectName())); + LOG_DEBUG(QString("Handling request to set static gateway: %1").arg(vGateway)); + if (_processSetStaticGateway.state() != QProcess::NotRunning) + { + LOG_DEBUG(QString("Rejecting request for %1. %2 is already running.") + .arg(__FUNCTION__) + .arg(_processSetStaticGateway.objectName())); + return; + } + _processSetStaticGateway.start(Wifi_Set_Static_IP, + QStringList() << vGateway); } /*! @@ -684,9 +708,13 @@ */ void WifiInterface::onProcessFinishedSetGateway(int vExitCode, QProcess::ExitStatus vExitStatus) { - Q_UNUSED(vExitCode) Q_UNUSED(vExitStatus) - // TODO + if (vExitCode != 0) + { + emit didError(tr("Failed to set gateway for %1").arg(_network.ssid())); + return; + } + emit didSetGateway(); } /*! @@ -697,7 +725,17 @@ void WifiInterface::doRequestSetSubnetMask(const QString &vSubnetMask) { Q_UNUSED(vSubnetMask) - // TODO + LOG_DEBUG(QString("WifiInterface::%1 %2").arg(__FUNCTION__).arg(QThread::currentThread()->objectName())); + LOG_DEBUG(QString("Handling request to set static subnet mask: %1").arg(vSubnetMask)); + if (_processSetStaticSubnetMask.state() != QProcess::NotRunning) + { + LOG_DEBUG(QString("Rejecting request for %1. %2 is already running.") + .arg(__FUNCTION__) + .arg(_processSetStaticSubnetMask.objectName())); + return; + } + _processSetStaticSubnetMask.start(Wifi_Set_SubnetMask, + QStringList() << vSubnetMask); } /*! @@ -708,9 +746,13 @@ */ void WifiInterface::onProcessFinishedSetSubnetMask(int vExitCode, QProcess::ExitStatus vExitStatus) { - Q_UNUSED(vExitCode) Q_UNUSED(vExitStatus) - // TODO + if (vExitCode != 0) + { + emit didError(tr("Failed to set subnet mask for %1. Has the IP been set?").arg(_network.ssid())); + return; + } + emit didSetSubnetMask(); } /*! @@ -720,8 +762,17 @@ */ void WifiInterface::doRequestSetDNS(const QString &vDNS) { - Q_UNUSED(vDNS) - // TODO + LOG_DEBUG(QString("WifiInterface::%1 %2").arg(__FUNCTION__).arg(QThread::currentThread()->objectName())); + LOG_DEBUG(QString("Handling request to set DNS: %1").arg(vDNS)); + if (_processSetDNS.state() != QProcess::NotRunning) + { + LOG_DEBUG(QString("Rejecting request for %1. %2 is already running.") + .arg(__FUNCTION__) + .arg(_processSetDNS.objectName())); + return; + } + _processSetDNS.start(Wifi_Set_DNS, + QStringList() << vDNS); } /*! @@ -732,7 +783,11 @@ */ void WifiInterface::onProcessFinishedSetDNS(int vExitCode, QProcess::ExitStatus vExitStatus) { - Q_UNUSED(vExitCode) Q_UNUSED(vExitStatus) - // TODO + if (vExitCode != 0) + { + emit didError(tr("Failed to set DNS.").arg(_network.ssid())); + return; + } + emit didSetDNS(); } Index: sources/wifi/WifiInterface.h =================================================================== diff -u -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 -r091bc0425b84f094cbd863865a5edac2477208eb --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 091bc0425b84f094cbd863865a5edac2477208eb) @@ -47,7 +47,7 @@ QProcess _processSetStaticIPAddress; QProcess _processSetStaticGateway; QProcess _processSetStaticSubnetMask; - QProcess _processSetStaticDNS; + QProcess _processSetDNS; Network _network; const QString _iface = "wlan0"; @@ -91,6 +91,11 @@ void didBusyChanged(const bool &vBusy); void didStatusChanged(const QString &vNewStatus); void didRequestAutoAssignedIP(); + // static IP address settings + void didSetStaticIPAddress(); + void didSetGateway(); + void didSetSubnetMask(); + void didSetDNS(); // emitted from separate threads void didScanStatusChanged(const bool);