Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2016-04-12 19:29:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2016-03-16 10:32:38.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2016-04-12 19:29:32.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 4 14:23:13 UTC 2016 - [email protected]
+
+- Update to 5.21.0 (boo#974793)
+ * ConnectionSettings: Initialize gateway ping timeout
+ * New TunSetting and Tun connection type
+ * Create devices for all known types
+ * Upgrade Qt version requirement to 5.4.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.21.0.php
+
+-------------------------------------------------------------------
Old:
----
networkmanager-qt-5.20.0.tar.xz
New:
----
networkmanager-qt-5.21.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.rhUlEL/_old 2016-04-12 19:29:32.000000000 +0200
+++ /var/tmp/diff_new_pack.rhUlEL/_new 2016-04-12 19:29:32.000000000 +0200
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.20
+%define _tar_path 5.21
Name: libKF5NetworkManagerQt
-Version: 5.20.0
+Version: 5.21.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
@@ -30,9 +30,9 @@
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: kf5-filesystem
-BuildRequires: cmake(Qt5Core) >= 5.3.0
-BuildRequires: cmake(Qt5DBus) >= 5.3.0
-BuildRequires: cmake(Qt5Network) >= 5.3.0
+BuildRequires: cmake(Qt5Core) >= 5.4.0
+BuildRequires: cmake(Qt5DBus) >= 5.4.0
+BuildRequires: cmake(Qt5Network) >= 5.4.0
BuildRequires: pkgconfig(NetworkManager) >= 0.9.8.4
BuildRequires: pkgconfig(libnm-glib) >= 0.9.8.4
BuildRequires: pkgconfig(libnm-util) >= 0.9.8.4
@@ -48,9 +48,9 @@
Summary: A Qt wrapper for NetworkManager DBus API
Group: Development/Libraries/KDE
Requires: libKF5NetworkManagerQt%{soversion} = %{version}
-Requires: cmake(Qt5Core) >= 5.3.0
-Requires: cmake(Qt5DBus) >= 5.3.0
-Requires: cmake(Qt5Network) >= 5.3.0
+Requires: cmake(Qt5Core) >= 5.4.0
+Requires: cmake(Qt5DBus) >= 5.4.0
+Requires: cmake(Qt5Network) >= 5.4.0
Requires: pkgconfig(NetworkManager) >= 0.9.8.4
Requires: pkgconfig(libnm-glib) >= 0.9.8.4
Requires: pkgconfig(libnm-util) >= 0.9.8.4
++++++ networkmanager-qt-5.20.0.tar.xz -> networkmanager-qt-5.21.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/CMakeLists.txt
new/networkmanager-qt-5.21.0/CMakeLists.txt
--- old/networkmanager-qt-5.20.0/CMakeLists.txt 2016-03-04 23:26:35.000000000
+0100
+++ new/networkmanager-qt-5.21.0/CMakeLists.txt 2016-04-04 10:20:31.000000000
+0200
@@ -3,7 +3,7 @@
project(NetworkManagerQt)
include(FeatureSummary)
-find_package(ECM 5.20.0 NO_MODULE)
+find_package(ECM 5.21.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)
@@ -16,7 +16,7 @@
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
-set(REQUIRED_QT_VERSION 5.3.0)
+set(REQUIRED_QT_VERSION 5.4.0)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED Core DBus Network)
add_definitions(${QT_DEFINITIONS})
@@ -32,7 +32,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.20.0") # handled by release scripts
+set(KF5_VERSION "5.21.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX NETWORKMANAGERQT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/TODO
new/networkmanager-qt-5.21.0/TODO
--- old/networkmanager-qt-5.20.0/TODO 1970-01-01 01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/TODO 2016-04-04 10:20:31.000000000 +0200
@@ -0,0 +1,75 @@
+== NetworkManager 1.0/1.2 ==
+
+* New interfaces:
+ - org.freedesktop.NetworkManager.Device.IPTunnel
+ - org.freedesktop.NetworkManager.Device.Vxlan
+
+* New properties/slots/signals:
+ - org.freedesktop.NetworkManager
+ - GetAllDevices ( ) → ao
+ The list of both realized and un-realized network devices. Un-realized
devices are software devices which do not yet have backing resources,
+ but for which backing resources can be created if the device is
activated.
+ - GlobalDnsConfiguration - a{sv} - (readwrite)
+ Dictionary of global DNS settings where the key is one of "searches",
"options" and "domains". The values for the "searches" and "options"
+ keys are string arrays describing the list of search domains and
resolver options, respectively. The value of the "domains" key is a second-level
+ dictionary, where each key is a domain name, and each key's value is a
third-level dictionary with the keys "servers" and "options". "servers" is
+ a string array of DNS servers, "options" is a string array of
domain-specific options.
+ - org.freedesktop.NetworkManager.Device.Wired
+ - S390Subchannels - as - (read)
+ Array of S/390 subchannels for S/390 or z/Architecture devices.
+ - org.freedesktop.NetworkManager.Device
+ - LldpNeighbors - aa{sv} - (read)
+ Array of LLDP neighbors; each element is a dictionary mapping LLDP TLV
names to variant boxed values.
+ - Real - b - (read)
+ True if the device exists, or False for placeholder devices that do
not yet exist but could be automatically
+ created by NetworkManager if one of their AvailableConnections was
activated.
+ - Reapply ( a{sa{sv}}: connection, t: version_id, u: flags ) → nothing
+ Attempts to update the configuration of a device without deactivating
it. NetworkManager has the concept of connections,
+ which are profiles that contain the configuration for a networking
device. Those connections are exposed via D-Bus as individual
+ objects that can be created, modified and deleted. When activating
such a settings-connection on a device, the settings-connection
+ is cloned to become an applied-connection and used to configure the
device (see GetAppliedConnection). Subsequent modification of
+ the settings-connection don't propagate automatically to the device's
applied-connection (with exception of the firewall-zone and
+ the metered property). For the changes to take effect, you can either
re-activate the settings-connection, or call Reapply. The Reapply
+ call allows you to directly update the applied-connection and
reconfigure the device. Reapply can also be useful if the currently
+ applied-connection is equal to the connection that is about to be
reapplied. This allows to reconfigure the device and revert external
+ changes like removing or adding an IP address (which NetworkManager
doesn't revert automatically because it is assumed that the user made
+ these changes intentionally outside of NetworkManager). Reapply can
make the applied-connection different from the settings-connection,
+ just like updating the settings-connection can make them different.
+ - GetAppliedConnection ( u: flags ) → a{sa{sv}}
+ Get the currently applied connection on the device. This is a snapshot
of the last activated connection on the device, that is the configuration
+ that is currently applied on the device. Usually this is the same as
GetSettings of the referenced settings connection. However, it can differ if
+ the settings connection was subsequently modified or the applied
connection was modified by Reapply. The applied connection is set when
activating
+ a device or when calling Reapply.
+
+* New settings and settings properties:
+ - bridge setting
+ - mac-address
+ - multicast-snooping
+ - connection setting
+ - lldp
+ - dcb setting
+ - ip-tunnel setting
+ - ipv4 setting
+ - address-data
+ - dad-timeout
+ - dhcp-fqdn
+ - dns-options
+ - ipv6 setting
+ - address-data
+ - dad-timeout
+ - dhcp-fqdn
+ - dns-options
+ - route-data
+ - route-metrics
+ - gsm setting
+ - sim-id
+ - sim-operator-id
+ - team-port setting
+ - vpn setting
+ - persistent
+ - vxlan setting
+ - wired setting
+ - wake-on-lan
+ - wake-on-lan-password
+ - 802-11-wireless setting
+ - powersave
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.20.0/autotests/settings/CMakeLists.txt
new/networkmanager-qt-5.21.0/autotests/settings/CMakeLists.txt
--- old/networkmanager-qt-5.20.0/autotests/settings/CMakeLists.txt
2016-03-04 23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/autotests/settings/CMakeLists.txt
2016-04-04 10:20:31.000000000 +0200
@@ -27,3 +27,7 @@
wirelesssettingtest
wirelesssecuritysettingtest
)
+
+if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.1.92 OR
${NETWORKMANAGER_VERSION} VERSION_GREATER 1.1.92)
+ ecm_add_test(tunsettingtest.cpp LINK_LIBRARIES Qt5::Test
KF5NetworkManagerQt_static)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.20.0/autotests/settings/tunsettingtest.cpp
new/networkmanager-qt-5.21.0/autotests/settings/tunsettingtest.cpp
--- old/networkmanager-qt-5.20.0/autotests/settings/tunsettingtest.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/autotests/settings/tunsettingtest.cpp
2016-04-04 10:20:31.000000000 +0200
@@ -0,0 +1,85 @@
+/*
+ Copyright 2016 Jan Grulich <[email protected]>
+
+ 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 "tunsettingtest.h"
+
+#include "settings/tunsetting.h"
+
+#include <nm-version.h>
+#if NM_CHECK_VERSION(1, 0, 0)
+#include <libnm/NetworkManager.h>
+#else
+#include <nm-setting-tun.h>
+#endif
+
+#include <QTest>
+
+void TunSettingTest::testSetting_data()
+{
+ QTest::addColumn<QString>("group");
+ QTest::addColumn<quint32>("mode");
+ QTest::addColumn<bool>("multiQueue");
+ QTest::addColumn<QString>("owner");
+ QTest::addColumn<bool>("pi");
+ QTest::addColumn<bool>("vnetHdr");
+
+ QTest::newRow("setting1")
+ << QString("randomGroup") // group
+ << (quint32)2 // mode
+ << true // multi-queue
+ << QString("randomOwner") // owner
+ << true // pi
+ << true; // vnet-hdr
+}
+
+void TunSettingTest::testSetting()
+{
+ QFETCH(QString, group);
+ QFETCH(quint32, mode);
+ QFETCH(bool, multiQueue);
+ QFETCH(QString, owner);
+ QFETCH(bool, pi);
+ QFETCH(bool, vnetHdr);
+
+ QVariantMap map;
+
+ map.insert(QLatin1String(NM_SETTING_TUN_GROUP), group);
+ map.insert(QLatin1String(NM_SETTING_TUN_MODE), mode);
+ map.insert(QLatin1String(NM_SETTING_TUN_MULTI_QUEUE), multiQueue);
+ map.insert(QLatin1String(NM_SETTING_TUN_OWNER), owner);
+ map.insert(QLatin1String(NM_SETTING_TUN_PI), pi);
+ map.insert(QLatin1String(NM_SETTING_TUN_VNET_HDR), vnetHdr);
+
+
+ NetworkManager::TunSetting setting;
+ setting.fromMap(map);
+
+ QVariantMap map1 = setting.toMap();
+
+ // Will fail if set some default values, because they are skipped in
toMap() method
+ QVariantMap::const_iterator it = map.constBegin();
+ while (it != map.constEnd()) {
+ QCOMPARE(it.value(), map1.value(it.key()));
+ ++it;
+ }
+}
+
+QTEST_MAIN(TunSettingTest)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.20.0/autotests/settings/tunsettingtest.h
new/networkmanager-qt-5.21.0/autotests/settings/tunsettingtest.h
--- old/networkmanager-qt-5.20.0/autotests/settings/tunsettingtest.h
1970-01-01 01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/autotests/settings/tunsettingtest.h
2016-04-04 10:20:31.000000000 +0200
@@ -0,0 +1,36 @@
+/*
+ Copyright 2016 Jan Grulich <[email protected]>
+
+ 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_TUNSETTING_TEST_H
+#define NETWORKMANAGERQT_TUNSETTING_TEST_H
+
+#include <QObject>
+
+class TunSettingTest : public QObject
+{
+ Q_OBJECT
+
+private Q_SLOTS:
+ void testSetting_data();
+ void testSetting();
+};
+
+#endif // NETWORKMANAGERQT_TUNSETTING_TEST_H
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/CMakeLists.txt
new/networkmanager-qt-5.21.0/src/CMakeLists.txt
--- old/networkmanager-qt-5.20.0/src/CMakeLists.txt 2016-03-04
23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/CMakeLists.txt 2016-04-04
10:20:31.000000000 +0200
@@ -145,6 +145,13 @@
)
endif()
+if (${NETWORKMANAGER_VERSION} VERSION_EQUAL 1.1.92 OR
${NETWORKMANAGER_VERSION} VERSION_GREATER 1.1.92)
+ set(NetworkManagerQt_SETTINGS_SRCS
+ ${NetworkManagerQt_SETTINGS_SRCS}
+ settings/tunsetting.cpp
+ )
+endif()
+
add_library(KF5NetworkManagerQt SHARED ${NetworkManagerQt_PART_SRCS}
${NetworkManagerQt_SETTINGS_SRCS} ${DBUS_INTERFACE_SRCS})
generate_export_header(KF5NetworkManagerQt EXPORT_FILE_NAME
${NetworkManagerQt_BINARY_DIR}/networkmanagerqt/networkmanagerqt_export.h
BASE_NAME NetworkManagerQt)
add_library(KF5::NetworkManagerQt ALIAS KF5NetworkManagerQt)
@@ -236,6 +243,7 @@
SerialSetting
Setting
TeamSetting
+ TunSetting
VlanSetting
VpnSetting
WimaxSetting
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/manager.cpp
new/networkmanager-qt-5.21.0/src/manager.cpp
--- old/networkmanager-qt-5.20.0/src/manager.cpp 2016-03-04
23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/manager.cpp 2016-04-04
10:20:31.000000000 +0200
@@ -51,6 +51,12 @@
#if !NM_CHECK_VERSION(1, 2, 0)
#include "wimaxdevice.h"
#endif
+#if NM_CHECK_VERSION(0, 9, 10)
+#include "gredevice.h"
+#include "macvlandevice.h"
+#include "tundevice.h"
+#include "vethdevice.h"
+#endif
#include "nmdebug.h"
@@ -310,6 +316,18 @@
case Device::Generic:
createdInterface = Device::Ptr(new NetworkManager::GenericDevice(uni),
&QObject::deleteLater);
break;
+ case Device::Gre:
+ createdInterface = Device::Ptr(new NetworkManager::GreDevice(uni),
&QObject::deleteLater);
+ break;
+ case Device::MacVlan:
+ createdInterface = Device::Ptr(new NetworkManager::MacVlanDevice(uni),
&QObject::deleteLater);
+ break;
+ case Device::Tun:
+ createdInterface = Device::Ptr(new NetworkManager::TunDevice(uni),
&QObject::deleteLater);
+ break;
+ case Device::Veth:
+ createdInterface = Device::Ptr(new NetworkManager::VethDevice(uni),
&QObject::deleteLater);
+ break;
#endif
default:
createdInterface = device;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.20.0/src/settings/connectionsettings.cpp
new/networkmanager-qt-5.21.0/src/settings/connectionsettings.cpp
--- old/networkmanager-qt-5.20.0/src/settings/connectionsettings.cpp
2016-03-04 23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/connectionsettings.cpp
2016-04-04 10:20:31.000000000 +0200
@@ -40,6 +40,7 @@
#include "pppsetting.h"
#include "pppoesetting.h"
#include "serialsetting.h"
+#include "tunsetting.h"
#include "vlansetting.h"
#include "vpnsetting.h"
#include "wimaxsetting.h"
@@ -83,6 +84,9 @@
, type(ConnectionSettings::Wired)
, autoconnect(true)
, readOnly(false)
+#if NM_CHECK_VERSION(0, 9, 10)
+ , gatewayPingTimeout(0)
+#endif
#if NM_CHECK_VERSION(1, 0, 0)
, autoconnectPriority(0)
#endif
@@ -202,6 +206,13 @@
addSetting(Setting::Ptr(new Ipv6Setting()));
break;
#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ case ConnectionSettings::Tun:
+ addSetting(Setting::Ptr(new TunSetting()));
+ addSetting(Setting::Ptr(new Ipv4Setting()));
+ addSetting(Setting::Ptr(new Ipv6Setting()));
+ break;
+#endif
case ConnectionSettings::Unknown:
default:
break;
@@ -315,6 +326,13 @@
addSetting(connectionSettings->setting(Setting::Ipv6));
break;
#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ case ConnectionSettings::Tun:
+ addSetting(connectionSettings->setting(Setting::Tun));
+ addSetting(connectionSettings->setting(Setting::Ipv4));
+ addSetting(connectionSettings->setting(Setting::Ipv6));
+ break;
+#endif
case ConnectionSettings::Unknown:
default:
break;
@@ -359,6 +377,10 @@
} else if (typeString == QLatin1String(NM_SETTING_GENERIC_SETTING_NAME)) {
type = Generic;
#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ } else if (typeString == QLatin1String(NM_SETTING_TUN_SETTING_NAME)) {
+ type = Tun;
+#endif
}
return type;
@@ -419,6 +441,11 @@
typeString = QLatin1String(NM_SETTING_GENERIC_SETTING_NAME);
break;
#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ case Tun:
+ typeString = QLatin1String(NM_SETTING_TUN_SETTING_NAME);
+ break;
+#endif
default:
break;
};
@@ -986,6 +1013,11 @@
dbg.nospace() <<
*(settingPtr.staticCast<NetworkManager::TeamSetting>().data());
break;
#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ case Setting::Tun:
+ dbg.nospace() <<
*(settingPtr.staticCast<NetworkManager::TunSetting>().data());
+ break;
+#endif
default:
dbg.nospace() << *settingPtr.data();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/networkmanager-qt-5.20.0/src/settings/connectionsettings.h
new/networkmanager-qt-5.21.0/src/settings/connectionsettings.h
--- old/networkmanager-qt-5.20.0/src/settings/connectionsettings.h
2016-03-04 23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/connectionsettings.h
2016-04-04 10:20:31.000000000 +0200
@@ -68,7 +68,10 @@
Wireless,
#if NM_CHECK_VERSION(0, 9, 10)
Team,
- Generic
+ Generic,
+#endif
+#if NM_CHECK_VERSION(1, 1, 92)
+ Tun
#endif
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/settings/setting.h
new/networkmanager-qt-5.21.0/src/settings/setting.h
--- old/networkmanager-qt-5.20.0/src/settings/setting.h 2016-03-04
23:26:35.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/setting.h 2016-04-04
10:20:31.000000000 +0200
@@ -49,8 +49,8 @@
typedef QSharedPointer<Setting> Ptr;
typedef QList<Ptr> List;
enum SettingType {Adsl, Cdma, Gsm, Infiniband, Ipv4, Ipv6, Ppp, Pppoe,
Security8021x, Serial,
- Vpn, Wired, Wireless, WirelessSecurity, Bluetooth,
OlpcMesh, Vlan, Wimax, Bond, Bridge, BridgePort, Team, Generic
- };
+ Vpn, Wired, Wireless, WirelessSecurity, Bluetooth,
OlpcMesh, Vlan, Wimax, Bond, Bridge, BridgePort, Team, Generic,
+ Tun };
enum SecretFlagType {None = 0, AgentOwned = 0x01, NotSaved = 0x02,
NotRequired = 0x04};
Q_DECLARE_FLAGS(SecretFlags, SecretFlagType)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/settings/tunsetting.cpp
new/networkmanager-qt-5.21.0/src/settings/tunsetting.cpp
--- old/networkmanager-qt-5.20.0/src/settings/tunsetting.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/tunsetting.cpp 2016-04-04
10:20:31.000000000 +0200
@@ -0,0 +1,213 @@
+/*
+ Copyright 2012-2013 Jan Grulich <[email protected]>
+
+ 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 "tunsetting.h"
+#include "tunsetting_p.h"
+
+#if !NM_CHECK_VERSION(1, 0, 0)
+#include <nm-setting-tun.h>
+#endif
+
+#include <QtCore/QDebug>
+
+NetworkManager::TunSettingPrivate::TunSettingPrivate()
+ : name(NM_SETTING_TUN_SETTING_NAME)
+ , mode(TunSetting::Tun)
+ , multiQueue(false)
+ , pi(false)
+ , vnetHdr(false)
+{ }
+
+NetworkManager::TunSetting::TunSetting()
+ : Setting(Setting::Tun)
+ , d_ptr(new TunSettingPrivate())
+{ }
+
+NetworkManager::TunSetting::TunSetting(const Ptr &other)
+ : Setting(other)
+ , d_ptr(new TunSettingPrivate())
+{
+ setGroup(other->group());
+ setMode(other->mode());
+ setMultiQueue(other->multiQueue());
+ setOwner(other->owner());
+ setPi(other->pi());
+ setVnetHdr(other->vnetHdr());
+}
+
+NetworkManager::TunSetting::~TunSetting()
+{
+ delete d_ptr;
+}
+
+QString NetworkManager::TunSetting::name() const
+{
+ Q_D(const TunSetting);
+
+ return d->name;
+}
+
+void NetworkManager::TunSetting::setGroup(const QString& group)
+{
+ Q_D(TunSetting);
+
+ d->group = group;
+}
+
+QString NetworkManager::TunSetting::group() const
+{
+ Q_D(const TunSetting);
+
+ return d->group;
+}
+
+void NetworkManager::TunSetting::setMode(NetworkManager::TunSetting::Mode mode)
+{
+ Q_D(TunSetting);
+
+ d->mode = mode;
+}
+
+NetworkManager::TunSetting::Mode NetworkManager::TunSetting::mode() const
+{
+ Q_D(const TunSetting);
+
+ return d->mode;
+}
+
+void NetworkManager::TunSetting::setMultiQueue(bool multiQueue)
+{
+ Q_D(TunSetting);
+
+ d->multiQueue = multiQueue;
+}
+
+bool NetworkManager::TunSetting::multiQueue() const
+{
+ Q_D(const TunSetting);
+
+ return d->multiQueue;
+}
+
+void NetworkManager::TunSetting::setOwner(const QString& owner)
+{
+ Q_D(TunSetting);
+
+ d->owner = owner;
+}
+
+QString NetworkManager::TunSetting::owner() const
+{
+ Q_D(const TunSetting);
+
+ return d->owner;
+}
+
+void NetworkManager::TunSetting::setPi(bool pi)
+{
+ Q_D(TunSetting);
+
+ d->pi = pi;
+}
+
+bool NetworkManager::TunSetting::pi() const
+{
+ Q_D(const TunSetting);
+
+ return d->pi;
+}
+
+void NetworkManager::TunSetting::setVnetHdr(bool vnetHdr)
+{
+ Q_D(TunSetting);
+
+ d->vnetHdr = vnetHdr;
+}
+
+bool NetworkManager::TunSetting::vnetHdr() const
+{
+ Q_D(const TunSetting);
+
+ return d->vnetHdr;
+}
+
+void NetworkManager::TunSetting::fromMap(const QVariantMap &setting)
+{
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_GROUP))) {
+
setGroup(setting.value(QLatin1String(NM_SETTING_TUN_GROUP)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_MODE))) {
+
setMode((Mode)setting.value(QLatin1String(NM_SETTING_TUN_MODE)).toUInt());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_MULTI_QUEUE))) {
+
setMultiQueue(setting.value(QLatin1String(NM_SETTING_TUN_MULTI_QUEUE)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_OWNER))) {
+
setOwner(setting.value(QLatin1String(NM_SETTING_TUN_OWNER)).toString());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_PI))) {
+ setPi(setting.value(QLatin1String(NM_SETTING_TUN_PI)).toBool());
+ }
+
+ if (setting.contains(QLatin1String(NM_SETTING_TUN_VNET_HDR))) {
+
setVnetHdr(setting.value(QLatin1String(NM_SETTING_TUN_VNET_HDR)).toBool());
+ }
+}
+
+QVariantMap NetworkManager::TunSetting::toMap() const
+{
+ QVariantMap setting;
+
+ if (!group().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_TUN_GROUP), group());
+ }
+
+ setting.insert(QLatin1String(NM_SETTING_TUN_MODE), (int)mode());
+ setting.insert(QLatin1String(NM_SETTING_TUN_MULTI_QUEUE), multiQueue());
+
+ if (!owner().isEmpty()) {
+ setting.insert(QLatin1String(NM_SETTING_TUN_OWNER), owner());
+ }
+
+ setting.insert(QLatin1String(NM_SETTING_TUN_PI), pi());
+ setting.insert(QLatin1String(NM_SETTING_TUN_VNET_HDR), vnetHdr());
+
+ return setting;
+}
+
+QDebug NetworkManager::operator <<(QDebug dbg, const
NetworkManager::TunSetting &setting)
+{
+ dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
+ dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
+
+ dbg.nospace() << NM_SETTING_TUN_GROUP << ": " << setting.group() << '\n';
+ dbg.nospace() << NM_SETTING_TUN_MODE << ": " << setting.mode() << '\n';
+ dbg.nospace() << NM_SETTING_TUN_MULTI_QUEUE << ": " <<
setting.multiQueue() << '\n';
+ dbg.nospace() << NM_SETTING_TUN_OWNER << ": " << setting.owner() << '\n';
+ dbg.nospace() << NM_SETTING_TUN_PI << ": " << setting.pi() << '\n';
+ dbg.nospace() << NM_SETTING_TUN_VNET_HDR << ": " << setting.vnetHdr() <<
'\n';
+
+
+ return dbg.maybeSpace();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/settings/tunsetting.h
new/networkmanager-qt-5.21.0/src/settings/tunsetting.h
--- old/networkmanager-qt-5.20.0/src/settings/tunsetting.h 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/tunsetting.h 2016-04-04
10:20:31.000000000 +0200
@@ -0,0 +1,85 @@
+/*
+ Copyright 2016 Jan Grulich <[email protected]>
+
+ 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_TUN_SETTING_H
+#define NETWORKMANAGERQT_TUN_SETTING_H
+
+#include <networkmanagerqt/networkmanagerqt_export.h>
+#include "setting.h"
+
+#include <QtCore/QString>
+
+namespace NetworkManager
+{
+
+class TunSettingPrivate;
+
+/**
+ * Represents generic setting
+ */
+class NETWORKMANAGERQT_EXPORT TunSetting : public Setting
+{
+public:
+ typedef QSharedPointer<TunSetting> Ptr;
+ typedef QList<Ptr> List;
+ enum Mode { Tun, Tap };
+
+
+ TunSetting();
+ explicit TunSetting(const Ptr &other);
+ ~TunSetting();
+
+ QString name() const Q_DECL_OVERRIDE;
+
+ void setGroup(const QString& group);
+ QString group() const;
+
+ void setMode(Mode mode);
+ Mode mode() const;
+
+ void setMultiQueue(bool multiQueue);
+ bool multiQueue() const;
+
+ void setOwner(const QString& owner);
+ QString owner() const;
+
+ void setPi(bool pi);
+ bool pi() const;
+
+ void setVnetHdr(bool vnetHdr);
+ bool vnetHdr() const;
+
+ void fromMap(const QVariantMap &setting) Q_DECL_OVERRIDE;
+
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
+
+protected:
+ TunSettingPrivate *d_ptr;
+
+private:
+ Q_DECLARE_PRIVATE(TunSetting)
+};
+
+NETWORKMANAGERQT_EXPORT QDebug operator<<(QDebug dbg, const TunSetting
&setting);
+
+}
+
+#endif // NETWORKMANAGERQT_TUN_SETTING_H
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.20.0/src/settings/tunsetting_p.h
new/networkmanager-qt-5.21.0/src/settings/tunsetting_p.h
--- old/networkmanager-qt-5.20.0/src/settings/tunsetting_p.h 1970-01-01
01:00:00.000000000 +0100
+++ new/networkmanager-qt-5.21.0/src/settings/tunsetting_p.h 2016-04-04
10:20:31.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ Copyright 2016 Jan Grulich <[email protected]>
+
+ 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_TUN_SETTING_P_H
+#define NETWORKMANAGERQT_TUN_SETTING_P_H
+
+#include <QtCore/QString>
+
+namespace NetworkManager
+{
+
+class TunSettingPrivate
+{
+public:
+ TunSettingPrivate();
+
+ QString name;
+ QString group;
+ NetworkManager::TunSetting::Mode mode;
+ bool multiQueue;
+ QString owner;
+ bool pi;
+ bool vnetHdr;
+};
+
+}
+
+#endif // NETWORKMANAGERQT_TUN_SETTING_P_H
+
