Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2018-11-14 14:38:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Wed Nov 14 14:38:38 2018 rev:57 rq:648552 version:5.52.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2018-10-22 11:16:43.151567036 +0200
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2018-11-14 14:38:45.763010472 +0100
@@ -1,0 +2,21 @@
+Mon Nov 12 10:35:54 UTC 2018 - wba...@tmo.at
+
+- Add patches that remove some new settings on Leap 42.3 (that
+ would require a newer NetworkManager) to fix the build:
+ * 0001-Revert-Add-missing-ipv4-setting-options.patch
+ * 0001-Revert-Add-vxlan-setting.patch
+
+-------------------------------------------------------------------
+Sun Nov 11 19:48:08 UTC 2018 - lbeltr...@kde.org
+
+- Update to 5.52.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.52.0.php
+- Changes since 5.51.0:
+ * Remove unused variable
+ * Add missing ipv4 setting options
+ * Add vxlan setting
+ * Create own categories file
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.51.0.tar.xz
New:
----
0001-Revert-Add-missing-ipv4-setting-options.patch
0001-Revert-Add-vxlan-setting.patch
networkmanager-qt-5.52.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.Add4xg/_old 2018-11-14 14:38:48.087008180 +0100
+++ /var/tmp/diff_new_pack.Add4xg/_new 2018-11-14 14:38:48.087008180 +0100
@@ -17,13 +17,13 @@
%define soversion 6
-%define _tar_path 5.51
+%define _tar_path 5.52
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} |
awk -F. '{print $1"."$2}')}
Name: libKF5NetworkManagerQt
-Version: 5.51.0
+Version: 5.52.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1-only OR LGPL-3.0-only
@@ -33,6 +33,10 @@
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE
Patch0: 0001-Revert-Require-NetworkManager-1.4.0-and-newer.patch
+# PATCH-FIX-OPENSUSE
+Patch1: 0001-Revert-Add-missing-ipv4-setting-options.patch
+# PATCH-FIX-OPENSUSE
+Patch2: 0001-Revert-Add-vxlan-setting.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
@@ -77,6 +81,8 @@
%setup -q -n networkmanager-qt-%{version}
%if 0%{?suse_version} < 1500
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%endif
%build
@@ -92,6 +98,7 @@
%files -n libKF5NetworkManagerQt%{soversion}
%license COPYING*
%{_kf5_libdir}/libKF5NetworkManagerQt.so.*
+%{_kf5_debugdir}/networkmanager-qt.categories
%files devel
%license COPYING*
++++++ 0001-Revert-Add-missing-ipv4-setting-options.patch ++++++
>From ec5a2e3ff51ebe56a66fe1fd4670f4a93ebded60 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wba...@tmo.at>
Date: Mon, 12 Nov 2018 11:33:31 +0100
Subject: [PATCH] Revert "Add missing ipv4 setting options"
This reverts commit b2244600b00cef0a85b3055c78b4a7af38197cab.
It needs a newer NetworkManager than we have in openSUSE Leap 42.3.
---
autotests/settings/ipv4settingtest.cpp | 58 +----------
src/settings/ipv4setting.cpp | 181 ---------------------------------
src/settings/ipv4setting.h | 28 -----
src/settings/ipv4setting_p.h | 7 --
4 files changed, 2 insertions(+), 272 deletions(-)
diff --git a/autotests/settings/ipv4settingtest.cpp
b/autotests/settings/ipv4settingtest.cpp
index c9434e0..e38af40 100644
--- a/autotests/settings/ipv4settingtest.cpp
+++ b/autotests/settings/ipv4settingtest.cpp
@@ -44,13 +44,6 @@ void IPv4SettingTest::testSetting_data()
QTest::addColumn<QString>("dhcpHostname");
QTest::addColumn<bool>("neverDefault");
QTest::addColumn<bool>("mayFail");
- QTest::addColumn<qint32>("dadTimeout");
- QTest::addColumn<QString>("dhcpFqdn");
- QTest::addColumn<QStringList>("dnsOptions");
- QTest::addColumn<qint32>("dnsPriority");
- QTest::addColumn<QString>("gateway");
- QTest::addColumn<NMVariantMapList>("addressData");
- QTest::addColumn<NMVariantMapList>("routeData");
QList<uint> dns;
dns << inet_addr("10.0.0.1");
@@ -75,26 +68,6 @@ void IPv4SettingTest::testSetting_data()
routeAddr << 25;
addresses << routeAddr;
- QStringList dnsOptions;
- dnsOptions << "opt1";
- dnsOptions << "opt2";
-
- NMVariantMapList addressData;
- QVariantMap addressMap;
- addressMap["address"] = "192.168.1.1";
- addressMap["prefix"] = 25;
- addressData.append(addressMap);
-
- NMVariantMapList routeData;
- QVariantMap routeMap;
- routeMap["dest"] = "192.168.1.1";
- routeMap["prefix"] = 25;
- routeData.append(routeMap);
- routeMap.clear();
- routeMap["dest"] = "192.168.1.2";
- routeMap["prefix"] = 25;
- routeData.append(routeMap);
-
QTest::newRow("setting1")
<< QString("auto") // method
<< dns // dns
@@ -108,14 +81,7 @@ void IPv4SettingTest::testSetting_data()
<< false // dhcpSendHostname
<< QString("home-test") // dhcpHostname
<< true // neverDefault
- << false // mayFail
- << 100 // dadTimeout
- << QString("foo.com") // dhcpFqdn
- << dnsOptions // dnsOptions
- << 100 // dnsPriority
- << QString("1.1.1.1") // gateway
- << addressData // addressData
- << routeData; // routeData
+ << false; // mayFail
}
void IPv4SettingTest::testSetting()
@@ -133,13 +99,6 @@ void IPv4SettingTest::testSetting()
QFETCH(QString, dhcpHostname);
QFETCH(bool, neverDefault);
QFETCH(bool, mayFail);
- QFETCH(qint32, dadTimeout);
- QFETCH(QString, dhcpFqdn);
- QFETCH(QStringList, dnsOptions);
- QFETCH(qint32, dnsPriority);
- QFETCH(QString, gateway);
- QFETCH(NMVariantMapList, addressData);
- QFETCH(NMVariantMapList, routeData);
QVariantMap map;
@@ -156,13 +115,6 @@ void IPv4SettingTest::testSetting()
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME),
dhcpHostname);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT),
neverDefault);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL), mayFail);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT), dadTimeout);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN), dhcpFqdn);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS), dnsOptions);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY),
dnsPriority);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY), gateway);
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA),
QVariant::fromValue(addressData));
- map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA),
QVariant::fromValue(routeData));
NetworkManager::Ipv4Setting setting;
setting.fromMap(map);
@@ -174,9 +126,7 @@ void IPv4SettingTest::testSetting()
while (it != map.constEnd()) {
if (it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS) &&
it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES) &&
- it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES) &&
- it.key() !=
QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA) &&
- it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))
{
+ it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)) {
QCOMPARE(it.value(), map1.value(it.key()));
}
++it;
@@ -188,10 +138,6 @@ void IPv4SettingTest::testSetting()
map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).value<UIntListList>());
QCOMPARE(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<UIntListList>(),
map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<UIntListList>());
-
QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))),
-
qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))));
-
QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))),
-
qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))));
}
QTEST_MAIN(IPv4SettingTest)
diff --git a/src/settings/ipv4setting.cpp b/src/settings/ipv4setting.cpp
index 4750110..02b2569 100644
--- a/src/settings/ipv4setting.cpp
+++ b/src/settings/ipv4setting.cpp
@@ -37,8 +37,6 @@ NetworkManager::Ipv4SettingPrivate::Ipv4SettingPrivate()
, dhcpSendHostname(true)
, neverDefault(false)
, mayFail(true)
- , dadTimeout(-1)
- , dnsPriority(0)
{ }
NetworkManager::Ipv4Setting::Ipv4Setting()
@@ -63,12 +61,6 @@ NetworkManager::Ipv4Setting::Ipv4Setting(const Ptr &other)
setDhcpHostname(other->dhcpHostname());
setNeverDefault(other->neverDefault());
setMayFail(other->mayFail());
- setDadTimeout(other->dadTimeout());
- setDhcpFqdn(other->dhcpFqdn());
- setDnsOptions(other->dnsOptions());
- setDnsPriority(other->dnsPriority());
- setAddressData(other->addressData());
- setRouteData(other->routeData());
}
NetworkManager::Ipv4Setting::~Ipv4Setting()
@@ -265,104 +257,6 @@ bool NetworkManager::Ipv4Setting::mayFail() const
return d->mayFail;
}
-void NetworkManager::Ipv4Setting::setDadTimeout(qint32 timeout)
-{
- Q_D(Ipv4Setting);
-
- d->dadTimeout = timeout;
-}
-
-qint32 NetworkManager::Ipv4Setting::dadTimeout() const
-{
- Q_D(const Ipv4Setting);
-
- return d->dadTimeout;
-}
-
-void NetworkManager::Ipv4Setting::setDhcpFqdn(const QString &fqdn)
-{
- Q_D(Ipv4Setting);
-
- d->dhcpFqdn = fqdn;
-}
-
-QString NetworkManager::Ipv4Setting::dhcpFqdn() const
-{
- Q_D(const Ipv4Setting);
-
- return d->dhcpFqdn;
-}
-
-void NetworkManager::Ipv4Setting::setDnsOptions(const QStringList &options)
-{
- Q_D(Ipv4Setting);
-
- d->dnsOptions = options;
-}
-
-QStringList NetworkManager::Ipv4Setting::dnsOptions() const
-{
- Q_D(const Ipv4Setting);
-
- return d->dnsOptions;
-}
-
-void NetworkManager::Ipv4Setting::setDnsPriority(qint32 priority)
-{
- Q_D(Ipv4Setting);
-
- d->dnsPriority = priority;
-}
-
-qint32 NetworkManager::Ipv4Setting::dnsPriority() const
-{
- Q_D(const Ipv4Setting);
-
- return d->dnsPriority;
-}
-
-void NetworkManager::Ipv4Setting::setGateway(const QString &gateway)
-{
- Q_D(Ipv4Setting);
-
- d->gateway = gateway;
-}
-
-QString NetworkManager::Ipv4Setting::gateway() const
-{
- Q_D(const Ipv4Setting);
-
- return d->gateway;
-}
-
-void NetworkManager::Ipv4Setting::setAddressData(const NMVariantMapList
&addressData)
-{
- Q_D(Ipv4Setting);
-
- d->addressData = addressData;
-}
-
-NMVariantMapList NetworkManager::Ipv4Setting::addressData() const
-{
- Q_D(const Ipv4Setting);
-
- return d->addressData;
-}
-
-void NetworkManager::Ipv4Setting::setRouteData(const NMVariantMapList
&routeData)
-{
- Q_D(Ipv4Setting);
-
- d->routeData = routeData;
-}
-
-NMVariantMapList NetworkManager::Ipv4Setting::routeData() const
-{
- Q_D(const Ipv4Setting);
-
- return d->routeData;
-}
-
void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
{
if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD))) {
@@ -496,34 +390,6 @@ void NetworkManager::Ipv4Setting::fromMap(const
QVariantMap &setting)
if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL))) {
setMayFail(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL)).toBool());
}
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT))) {
-
setDadTimeout(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT)).toUInt());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN))) {
-
setDhcpFqdn(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN)).toString());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS))) {
-
setDnsOptions(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS)).toStringList());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY)))
{
-
setDnsPriority(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY)).toInt());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY))) {
-
setGateway(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY)).toString());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA)))
{
-
setRouteData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))));
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))) {
-
setAddressData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))));
- }
}
QVariantMap NetworkManager::Ipv4Setting::toMap() const
@@ -614,34 +480,6 @@ QVariantMap NetworkManager::Ipv4Setting::toMap() const
setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL),
mayFail());
}
- if (dadTimeout() >= 0) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT),
dadTimeout());
- }
-
- if (!dhcpFqdn().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN),
dhcpFqdn());
- }
-
- if (!dnsOptions().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS),
dnsOptions());
- }
-
- if (dnsPriority() != 0) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY),
dnsPriority());
- }
-
- if (!gateway().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY),
gateway());
- }
-
- if (!addressData().empty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA),
QVariant::fromValue(addressData()));
- }
-
- if (!routeData().empty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA),
QVariant::fromValue(routeData()));
- }
-
return setting;
}
@@ -672,25 +510,6 @@ QDebug NetworkManager::operator <<(QDebug dbg, const
NetworkManager::Ipv4Setting
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME << ": " <<
setting.dhcpHostname() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT << ": " <<
setting.neverDefault() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_MAY_FAIL << ": " <<
setting.mayFail() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT << ": " <<
setting.dadTimeout() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_FQDN << ": " <<
setting.dhcpFqdn() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS << ": " <<
setting.dnsOptions() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY << ": " <<
setting.dnsPriority() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_GATEWAY << ": " <<
setting.gateway() << '\n';
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & addressData, setting.addressData()) {
- QVariantMap::const_iterator i = addressData.constBegin();
- while (i != addressData.constEnd()) {
- dbg.nospace() << i.key() << ": " << i.value() << '\n';
- }
- }
- dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTE_DATA << ": " << '\n';
- Q_FOREACH (const QVariantMap & routeData, setting.routeData()) {
- QVariantMap::const_iterator i = routeData.constBegin();
- while (i != routeData.constEnd()) {
- dbg.nospace() << i.key() << ": " << i.value() << '\n';
- }
- }
return dbg.maybeSpace();
}
diff --git a/src/settings/ipv4setting.h b/src/settings/ipv4setting.h
index 466a627..601f679 100644
--- a/src/settings/ipv4setting.h
+++ b/src/settings/ipv4setting.h
@@ -48,13 +48,6 @@
#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL
NM_SETTING_IP4_CONFIG_METHOD_MANUAL
#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED
NM_SETTING_IP4_CONFIG_METHOD_SHARED
#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED
NM_SETTING_IP4_CONFIG_METHOD_DISABLED
-#define NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT
NM_SETTING_IP_CONFIG_DAD_TIMEOUT
-#define NMQT_SETTING_IP4_CONFIG_DHCP_FQDN
NM_SETTING_IP4_CONFIG_DHCP_FQDN
-#define NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS
NM_SETTING_IP_CONFIG_DNS_OPTIONS
-#define NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY
NM_SETTING_IP_CONFIG_DNS_PRIORITY
-#define NMQT_SETTING_IP4_CONFIG_GATEWAY NM_SETTING_IP_CONFIG_GATEWAY
-#define NMQT_SETTING_IP4_CONFIG_ROUTE_DATA "route-data"
-#define NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA "address-data"
namespace NetworkManager
@@ -117,27 +110,6 @@ public:
void setMayFail(bool mayFail);
bool mayFail() const;
- void setDadTimeout(qint32 timeout);
- qint32 dadTimeout() const;
-
- void setDhcpFqdn(const QString &fqdn);
- QString dhcpFqdn() const;
-
- void setDnsOptions(const QStringList &options);
- QStringList dnsOptions() const;
-
- void setDnsPriority(qint32 priority);
- qint32 dnsPriority() const;
-
- void setGateway(const QString &gateway);
- QString gateway() const;
-
- void setAddressData(const NMVariantMapList &addressData);
- NMVariantMapList addressData() const;
-
- void setRouteData(const NMVariantMapList &routeData);
- NMVariantMapList routeData() const;
-
void fromMap(const QVariantMap &setting) override;
QVariantMap toMap() const override;
diff --git a/src/settings/ipv4setting_p.h b/src/settings/ipv4setting_p.h
index ba0f9e9..30a36e0 100644
--- a/src/settings/ipv4setting_p.h
+++ b/src/settings/ipv4setting_p.h
@@ -49,13 +49,6 @@ public:
QString dhcpHostname;
bool neverDefault;
bool mayFail;
- qint32 dadTimeout;
- QString dhcpFqdn;
- QStringList dnsOptions;
- qint32 dnsPriority;
- QString gateway;
- NMVariantMapList addressData;
- NMVariantMapList routeData;
};
}
--
2.16.4
++++++ 0001-Revert-Add-vxlan-setting.patch ++++++
++++ 902 lines (skipped)
++++++ networkmanager-qt-5.51.0.tar.xz -> networkmanager-qt-5.52.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/CMakeLists.txt
new/networkmanager-qt-5.52.0/CMakeLists.txt
--- old/networkmanager-qt-5.51.0/CMakeLists.txt 2018-10-07 12:10:46.000000000
+0200
+++ new/networkmanager-qt-5.52.0/CMakeLists.txt 2018-11-03 13:02:58.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.51.0") # handled by release scripts
+set(KF5_VERSION "5.52.0") # handled by release scripts
project(NetworkManagerQt VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.51.0 NO_MODULE)
+find_package(ECM 5.52.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -87,4 +87,5 @@
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
+install(FILES networkmanager-qt.categories DESTINATION ${KDE_INSTALL_CONFDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/autotests/settings/CMakeLists.txt
new/networkmanager-qt-5.52.0/autotests/settings/CMakeLists.txt
--- old/networkmanager-qt-5.51.0/autotests/settings/CMakeLists.txt
2018-10-07 12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/autotests/settings/CMakeLists.txt
2018-11-03 13:02:58.000000000 +0100
@@ -22,6 +22,7 @@
pppoesettingtest
serialsettingtest
vlansettingtest
+ vxlansettingtest
vpnsettingtest
wimaxsettingtest
wiredsettingtest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/autotests/settings/ipv4settingtest.cpp
new/networkmanager-qt-5.52.0/autotests/settings/ipv4settingtest.cpp
--- old/networkmanager-qt-5.51.0/autotests/settings/ipv4settingtest.cpp
2018-10-07 12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/autotests/settings/ipv4settingtest.cpp
2018-11-03 13:02:58.000000000 +0100
@@ -44,6 +44,13 @@
QTest::addColumn<QString>("dhcpHostname");
QTest::addColumn<bool>("neverDefault");
QTest::addColumn<bool>("mayFail");
+ QTest::addColumn<qint32>("dadTimeout");
+ QTest::addColumn<QString>("dhcpFqdn");
+ QTest::addColumn<QStringList>("dnsOptions");
+ QTest::addColumn<qint32>("dnsPriority");
+ QTest::addColumn<QString>("gateway");
+ QTest::addColumn<NMVariantMapList>("addressData");
+ QTest::addColumn<NMVariantMapList>("routeData");
QList<uint> dns;
dns << inet_addr("10.0.0.1");
@@ -68,6 +75,26 @@
routeAddr << 25;
addresses << routeAddr;
+ QStringList dnsOptions;
+ dnsOptions << "opt1";
+ dnsOptions << "opt2";
+
+ NMVariantMapList addressData;
+ QVariantMap addressMap;
+ addressMap["address"] = "192.168.1.1";
+ addressMap["prefix"] = 25;
+ addressData.append(addressMap);
+
+ NMVariantMapList routeData;
+ QVariantMap routeMap;
+ routeMap["dest"] = "192.168.1.1";
+ routeMap["prefix"] = 25;
+ routeData.append(routeMap);
+ routeMap.clear();
+ routeMap["dest"] = "192.168.1.2";
+ routeMap["prefix"] = 25;
+ routeData.append(routeMap);
+
QTest::newRow("setting1")
<< QString("auto") // method
<< dns // dns
@@ -81,7 +108,14 @@
<< false // dhcpSendHostname
<< QString("home-test") // dhcpHostname
<< true // neverDefault
- << false; // mayFail
+ << false // mayFail
+ << 100 // dadTimeout
+ << QString("foo.com") // dhcpFqdn
+ << dnsOptions // dnsOptions
+ << 100 // dnsPriority
+ << QString("1.1.1.1") // gateway
+ << addressData // addressData
+ << routeData; // routeData
}
void IPv4SettingTest::testSetting()
@@ -99,6 +133,13 @@
QFETCH(QString, dhcpHostname);
QFETCH(bool, neverDefault);
QFETCH(bool, mayFail);
+ QFETCH(qint32, dadTimeout);
+ QFETCH(QString, dhcpFqdn);
+ QFETCH(QStringList, dnsOptions);
+ QFETCH(qint32, dnsPriority);
+ QFETCH(QString, gateway);
+ QFETCH(NMVariantMapList, addressData);
+ QFETCH(NMVariantMapList, routeData);
QVariantMap map;
@@ -115,6 +156,13 @@
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME),
dhcpHostname);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT),
neverDefault);
map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL), mayFail);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT), dadTimeout);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN), dhcpFqdn);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS), dnsOptions);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY),
dnsPriority);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY), gateway);
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA),
QVariant::fromValue(addressData));
+ map.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA),
QVariant::fromValue(routeData));
NetworkManager::Ipv4Setting setting;
setting.fromMap(map);
@@ -126,7 +174,9 @@
while (it != map.constEnd()) {
if (it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS) &&
it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES) &&
- it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)) {
+ it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES) &&
+ it.key() !=
QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA) &&
+ it.key() != QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))
{
QCOMPARE(it.value(), map1.value(it.key()));
}
++it;
@@ -138,6 +188,10 @@
map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESSES)).value<UIntListList>());
QCOMPARE(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<UIntListList>(),
map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTES)).value<UIntListList>());
+
QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))),
+
qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))));
+
QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))),
+
qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))));
}
QTEST_MAIN(IPv4SettingTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/autotests/settings/vxlansettingtest.cpp
new/networkmanager-qt-5.52.0/autotests/settings/vxlansettingtest.cpp
--- old/networkmanager-qt-5.51.0/autotests/settings/vxlansettingtest.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/autotests/settings/vxlansettingtest.cpp
2018-11-03 13:02:58.000000000 +0100
@@ -0,0 +1,116 @@
+/*
+ Copyright 2018 Billy Laws <blaw...@gmai.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#include "vxlansettingtest.h"
+
+#include "settings/vxlansetting.h"
+
+#include <libnm/NetworkManager.h>
+
+#include <QTest>
+
+void VxlanSettingTest::testSetting_data()
+{
+ QTest::addColumn<quint32>("ageing");
+ QTest::addColumn<quint32>("destinationPort");
+ QTest::addColumn<quint32>("id");
+ QTest::addColumn<bool>("l2Miss");
+ QTest::addColumn<bool>("l3Miss");
+ QTest::addColumn<bool>("learning");
+ QTest::addColumn<quint32>("limit");
+ QTest::addColumn<QString>("local");
+ QTest::addColumn<QString>("parent");
+ QTest::addColumn<bool>("proxy");
+ QTest::addColumn<QString>("remote");
+ QTest::addColumn<bool>("rsc");
+ QTest::addColumn<quint32>("sourcePortMax");
+ QTest::addColumn<quint32>("sourcePortMin");
+ QTest::addColumn<quint32>("tos");
+ QTest::addColumn<quint32>("ttl");
+
+ QTest::newRow("setting1")
+ << (quint32) 2 // ageing
+ << (quint32) 334 //
destinationPort
+ << (quint32) 2 // id
+ << (bool) true // l2Miss
+ << (bool) true // l3Miss
+ << (bool) false // learning
+ << (quint32) 2 // limit
+ << QString("foo") // local
+ << QString("bar") // parent
+ << (bool) true // proxy
+ << QString("foo") // remote
+ << (bool) true // rsc
+ << (quint32) 2 //
sourcePortMax
+ << (quint32) 2 //
sourcePortMin
+ << (quint32) 2 // tos
+ << (quint32) 2; // ttl
+}
+
+void VxlanSettingTest::testSetting()
+{
+ QFETCH(quint32, ageing);
+ QFETCH(quint32, destinationPort);
+ QFETCH(quint32, id);
+ QFETCH(bool, l2Miss);
+ QFETCH(bool, l3Miss);
+ QFETCH(bool, learning);
+ QFETCH(quint32, limit);
+ QFETCH(QString, local);
+ QFETCH(QString, parent);
+ QFETCH(bool, proxy);
+ QFETCH(QString, remote);
+ QFETCH(bool, rsc);
+ QFETCH(quint32, sourcePortMax);
+ QFETCH(quint32, sourcePortMin);
+ QFETCH(quint32, tos);
+ QFETCH(quint32, ttl);
+
+ QVariantMap map;
+
+ map.insert(QLatin1String(NM_SETTING_VXLAN_AGEING), ageing);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_DESTINATION_PORT),
destinationPort);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_ID), id);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_L2_MISS), l2Miss);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_L3_MISS), l3Miss);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_LEARNING), learning);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_LIMIT), limit);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_LOCAL), local);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_PARENT), parent);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_PROXY), proxy);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_REMOTE), remote);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_RSC), rsc);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MAX), sourcePortMax);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MIN), sourcePortMin);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_TOS), tos);
+ map.insert(QLatin1String(NM_SETTING_VXLAN_TTL), ttl);
+
+ NetworkManager::VxlanSetting setting;
+ setting.fromMap(map);
+
+ QVariantMap map1 = setting.toMap();
+ QVariantMap::const_iterator it = map.constBegin();
+ while (it != map.constEnd()) {
+ QCOMPARE(it.value(), map1.value(it.key()));
+ ++it;
+ }
+}
+
+QTEST_MAIN(VxlanSettingTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/autotests/settings/vxlansettingtest.h
new/networkmanager-qt-5.52.0/autotests/settings/vxlansettingtest.h
--- old/networkmanager-qt-5.51.0/autotests/settings/vxlansettingtest.h
1970-01-01 01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/autotests/settings/vxlansettingtest.h
2018-11-03 13:02:58.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ Copyright 2018 Billy Laws <blaw...@gmai.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#ifndef NETWORKMANAGERQT_VXLANSETTING_TEST_H
+#define NETWORKMANAGERQT_VXLANSETTING_TEST_H
+
+#include <QObject>
+
+class VxlanSettingTest : public QObject
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+ void testSetting_data();
+ void testSetting();
+};
+
+#endif // NETWORKMANAGERQT_VXLANSETTING_TEST_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/networkmanager-qt.categories
new/networkmanager-qt-5.52.0/networkmanager-qt.categories
--- old/networkmanager-qt-5.51.0/networkmanager-qt.categories 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/networkmanager-qt.categories 2018-11-03
13:02:58.000000000 +0100
@@ -0,0 +1 @@
+networkmanager-qt NetworkManagerQt DEFAULT_SEVERITY [WARNING] IDENTIFIER
[NMQT]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/CMakeLists.txt
new/networkmanager-qt-5.52.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.51.0/src/CMakeLists.txt 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/CMakeLists.txt 2018-11-03
13:02:58.000000000 +0100
@@ -78,6 +78,7 @@
settings/teamsetting.cpp
settings/genericsetting.cpp
settings/tunsetting.cpp
+ settings/vxlansetting.cpp
)
set(DBUS_INTERFACE_SRCS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/src/settings/ipv4setting.cpp
new/networkmanager-qt-5.52.0/src/settings/ipv4setting.cpp
--- old/networkmanager-qt-5.51.0/src/settings/ipv4setting.cpp 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/ipv4setting.cpp 2018-11-03
13:02:58.000000000 +0100
@@ -37,6 +37,8 @@
, dhcpSendHostname(true)
, neverDefault(false)
, mayFail(true)
+ , dadTimeout(-1)
+ , dnsPriority(0)
{ }
NetworkManager::Ipv4Setting::Ipv4Setting()
@@ -61,6 +63,12 @@
setDhcpHostname(other->dhcpHostname());
setNeverDefault(other->neverDefault());
setMayFail(other->mayFail());
+ setDadTimeout(other->dadTimeout());
+ setDhcpFqdn(other->dhcpFqdn());
+ setDnsOptions(other->dnsOptions());
+ setDnsPriority(other->dnsPriority());
+ setAddressData(other->addressData());
+ setRouteData(other->routeData());
}
NetworkManager::Ipv4Setting::~Ipv4Setting()
@@ -257,6 +265,104 @@
return d->mayFail;
}
+void NetworkManager::Ipv4Setting::setDadTimeout(qint32 timeout)
+{
+ Q_D(Ipv4Setting);
+
+ d->dadTimeout = timeout;
+}
+
+qint32 NetworkManager::Ipv4Setting::dadTimeout() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->dadTimeout;
+}
+
+void NetworkManager::Ipv4Setting::setDhcpFqdn(const QString &fqdn)
+{
+ Q_D(Ipv4Setting);
+
+ d->dhcpFqdn = fqdn;
+}
+
+QString NetworkManager::Ipv4Setting::dhcpFqdn() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->dhcpFqdn;
+}
+
+void NetworkManager::Ipv4Setting::setDnsOptions(const QStringList &options)
+{
+ Q_D(Ipv4Setting);
+
+ d->dnsOptions = options;
+}
+
+QStringList NetworkManager::Ipv4Setting::dnsOptions() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->dnsOptions;
+}
+
+void NetworkManager::Ipv4Setting::setDnsPriority(qint32 priority)
+{
+ Q_D(Ipv4Setting);
+
+ d->dnsPriority = priority;
+}
+
+qint32 NetworkManager::Ipv4Setting::dnsPriority() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->dnsPriority;
+}
+
+void NetworkManager::Ipv4Setting::setGateway(const QString &gateway)
+{
+ Q_D(Ipv4Setting);
+
+ d->gateway = gateway;
+}
+
+QString NetworkManager::Ipv4Setting::gateway() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->gateway;
+}
+
+void NetworkManager::Ipv4Setting::setAddressData(const NMVariantMapList
&addressData)
+{
+ Q_D(Ipv4Setting);
+
+ d->addressData = addressData;
+}
+
+NMVariantMapList NetworkManager::Ipv4Setting::addressData() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->addressData;
+}
+
+void NetworkManager::Ipv4Setting::setRouteData(const NMVariantMapList
&routeData)
+{
+ Q_D(Ipv4Setting);
+
+ d->routeData = routeData;
+}
+
+NMVariantMapList NetworkManager::Ipv4Setting::routeData() const
+{
+ Q_D(const Ipv4Setting);
+
+ return d->routeData;
+}
+
void NetworkManager::Ipv4Setting::fromMap(const QVariantMap &setting)
{
if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_METHOD))) {
@@ -390,6 +496,34 @@
if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL))) {
setMayFail(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL)).toBool());
}
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT))) {
+
setDadTimeout(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN))) {
+
setDhcpFqdn(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS))) {
+
setDnsOptions(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS)).toStringList());
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY)))
{
+
setDnsPriority(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY)).toInt());
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY))) {
+
setGateway(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA)))
{
+
setRouteData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))));
+ }
+
+ if (setting.contains(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA))) {
+
setAddressData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA))));
+ }
}
QVariantMap NetworkManager::Ipv4Setting::toMap() const
@@ -480,6 +614,34 @@
setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_MAY_FAIL),
mayFail());
}
+ if (dadTimeout() >= 0) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT),
dadTimeout());
+ }
+
+ if (!dhcpFqdn().isEmpty()) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DHCP_FQDN),
dhcpFqdn());
+ }
+
+ if (!dnsOptions().isEmpty()) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS),
dnsOptions());
+ }
+
+ if (dnsPriority() != 0) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY),
dnsPriority());
+ }
+
+ if (!gateway().isEmpty()) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_GATEWAY),
gateway());
+ }
+
+ if (!addressData().empty()) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA),
QVariant::fromValue(addressData()));
+ }
+
+ if (!routeData().empty()) {
+ setting.insert(QLatin1String(NMQT_SETTING_IP4_CONFIG_ROUTE_DATA),
QVariant::fromValue(routeData()));
+ }
+
return setting;
}
@@ -510,6 +672,25 @@
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_HOSTNAME << ": " <<
setting.dhcpHostname() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_NEVER_DEFAULT << ": " <<
setting.neverDefault() << '\n';
dbg.nospace() << NMQT_SETTING_IP4_CONFIG_MAY_FAIL << ": " <<
setting.mayFail() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT << ": " <<
setting.dadTimeout() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DHCP_FQDN << ": " <<
setting.dhcpFqdn() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS << ": " <<
setting.dnsOptions() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY << ": " <<
setting.dnsPriority() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_GATEWAY << ": " <<
setting.gateway() << '\n';
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA << ": " << '\n';
+ Q_FOREACH (const QVariantMap & addressData, setting.addressData()) {
+ QVariantMap::const_iterator i = addressData.constBegin();
+ while (i != addressData.constEnd()) {
+ dbg.nospace() << i.key() << ": " << i.value() << '\n';
+ }
+ }
+ dbg.nospace() << NMQT_SETTING_IP4_CONFIG_ROUTE_DATA << ": " << '\n';
+ Q_FOREACH (const QVariantMap & routeData, setting.routeData()) {
+ QVariantMap::const_iterator i = routeData.constBegin();
+ while (i != routeData.constEnd()) {
+ dbg.nospace() << i.key() << ": " << i.value() << '\n';
+ }
+ }
return dbg.maybeSpace();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/settings/ipv4setting.h
new/networkmanager-qt-5.52.0/src/settings/ipv4setting.h
--- old/networkmanager-qt-5.51.0/src/settings/ipv4setting.h 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/ipv4setting.h 2018-11-03
13:02:58.000000000 +0100
@@ -48,6 +48,13 @@
#define NMQT_SETTING_IP4_CONFIG_METHOD_MANUAL
NM_SETTING_IP4_CONFIG_METHOD_MANUAL
#define NMQT_SETTING_IP4_CONFIG_METHOD_SHARED
NM_SETTING_IP4_CONFIG_METHOD_SHARED
#define NMQT_SETTING_IP4_CONFIG_METHOD_DISABLED
NM_SETTING_IP4_CONFIG_METHOD_DISABLED
+#define NMQT_SETTING_IP4_CONFIG_DAD_TIMEOUT
NM_SETTING_IP_CONFIG_DAD_TIMEOUT
+#define NMQT_SETTING_IP4_CONFIG_DHCP_FQDN
NM_SETTING_IP4_CONFIG_DHCP_FQDN
+#define NMQT_SETTING_IP4_CONFIG_DNS_OPTIONS
NM_SETTING_IP_CONFIG_DNS_OPTIONS
+#define NMQT_SETTING_IP4_CONFIG_DNS_PRIORITY
NM_SETTING_IP_CONFIG_DNS_PRIORITY
+#define NMQT_SETTING_IP4_CONFIG_GATEWAY NM_SETTING_IP_CONFIG_GATEWAY
+#define NMQT_SETTING_IP4_CONFIG_ROUTE_DATA "route-data"
+#define NMQT_SETTING_IP4_CONFIG_ADDRESS_DATA "address-data"
namespace NetworkManager
@@ -110,6 +117,27 @@
void setMayFail(bool mayFail);
bool mayFail() const;
+ void setDadTimeout(qint32 timeout);
+ qint32 dadTimeout() const;
+
+ void setDhcpFqdn(const QString &fqdn);
+ QString dhcpFqdn() const;
+
+ void setDnsOptions(const QStringList &options);
+ QStringList dnsOptions() const;
+
+ void setDnsPriority(qint32 priority);
+ qint32 dnsPriority() const;
+
+ void setGateway(const QString &gateway);
+ QString gateway() const;
+
+ void setAddressData(const NMVariantMapList &addressData);
+ NMVariantMapList addressData() const;
+
+ void setRouteData(const NMVariantMapList &routeData);
+ NMVariantMapList routeData() const;
+
void fromMap(const QVariantMap &setting) override;
QVariantMap toMap() const override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/src/settings/ipv4setting_p.h
new/networkmanager-qt-5.52.0/src/settings/ipv4setting_p.h
--- old/networkmanager-qt-5.51.0/src/settings/ipv4setting_p.h 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/ipv4setting_p.h 2018-11-03
13:02:58.000000000 +0100
@@ -23,6 +23,7 @@
#include "../ipconfig.h"
+#include <networkmanagerqt/networkmanagerqt_export.h>
#include <QtCore/QStringList>
#include <QtNetwork/QHostAddress>
@@ -48,6 +49,13 @@
QString dhcpHostname;
bool neverDefault;
bool mayFail;
+ qint32 dadTimeout;
+ QString dhcpFqdn;
+ QStringList dnsOptions;
+ qint32 dnsPriority;
+ QString gateway;
+ NMVariantMapList addressData;
+ NMVariantMapList routeData;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/settings/setting.cpp
new/networkmanager-qt-5.52.0/src/settings/setting.cpp
--- old/networkmanager-qt-5.51.0/src/settings/setting.cpp 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/setting.cpp 2018-11-03
13:02:58.000000000 +0100
@@ -115,6 +115,9 @@
case Team:
typeString = QLatin1String(NM_SETTING_TEAM_SETTING_NAME);
break;
+ case Vxlan:
+ typeString = QLatin1String(NM_SETTING_VXLAN_SETTING_NAME);
+ break;
case NetworkManager::Setting::Generic:
typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
break;
@@ -167,6 +170,8 @@
type = Bridge;
} else if (typeString == QLatin1String(NM_SETTING_TEAM_SETTING_NAME)) {
type = Team;
+ } else if (typeString == QLatin1String(NM_SETTING_VXLAN_SETTING_NAME)) {
+ type = Vxlan;
} else if (typeString == QLatin1String(NM_SETTING_GENERIC_SETTING_NAME)) {
type = Generic;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/settings/setting.h
new/networkmanager-qt-5.52.0/src/settings/setting.h
--- old/networkmanager-qt-5.51.0/src/settings/setting.h 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/setting.h 2018-11-03
13:02:58.000000000 +0100
@@ -71,7 +71,8 @@
BridgePort,
Team,
Generic,
- Tun
+ Tun,
+ Vxlan
};
enum SecretFlagType {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/settings/vpnsetting.cpp
new/networkmanager-qt-5.52.0/src/settings/vpnsetting.cpp
--- old/networkmanager-qt-5.51.0/src/settings/vpnsetting.cpp 2018-10-07
12:10:46.000000000 +0200
+++ new/networkmanager-qt-5.52.0/src/settings/vpnsetting.cpp 2018-11-03
13:02:58.000000000 +0100
@@ -218,7 +218,6 @@
if (map.contains(QLatin1String("VpnSecrets"))) {
const QStringList list =
map.value(QLatin1String("VpnSecrets")).split("%SEP%");
- NMStringMap map;
if (list.count() % 2 == 0) {
for (int i = 0; i < list.count(); i += 2) {
if (d->secrets.contains(list[i])) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/src/settings/vxlansetting.cpp
new/networkmanager-qt-5.52.0/src/settings/vxlansetting.cpp
--- old/networkmanager-qt-5.51.0/src/settings/vxlansetting.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/src/settings/vxlansetting.cpp 2018-11-03
13:02:58.000000000 +0100
@@ -0,0 +1,467 @@
+/*
+ Copyright 2018 Billy Laws <blaw...@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#include "vxlansetting.h"
+#include "vxlansetting_p.h"
+
+#include <QtCore/QDebug>
+
+NetworkManager::VxlanSettingPrivate::VxlanSettingPrivate()
+ : name(NM_SETTING_VXLAN_SETTING_NAME)
+ , ageing(32)
+ , destinationPort(8472)
+ , id(0)
+ , l2Miss(false)
+ , l3Miss(false)
+ , learning(true)
+ , limit(0)
+ , proxy(false)
+ , rsc(false)
+ , sourcePortMax(0)
+ , sourcePortMin(0)
+ , tos(0)
+ , ttl(0)
+{ }
+
+NetworkManager::VxlanSetting::VxlanSetting()
+ : Setting(Setting::Vxlan)
+ , d_ptr(new VxlanSettingPrivate())
+{ }
+
+NetworkManager::VxlanSetting::VxlanSetting(const
NetworkManager::VxlanSetting::Ptr &other)
+ : Setting(other)
+ , d_ptr(new VxlanSettingPrivate())
+{
+ setAgeing(other->ageing());
+ setDestinationPort(other->destinationPort());
+ setId(other->id());
+ setL2Miss(other->l2Miss());
+ setL3Miss(other->l3Miss());
+ setLearning(other->learning());
+ setLimit(other->limit());
+ setLocal(other->local());
+ setParent(other->parent());
+ setProxy(other->proxy());
+ setRemote(other->remote());
+ setRsc(other->rsc());
+ setSourcePortMax(other->sourcePortMax());
+ setSourcePortMin(other->sourcePortMin());
+ setTos(other->tos());
+ setTtl(other->ttl());
+}
+
+NetworkManager::VxlanSetting::~VxlanSetting()
+{
+ delete d_ptr;
+}
+
+QString NetworkManager::VxlanSetting::name() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->name;
+}
+
+void NetworkManager::VxlanSetting::setAgeing(quint32 ageing)
+{
+ Q_D(VxlanSetting);
+
+ d->ageing = ageing;
+}
+
+quint32 NetworkManager::VxlanSetting::ageing() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->ageing;
+}
+
+void NetworkManager::VxlanSetting::setDestinationPort(quint32 port)
+{
+ Q_D(VxlanSetting);
+
+ d->destinationPort = port;
+}
+
+quint32 NetworkManager::VxlanSetting::destinationPort() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->destinationPort;
+}
+
+void NetworkManager::VxlanSetting::setId(quint32 id)
+{
+ Q_D(VxlanSetting);
+
+ d->id = id;
+}
+
+quint32 NetworkManager::VxlanSetting::id() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->id;
+}
+
+void NetworkManager::VxlanSetting::setL2Miss(bool enable)
+{
+ Q_D(VxlanSetting);
+
+ d->l2Miss = enable;
+}
+
+bool NetworkManager::VxlanSetting::l2Miss() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->l2Miss;
+}
+
+void NetworkManager::VxlanSetting::setL3Miss(bool enable)
+{
+ Q_D(VxlanSetting);
+
+ d->l3Miss = enable;
+}
+
+bool NetworkManager::VxlanSetting::l3Miss() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->l3Miss;
+}
+
+void NetworkManager::VxlanSetting::setLearning(bool enable)
+{
+ Q_D(VxlanSetting);
+
+ d->learning = enable;
+}
+
+bool NetworkManager::VxlanSetting::learning() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->learning;
+}
+
+
+void NetworkManager::VxlanSetting::setLimit(quint32 limit)
+{
+ Q_D(VxlanSetting);
+
+ d->limit = limit;
+}
+
+quint32 NetworkManager::VxlanSetting::limit() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->limit;
+}
+
+void NetworkManager::VxlanSetting::setLocal(QString local)
+{
+ Q_D(VxlanSetting);
+
+ d->local = local;
+}
+
+QString NetworkManager::VxlanSetting::local() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->local;
+}
+
+void NetworkManager::VxlanSetting::setParent(QString parent)
+{
+ Q_D(VxlanSetting);
+
+ d->parent = parent;
+}
+
+QString NetworkManager::VxlanSetting::parent() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->parent;
+}
+
+void NetworkManager::VxlanSetting::setProxy(bool enable)
+{
+ Q_D(VxlanSetting);
+
+ d->proxy = enable;
+}
+
+bool NetworkManager::VxlanSetting::proxy() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->proxy;
+}
+
+void NetworkManager::VxlanSetting::setRemote(QString remote)
+{
+ Q_D(VxlanSetting);
+
+ d->remote = remote;
+}
+
+QString NetworkManager::VxlanSetting::remote() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->remote;
+}
+
+void NetworkManager::VxlanSetting::setRsc(bool enable)
+{
+ Q_D(VxlanSetting);
+
+ d->rsc = enable;
+}
+
+bool NetworkManager::VxlanSetting::rsc() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->rsc;
+}
+
+void NetworkManager::VxlanSetting::setSourcePortMax(quint32 maxPort)
+{
+ Q_D(VxlanSetting);
+
+ d->sourcePortMax = maxPort;
+}
+
+quint32 NetworkManager::VxlanSetting::sourcePortMax() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->sourcePortMax;
+}
+
+void NetworkManager::VxlanSetting::setSourcePortMin(quint32 minPort)
+{
+ Q_D(VxlanSetting);
+
+ d->sourcePortMin = minPort;
+}
+
+quint32 NetworkManager::VxlanSetting::sourcePortMin() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->sourcePortMin;
+}
+
+void NetworkManager::VxlanSetting::setTos(quint32 tos)
+{
+ Q_D(VxlanSetting);
+
+ d->tos = tos;
+}
+
+quint32 NetworkManager::VxlanSetting::tos() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->tos;
+}
+
+void NetworkManager::VxlanSetting::setTtl(quint32 ttl)
+{
+ Q_D(VxlanSetting);
+
+ d->ttl = ttl;
+}
+
+quint32 NetworkManager::VxlanSetting::ttl() const
+{
+ Q_D(const VxlanSetting);
+
+ return d->ttl;
+}
+void NetworkManager::VxlanSetting::fromMap(const QVariantMap &setting)
+{
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_AGEING))) {
+
setAgeing(setting.value(QLatin1String(NM_SETTING_VXLAN_AGEING)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_DESTINATION_PORT))) {
+
setDestinationPort(setting.value(QLatin1String(NM_SETTING_VXLAN_DESTINATION_PORT)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_ID))) {
+ setId(setting.value(QLatin1String(NM_SETTING_VXLAN_ID)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_L2_MISS))) {
+
setL2Miss(setting.value(QLatin1String(NM_SETTING_VXLAN_L2_MISS)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_L3_MISS))) {
+
setL3Miss(setting.value(QLatin1String(NM_SETTING_VXLAN_L3_MISS)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_LEARNING))) {
+
setLearning(setting.value(QLatin1String(NM_SETTING_VXLAN_LEARNING)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_LIMIT))) {
+
setLimit(setting.value(QLatin1String(NM_SETTING_VXLAN_LIMIT)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_LOCAL))) {
+
setLocal(setting.value(QLatin1String(NM_SETTING_VXLAN_LOCAL)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_PARENT))) {
+
setParent(setting.value(QLatin1String(NM_SETTING_VXLAN_PARENT)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_PROXY))) {
+
setProxy(setting.value(QLatin1String(NM_SETTING_VXLAN_PROXY)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_REMOTE))) {
+
setRemote(setting.value(QLatin1String(NM_SETTING_VXLAN_REMOTE)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_RSC))) {
+ setRsc(setting.value(QLatin1String(NM_SETTING_VXLAN_RSC)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MAX))) {
+
setSourcePortMax(setting.value(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MAX)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MIN))) {
+
setSourcePortMin(setting.value(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MIN)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_TOS))) {
+ setTos(setting.value(QLatin1String(NM_SETTING_VXLAN_TOS)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_VXLAN_TTL))) {
+ setTtl(setting.value(QLatin1String(NM_SETTING_VXLAN_TTL)).toUInt());
+ }
+}
+
+QVariantMap NetworkManager::VxlanSetting::toMap() const
+{
+ QVariantMap setting;
+
+ if (ageing() != 32) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_AGEING), ageing());
+ }
+
+ if (destinationPort() != 8472) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_DESTINATION_PORT),
destinationPort());
+ }
+
+ if (id()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_ID), id());
+ }
+
+ if (l2Miss()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_L2_MISS), l2Miss());
+ }
+
+ if (l3Miss()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_L3_MISS), l3Miss());
+ }
+
+ if (!learning()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_LEARNING), learning());
+ }
+
+ if (limit()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_LIMIT), limit());
+ }
+
+ if (!local().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_LOCAL), local());
+ }
+
+ if (!parent().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_PARENT), parent());
+ }
+
+ if (proxy()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_PROXY), proxy());
+ }
+
+ if (!remote().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_REMOTE), remote());
+ }
+
+ if (rsc()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_RSC), rsc());
+ }
+
+ if (sourcePortMax()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MAX),
sourcePortMax());
+ }
+
+ if (sourcePortMin()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_SOURCE_PORT_MIN),
sourcePortMin());
+ }
+
+ if (tos()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_TOS), tos());
+ }
+
+ if (ttl()) {
+ setting.insert(QLatin1String(NM_SETTING_VXLAN_TTL), ttl());
+ }
+
+ return setting;
+}
+
+QDebug NetworkManager::operator <<(QDebug dbg, const
NetworkManager::VxlanSetting &setting)
+{
+ dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
+ dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
+
+ dbg.nospace() << NM_SETTING_VXLAN_AGEING << ": " << setting.ageing() <<
'\n';
+ dbg.nospace() << NM_SETTING_VXLAN_DESTINATION_PORT << ": " <<
setting.destinationPort() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_ID << ": " << setting.id() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_L2_MISS << ": " << setting.l2Miss() <<
'\n';
+ dbg.nospace() << NM_SETTING_VXLAN_L3_MISS << ": " << setting.l3Miss() <<
'\n';
+ dbg.nospace() << NM_SETTING_VXLAN_LEARNING << ": " << setting.learning()
<< '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_LIMIT << ": " << setting.limit() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_LOCAL << ": " << setting.local() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_PARENT << ": " << setting.parent() <<
'\n';
+ dbg.nospace() << NM_SETTING_VXLAN_PROXY << ": " << setting.proxy() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_REMOTE << ": " << setting.remote() <<
'\n';
+ dbg.nospace() << NM_SETTING_VXLAN_RSC << ": " << setting.rsc() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_SOURCE_PORT_MAX << ": " <<
setting.sourcePortMax() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_SOURCE_PORT_MIN << ": " <<
setting.sourcePortMin() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_TOS << ": " << setting.tos() << '\n';
+ dbg.nospace() << NM_SETTING_VXLAN_TTL << ": " << setting.ttl() << '\n';
+
+ return dbg.maybeSpace();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.51.0/src/settings/vxlansetting.h
new/networkmanager-qt-5.52.0/src/settings/vxlansetting.h
--- old/networkmanager-qt-5.51.0/src/settings/vxlansetting.h 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/src/settings/vxlansetting.h 2018-11-03
13:02:58.000000000 +0100
@@ -0,0 +1,111 @@
+/*
+ Copyright 2018 Billy Laws <blaw...@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#ifndef NETWORKMANAGERQT_VXLAN_SETTING_H
+#define NETWORKMANAGERQT_VXLAN_SETTING_H
+
+#include <networkmanagerqt/networkmanagerqt_export.h>
+#include "setting.h"
+
+#include <QtCore/QString>
+
+namespace NetworkManager
+{
+
+class VxlanSettingPrivate;
+
+/**
+ * Represents vxlan setting
+ */
+class NETWORKMANAGERQT_EXPORT VxlanSetting : public Setting
+{
+public:
+ typedef QSharedPointer<VxlanSetting> Ptr;
+ typedef QList<Ptr> List;
+ VxlanSetting();
+ explicit VxlanSetting(const Ptr &other);
+ ~VxlanSetting() override;
+
+ QString name() const override;
+
+ void setAgeing(quint32 ageing);
+ quint32 ageing() const;
+
+ void setDestinationPort(quint32 port);
+ quint32 destinationPort() const;
+
+ void setId(quint32 id);
+ quint32 id() const;
+
+ void setL2Miss(bool enable);
+ bool l2Miss() const;
+
+ void setL3Miss(bool enable);
+ bool l3Miss() const;
+
+ void setLearning(bool enable);
+ bool learning() const;
+
+ void setLimit(quint32 limit);
+ quint32 limit() const;
+
+ void setLocal(QString local);
+ QString local() const;
+
+ void setParent(QString parent);
+ QString parent() const;
+
+ void setProxy(bool enable);
+ bool proxy() const;
+
+ void setRemote(QString remote);
+ QString remote() const;
+
+ void setRsc(bool enable);
+ bool rsc() const;
+
+ void setSourcePortMax(quint32 maxPort);
+ quint32 sourcePortMax() const;
+
+ void setSourcePortMin(quint32 minPort);
+ quint32 sourcePortMin() const;
+
+ void setTos(quint32 tos);
+ quint32 tos() const;
+
+ void setTtl(quint32 ttl);
+ quint32 ttl() const;
+
+ void fromMap(const QVariantMap &setting) override;
+
+ QVariantMap toMap() const override;
+
+protected:
+ VxlanSettingPrivate *d_ptr;
+
+private:
+ Q_DECLARE_PRIVATE(VxlanSetting)
+};
+
+NETWORKMANAGERQT_EXPORT QDebug operator<<(QDebug dbg, const VxlanSetting
&setting);
+
+}
+
+#endif // NETWORKMANAGERQT_VXLAN_SETTING_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.51.0/src/settings/vxlansetting_p.h
new/networkmanager-qt-5.52.0/src/settings/vxlansetting_p.h
--- old/networkmanager-qt-5.51.0/src/settings/vxlansetting_p.h 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.52.0/src/settings/vxlansetting_p.h 2018-11-03
13:02:58.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ Copyright 2018 Billy Laws <blaw...@gmail.com>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+*/
+
+#ifndef NETWORKMANAGERQT_VXLAN_SETTING_P_H
+#define NETWORKMANAGERQT_VXLAN_SETTING_P_H
+
+#include <QtCore/QString>
+
+namespace NetworkManager
+{
+
+class VxlanSettingPrivate
+{
+public:
+ VxlanSettingPrivate();
+
+ QString name;
+ quint32 ageing;
+ quint32 destinationPort;
+ quint32 id;
+ bool l2Miss;
+ bool l3Miss;
+ bool learning;
+ quint32 limit;
+ QString local;
+ QString parent;
+ bool proxy;
+ QString remote;
+ bool rsc;
+ quint32 sourcePortMax;
+ quint32 sourcePortMin;
+ quint32 tos;
+ quint32 ttl;
+};
+
+}
+
+#endif // NETWORKMANAGERQT_VXLAN_SETTING_P_H
