From fc2f6ac9d7e7ac8ab343c11786f7437610fa0a19 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Thu, 6 Nov 2014 18:06:49 +0100 Subject: [Wifi] graduate from Qt.labs.wifi 0.1 to B2Qt.Wifi 1.0 - Make wifi library available from c++ 1) included with "#include ", available classes are: QWifiDevice, QWifiManager, QWifiConfiguration - Re-design of API: 1) connectedSSID -> currentSSID get current network from this property instead of networks state change events 2) networkStateChanaged(QWifiNetwork *) -> networkStateChanged(NetworkState) Don't expose QWifiNetwork objects to library users, use data model roles instead, no need to pollute API with "read-only" class. The flaws of exposing QWifiNetwork become apparent when looking at C++ API. 3) New BackendState enum for backend state changes events, backendStateChanged(BackendState) Initializing backend can be lengthy operation and can block GUI thread, same is true for DHCP requests, now these operations are moved into a separate thread and backend state change events are delivered asynchronously. 4) Make WifiManager a Singleton, we don't want several instances starting and stopping system processes and it makes global state handling simpler. 5) Rename Interface -> WifiDevice 6!) Introducing QWifiConfiguration. This abstraction allows for easy way to add new features, whatever we choose to support from: http://w1.fi/cgit/hostap/plain/wpa_supplicant/wpa_supplicant.conf The idea for it is to be a Qt-style wrapper for "network {}" configurations from wpa_supplicant.conf. Also this makes life simpler for developers if they know what network they will be using, they can omit scanning, listing, selecting parts and do something like this instead: WifiConfiguration { id: config ssid: "network name" passphrase: "12345678" } if (!WifiManager.connect(config)) print("failed to connect: " + WifiManager.lastError) - Optimizations: 1) Async. event delivery. 2) eLinux: Don't use "ifup", it is slow because it starts dhcp request even before any network has been configured. Use start-stop-daemon and ifconfig directly. - Bug fixes (many), but most importantly: 1) Get backend state properly when WifiManager is created. - Public header cleanup - Other: 1) Added categorized logging. 2) Methods to get/set wifi interface name. Not exposed to qml. - Missing parts that will be added as a separate patch: * [doc] Getting started guide for c++ and qml * [doc] Update for qml docs and new docs for c++. The current docs are out-of-date. Task-number: QTEE-649 Task-number: QTEE-810 Change-Id: I7dc8709aed2de622828a119749aef31534a4296d Reviewed-by: Laszlo Agocs --- src/imports/wifi/qwifinetwork.h | 71 ----------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 src/imports/wifi/qwifinetwork.h (limited to 'src/imports/wifi/qwifinetwork.h') diff --git a/src/imports/wifi/qwifinetwork.h b/src/imports/wifi/qwifinetwork.h deleted file mode 100644 index 5a92e17..0000000 --- a/src/imports/wifi/qwifinetwork.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of Qt Enterprise Embedded. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** the contact form at http://www.qt.io -** -****************************************************************************/ -#ifndef QWIFINETWORK_H -#define QWIFINETWORK_H - -#include -#include - -class QWifiNetwork : public QObject -{ - Q_OBJECT - - Q_PROPERTY(QByteArray bssid READ bssid CONSTANT) - Q_PROPERTY(QByteArray ssid READ ssid CONSTANT) - Q_PROPERTY(int signalStrength READ signalStrength NOTIFY signalStrengthChanged) - Q_PROPERTY(bool supportsWPA2 READ supportsWPA2 CONSTANT) - Q_PROPERTY(bool supportsWPA READ supportsWPA CONSTANT) - Q_PROPERTY(bool supportsWEP READ supportsWEP CONSTANT) - Q_PROPERTY(bool supportsWPS READ supportsWPS CONSTANT) - -public: - QWifiNetwork(); - - QByteArray bssid() const { return m_bssid; } - void setBssid(const QByteArray &id) { m_bssid = id; } - - QByteArray ssid() const { return m_ssid; } - void setSsid(const QByteArray &id) { m_ssid = id; } - - int signalStrength() const { return m_signalStrength; } - void setSignalStrength(int strength); - - void setOutOfRange(bool outOfRange); - bool outOfRange() { return m_outOfRange; } - - QByteArray flags() const { return m_flags; } - void setFlags(const QByteArray &f) { m_flags = f; } - bool supportsWPA2() const { return m_flags.contains("WPA2"); } - bool supportsWPA() const { return m_flags.contains("WPA"); } - bool supportsWEP() const { return m_flags.contains("WEP"); } - bool supportsWPS() const { return m_flags.contains("WPS"); } - -signals: - void signalStrengthChanged(int strength); - -private: - QByteArray m_bssid; - QByteArray m_ssid; - int m_signalStrength; - - QByteArray m_flags; - bool m_outOfRange; -}; - -#endif // QWIFINETWORK_H -- cgit v1.2.3