ETM-Schurig/powersync-libnm
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update license header

Browse Source
This commit is contained in:
Simon Stürz 2019-09-16 16:53:58 +02:00
parent 1788716a4d
commit b93069608e
25 changed files with 532 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/control vendored
View File

@ -8,6 +8,8 @@ Build-Depends: debhelper (>= 9.0.0),
qt5-qmake, qt5-qmake,
qtbase5-dev, qtbase5-dev,
qtbase5-dev-tools, qtbase5-dev-tools,
libqt5bluetooth5,
qtconnectivity5-dev
Standards-Version: 3.9.7 Standards-Version: 3.9.7
Package: libnymea-networkmanager Package: libnymea-networkmanager
@ -15,7 +17,8 @@ Section: libs
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
libqt5network5 libqt5network5,
libqt5bluetooth5
Description: Qt 5 based library for the network-manager DBus API. Description: Qt 5 based library for the network-manager DBus API.
Qt 5 based library for the network-manager DBus API. Qt 5 based library for the network-manager DBus API.

25
libnymea-networkmanager/bluetooth/bluetoothserver.cpp
View File

@ -1,3 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* *
* This file is part of libnymea-networkmanager. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "bluetoothserver.h" #include "bluetoothserver.h"
#include "../networkmanager.h" #include "../networkmanager.h"
#include "../networkmanagerutils.h" #include "../networkmanagerutils.h"
@ -358,8 +379,8 @@ void BluetoothServer::start()
m_genericAttributeService = m_controller->addService(genericAttributeServiceData(), m_controller); m_genericAttributeService = m_controller->addService(genericAttributeServiceData(), m_controller);
// Create custom services // Create custom services
m_networkService = new NetworkService(m_controller->addService(NetworkService::serviceData(), m_controller), m_controller); m_networkService = new NetworkService(m_controller->addService(NetworkService::serviceData(), m_controller), m_networkManager, m_controller);
m_wirelessService = new WirelessService(m_controller->addService(WirelessService::serviceData(), m_controller), m_controller); m_wirelessService = new WirelessService(m_controller->addService(WirelessService::serviceData(), m_controller), m_networkManager, m_controller);
QLowEnergyAdvertisingData advertisingData; QLowEnergyAdvertisingData advertisingData;
advertisingData.setDiscoverability(QLowEnergyAdvertisingData::DiscoverabilityGeneral); advertisingData.setDiscoverability(QLowEnergyAdvertisingData::DiscoverabilityGeneral);

21
libnymea-networkmanager/bluetooth/bluetoothserver.h
View File

@ -1,3 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* *
* This file is part of libnymea-networkmanager. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef BLUETOOTHSERVER_H #ifndef BLUETOOTHSERVER_H
#define BLUETOOTHSERVER_H #define BLUETOOTHSERVER_H

37
libnymea-networkmanager/bluetooth/bluetoothuuids.h
View File

@ -1,13 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2016 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of loopd. * * This file is part of libnymea-networkmanager. *
* * * *
* Loopd can not be copied and/or distributed without the express * * This library is free software; you can redistribute it and/or *
* permission of guh GmbH. * * modify it under the terms of the GNU Lesser General Public *
* * * License as published by the Free Software Foundation; either *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef BLUETOOTHUUIDS_H #ifndef BLUETOOTHUUIDS_H
#define BLUETOOTHUUIDS_H #define BLUETOOTHUUIDS_H
@ -26,10 +37,4 @@ static QBluetoothUuid wirelessCommanderCharacteristicUuid = QBluetoothUuid(QUuid
static QBluetoothUuid wirelessResponseCharacteristicUuid = QBluetoothUuid(QUuid("e081fec2-f757-4449-b9c9-bfa83133f7fc")); static QBluetoothUuid wirelessResponseCharacteristicUuid = QBluetoothUuid(QUuid("e081fec2-f757-4449-b9c9-bfa83133f7fc"));
static QBluetoothUuid wirelessStateCharacteristicUuid = QBluetoothUuid(QUuid("e081fec3-f757-4449-b9c9-bfa83133f7fc")); static QBluetoothUuid wirelessStateCharacteristicUuid = QBluetoothUuid(QUuid("e081fec3-f757-4449-b9c9-bfa83133f7fc"));
static QBluetoothUuid systemServiceUuid = QBluetoothUuid(QUuid("e081fed0-f757-4449-b9c9-bfa83133f7fc"));
static QBluetoothUuid systemCommanderCharacteristicUuid = QBluetoothUuid(QUuid("e081fed1-f757-4449-b9c9-bfa83133f7fc"));
static QBluetoothUuid systemResponseCharacteristicUuid = QBluetoothUuid(QUuid("e081fed2-f757-4449-b9c9-bfa83133f7fc"));
static QBluetoothUuid systemUpdateCharacteristicUuid = QBluetoothUuid(QUuid("e081fed3-f757-4449-b9c9-bfa83133f7fc"));
#endif // BLUETOOTHUUIDS_H #endif // BLUETOOTHUUIDS_H

56
libnymea-networkmanager/bluetooth/networkservice.cpp
View File

@ -1,3 +1,25 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
* Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* *
* This file is part of libnymea-networkmanager. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networkservice.h" #include "networkservice.h"
#include "bluetoothuuids.h" #include "bluetoothuuids.h"
@ -19,9 +41,9 @@ NetworkService::NetworkService(QLowEnergyService *service, NetworkManager *netwo
connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError)));
// NetworkManager // NetworkManager
connect(Loopd::instance()->networkManager(), &NetworkManager::stateChanged, this, &NetworkService::onNetworkManagerStateChanged); connect(m_networkManager, &NetworkManager::stateChanged, this, &NetworkService::onNetworkManagerStateChanged);
connect(Loopd::instance()->networkManager(), &NetworkManager::networkingEnabledChanged, this, &NetworkService::onNetworkingEnabledChanged); connect(m_networkManager, &NetworkManager::networkingEnabledChanged, this, &NetworkService::onNetworkingEnabledChanged);
connect(Loopd::instance()->networkManager(), &NetworkManager::wirelessEnabledChanged, this, &NetworkService::onWirelessEnabledChanged); connect(m_networkManager, &NetworkManager::wirelessEnabledChanged, this, &NetworkService::onWirelessEnabledChanged);
} }
QLowEnergyService *NetworkService::service() QLowEnergyService *NetworkService::service()
@ -43,7 +65,7 @@ QLowEnergyServiceData NetworkService::serviceData()
networkStatusData.setValue(QByteArray(1, 0)); networkStatusData.setValue(QByteArray(1, 0));
networkStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify); networkStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify);
networkStatusData.addDescriptor(clientConfigDescriptorData); networkStatusData.addDescriptor(clientConfigDescriptorData);
networkStatusData.setValue(NetworkService::getNetworkManagerStateByteArray(Loopd::instance()->networkManager()->state())); networkStatusData.setValue(NetworkService::getNetworkManagerStateByteArray(NetworkManager::NetworkManagerStateUnknown));
serviceData.addCharacteristic(networkStatusData); serviceData.addCharacteristic(networkStatusData);
// Network manager commander ef6d6612-b8af-49e0-9eca-ab343513641c // Network manager commander ef6d6612-b8af-49e0-9eca-ab343513641c
@ -66,7 +88,7 @@ QLowEnergyServiceData NetworkService::serviceData()
networkingEnabledStatusData.setUuid(networkingEnabledCharacteristicUuid); networkingEnabledStatusData.setUuid(networkingEnabledCharacteristicUuid);
networkingEnabledStatusData.setValue(QByteArray(1, 0)); networkingEnabledStatusData.setValue(QByteArray(1, 0));
networkingEnabledStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify); networkingEnabledStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify);
networkingEnabledStatusData.setValue(QByteArray::number(static_cast<int>(Loopd::instance()->networkManager()->networkingEnabled()))); networkingEnabledStatusData.setValue(QByteArray::number(0));
serviceData.addCharacteristic(networkingEnabledStatusData); serviceData.addCharacteristic(networkingEnabledStatusData);
// Wireless enabled ef6d6615-b8af-49e0-9eca-ab343513641c // Wireless enabled ef6d6615-b8af-49e0-9eca-ab343513641c
@ -74,7 +96,7 @@ QLowEnergyServiceData NetworkService::serviceData()
wirelessEnabledStatusData.setUuid(wirelessEnabledCharacteristicUuid); wirelessEnabledStatusData.setUuid(wirelessEnabledCharacteristicUuid);
wirelessEnabledStatusData.setValue(QByteArray(1, 0)); wirelessEnabledStatusData.setValue(QByteArray(1, 0));
wirelessEnabledStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify); wirelessEnabledStatusData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify);
wirelessEnabledStatusData.setValue(QByteArray::number(static_cast<int>(Loopd::instance()->networkManager()->wirelessEnabled()))); wirelessEnabledStatusData.setValue(QByteArray::number(0));
serviceData.addCharacteristic(wirelessEnabledStatusData); serviceData.addCharacteristic(wirelessEnabledStatusData);
return serviceData; return serviceData;
@ -179,7 +201,7 @@ void NetworkService::characteristicChanged(const QLowEnergyCharacteristic &chara
return; return;
} }
if (!Loopd::instance()->networkManager()->available()) { if (!m_networkManager->available()) {
qCWarning(dcNetworkManagerBluetoothServer()) << "NetworkService: Networkmanager not available"; qCWarning(dcNetworkManagerBluetoothServer()) << "NetworkService: Networkmanager not available";
sendResponse(NetworkServiceResponseNetworkManagerNotAvailable); sendResponse(NetworkServiceResponseNetworkManagerNotAvailable);
return; return;
@ -249,19 +271,19 @@ void NetworkService::processCommand(const NetworkServiceCommand &command)
switch (command) { switch (command) {
case NetworkServiceCommandEnableNetworking: case NetworkServiceCommandEnableNetworking:
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Enable networking\" command"; qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Enable networking\" command";
Loopd::instance()->networkManager()->enableNetworking(true); m_networkManager->enableNetworking(true);
break; break;
case NetworkServiceCommandDisableNetworking: case NetworkServiceCommandDisableNetworking:
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Disable networking\" command"; qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Disable networking\" command";
Loopd::instance()->networkManager()->enableNetworking(false); m_networkManager->enableNetworking(false);
break; break;
case NetworkServiceCommandEnableWireless: case NetworkServiceCommandEnableWireless:
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Enable wireless networking\" command"; qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Enable wireless networking\" command";
Loopd::instance()->networkManager()->enableWireless(true); m_networkManager->enableWireless(true);
break; break;
case NetworkServiceCommandDisableWireless: case NetworkServiceCommandDisableWireless:
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Disable wireless networking\" command"; qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: received \"Disable wireless networking\" command";
Loopd::instance()->networkManager()->enableWireless(false); m_networkManager->enableWireless(false);
break; break;
default: default:
qCWarning(dcNetworkManagerBluetoothServer()) << "NetworkService: Unhandled command" << command; qCWarning(dcNetworkManagerBluetoothServer()) << "NetworkService: Unhandled command" << command;
@ -283,8 +305,8 @@ bool NetworkService::onNetworkManagerStateChanged()
return false; return false;
} }
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify state changed" << NetworkService::getNetworkManagerStateByteArray(Loopd::instance()->networkManager()->state()); qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify state changed" << NetworkService::getNetworkManagerStateByteArray(m_networkManager->state());
m_service->writeCharacteristic(characteristic, NetworkService::getNetworkManagerStateByteArray(Loopd::instance()->networkManager()->state())); m_service->writeCharacteristic(characteristic, NetworkService::getNetworkManagerStateByteArray(m_networkManager->state()));
return true; return true;
} }
@ -301,8 +323,8 @@ bool NetworkService::onNetworkingEnabledChanged()
return false; return false;
} }
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify networking enabled changed:" << (Loopd::instance()->networkManager()->networkingEnabled() ? "enabled" : "disabled"); qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify networking enabled changed:" << (m_networkManager->networkingEnabled() ? "enabled" : "disabled");
m_service->writeCharacteristic(characteristic, Loopd::instance()->networkManager()->networkingEnabled() ? QByteArray::fromHex("01") : QByteArray::fromHex("00")); m_service->writeCharacteristic(characteristic, m_networkManager->networkingEnabled() ? QByteArray::fromHex("01") : QByteArray::fromHex("00"));
return true; return true;
} }
@ -319,7 +341,7 @@ bool NetworkService::onWirelessEnabledChanged()
return false; return false;
} }
qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify wireless networking enabled changed:" << (Loopd::instance()->networkManager()->wirelessEnabled() ? "enabled" : "disabled"); qCDebug(dcNetworkManagerBluetoothServer()) << "NetworkService: Notify wireless networking enabled changed:" << (m_networkManager->wirelessEnabled() ? "enabled" : "disabled");
m_service->writeCharacteristic(characteristic, Loopd::instance()->networkManager()->wirelessEnabled() ? QByteArray::fromHex("01") : QByteArray::fromHex("00")); m_service->writeCharacteristic(characteristic, m_networkManager->wirelessEnabled() ? QByteArray::fromHex("01") : QByteArray::fromHex("00"));
return true; return true;
} }

31
libnymea-networkmanager/bluetooth/networkservice.h
View File

@ -1,13 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2016 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of loopd. * * This file is part of libnymea-networkmanager. *
* * * *
* Loopd can not be copied and/or distributed without the express * * This library is free software; you can redistribute it and/or *
* permission of guh GmbH. * * modify it under the terms of the GNU Lesser General Public *
* * * License as published by the Free Software Foundation; either *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKSERVICE_H #ifndef NETWORKSERVICE_H
#define NETWORKSERVICE_H #define NETWORKSERVICE_H

58
libnymea-networkmanager/bluetooth/wirelessservice.cpp
View File

@ -1,29 +1,37 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2016 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of loopd. * * This file is part of libnymea-networkmanager. *
* * * *
* Loopd can not be copied and/or distributed without the express * * This library is free software; you can redistribute it and/or *
* permission of guh GmbH. * * modify it under the terms of the GNU Lesser General Public *
* * * License as published by the Free Software Foundation; either *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "wirelessservice.h" #include "wirelessservice.h"
#include "bluetoothuuids.h" #include "bluetoothuuids.h"
#include "loggingcategory.h"
#include "loopd.h"
#include <QJsonDocument> #include <QJsonDocument>
#include <QNetworkInterface> #include <QNetworkInterface>
#include <QLowEnergyDescriptorData> #include <QLowEnergyDescriptorData>
#include <QLowEnergyCharacteristicData> #include <QLowEnergyCharacteristicData>
WirelessService::WirelessService(QLowEnergyService *service, QObject *parent) : WirelessService::WirelessService(QLowEnergyService *service, NetworkManager *networkManager, QObject *parent) :
QObject(parent), QObject(parent),
m_service(service), m_service(service),
m_device(nullptr), m_networkManager(networkManager)
m_readingInputData(false)
{ {
qCDebug(dcNetworkManagerBluetoothServer()) << "Create WirelessService."; qCDebug(dcNetworkManagerBluetoothServer()) << "Create WirelessService.";
@ -35,13 +43,13 @@ WirelessService::WirelessService(QLowEnergyService *service, QObject *parent) :
connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError))); connect(m_service, SIGNAL(error(QLowEnergyService::ServiceError)), this, SLOT(serviceError(QLowEnergyService::ServiceError)));
// Get the wireless network device if there is any // Get the wireless network device if there is any
if (!Loopd::instance()->networkManager()->wirelessAvailable()) { if (!m_networkManager->wirelessAvailable()) {
qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: There is no wireless network device available"; qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: There is no wireless network device available";
return; return;
} }
qCDebug(dcNetworkManagerBluetoothServer()) << "WirelessService: Using" << Loopd::instance()->networkManager()->wirelessNetworkDevices().first(); qCDebug(dcNetworkManagerBluetoothServer()) << "WirelessService: Using" << m_networkManager->wirelessNetworkDevices().first();
m_device = Loopd::instance()->networkManager()->wirelessNetworkDevices().first(); m_device = m_networkManager->wirelessNetworkDevices().first();
connect(m_device, &WirelessNetworkDevice::bitRateChanged, this, &WirelessService::onWirelessDeviceBitRateChanged); connect(m_device, &WirelessNetworkDevice::bitRateChanged, this, &WirelessService::onWirelessDeviceBitRateChanged);
connect(m_device, &WirelessNetworkDevice::stateChanged, this, &WirelessService::onWirelessDeviceStateChanged); connect(m_device, &WirelessNetworkDevice::stateChanged, this, &WirelessService::onWirelessDeviceStateChanged);
} }
@ -80,11 +88,7 @@ QLowEnergyServiceData WirelessService::serviceData()
wirelessStatusCharacteristicData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify); wirelessStatusCharacteristicData.setProperties(QLowEnergyCharacteristic::Read | QLowEnergyCharacteristic::Notify);
wirelessStatusCharacteristicData.addDescriptor(clientConfigDescriptorData); wirelessStatusCharacteristicData.addDescriptor(clientConfigDescriptorData);
wirelessStatusCharacteristicData.setValueLength(1, 1); wirelessStatusCharacteristicData.setValueLength(1, 1);
if (!Loopd::instance()->networkManager()->wirelessAvailable()) { wirelessStatusCharacteristicData.setValue(WirelessService::getWirelessNetworkDeviceState(NetworkDevice::NetworkDeviceStateUnavailable));
wirelessStatusCharacteristicData.setValue(WirelessService::getWirelessNetworkDeviceState(NetworkDevice::NetworkDeviceStateUnavailable));
} else {
wirelessStatusCharacteristicData.setValue(WirelessService::getWirelessNetworkDeviceState(Loopd::instance()->networkManager()->wirelessNetworkDevices().first()->deviceState()));
}
serviceData.addCharacteristic(wirelessStatusCharacteristicData); serviceData.addCharacteristic(wirelessStatusCharacteristicData);
return serviceData; return serviceData;
@ -94,7 +98,7 @@ QLowEnergyServiceData WirelessService::serviceData()
WirelessService::WirelessServiceResponse WirelessService::checkWirelessErrors() WirelessService::WirelessServiceResponse WirelessService::checkWirelessErrors()
{ {
// Check possible errors // Check possible errors
if (!Loopd::instance()->networkManager()->available()) { if (!m_networkManager->available()) {
qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: The networkmanager is not available."; qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: The networkmanager is not available.";
return WirelessServiceResponseNetworkManagerNotAvailable; return WirelessServiceResponseNetworkManagerNotAvailable;
} }
@ -104,12 +108,12 @@ WirelessService::WirelessServiceResponse WirelessService::checkWirelessErrors()
return WirelessServiceResponseWirelessNotAvailable; return WirelessServiceResponseWirelessNotAvailable;
} }
if (!Loopd::instance()->networkManager()->networkingEnabled()) { if (!m_networkManager->networkingEnabled()) {
qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: Networking not enabled"; qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: Networking not enabled";
return WirelessServiceResponseNetworkingNotEnabled; return WirelessServiceResponseNetworkingNotEnabled;
} }
if (!Loopd::instance()->networkManager()->wirelessEnabled()) { if (!m_networkManager->wirelessEnabled()) {
qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: Wireless not enabled"; qCWarning(dcNetworkManagerBluetoothServer()) << "WirelessService: Wireless not enabled";
return WirelessServiceResponseWirelessNotEnabled; return WirelessServiceResponseWirelessNotEnabled;
} }
@ -241,7 +245,7 @@ void WirelessService::commandConnect(const QVariantMap &request)
return; return;
} }
NetworkManager::NetworkManagerError networkError = Loopd::instance()->networkManager()->connectWifi(m_device->interface(), parameters.value("e").toString(), parameters.value("p").toString()); NetworkManager::NetworkManagerError networkError = m_networkManager->connectWifi(m_device->interface(), parameters.value("e").toString(), parameters.value("p").toString());
WirelessService::WirelessServiceResponse responseCode = WirelessService::WirelessServiceResponseSuccess; WirelessService::WirelessServiceResponse responseCode = WirelessService::WirelessServiceResponseSuccess;
switch (networkError) { switch (networkError) {
case NetworkManager::NetworkManagerErrorNoError: case NetworkManager::NetworkManagerErrorNoError:

33
libnymea-networkmanager/bluetooth/wirelessservice.h
View File

@ -1,13 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2016 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of loopd. * * This file is part of libnymea-networkmanager. *
* * * *
* Loopd can not be copied and/or distributed without the express * * This library is free software; you can redistribute it and/or *
* permission of guh GmbH. * * modify it under the terms of the GNU Lesser General Public *
* * * License as published by the Free Software Foundation; either *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * version 2.1 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; If not, see *
* <http://www.gnu.org/licenses/>. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef WIRELESSSERVICE_H #ifndef WIRELESSSERVICE_H
#define WIRELESSSERVICE_H #define WIRELESSSERVICE_H
@ -59,7 +70,7 @@ private:
NetworkManager *m_networkManager = nullptr; NetworkManager *m_networkManager = nullptr;
WirelessNetworkDevice *m_device = nullptr; WirelessNetworkDevice *m_device = nullptr;
bool m_readingInputData; bool m_readingInputData = false;
QByteArray m_inputDataStream; QByteArray m_inputDataStream;
WirelessServiceResponse checkWirelessErrors(); WirelessServiceResponse checkWirelessErrors();

22
libnymea-networkmanager/libnymea-networkmanager.pro
View File

@ -9,10 +9,6 @@ QMAKE_LFLAGS *= -std=c++11
DEFINES += VERSION_STRING=\\\"$${VERSION_STRING}\\\" DEFINES += VERSION_STRING=\\\"$${VERSION_STRING}\\\"
HEADERS += \ HEADERS += \
bluetooth/bluetoothserver.h \
bluetooth/bluetoothuuids.h \
bluetooth/networkservice.h \
bluetooth/wirelessservice.h \
networkmanager.h \ networkmanager.h \
networkconnection.h \ networkconnection.h \
networkdevice.h \ networkdevice.h \
@ -20,11 +16,9 @@ HEADERS += \
wirednetworkdevice.h \ wirednetworkdevice.h \
wirelessaccesspoint.h \ wirelessaccesspoint.h \
wirelessnetworkdevice.h \ wirelessnetworkdevice.h \
networkmanagerutils.h \ networkmanagerutils.h
SOURCES += \ SOURCES += \
bluetooth/networkservice.cpp \
bluetooth/wirelessservice.cpp \
networkmanager.cpp \ networkmanager.cpp \
networkconnection.cpp \ networkconnection.cpp \
networkdevice.cpp \ networkdevice.cpp \
@ -32,19 +26,23 @@ SOURCES += \
wirednetworkdevice.cpp \ wirednetworkdevice.cpp \
wirelessaccesspoint.cpp \ wirelessaccesspoint.cpp \
wirelessnetworkdevice.cpp \ wirelessnetworkdevice.cpp \
networkmanagerutils.cpp \ networkmanagerutils.cpp
equals(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 7) { equals(QT_MAJOR_VERSION, 5):!lessThan(QT_MINOR_VERSION, 7) {
message(Building with Bluetooth LE server functionality. Qt $${QT_VERSION}.) message(Building with Bluetooth LE server functionality. Qt $${QT_VERSION}.)
QT += bluetooth QT += bluetooth
HEADERS += \ HEADERS += \
bluetooth/bluetoothserver.h bluetooth/bluetoothserver.h \
bluetooth/bluetoothuuids.h \
bluetooth/networkservice.h \
bluetooth/wirelessservice.h \
SOURCES += \ SOURCES += \
bluetooth/bluetoothserver.cpp bluetooth/bluetoothserver.cpp \
bluetooth/networkservice.cpp \
bluetooth/wirelessservice.cpp \
} else { } else {
message(Bluetooth LE server functionality not supported with Qt $${QT_VERSION}.) message(Bluetooth LE server functionality not supported with Qt $${QT_VERSION}.)
} }

41
libnymea-networkmanager/networkconnection.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networkconnection.h" #include "networkconnection.h"
#include "networkmanagerutils.h" #include "networkmanagerutils.h"

41
libnymea-networkmanager/networkconnection.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKCONNECTION_H #ifndef NETWORKCONNECTION_H
#define NETWORKCONNECTION_H #define NETWORKCONNECTION_H

47
libnymea-networkmanager/networkdevice.cpp
View File

@ -1,25 +1,26 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*! \enum guhserver::NetworkDevice::NetworkDeviceState /*! \enum NetworkDevice::NetworkDeviceState
\value NetworkDeviceStateUnknown \value NetworkDeviceStateUnknown
\value NetworkDeviceStateUnmanaged \value NetworkDeviceStateUnmanaged
\value NetworkDeviceStateUnavailable \value NetworkDeviceStateUnavailable
@ -35,7 +36,7 @@
\value NetworkDeviceStateFailed \value NetworkDeviceStateFailed
*/ */
/*! \enum guhserver::NetworkDevice::NetworkDeviceStateReason /*! \enum NetworkDevice::NetworkDeviceStateReason
\value NetworkDeviceStateReasonNone \value NetworkDeviceStateReasonNone
\value NetworkDeviceStateReasonUnknown \value NetworkDeviceStateReasonUnknown
\value NetworkDeviceStateReasonNowManaged \value NetworkDeviceStateReasonNowManaged
@ -102,7 +103,7 @@
*/ */
/*! \enum guhserver::NetworkDevice::NetworkDeviceType /*! \enum NetworkDevice::NetworkDeviceType
\value NetworkDeviceTypeUnknown \value NetworkDeviceTypeUnknown
\value NetworkDeviceTypeEthernet \value NetworkDeviceTypeEthernet
\value NetworkDeviceTypeWifi \value NetworkDeviceTypeWifi

41
libnymea-networkmanager/networkdevice.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKDEVICE_H #ifndef NETWORKDEVICE_H
#define NETWORKDEVICE_H #define NETWORKDEVICE_H

41
libnymea-networkmanager/networkmanager.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networkmanager.h" #include "networkmanager.h"
#include "networkconnection.h" #include "networkconnection.h"

41
libnymea-networkmanager/networkmanager.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKMANAGER_H #ifndef NETWORKMANAGER_H
#define NETWORKMANAGER_H #define NETWORKMANAGER_H

41
libnymea-networkmanager/networkmanagerutils.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networkmanagerutils.h" #include "networkmanagerutils.h"

41
libnymea-networkmanager/networkmanagerutils.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKMANAGERUTILS_H #ifndef NETWORKMANAGERUTILS_H
#define NETWORKMANAGERUTILS_H #define NETWORKMANAGERUTILS_H

43
libnymea-networkmanager/networksettings.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "networksettings.h" #include "networksettings.h"
#include "networkmanagerutils.h" #include "networkmanagerutils.h"
@ -100,7 +101,7 @@ void NetworkSettings::connectionRemoved(const QDBusObjectPath &objectPath)
void NetworkSettings::propertiesChanged(const QVariantMap &properties) void NetworkSettings::propertiesChanged(const QVariantMap &properties)
{ {
Q_UNUSED(properties); Q_UNUSED(properties)
// TODO: handle settings changes // TODO: handle settings changes
//qCDebug(dcNetworkManager()) << "Settins: properties changed" << properties; //qCDebug(dcNetworkManager()) << "Settins: properties changed" << properties;
} }

41
libnymea-networkmanager/networksettings.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef NETWORKSETTINGS_H #ifndef NETWORKSETTINGS_H
#define NETWORKSETTINGS_H #define NETWORKSETTINGS_H

41
libnymea-networkmanager/wirednetworkdevice.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "wirednetworkdevice.h" #include "wirednetworkdevice.h"

41
libnymea-networkmanager/wirednetworkdevice.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef WIREDNETWORKDEVICE_H #ifndef WIREDNETWORKDEVICE_H
#define WIREDNETWORKDEVICE_H #define WIREDNETWORKDEVICE_H

41
libnymea-networkmanager/wirelessaccesspoint.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*! \enum guhserver::WirelessAccessPoint::ApSecurityMode /*! \enum guhserver::WirelessAccessPoint::ApSecurityMode
\value ApSecurityModeNone \value ApSecurityModeNone

41
libnymea-networkmanager/wirelessaccesspoint.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef WIRELESSACCESSPOINT_H #ifndef WIRELESSACCESSPOINT_H
#define WIRELESSACCESSPOINT_H #define WIRELESSACCESSPOINT_H

41
libnymea-networkmanager/wirelessnetworkdevice.cpp
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/*! \fn void WirelessNetworkDevice::bitRateChanged(const int &bitRate); /*! \fn void WirelessNetworkDevice::bitRateChanged(const int &bitRate);
This signal will be emitted when the \a bitRate of this \l{WirelessNetworkDevice} has changed. This signal will be emitted when the \a bitRate of this \l{WirelessNetworkDevice} has changed.

41
libnymea-networkmanager/wirelessnetworkdevice.h
View File

@ -1,23 +1,24 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* * * *
* Copyright (C) 2018 Simon Stürz <simon.stuerz@guh.io> * * Copyright (C) 2018-2019 Simon Stürz <simon.stuerz@nymea.io> *
* * * *
* This file is part of libnymea-networkmanager. * * This file is part of libnymea-networkmanager. *
* * * *
* libnymea-networkmanager is free software: you can redistribute it and/or * * This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as published by * * modify it under the terms of the GNU Lesser General Public *
* the Free Software Foundation, either version 3 of the License, * * License as published by the Free Software Foundation; either *
* or (at your option) any later version. * * version 2.1 of the License, or (at your option) any later version. *
* * * *
* libnymea-networkmanager is distributed in the hope that it will be useful, * * This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* GNU General Public License for more details. * * Lesser General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along * * You should have received a copy of the GNU Lesser General Public *
* with libnymea-networkmanager. If not, see <http://www.gnu.org/licenses/>. * * License along with this library; If not, see *
* * * <http://www.gnu.org/licenses/>. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#ifndef WIRELESSNETWORKMANAGER_H #ifndef WIRELESSNETWORKMANAGER_H
#define WIRELESSNETWORKMANAGER_H #define WIRELESSNETWORKMANAGER_H