diff --git a/CMakeLists.txt b/CMakeLists.txt index a806e82..715b4e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project(pipedal HOMEPAGE_URL "https://rerdavies.github.io/pipedal" ) -EXECUTE_PROCESS( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE ) +execute_process( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE ) set (DISPLAY_VERSION "PiPedal v1.4.87-Experimental") set (PACKAGE_ARCHITECTURE ${DEBIAN_ARCHITECTURE}) @@ -18,6 +18,16 @@ enable_testing() #add_subdirectory("submodules/pipedal_p2pd") add_subdirectory("modules/SQLiteCpp") + +set(SDBUSCPP_BUILD_CODEGEN on) +set(SDBUSCPP_INSTALL off) +set(SDBUSCPP_BUILD_DOCS off) +set(SDBUSCPP_BUILD_DOXYGEN_DOCS off) +set(SDBUSCPP_BUILD_TESTS off) +#set(BUILD_SHARED_LIBS on) +add_subdirectory("modules/sdbus-cpp") + + add_subdirectory("PiPedalCommon") add_subdirectory("vite") @@ -96,7 +106,10 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IoT guitar effect pedal for Raspberry Pi" set(CPACK_DEBIAN_PACKAGE_SECTION sound) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_CONTROL_STRICT_PERMISSION TRUE) -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libicu-dev ,lv2-dev, ffmpeg, authbind, curl, gpg, alsa-base| pipewire, alsa-utils" ) + +# Accept either libzip4 or libzip5 to satisfy libzip 4 linkage (because Ubuntu nonsense) + +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libicu-dev ,lv2-dev, ffmpeg, authbind, curl, gpg, alsa-base| pipewire, alsa-utils") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEBIAN_ARCHITECTURE}) set(CPACK_PACKAGING_INSTALL_PREFIX /usr) set(CPACK_PROJECT_NAME ${PROJECT_NAME}) @@ -111,7 +124,9 @@ endif() set(CPACK_DEBIAN_PACKAGE_SIGN_ALGORITHM "detached") set(CPACK_DEBIAN_PACKAGE_SIGN_TYPE "origin") -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm") +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA + "${CMAKE_CURRENT_SOURCE_DIR}/debian/shlibs.override;${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm;${CMAKE_CURRENT_SOURCE_DIR}/debian/shlibs.local" + ) include(CPack) diff --git a/LICENSE.md b/LICENSE.md index 2cde791..580f2b0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,7 +2,7 @@ Original content in this project is covered under the following license. MIT License -© 2021-2024 Robin E. R. Davies +© Robin E. R. Davies Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -25,10 +25,21 @@ THE SOFTWARE. --- PiPedal also makes use of a wide variety of open-source source-code, data, -and directly- or indirectly-linked libraries that are covered under the following licenses. +and directly- or indirectly-linked libraries that are covered under the following +licenses. + +Portions of PiPedal are covered by the folling well-known open-source licenses: + + MIT, MIT-like, BSD variants, Mozilla, LGPL, Apache 2.0, CC BY. SIL + +as well as a variety of other licenses. None of these licenses are GPL. And none +of these licenses restrict commercial use. However some of them are restrictive, +and are not compatible with GPL licenses. You should NOT combine PiPedal with +GPL-licensed code unless you have taken appropriate steps to remove +source-code, data or dependencies that PiPedal uses which are not +compatible with a GPL license. --- -

PiPedal uses open-source software covered by the following copyright notices and licenses.

© 1995-2017 Jean-loup Gailly
diff --git a/PiPedalCommon/buildNetworkManagerProxies.sh b/PiPedalCommon/buildNetworkManagerProxies.sh new file mode 100755 index 0000000..d8ca012 --- /dev/null +++ b/PiPedalCommon/buildNetworkManagerProxies.sh @@ -0,0 +1,22 @@ +#!/usr/bin/bash +# Build NetworkManager dbus proxies. +# This script generates the necessary code for the D-Bus proxies used by the NetworkManager. +# It is not performed as part of the build, since this is an infrequently performed operation +# that uses tools built as part of the libsdbus-c++ library. + +# Relative path to XML2CPP tool from sdbus-cpp module. +# Assumes at least a partial build. +XML2CPP=../build/modules/sdbus-cpp/tools/sdbus-c++-xml2cpp + +set -e + +SOURCE_DIR=./src/include/dbus/xml +DEST_DIR=./src/include/dbus + +for file in $DEST_DIR/*.hpp; do + if [ -f "$file" ]; then + filename=$(basename "$file" .hpp) + echo $XML2CPP $SOURCE_DIR/${filename}.xml --proxy="$DEST_DIR/${filename}.hpp" + $XML2CPP $SOURCE_DIR/${filename}.xml --proxy="$DEST_DIR/${filename}.hpp" + fi +done \ No newline at end of file diff --git a/PiPedalCommon/src/CMakeLists.txt b/PiPedalCommon/src/CMakeLists.txt index 99e0795..6829869 100644 --- a/PiPedalCommon/src/CMakeLists.txt +++ b/PiPedalCommon/src/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 3.19.0) # specify the C++ standard set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED True)# apt get lbsdbus-c++-dev +set(CMAKE_CXX_STANDARD_REQUIRED True) + -find_package(sdbus-c++ REQUIRED) include(FindPkgConfig) @@ -97,7 +97,8 @@ add_library(PiPedalCommon STATIC ss.hpp ) target_include_directories(PiPedalCommon PUBLIC "include" ${LIBNL3_INCLUDE_DIRS}) -target_link_libraries(PiPedalCommon PUBLIC ${LIBNL3_LIBRARIES} SDBusCpp::sdbus-c++ ) +target_link_libraries(PiPedalCommon PUBLIC ${LIBNL3_LIBRARIES} sdbus-c++-objlib + ) diff --git a/PiPedalCommon/src/DBusDispatcher.cpp b/PiPedalCommon/src/DBusDispatcher.cpp index 844e7a5..412db24 100644 --- a/PiPedalCommon/src/DBusDispatcher.cpp +++ b/PiPedalCommon/src/DBusDispatcher.cpp @@ -102,7 +102,7 @@ void DBusDispatcher::ThreadProc() idle = true; quitting = false; - while (busConnection->processPendingRequest()) + while (busConnection->processPendingEvent()) { idle = false; } diff --git a/PiPedalCommon/src/DBusVariantHelper.cpp b/PiPedalCommon/src/DBusVariantHelper.cpp index 4cea124..6c79895 100644 --- a/PiPedalCommon/src/DBusVariantHelper.cpp +++ b/PiPedalCommon/src/DBusVariantHelper.cpp @@ -38,11 +38,11 @@ std::ostream&operator<<(std::ostream&s, const sdbus::Variant&v) { s << '['; bool first = true; - for (const sdbus::ObjectPath&value: values) + for (const sdbus::Variant&value: values) { if (!first) s << ", "; first = false; - s << value.c_str(); + s << value; } s << ']'; diff --git a/PiPedalCommon/src/WifiConfigSettings.cpp b/PiPedalCommon/src/WifiConfigSettings.cpp index 9b574ac..d900033 100644 --- a/PiPedalCommon/src/WifiConfigSettings.cpp +++ b/PiPedalCommon/src/WifiConfigSettings.cpp @@ -188,8 +188,8 @@ namespace pipedal::priv Device(const std::string &path) : m_proxy(sdbus::createProxy( sdbus::createSystemBusConnection(), - "org.freedesktop.NetworkManager", - path)) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + sdbus::ObjectPath(path))) { } @@ -217,12 +217,12 @@ namespace pipedal::priv NetworkManager() : m_proxy(sdbus::createProxy( sdbus::createSystemBusConnection(), - "org.freedesktop.NetworkManager", - "/org/freedesktop/NetworkManager")), + sdbus::ServiceName("org.freedesktop.NetworkManager"), + sdbus::ObjectPath("/org/freedesktop/NetworkManager"))), m_settings_proxy(sdbus::createProxy( sdbus::createSystemBusConnection(), - "org.freedesktop.NetworkManager", - "/org/freedesktop/NetworkManager/Settings")) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + sdbus::ObjectPath("/org/freedesktop/NetworkManager/Settings"))) { } @@ -329,8 +329,8 @@ namespace pipedal::priv { auto connection_proxy = sdbus::createProxy( m_proxy->getConnection(), - "org.freedesktop.NetworkManager", - connection); + sdbus::ServiceName("org.freedesktop.NetworkManager"), + sdbus::ObjectPath(connection)); connection_proxy->callMethod("Delete") .onInterface("org.freedesktop.NetworkManager.Settings.Connection"); } @@ -347,7 +347,7 @@ namespace pipedal::priv { auto conn_proxy = sdbus::createProxy( m_proxy->getConnection(), - "org.freedesktop.NetworkManager", + sdbus::ServiceName("org.freedesktop.NetworkManager"), conn); sdbus::ObjectPath conn_device; @@ -374,7 +374,7 @@ namespace pipedal::priv for (const auto &conn_path : connections) { auto conn_proxy = sdbus::createProxy(sdbus::createSystemBusConnection(), - "org.freedesktop.NetworkManager", + sdbus::ServiceName("org.freedesktop.NetworkManager"), conn_path); sdbus::Variant settings_variant; diff --git a/PiPedalCommon/src/include/NetworkManagerInterfaces.hpp b/PiPedalCommon/src/include/NetworkManagerInterfaces.hpp index 084ebc6..b8f6539 100644 --- a/PiPedalCommon/src/include/NetworkManagerInterfaces.hpp +++ b/PiPedalCommon/src/include/NetworkManagerInterfaces.hpp @@ -30,8 +30,9 @@ public: NetworkManager(DBusDispatcher &dispatcher) : sdbus::ProxyInterfaces( dispatcher.Connection(), - INTERFACE_NAME, - "/org/freedesktop/NetworkManager") + sdbus::ServiceName(INTERFACE_NAME), + sdbus::ObjectPath("/org/freedesktop/NetworkManager")), + objectPath_("/org/freedesktop/NetworkManager") { registerProxy(); } @@ -46,7 +47,11 @@ public: DBusEvent OnDeviceAdded; DBusEvent OnDeviceRemoved; + const sdbus::ObjectPath& getObjectPath() const{ return objectPath_; } + private: + sdbus::ObjectPath objectPath_; + void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); @@ -79,8 +84,9 @@ public: Device(DBusDispatcher &dispatcher, const sdbus::ObjectPath &path) : sdbus::ProxyInterfaces( dispatcher.Connection(), - "org.freedesktop.NetworkManager", - path) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + path), + objectPath_(path) { registerProxy(); } @@ -103,7 +109,10 @@ public: return this->DeviceType() == NM_DEVICE_TYPE_WIFI_P2P; } + const sdbus::ObjectPath&getObjectPath() const { return objectPath_; } + private: + sdbus::ObjectPath objectPath_; void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); @@ -124,8 +133,12 @@ public: using base = sdbus::ProxyInterfaces< org::freedesktop::NetworkManager::Device::WifiP2P_proxy>; - WifiP2P(DBusDispatcher &dispatcher, const std::string &objectPath) - : base(dispatcher.Connection(), "org.freedesktop.NetworkManager", objectPath) + WifiP2P(DBusDispatcher &dispatcher, const sdbus::ObjectPath&objectPath) + : base(dispatcher.Connection(), + sdbus::ServiceName("org.freedesktop.NetworkManager"), + objectPath), + objectPath_(objectPath) + { registerProxy(); } @@ -135,13 +148,16 @@ public: } static ptr Create(DBusDispatcher &dispatcher, const std::string &objectPath) { - return std::make_unique(dispatcher, objectPath); + return std::make_unique(dispatcher, sdbus::ObjectPath(objectPath)); } DBusEvent OnPeerAdded; DBusEvent OnPeerRemoved; DBusEvent OnStateChanged; + const sdbus::ObjectPath&getObjectPath() const { return objectPath_; } private: + sdbus::ObjectPath objectPath_; + void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); @@ -173,7 +189,10 @@ public: Connection(DBusDispatcher &dispatcher, const sdbus::ObjectPath &objectPath) : sdbus::ProxyInterfaces( - dispatcher.Connection(), "org.freedesktop.NetworkManager", objectPath) + dispatcher.Connection(), + sdbus::ServiceName("org.freedesktop.NetworkManager"), + objectPath), + objectPath_(objectPath) { registerProxy(); } @@ -190,7 +209,10 @@ public: DBusEvent<> OnUpdated; DBusEvent<> OnRemoved; + const sdbus::ObjectPath&getObjectPath() const { return objectPath_; } private: + sdbus::ObjectPath objectPath_; + virtual void onUpdated() override { OnUpdated.fire(); @@ -208,7 +230,7 @@ public: WifiP2PPeer(DBusDispatcher &dispatcher, const sdbus::ObjectPath &objectPath) : sdbus::ProxyInterfaces( - dispatcher.Connection(), "org.freedesktop.NetworkManager", objectPath) + dispatcher.Connection(), sdbus::ServiceName("org.freedesktop.NetworkManager"), objectPath) { registerProxy(); } @@ -243,8 +265,9 @@ public: DeviceWireless(DBusDispatcher &dispatcher, const sdbus::ObjectPath &path) : sdbus::ProxyInterfaces( dispatcher.Connection(), - "org.freedesktop.NetworkManager", - path) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + path), + objectPath_(path) { registerProxy(); } @@ -259,7 +282,11 @@ public: } DBusEvent OnAccessPointAdded; DBusEvent OnAccessPointRemoved; + + const sdbus::ObjectPath& getObjectPath() const{ return objectPath_; } protected: + sdbus::ObjectPath objectPath_; + void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); @@ -288,8 +315,9 @@ public: AccessPoint(DBusDispatcher &dispatcher, const sdbus::ObjectPath &path) : sdbus::ProxyInterfaces( dispatcher.Connection(), - "org.freedesktop.NetworkManager", - path) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + path), + objectPath_(path) { registerProxy(); } @@ -302,7 +330,10 @@ public: { return std::make_unique(dispatcher, path); } + const sdbus::ObjectPath& getObjectPath() const{ return objectPath_; } + protected: + sdbus::ObjectPath objectPath_; void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); @@ -318,8 +349,9 @@ public: ActiveConnection(DBusDispatcher &dispatcher, const sdbus::ObjectPath &path) : sdbus::ProxyInterfaces( dispatcher.Connection(), - "org.freedesktop.NetworkManager", - path) + sdbus::ServiceName("org.freedesktop.NetworkManager"), + path), + objectPath_(path) { registerProxy(); } @@ -333,7 +365,11 @@ public: return std::make_unique(dispatcher, path); } DBusEvent OnStateChanged; + + const sdbus::ObjectPath& getObjectPath() const{ return objectPath_; } + protected: + sdbus::ObjectPath objectPath_; void EventTrace(const char *method, const std::string &message) { LogTrace(getObjectPath(), method, message); diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.AccessPoint.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.AccessPoint.hpp index 9cd48ad..d9adc16 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.AccessPoint.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.AccessPoint.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_AccessPoint_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_AccessPoint_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_AccessPoint_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_AccessPoint_hpp__proxy__H__ #include #include @@ -21,65 +21,74 @@ public: protected: AccessPoint_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + AccessPoint_proxy(const AccessPoint_proxy&) = delete; + AccessPoint_proxy& operator=(const AccessPoint_proxy&) = delete; + AccessPoint_proxy(AccessPoint_proxy&&) = delete; + AccessPoint_proxy& operator=(AccessPoint_proxy&&) = delete; + ~AccessPoint_proxy() = default; + void registerProxy() + { + } + public: uint32_t Flags() { - return proxy_.getProperty("Flags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Flags").onInterface(INTERFACE_NAME).get(); } uint32_t WpaFlags() { - return proxy_.getProperty("WpaFlags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WpaFlags").onInterface(INTERFACE_NAME).get(); } uint32_t RsnFlags() { - return proxy_.getProperty("RsnFlags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RsnFlags").onInterface(INTERFACE_NAME).get(); } std::vector Ssid() { - return proxy_.getProperty("Ssid").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ssid").onInterface(INTERFACE_NAME).get>(); } uint32_t Frequency() { - return proxy_.getProperty("Frequency").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Frequency").onInterface(INTERFACE_NAME).get(); } std::string HwAddress() { - return proxy_.getProperty("HwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("HwAddress").onInterface(INTERFACE_NAME).get(); } uint32_t Mode() { - return proxy_.getProperty("Mode").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Mode").onInterface(INTERFACE_NAME).get(); } uint32_t MaxBitrate() { - return proxy_.getProperty("MaxBitrate").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("MaxBitrate").onInterface(INTERFACE_NAME).get(); } uint8_t Strength() { - return proxy_.getProperty("Strength").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Strength").onInterface(INTERFACE_NAME).get(); } int32_t LastSeen() { - return proxy_.getProperty("LastSeen").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("LastSeen").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Connection.Active.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Connection.Active.hpp index 09b57d2..e8e67a8 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Connection.Active.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Connection.Active.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Connection_Active_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Connection_Active_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Connection_Active_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Connection_Active_hpp__proxy__H__ #include #include @@ -22,103 +22,112 @@ public: protected: Active_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& state, const uint32_t& reason){ this->onStateChanged(state, reason); }); } + Active_proxy(const Active_proxy&) = delete; + Active_proxy& operator=(const Active_proxy&) = delete; + Active_proxy(Active_proxy&&) = delete; + Active_proxy& operator=(Active_proxy&&) = delete; + ~Active_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& state, const uint32_t& reason){ this->onStateChanged(state, reason); }); + } + virtual void onStateChanged(const uint32_t& state, const uint32_t& reason) = 0; public: sdbus::ObjectPath Connection() { - return proxy_.getProperty("Connection").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Connection").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath SpecificObject() { - return proxy_.getProperty("SpecificObject").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("SpecificObject").onInterface(INTERFACE_NAME).get(); } std::string Id() { - return proxy_.getProperty("Id").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Id").onInterface(INTERFACE_NAME).get(); } std::string Uuid() { - return proxy_.getProperty("Uuid").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Uuid").onInterface(INTERFACE_NAME).get(); } std::string Type() { - return proxy_.getProperty("Type").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Type").onInterface(INTERFACE_NAME).get(); } std::vector Devices() { - return proxy_.getProperty("Devices").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Devices").onInterface(INTERFACE_NAME).get>(); } uint32_t State() { - return proxy_.getProperty("State").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("State").onInterface(INTERFACE_NAME).get(); } uint32_t StateFlags() { - return proxy_.getProperty("StateFlags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("StateFlags").onInterface(INTERFACE_NAME).get(); } bool Default() { - return proxy_.getProperty("Default").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Default").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Ip4Config() { - return proxy_.getProperty("Ip4Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip4Config").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Dhcp4Config() { - return proxy_.getProperty("Dhcp4Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Dhcp4Config").onInterface(INTERFACE_NAME).get(); } bool Default6() { - return proxy_.getProperty("Default6").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Default6").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Ip6Config() { - return proxy_.getProperty("Ip6Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip6Config").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Dhcp6Config() { - return proxy_.getProperty("Dhcp6Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Dhcp6Config").onInterface(INTERFACE_NAME).get(); } bool Vpn() { - return proxy_.getProperty("Vpn").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Vpn").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Controller() { - return proxy_.getProperty("Controller").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Controller").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Master() { - return proxy_.getProperty("Master").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Master").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP4Config.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP4Config.hpp index 44baae0..63a3ab8 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP4Config.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP4Config.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DHCP4Config_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DHCP4Config_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DHCP4Config_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DHCP4Config_hpp__proxy__H__ #include #include @@ -21,20 +21,29 @@ public: protected: DHCP4Config_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + DHCP4Config_proxy(const DHCP4Config_proxy&) = delete; + DHCP4Config_proxy& operator=(const DHCP4Config_proxy&) = delete; + DHCP4Config_proxy(DHCP4Config_proxy&&) = delete; + DHCP4Config_proxy& operator=(DHCP4Config_proxy&&) = delete; + ~DHCP4Config_proxy() = default; + void registerProxy() + { + } + public: std::map Options() { - return proxy_.getProperty("Options").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Options").onInterface(INTERFACE_NAME).get>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP6Config.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP6Config.hpp index c13839c..c1ff68c 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP6Config.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DHCP6Config.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DHCP6Config_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DHCP6Config_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DHCP6Config_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DHCP6Config_hpp__proxy__H__ #include #include @@ -21,20 +21,29 @@ public: protected: DHCP6Config_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + DHCP6Config_proxy(const DHCP6Config_proxy&) = delete; + DHCP6Config_proxy& operator=(const DHCP6Config_proxy&) = delete; + DHCP6Config_proxy(DHCP6Config_proxy&&) = delete; + DHCP6Config_proxy& operator=(DHCP6Config_proxy&&) = delete; + ~DHCP6Config_proxy() = default; + void registerProxy() + { + } + public: std::map Options() { - return proxy_.getProperty("Options").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Options").onInterface(INTERFACE_NAME).get>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Statistics.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Statistics.hpp index 6eb0830..5a19c32 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Statistics.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Statistics.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_Statistics_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_Statistics_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_Statistics_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_Statistics_hpp__proxy__H__ #include #include @@ -22,35 +22,44 @@ public: protected: Statistics_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + Statistics_proxy(const Statistics_proxy&) = delete; + Statistics_proxy& operator=(const Statistics_proxy&) = delete; + Statistics_proxy(Statistics_proxy&&) = delete; + Statistics_proxy& operator=(Statistics_proxy&&) = delete; + ~Statistics_proxy() = default; + void registerProxy() + { + } + public: uint32_t RefreshRateMs() { - return proxy_.getProperty("RefreshRateMs").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RefreshRateMs").onInterface(INTERFACE_NAME).get(); } void RefreshRateMs(const uint32_t& value) { - proxy_.setProperty("RefreshRateMs").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("RefreshRateMs").onInterface(INTERFACE_NAME).toValue(value); } uint64_t TxBytes() { - return proxy_.getProperty("TxBytes").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("TxBytes").onInterface(INTERFACE_NAME).get(); } uint64_t RxBytes() { - return proxy_.getProperty("RxBytes").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RxBytes").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.WifiP2P.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.WifiP2P.hpp index 8ff2ec9..72a014f 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.WifiP2P.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.WifiP2P.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_WifiP2P_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_WifiP2P_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_WifiP2P_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_WifiP2P_hpp__proxy__H__ #include #include @@ -22,41 +22,50 @@ public: protected: WifiP2P_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("PeerAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& peer){ this->onPeerAdded(peer); }); - proxy_.uponSignal("PeerRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& peer){ this->onPeerRemoved(peer); }); } + WifiP2P_proxy(const WifiP2P_proxy&) = delete; + WifiP2P_proxy& operator=(const WifiP2P_proxy&) = delete; + WifiP2P_proxy(WifiP2P_proxy&&) = delete; + WifiP2P_proxy& operator=(WifiP2P_proxy&&) = delete; + ~WifiP2P_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("PeerAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& peer){ this->onPeerAdded(peer); }); + m_proxy.uponSignal("PeerRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& peer){ this->onPeerRemoved(peer); }); + } + virtual void onPeerAdded(const sdbus::ObjectPath& peer) = 0; virtual void onPeerRemoved(const sdbus::ObjectPath& peer) = 0; public: void StartFind(const std::map& options) { - proxy_.callMethod("StartFind").onInterface(INTERFACE_NAME).withArguments(options); + m_proxy.callMethod("StartFind").onInterface(INTERFACE_NAME).withArguments(options); } void StopFind() { - proxy_.callMethod("StopFind").onInterface(INTERFACE_NAME); + m_proxy.callMethod("StopFind").onInterface(INTERFACE_NAME); } public: std::string HwAddress() { - return proxy_.getProperty("HwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("HwAddress").onInterface(INTERFACE_NAME).get(); } std::vector Peers() { - return proxy_.getProperty("Peers").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Peers").onInterface(INTERFACE_NAME).get>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Wireless.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Wireless.hpp index e00de94..bbfa822 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Wireless.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.Wireless.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_Wireless_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_Wireless_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_Wireless_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_Wireless_hpp__proxy__H__ #include #include @@ -22,14 +22,23 @@ public: protected: Wireless_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("AccessPointAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& access_point){ this->onAccessPointAdded(access_point); }); - proxy_.uponSignal("AccessPointRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& access_point){ this->onAccessPointRemoved(access_point); }); } + Wireless_proxy(const Wireless_proxy&) = delete; + Wireless_proxy& operator=(const Wireless_proxy&) = delete; + Wireless_proxy(Wireless_proxy&&) = delete; + Wireless_proxy& operator=(Wireless_proxy&&) = delete; + ~Wireless_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("AccessPointAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& access_point){ this->onAccessPointAdded(access_point); }); + m_proxy.uponSignal("AccessPointRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& access_point){ this->onAccessPointRemoved(access_point); }); + } + virtual void onAccessPointAdded(const sdbus::ObjectPath& access_point) = 0; virtual void onAccessPointRemoved(const sdbus::ObjectPath& access_point) = 0; @@ -37,65 +46,65 @@ public: std::vector GetAccessPoints() { std::vector result; - proxy_.callMethod("GetAccessPoints").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetAccessPoints").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } std::vector GetAllAccessPoints() { std::vector result; - proxy_.callMethod("GetAllAccessPoints").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetAllAccessPoints").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } void RequestScan(const std::map& options) { - proxy_.callMethod("RequestScan").onInterface(INTERFACE_NAME).withArguments(options); + m_proxy.callMethod("RequestScan").onInterface(INTERFACE_NAME).withArguments(options); } public: std::string HwAddress() { - return proxy_.getProperty("HwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("HwAddress").onInterface(INTERFACE_NAME).get(); } std::string PermHwAddress() { - return proxy_.getProperty("PermHwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("PermHwAddress").onInterface(INTERFACE_NAME).get(); } uint32_t Mode() { - return proxy_.getProperty("Mode").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Mode").onInterface(INTERFACE_NAME).get(); } uint32_t Bitrate() { - return proxy_.getProperty("Bitrate").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Bitrate").onInterface(INTERFACE_NAME).get(); } std::vector AccessPoints() { - return proxy_.getProperty("AccessPoints").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("AccessPoints").onInterface(INTERFACE_NAME).get>(); } sdbus::ObjectPath ActiveAccessPoint() { - return proxy_.getProperty("ActiveAccessPoint").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ActiveAccessPoint").onInterface(INTERFACE_NAME).get(); } uint32_t WirelessCapabilities() { - return proxy_.getProperty("WirelessCapabilities").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WirelessCapabilities").onInterface(INTERFACE_NAME).get(); } int64_t LastScan() { - return proxy_.getProperty("LastScan").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("LastScan").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.hpp index bdb1c90..bc082a8 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Device.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Device_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Device_hpp__proxy__H__ #include #include @@ -21,211 +21,220 @@ public: protected: Device_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& new_state, const uint32_t& old_state, const uint32_t& reason){ this->onStateChanged(new_state, old_state, reason); }); } + Device_proxy(const Device_proxy&) = delete; + Device_proxy& operator=(const Device_proxy&) = delete; + Device_proxy(Device_proxy&&) = delete; + Device_proxy& operator=(Device_proxy&&) = delete; + ~Device_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& new_state, const uint32_t& old_state, const uint32_t& reason){ this->onStateChanged(new_state, old_state, reason); }); + } + virtual void onStateChanged(const uint32_t& new_state, const uint32_t& old_state, const uint32_t& reason) = 0; public: void Reapply(const std::map>& connection, const uint64_t& version_id, const uint32_t& flags) { - proxy_.callMethod("Reapply").onInterface(INTERFACE_NAME).withArguments(connection, version_id, flags); + m_proxy.callMethod("Reapply").onInterface(INTERFACE_NAME).withArguments(connection, version_id, flags); } std::tuple>, uint64_t> GetAppliedConnection(const uint32_t& flags) { std::tuple>, uint64_t> result; - proxy_.callMethod("GetAppliedConnection").onInterface(INTERFACE_NAME).withArguments(flags).storeResultsTo(result); + m_proxy.callMethod("GetAppliedConnection").onInterface(INTERFACE_NAME).withArguments(flags).storeResultsTo(result); return result; } void Disconnect() { - proxy_.callMethod("Disconnect").onInterface(INTERFACE_NAME); + m_proxy.callMethod("Disconnect").onInterface(INTERFACE_NAME); } void Delete() { - proxy_.callMethod("Delete").onInterface(INTERFACE_NAME); + m_proxy.callMethod("Delete").onInterface(INTERFACE_NAME); } public: std::string Udi() { - return proxy_.getProperty("Udi").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Udi").onInterface(INTERFACE_NAME).get(); } std::string Path() { - return proxy_.getProperty("Path").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Path").onInterface(INTERFACE_NAME).get(); } std::string Interface() { - return proxy_.getProperty("Interface").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Interface").onInterface(INTERFACE_NAME).get(); } std::string IpInterface() { - return proxy_.getProperty("IpInterface").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("IpInterface").onInterface(INTERFACE_NAME).get(); } std::string Driver() { - return proxy_.getProperty("Driver").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Driver").onInterface(INTERFACE_NAME).get(); } std::string DriverVersion() { - return proxy_.getProperty("DriverVersion").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DriverVersion").onInterface(INTERFACE_NAME).get(); } std::string FirmwareVersion() { - return proxy_.getProperty("FirmwareVersion").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("FirmwareVersion").onInterface(INTERFACE_NAME).get(); } uint32_t Capabilities() { - return proxy_.getProperty("Capabilities").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Capabilities").onInterface(INTERFACE_NAME).get(); } uint32_t Ip4Address() { - return proxy_.getProperty("Ip4Address").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip4Address").onInterface(INTERFACE_NAME).get(); } uint32_t State() { - return proxy_.getProperty("State").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("State").onInterface(INTERFACE_NAME).get(); } sdbus::Struct StateReason() { - return proxy_.getProperty("StateReason").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("StateReason").onInterface(INTERFACE_NAME).get>(); } sdbus::ObjectPath ActiveConnection() { - return proxy_.getProperty("ActiveConnection").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ActiveConnection").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Ip4Config() { - return proxy_.getProperty("Ip4Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip4Config").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Dhcp4Config() { - return proxy_.getProperty("Dhcp4Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Dhcp4Config").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Ip6Config() { - return proxy_.getProperty("Ip6Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip6Config").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath Dhcp6Config() { - return proxy_.getProperty("Dhcp6Config").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Dhcp6Config").onInterface(INTERFACE_NAME).get(); } bool Managed() { - return proxy_.getProperty("Managed").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Managed").onInterface(INTERFACE_NAME).get(); } void Managed(const bool& value) { - proxy_.setProperty("Managed").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("Managed").onInterface(INTERFACE_NAME).toValue(value); } bool Autoconnect() { - return proxy_.getProperty("Autoconnect").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Autoconnect").onInterface(INTERFACE_NAME).get(); } void Autoconnect(const bool& value) { - proxy_.setProperty("Autoconnect").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("Autoconnect").onInterface(INTERFACE_NAME).toValue(value); } bool FirmwareMissing() { - return proxy_.getProperty("FirmwareMissing").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("FirmwareMissing").onInterface(INTERFACE_NAME).get(); } bool NmPluginMissing() { - return proxy_.getProperty("NmPluginMissing").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("NmPluginMissing").onInterface(INTERFACE_NAME).get(); } uint32_t DeviceType() { - return proxy_.getProperty("DeviceType").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DeviceType").onInterface(INTERFACE_NAME).get(); } std::vector AvailableConnections() { - return proxy_.getProperty("AvailableConnections").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("AvailableConnections").onInterface(INTERFACE_NAME).get>(); } std::string PhysicalPortId() { - return proxy_.getProperty("PhysicalPortId").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("PhysicalPortId").onInterface(INTERFACE_NAME).get(); } uint32_t Mtu() { - return proxy_.getProperty("Mtu").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Mtu").onInterface(INTERFACE_NAME).get(); } uint32_t Metered() { - return proxy_.getProperty("Metered").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Metered").onInterface(INTERFACE_NAME).get(); } std::vector> LldpNeighbors() { - return proxy_.getProperty("LldpNeighbors").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("LldpNeighbors").onInterface(INTERFACE_NAME).get>>(); } bool Real() { - return proxy_.getProperty("Real").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Real").onInterface(INTERFACE_NAME).get(); } uint32_t Ip4Connectivity() { - return proxy_.getProperty("Ip4Connectivity").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip4Connectivity").onInterface(INTERFACE_NAME).get(); } uint32_t Ip6Connectivity() { - return proxy_.getProperty("Ip6Connectivity").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ip6Connectivity").onInterface(INTERFACE_NAME).get(); } uint32_t InterfaceFlags() { - return proxy_.getProperty("InterfaceFlags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("InterfaceFlags").onInterface(INTERFACE_NAME).get(); } std::string HwAddress() { - return proxy_.getProperty("HwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("HwAddress").onInterface(INTERFACE_NAME).get(); } std::vector Ports() { - return proxy_.getProperty("Ports").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Ports").onInterface(INTERFACE_NAME).get>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DnsManager.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DnsManager.hpp index 9cba4bb..a77f8ed 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DnsManager.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.DnsManager.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DnsManager_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_DnsManager_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DnsManager_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_DnsManager_hpp__proxy__H__ #include #include @@ -21,30 +21,39 @@ public: protected: DnsManager_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + DnsManager_proxy(const DnsManager_proxy&) = delete; + DnsManager_proxy& operator=(const DnsManager_proxy&) = delete; + DnsManager_proxy(DnsManager_proxy&&) = delete; + DnsManager_proxy& operator=(DnsManager_proxy&&) = delete; + ~DnsManager_proxy() = default; + void registerProxy() + { + } + public: std::string Mode() { - return proxy_.getProperty("Mode").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Mode").onInterface(INTERFACE_NAME).get(); } std::string RcManager() { - return proxy_.getProperty("RcManager").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RcManager").onInterface(INTERFACE_NAME).get(); } std::vector> Configuration() { - return proxy_.getProperty("Configuration").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Configuration").onInterface(INTERFACE_NAME).get>>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP4Config.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP4Config.hpp index 7fdd631..86594a2 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP4Config.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP4Config.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_IP4Config_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_IP4Config_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_IP4Config_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_IP4Config_hpp__proxy__H__ #include #include @@ -21,80 +21,89 @@ public: protected: IP4Config_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + IP4Config_proxy(const IP4Config_proxy&) = delete; + IP4Config_proxy& operator=(const IP4Config_proxy&) = delete; + IP4Config_proxy(IP4Config_proxy&&) = delete; + IP4Config_proxy& operator=(IP4Config_proxy&&) = delete; + ~IP4Config_proxy() = default; + void registerProxy() + { + } + public: std::vector> Addresses() { - return proxy_.getProperty("Addresses").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Addresses").onInterface(INTERFACE_NAME).get>>(); } std::vector> AddressData() { - return proxy_.getProperty("AddressData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("AddressData").onInterface(INTERFACE_NAME).get>>(); } std::string Gateway() { - return proxy_.getProperty("Gateway").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Gateway").onInterface(INTERFACE_NAME).get(); } std::vector> Routes() { - return proxy_.getProperty("Routes").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Routes").onInterface(INTERFACE_NAME).get>>(); } std::vector> RouteData() { - return proxy_.getProperty("RouteData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RouteData").onInterface(INTERFACE_NAME).get>>(); } std::vector Nameservers() { - return proxy_.getProperty("Nameservers").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Nameservers").onInterface(INTERFACE_NAME).get>(); } std::vector> NameserverData() { - return proxy_.getProperty("NameserverData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("NameserverData").onInterface(INTERFACE_NAME).get>>(); } std::vector Domains() { - return proxy_.getProperty("Domains").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Domains").onInterface(INTERFACE_NAME).get>(); } std::vector Searches() { - return proxy_.getProperty("Searches").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Searches").onInterface(INTERFACE_NAME).get>(); } std::vector DnsOptions() { - return proxy_.getProperty("DnsOptions").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DnsOptions").onInterface(INTERFACE_NAME).get>(); } int32_t DnsPriority() { - return proxy_.getProperty("DnsPriority").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DnsPriority").onInterface(INTERFACE_NAME).get(); } std::vector WinsServers() { - return proxy_.getProperty("WinsServers").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WinsServers").onInterface(INTERFACE_NAME).get>(); } std::vector WinsServerData() { - return proxy_.getProperty("WinsServerData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WinsServerData").onInterface(INTERFACE_NAME).get>(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP6Config.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP6Config.hpp index 94935fb..29c7822 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP6Config.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.IP6Config.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_IP6Config_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_IP6Config_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_IP6Config_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_IP6Config_hpp__proxy__H__ #include #include @@ -21,65 +21,74 @@ public: protected: IP6Config_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + IP6Config_proxy(const IP6Config_proxy&) = delete; + IP6Config_proxy& operator=(const IP6Config_proxy&) = delete; + IP6Config_proxy(IP6Config_proxy&&) = delete; + IP6Config_proxy& operator=(IP6Config_proxy&&) = delete; + ~IP6Config_proxy() = default; + void registerProxy() + { + } + public: std::vector, uint32_t, std::vector>> Addresses() { - return proxy_.getProperty("Addresses").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Addresses").onInterface(INTERFACE_NAME).get, uint32_t, std::vector>>>(); } std::vector> AddressData() { - return proxy_.getProperty("AddressData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("AddressData").onInterface(INTERFACE_NAME).get>>(); } std::string Gateway() { - return proxy_.getProperty("Gateway").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Gateway").onInterface(INTERFACE_NAME).get(); } std::vector, uint32_t, std::vector, uint32_t>> Routes() { - return proxy_.getProperty("Routes").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Routes").onInterface(INTERFACE_NAME).get, uint32_t, std::vector, uint32_t>>>(); } std::vector> RouteData() { - return proxy_.getProperty("RouteData").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RouteData").onInterface(INTERFACE_NAME).get>>(); } std::vector> Nameservers() { - return proxy_.getProperty("Nameservers").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Nameservers").onInterface(INTERFACE_NAME).get>>(); } std::vector Domains() { - return proxy_.getProperty("Domains").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Domains").onInterface(INTERFACE_NAME).get>(); } std::vector Searches() { - return proxy_.getProperty("Searches").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Searches").onInterface(INTERFACE_NAME).get>(); } std::vector DnsOptions() { - return proxy_.getProperty("DnsOptions").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DnsOptions").onInterface(INTERFACE_NAME).get>(); } int32_t DnsPriority() { - return proxy_.getProperty("DnsPriority").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("DnsPriority").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.Connection.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.Connection.hpp index 0beb271..be9b2cd 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.Connection.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.Connection.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Settings_Connection_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Settings_Connection_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Settings_Connection_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Settings_Connection_hpp__proxy__H__ #include #include @@ -22,82 +22,91 @@ public: protected: Connection_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("Updated").onInterface(INTERFACE_NAME).call([this](){ this->onUpdated(); }); - proxy_.uponSignal("Removed").onInterface(INTERFACE_NAME).call([this](){ this->onRemoved(); }); } + Connection_proxy(const Connection_proxy&) = delete; + Connection_proxy& operator=(const Connection_proxy&) = delete; + Connection_proxy(Connection_proxy&&) = delete; + Connection_proxy& operator=(Connection_proxy&&) = delete; + ~Connection_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("Updated").onInterface(INTERFACE_NAME).call([this](){ this->onUpdated(); }); + m_proxy.uponSignal("Removed").onInterface(INTERFACE_NAME).call([this](){ this->onRemoved(); }); + } + virtual void onUpdated() = 0; virtual void onRemoved() = 0; public: void Update(const std::map>& properties) { - proxy_.callMethod("Update").onInterface(INTERFACE_NAME).withArguments(properties); + m_proxy.callMethod("Update").onInterface(INTERFACE_NAME).withArguments(properties); } void UpdateUnsaved(const std::map>& properties) { - proxy_.callMethod("UpdateUnsaved").onInterface(INTERFACE_NAME).withArguments(properties); + m_proxy.callMethod("UpdateUnsaved").onInterface(INTERFACE_NAME).withArguments(properties); } void Delete() { - proxy_.callMethod("Delete").onInterface(INTERFACE_NAME); + m_proxy.callMethod("Delete").onInterface(INTERFACE_NAME); } std::map> GetSettings() { std::map> result; - proxy_.callMethod("GetSettings").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetSettings").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } std::map> GetSecrets(const std::string& setting_name) { std::map> result; - proxy_.callMethod("GetSecrets").onInterface(INTERFACE_NAME).withArguments(setting_name).storeResultsTo(result); + m_proxy.callMethod("GetSecrets").onInterface(INTERFACE_NAME).withArguments(setting_name).storeResultsTo(result); return result; } void ClearSecrets() { - proxy_.callMethod("ClearSecrets").onInterface(INTERFACE_NAME); + m_proxy.callMethod("ClearSecrets").onInterface(INTERFACE_NAME); } void Save() { - proxy_.callMethod("Save").onInterface(INTERFACE_NAME); + m_proxy.callMethod("Save").onInterface(INTERFACE_NAME); } std::map Update2(const std::map>& settings, const uint32_t& flags, const std::map& args) { std::map result; - proxy_.callMethod("Update2").onInterface(INTERFACE_NAME).withArguments(settings, flags, args).storeResultsTo(result); + m_proxy.callMethod("Update2").onInterface(INTERFACE_NAME).withArguments(settings, flags, args).storeResultsTo(result); return result; } public: bool Unsaved() { - return proxy_.getProperty("Unsaved").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Unsaved").onInterface(INTERFACE_NAME).get(); } uint32_t Flags() { - return proxy_.getProperty("Flags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Flags").onInterface(INTERFACE_NAME).get(); } std::string Filename() { - return proxy_.getProperty("Filename").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Filename").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.hpp index 1285c17..299efb7 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.Settings.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Settings_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_Settings_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Settings_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_Settings_hpp__proxy__H__ #include #include @@ -21,14 +21,23 @@ public: protected: Settings_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("NewConnection").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& connection){ this->onNewConnection(connection); }); - proxy_.uponSignal("ConnectionRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& connection){ this->onConnectionRemoved(connection); }); } + Settings_proxy(const Settings_proxy&) = delete; + Settings_proxy& operator=(const Settings_proxy&) = delete; + Settings_proxy(Settings_proxy&&) = delete; + Settings_proxy& operator=(Settings_proxy&&) = delete; + ~Settings_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("NewConnection").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& connection){ this->onNewConnection(connection); }); + m_proxy.uponSignal("ConnectionRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& connection){ this->onConnectionRemoved(connection); }); + } + virtual void onNewConnection(const sdbus::ObjectPath& connection) = 0; virtual void onConnectionRemoved(const sdbus::ObjectPath& connection) = 0; @@ -36,75 +45,75 @@ public: std::vector ListConnections() { std::vector result; - proxy_.callMethod("ListConnections").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("ListConnections").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } sdbus::ObjectPath GetConnectionByUuid(const std::string& uuid) { sdbus::ObjectPath result; - proxy_.callMethod("GetConnectionByUuid").onInterface(INTERFACE_NAME).withArguments(uuid).storeResultsTo(result); + m_proxy.callMethod("GetConnectionByUuid").onInterface(INTERFACE_NAME).withArguments(uuid).storeResultsTo(result); return result; } sdbus::ObjectPath AddConnection(const std::map>& connection) { sdbus::ObjectPath result; - proxy_.callMethod("AddConnection").onInterface(INTERFACE_NAME).withArguments(connection).storeResultsTo(result); + m_proxy.callMethod("AddConnection").onInterface(INTERFACE_NAME).withArguments(connection).storeResultsTo(result); return result; } sdbus::ObjectPath AddConnectionUnsaved(const std::map>& connection) { sdbus::ObjectPath result; - proxy_.callMethod("AddConnectionUnsaved").onInterface(INTERFACE_NAME).withArguments(connection).storeResultsTo(result); + m_proxy.callMethod("AddConnectionUnsaved").onInterface(INTERFACE_NAME).withArguments(connection).storeResultsTo(result); return result; } std::tuple> AddConnection2(const std::map>& settings, const uint32_t& flags, const std::map& args) { std::tuple> result; - proxy_.callMethod("AddConnection2").onInterface(INTERFACE_NAME).withArguments(settings, flags, args).storeResultsTo(result); + m_proxy.callMethod("AddConnection2").onInterface(INTERFACE_NAME).withArguments(settings, flags, args).storeResultsTo(result); return result; } std::tuple> LoadConnections(const std::vector& filenames) { std::tuple> result; - proxy_.callMethod("LoadConnections").onInterface(INTERFACE_NAME).withArguments(filenames).storeResultsTo(result); + m_proxy.callMethod("LoadConnections").onInterface(INTERFACE_NAME).withArguments(filenames).storeResultsTo(result); return result; } bool ReloadConnections() { bool result; - proxy_.callMethod("ReloadConnections").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("ReloadConnections").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } void SaveHostname(const std::string& hostname) { - proxy_.callMethod("SaveHostname").onInterface(INTERFACE_NAME).withArguments(hostname); + m_proxy.callMethod("SaveHostname").onInterface(INTERFACE_NAME).withArguments(hostname); } public: std::vector Connections() { - return proxy_.getProperty("Connections").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Connections").onInterface(INTERFACE_NAME).get>(); } std::string Hostname() { - return proxy_.getProperty("Hostname").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Hostname").onInterface(INTERFACE_NAME).get(); } bool CanModify() { - return proxy_.getProperty("CanModify").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("CanModify").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.WifiP2PPeer.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.WifiP2PPeer.hpp index 80c607c..75cfee4 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.WifiP2PPeer.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.WifiP2PPeer.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_WifiP2PPeer_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_WifiP2PPeer_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_WifiP2PPeer_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_WifiP2PPeer_hpp__proxy__H__ #include #include @@ -21,65 +21,74 @@ public: protected: WifiP2PPeer_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { } + WifiP2PPeer_proxy(const WifiP2PPeer_proxy&) = delete; + WifiP2PPeer_proxy& operator=(const WifiP2PPeer_proxy&) = delete; + WifiP2PPeer_proxy(WifiP2PPeer_proxy&&) = delete; + WifiP2PPeer_proxy& operator=(WifiP2PPeer_proxy&&) = delete; + ~WifiP2PPeer_proxy() = default; + void registerProxy() + { + } + public: std::string Name() { - return proxy_.getProperty("Name").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Name").onInterface(INTERFACE_NAME).get(); } uint32_t Flags() { - return proxy_.getProperty("Flags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Flags").onInterface(INTERFACE_NAME).get(); } std::string Manufacturer() { - return proxy_.getProperty("Manufacturer").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Manufacturer").onInterface(INTERFACE_NAME).get(); } std::string Model() { - return proxy_.getProperty("Model").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Model").onInterface(INTERFACE_NAME).get(); } std::string ModelNumber() { - return proxy_.getProperty("ModelNumber").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ModelNumber").onInterface(INTERFACE_NAME).get(); } std::string Serial() { - return proxy_.getProperty("Serial").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Serial").onInterface(INTERFACE_NAME).get(); } std::vector WfdIEs() { - return proxy_.getProperty("WfdIEs").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WfdIEs").onInterface(INTERFACE_NAME).get>(); } std::string HwAddress() { - return proxy_.getProperty("HwAddress").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("HwAddress").onInterface(INTERFACE_NAME).get(); } uint8_t Strength() { - return proxy_.getProperty("Strength").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Strength").onInterface(INTERFACE_NAME).get(); } int32_t LastSeen() { - return proxy_.getProperty("LastSeen").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("LastSeen").onInterface(INTERFACE_NAME).get(); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }}} // namespaces diff --git a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.hpp b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.hpp index a4e7746..30c586a 100644 --- a/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.hpp +++ b/PiPedalCommon/src/include/dbus/org.freedesktop.NetworkManager.hpp @@ -3,8 +3,8 @@ * This file was automatically generated by sdbus-c++-xml2cpp; DO NOT EDIT! */ -#ifndef __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_hpp__proxy__H__ -#define __sdbuscpp__dbus_hpp_org_freedesktop_NetworkManager_hpp__proxy__H__ +#ifndef __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_hpp__proxy__H__ +#define __sdbuscpp____src_include_dbus_org_freedesktop_NetworkManager_hpp__proxy__H__ #include #include @@ -20,16 +20,25 @@ public: protected: NetworkManager_proxy(sdbus::IProxy& proxy) - : proxy_(proxy) + : m_proxy(proxy) { - proxy_.uponSignal("CheckPermissions").onInterface(INTERFACE_NAME).call([this](){ this->onCheckPermissions(); }); - proxy_.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& state){ this->onStateChanged(state); }); - proxy_.uponSignal("DeviceAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& device_path){ this->onDeviceAdded(device_path); }); - proxy_.uponSignal("DeviceRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& device_path){ this->onDeviceRemoved(device_path); }); } + NetworkManager_proxy(const NetworkManager_proxy&) = delete; + NetworkManager_proxy& operator=(const NetworkManager_proxy&) = delete; + NetworkManager_proxy(NetworkManager_proxy&&) = delete; + NetworkManager_proxy& operator=(NetworkManager_proxy&&) = delete; + ~NetworkManager_proxy() = default; + void registerProxy() + { + m_proxy.uponSignal("CheckPermissions").onInterface(INTERFACE_NAME).call([this](){ this->onCheckPermissions(); }); + m_proxy.uponSignal("StateChanged").onInterface(INTERFACE_NAME).call([this](const uint32_t& state){ this->onStateChanged(state); }); + m_proxy.uponSignal("DeviceAdded").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& device_path){ this->onDeviceAdded(device_path); }); + m_proxy.uponSignal("DeviceRemoved").onInterface(INTERFACE_NAME).call([this](const sdbus::ObjectPath& device_path){ this->onDeviceRemoved(device_path); }); + } + virtual void onCheckPermissions() = 0; virtual void onStateChanged(const uint32_t& state) = 0; virtual void onDeviceAdded(const sdbus::ObjectPath& device_path) = 0; @@ -38,281 +47,281 @@ protected: public: void Reload(const uint32_t& flags) { - proxy_.callMethod("Reload").onInterface(INTERFACE_NAME).withArguments(flags); + m_proxy.callMethod("Reload").onInterface(INTERFACE_NAME).withArguments(flags); } std::vector GetDevices() { std::vector result; - proxy_.callMethod("GetDevices").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetDevices").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } std::vector GetAllDevices() { std::vector result; - proxy_.callMethod("GetAllDevices").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetAllDevices").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } sdbus::ObjectPath GetDeviceByIpIface(const std::string& iface) { sdbus::ObjectPath result; - proxy_.callMethod("GetDeviceByIpIface").onInterface(INTERFACE_NAME).withArguments(iface).storeResultsTo(result); + m_proxy.callMethod("GetDeviceByIpIface").onInterface(INTERFACE_NAME).withArguments(iface).storeResultsTo(result); return result; } sdbus::ObjectPath ActivateConnection(const sdbus::ObjectPath& connection, const sdbus::ObjectPath& device, const sdbus::ObjectPath& specific_object) { sdbus::ObjectPath result; - proxy_.callMethod("ActivateConnection").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object).storeResultsTo(result); + m_proxy.callMethod("ActivateConnection").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object).storeResultsTo(result); return result; } std::tuple AddAndActivateConnection(const std::map>& connection, const sdbus::ObjectPath& device, const sdbus::ObjectPath& specific_object) { std::tuple result; - proxy_.callMethod("AddAndActivateConnection").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object).storeResultsTo(result); + m_proxy.callMethod("AddAndActivateConnection").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object).storeResultsTo(result); return result; } std::tuple> AddAndActivateConnection2(const std::map>& connection, const sdbus::ObjectPath& device, const sdbus::ObjectPath& specific_object, const std::map& options) { std::tuple> result; - proxy_.callMethod("AddAndActivateConnection2").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object, options).storeResultsTo(result); + m_proxy.callMethod("AddAndActivateConnection2").onInterface(INTERFACE_NAME).withArguments(connection, device, specific_object, options).storeResultsTo(result); return result; } void DeactivateConnection(const sdbus::ObjectPath& active_connection) { - proxy_.callMethod("DeactivateConnection").onInterface(INTERFACE_NAME).withArguments(active_connection); + m_proxy.callMethod("DeactivateConnection").onInterface(INTERFACE_NAME).withArguments(active_connection); } void Sleep(const bool& sleep) { - proxy_.callMethod("Sleep").onInterface(INTERFACE_NAME).withArguments(sleep); + m_proxy.callMethod("Sleep").onInterface(INTERFACE_NAME).withArguments(sleep); } void Enable(const bool& enable) { - proxy_.callMethod("Enable").onInterface(INTERFACE_NAME).withArguments(enable); + m_proxy.callMethod("Enable").onInterface(INTERFACE_NAME).withArguments(enable); } std::map GetPermissions() { std::map result; - proxy_.callMethod("GetPermissions").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetPermissions").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } void SetLogging(const std::string& level, const std::string& domains) { - proxy_.callMethod("SetLogging").onInterface(INTERFACE_NAME).withArguments(level, domains); + m_proxy.callMethod("SetLogging").onInterface(INTERFACE_NAME).withArguments(level, domains); } std::tuple GetLogging() { std::tuple result; - proxy_.callMethod("GetLogging").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("GetLogging").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } uint32_t CheckConnectivity() { uint32_t result; - proxy_.callMethod("CheckConnectivity").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("CheckConnectivity").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } uint32_t state() { uint32_t result; - proxy_.callMethod("state").onInterface(INTERFACE_NAME).storeResultsTo(result); + m_proxy.callMethod("state").onInterface(INTERFACE_NAME).storeResultsTo(result); return result; } sdbus::ObjectPath CheckpointCreate(const std::vector& devices, const uint32_t& rollback_timeout, const uint32_t& flags) { sdbus::ObjectPath result; - proxy_.callMethod("CheckpointCreate").onInterface(INTERFACE_NAME).withArguments(devices, rollback_timeout, flags).storeResultsTo(result); + m_proxy.callMethod("CheckpointCreate").onInterface(INTERFACE_NAME).withArguments(devices, rollback_timeout, flags).storeResultsTo(result); return result; } void CheckpointDestroy(const sdbus::ObjectPath& checkpoint) { - proxy_.callMethod("CheckpointDestroy").onInterface(INTERFACE_NAME).withArguments(checkpoint); + m_proxy.callMethod("CheckpointDestroy").onInterface(INTERFACE_NAME).withArguments(checkpoint); } std::map CheckpointRollback(const sdbus::ObjectPath& checkpoint) { std::map result; - proxy_.callMethod("CheckpointRollback").onInterface(INTERFACE_NAME).withArguments(checkpoint).storeResultsTo(result); + m_proxy.callMethod("CheckpointRollback").onInterface(INTERFACE_NAME).withArguments(checkpoint).storeResultsTo(result); return result; } void CheckpointAdjustRollbackTimeout(const sdbus::ObjectPath& checkpoint, const uint32_t& add_timeout) { - proxy_.callMethod("CheckpointAdjustRollbackTimeout").onInterface(INTERFACE_NAME).withArguments(checkpoint, add_timeout); + m_proxy.callMethod("CheckpointAdjustRollbackTimeout").onInterface(INTERFACE_NAME).withArguments(checkpoint, add_timeout); } public: std::vector Devices() { - return proxy_.getProperty("Devices").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Devices").onInterface(INTERFACE_NAME).get>(); } std::vector AllDevices() { - return proxy_.getProperty("AllDevices").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("AllDevices").onInterface(INTERFACE_NAME).get>(); } std::vector Checkpoints() { - return proxy_.getProperty("Checkpoints").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Checkpoints").onInterface(INTERFACE_NAME).get>(); } bool NetworkingEnabled() { - return proxy_.getProperty("NetworkingEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("NetworkingEnabled").onInterface(INTERFACE_NAME).get(); } bool WirelessEnabled() { - return proxy_.getProperty("WirelessEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WirelessEnabled").onInterface(INTERFACE_NAME).get(); } void WirelessEnabled(const bool& value) { - proxy_.setProperty("WirelessEnabled").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("WirelessEnabled").onInterface(INTERFACE_NAME).toValue(value); } bool WirelessHardwareEnabled() { - return proxy_.getProperty("WirelessHardwareEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WirelessHardwareEnabled").onInterface(INTERFACE_NAME).get(); } bool WwanEnabled() { - return proxy_.getProperty("WwanEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WwanEnabled").onInterface(INTERFACE_NAME).get(); } void WwanEnabled(const bool& value) { - proxy_.setProperty("WwanEnabled").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("WwanEnabled").onInterface(INTERFACE_NAME).toValue(value); } bool WwanHardwareEnabled() { - return proxy_.getProperty("WwanHardwareEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WwanHardwareEnabled").onInterface(INTERFACE_NAME).get(); } bool WimaxEnabled() { - return proxy_.getProperty("WimaxEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WimaxEnabled").onInterface(INTERFACE_NAME).get(); } void WimaxEnabled(const bool& value) { - proxy_.setProperty("WimaxEnabled").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("WimaxEnabled").onInterface(INTERFACE_NAME).toValue(value); } bool WimaxHardwareEnabled() { - return proxy_.getProperty("WimaxHardwareEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("WimaxHardwareEnabled").onInterface(INTERFACE_NAME).get(); } uint32_t RadioFlags() { - return proxy_.getProperty("RadioFlags").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("RadioFlags").onInterface(INTERFACE_NAME).get(); } std::vector ActiveConnections() { - return proxy_.getProperty("ActiveConnections").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ActiveConnections").onInterface(INTERFACE_NAME).get>(); } sdbus::ObjectPath PrimaryConnection() { - return proxy_.getProperty("PrimaryConnection").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("PrimaryConnection").onInterface(INTERFACE_NAME).get(); } std::string PrimaryConnectionType() { - return proxy_.getProperty("PrimaryConnectionType").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("PrimaryConnectionType").onInterface(INTERFACE_NAME).get(); } uint32_t Metered() { - return proxy_.getProperty("Metered").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Metered").onInterface(INTERFACE_NAME).get(); } sdbus::ObjectPath ActivatingConnection() { - return proxy_.getProperty("ActivatingConnection").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ActivatingConnection").onInterface(INTERFACE_NAME).get(); } bool Startup() { - return proxy_.getProperty("Startup").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Startup").onInterface(INTERFACE_NAME).get(); } std::string Version() { - return proxy_.getProperty("Version").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Version").onInterface(INTERFACE_NAME).get(); } std::vector VersionInfo() { - return proxy_.getProperty("VersionInfo").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("VersionInfo").onInterface(INTERFACE_NAME).get>(); } std::vector Capabilities() { - return proxy_.getProperty("Capabilities").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Capabilities").onInterface(INTERFACE_NAME).get>(); } uint32_t State() { - return proxy_.getProperty("State").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("State").onInterface(INTERFACE_NAME).get(); } uint32_t Connectivity() { - return proxy_.getProperty("Connectivity").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("Connectivity").onInterface(INTERFACE_NAME).get(); } bool ConnectivityCheckAvailable() { - return proxy_.getProperty("ConnectivityCheckAvailable").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ConnectivityCheckAvailable").onInterface(INTERFACE_NAME).get(); } bool ConnectivityCheckEnabled() { - return proxy_.getProperty("ConnectivityCheckEnabled").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ConnectivityCheckEnabled").onInterface(INTERFACE_NAME).get(); } void ConnectivityCheckEnabled(const bool& value) { - proxy_.setProperty("ConnectivityCheckEnabled").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("ConnectivityCheckEnabled").onInterface(INTERFACE_NAME).toValue(value); } std::string ConnectivityCheckUri() { - return proxy_.getProperty("ConnectivityCheckUri").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("ConnectivityCheckUri").onInterface(INTERFACE_NAME).get(); } std::map GlobalDnsConfiguration() { - return proxy_.getProperty("GlobalDnsConfiguration").onInterface(INTERFACE_NAME); + return m_proxy.getProperty("GlobalDnsConfiguration").onInterface(INTERFACE_NAME).get>(); } void GlobalDnsConfiguration(const std::map& value) { - proxy_.setProperty("GlobalDnsConfiguration").onInterface(INTERFACE_NAME).toValue(value); + m_proxy.setProperty("GlobalDnsConfiguration").onInterface(INTERFACE_NAME).toValue(value); } private: - sdbus::IProxy& proxy_; + sdbus::IProxy& m_proxy; }; }} // namespaces diff --git a/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Group.xml b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Group.xml new file mode 100644 index 0000000..38d252a --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Group.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Interfaces.xml b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Interfaces.xml new file mode 100644 index 0000000..6430741 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Interfaces.xml @@ -0,0 +1,514 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.P2PGo.xml b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.P2PGo.xml new file mode 100644 index 0000000..a003dcb --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.P2PGo.xml @@ -0,0 +1,32 @@ +('\n' + '\n' + '\n') \ No newline at end of file diff --git a/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Peer.xml b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Peer.xml new file mode 100644 index 0000000..2e1440e --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/f1.w1.wpa_supplicant1.Peer.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/fi.w1.wpa_supplicant1.xml b/PiPedalCommon/src/include/dbus/xml/fi.w1.wpa_supplicant1.xml new file mode 100644 index 0000000..bc64187 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/fi.w1.wpa_supplicant1.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.DBus.Properties.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.DBus.Properties.xml new file mode 100644 index 0000000..d4b398d --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.DBus.Properties.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AccessPoint.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AccessPoint.xml new file mode 100644 index 0000000..7340bda --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AccessPoint.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AgentManager.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AgentManager.xml new file mode 100644 index 0000000..66dfea2 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.AgentManager.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Checkpoint.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Checkpoint.xml new file mode 100644 index 0000000..d47407b --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Checkpoint.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Connection.Active.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Connection.Active.xml new file mode 100644 index 0000000..faab73a --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Connection.Active.xml @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP4Config.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP4Config.xml new file mode 100644 index 0000000..ae5c374 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP4Config.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP6Config.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP6Config.xml new file mode 100644 index 0000000..7da61b2 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DHCP6Config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Bond.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Bond.xml new file mode 100644 index 0000000..34803d1 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Bond.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Dummy.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Dummy.xml new file mode 100644 index 0000000..ccef0b5 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Dummy.xml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Generic.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Generic.xml new file mode 100644 index 0000000..231b22d --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Generic.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Loopback.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Loopback.xml new file mode 100644 index 0000000..9023633 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Loopback.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Modem.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Modem.xml new file mode 100644 index 0000000..1aa0c83 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Modem.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Statistics.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Statistics.xml new file mode 100644 index 0000000..ab9076c --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Statistics.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WifiP2P.xml new file mode 100644 index 0000000..73b8cc0 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WifiP2P.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WireGuard.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WireGuard.xml new file mode 100644 index 0000000..b81cae8 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.WireGuard.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wired.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wired.xml new file mode 100644 index 0000000..41ea1c6 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wired.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wireless.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wireless.xml new file mode 100644 index 0000000..c428e99 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wireless.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wpan.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wpan.xml new file mode 100644 index 0000000..f8acde5 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.Wpan.xml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.xml new file mode 100644 index 0000000..36f7f5d --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Device.xml @@ -0,0 +1,407 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DnsManager.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DnsManager.xml new file mode 100644 index 0000000..702efb8 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.DnsManager.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP4Config.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP4Config.xml new file mode 100644 index 0000000..f6e18b7 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP4Config.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP6Config.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP6Config.xml new file mode 100644 index 0000000..e47b35f --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.IP6Config.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.PPP.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.PPP.xml new file mode 100644 index 0000000..b64414f --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.PPP.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.SecretAgent.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.SecretAgent.xml new file mode 100644 index 0000000..928e39a --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.SecretAgent.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.Connection.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.Connection.xml new file mode 100644 index 0000000..a9240ec --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.Connection.xml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.xml new file mode 100644 index 0000000..ea271df --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.Settings.xml @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Connection.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Connection.xml new file mode 100644 index 0000000..2167064 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Connection.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Plugin.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Plugin.xml new file mode 100644 index 0000000..b01f7a8 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.VPN.Plugin.xml @@ -0,0 +1,204 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WiMax.Nsp.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WiMax.Nsp.xml new file mode 100644 index 0000000..249df7e --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WiMax.Nsp.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WifiP2PPeer.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WifiP2PPeer.xml new file mode 100644 index 0000000..349dc87 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.WifiP2PPeer.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.xml b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.xml new file mode 100644 index 0000000..c92c801 --- /dev/null +++ b/PiPedalCommon/src/include/dbus/xml/org.freedesktop.NetworkManager.xml @@ -0,0 +1,598 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian/shlibs.local b/debian/shlibs.local new file mode 100644 index 0000000..cf69f9d --- /dev/null +++ b/debian/shlibs.local @@ -0,0 +1 @@ +libzip 4 libzip4 (>= 1.0) | libzip5 (>= 1.0) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ec8462f..61ff821 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,7 +54,6 @@ message(STATUS "*** ${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR}") include(FindPkgConfig) -find_package(sdbus-c++ REQUIRED) @@ -122,7 +121,6 @@ else() message(STATUS "LILV_0_INCLUDE_DIRS: ${LILV_0_INCLUDE_DIRS}") endif() -pkg_check_modules(ZIP "lilv-0") # Use LV2 headers from the /usr/lib directory. #set (LV2DEV_INCLUDE_DIRS /usr/lib) @@ -154,7 +152,7 @@ else() set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-multichar -Wno-psabi") endif() -EXECUTE_PROCESS( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE ) +execute_process( COMMAND dpkg --print-architecture COMMAND tr -d '\n' OUTPUT_VARIABLE DEBIAN_ARCHITECTURE ) message(STATUS DEBIAN_ARCHITECTURE="${DEBIAN_ARCHITECTURE}") add_compile_definitions(DEBIAN_ARCHITECTURE="${DEBIAN_ARCHITECTURE}") diff --git a/src/HotspotManager.cpp b/src/HotspotManager.cpp index b3dd62a..8dbb6fe 100644 --- a/src/HotspotManager.cpp +++ b/src/HotspotManager.cpp @@ -688,14 +688,14 @@ std::vector> HotspotManagerImpl::GetAllAutoConnectSsids() bool autoConnect = true; if (settings["connection"].count("autoconnect") > 0) { - autoConnect = settings["connection"]["autoconnect"]; + autoConnect = settings["connection"]["autoconnect"].get(); } bool isInfrastructure = settings["802-11-wireless"].count("mode") > 0 && settings["802-11-wireless"]["mode"].get() == "infrastructure"; if (isInfrastructure && autoConnect) { std::vector ssid = - settings["802-11-wireless"]["ssid"]; + settings["802-11-wireless"]["ssid"].get>(); ssids.push_back(std::move(ssid)); } } @@ -855,18 +855,20 @@ void HotspotManagerImpl::StartHotspot() std::map &connection = settings["connection"]; - connection["type"] = "802-11-wireless"; - connection["autoconnect"] = false; - connection["id"] = PIPEDAL_HOTSPOT_NAME; - connection["interface-name"] = wlanDevice->Interface(); - connection["uuid"] = serviceConfiguration.uuid; + using namespace sdbus; + + connection["type"] = sdbus::Variant("802-11-wireless"); + connection["autoconnect"] = sdbus::Variant(false); + connection["id"] = sdbus::Variant(PIPEDAL_HOTSPOT_NAME); + connection["interface-name"] = sdbus::Variant(wlanDevice->Interface()); + connection["uuid"] = sdbus::Variant(serviceConfiguration.uuid); std::map &wireless = settings["802-11-wireless"]; std::string ssid = this->wifiConfigSettings.hotspotName_; std::vector vSsid{ssid.begin(), ssid.end()}; - wireless["ssid"] = vSsid; - wireless["mode"] = "ap"; + wireless["ssid"] = sdbus::Variant(vSsid); + wireless["mode"] = sdbus::Variant("ap"); uint32_t iChannel = 0; auto channel = this->wifiConfigSettings.channel_; @@ -879,18 +881,18 @@ void HotspotManagerImpl::StartHotspot() // NM "band" values: "a" (5GHz), "bg" (2.4GHz). Channels 1-14 -> 2.4GHz; >14 -> 5GHz. if (iChannel != 0) { - wireless["channel"] = iChannel; - wireless["band"] = (iChannel > 14) ? "a" : "bg"; + wireless["channel"] = sdbus::Variant(iChannel); + wireless["band"] = sdbus::Variant((iChannel > 14) ? "a" : "bg"); } std::map &wirelessSecurity = settings["802-11-wireless-security"]; - wirelessSecurity["key-mgmt"] = "wpa-psk"; - wirelessSecurity["psk"] = wifiConfigSettings.password_; + wirelessSecurity["key-mgmt"] = sdbus::Variant("wpa-psk"); + wirelessSecurity["psk"] = sdbus::Variant(wifiConfigSettings.password_); // IPv4 shared method: NM will configure NAT and DHCP; static address is fine. - settings["ipv4"]["method"] = "shared"; + settings["ipv4"]["method"] = sdbus::Variant("shared"); // For IPv6, use ignore to avoid advertising IPv6 if not needed; shared IPv6 is less common and can cause issues. - settings["ipv6"]["method"] = "ignore"; + settings["ipv6"]["method"] = sdbus::Variant("ignore"); // If IPv6 were used, addr-gen-mode would be numeric enum; with method=ignore, omit it. //////////////////////////////////////////////////////////////// @@ -903,16 +905,16 @@ void HotspotManagerImpl::StartHotspot() {"prefix", sdbus::Variant(uint32_t(24))}}}); // For method=shared, NM provides DHCP; explicit DHCP client options on this device are not applicable. // settings["ipv4"]["dhcp-options"] = sdbus::Variant(std::vector{ - // "option:classless-static-route,192.168.60.0/8,0.0.0.0,0.0.0.0/0,192.168.60.1"}); + // "option:classless-static-route,192.168.60.0/24,0.0.0.0,0.0.0.0/0,192.168.60.1"}); // settings["ipv4"]["dhcp-options"] = sdbus::Variant(std::vector{ - // "option:classless-static-route,192.168.60.0/8,192.168.60.1"}); + // "option:classless-static-route,192.168.60.0/24,192.168.60.1"}); //////////////////////////////////////////////////////////// // With IPv6 ignored, don't set address-data or gateway; NM may reject extraneous keys. std::map options; - options["persist"] = "disk"; + options["persist"] = sdbus::Variant("disk"); Connection::ptr existingConnection = FindExistingConnection(); if (existingConnection) @@ -921,7 +923,7 @@ void HotspotManagerImpl::StartHotspot() auto activeConnectionPath = networkManager->ActivateConnection( existingConnection->getObjectPath(), wlanDevice->getObjectPath(), - "/"); + sdbus::ObjectPath("/")); this->activeConnection = ActiveConnection::Create(dbusDispatcher, activeConnectionPath); } else @@ -930,7 +932,10 @@ void HotspotManagerImpl::StartHotspot() // Call AddAndActivateConnection2 method to create and activate the hotspot sdbus::ObjectPath nullPath("/"); auto result = networkManager->AddAndActivateConnection2( - settings, wlanDevice->getObjectPath(), "/", options + settings, + wlanDevice->getObjectPath(), + sdbus::ObjectPath("/"), + options ); auto connectionPath = std::get<0>(result);