File 0001-Revert-Add-missing-IPv6-options.patch of Package libKF5NetworkManagerQt
From 5980043ef2be0be3068f07af3f154c8dbe9173d3 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Mon, 10 Dec 2018 14:44:49 +0100
Subject: [PATCH] Revert "Add missing IPv6 options"
This reverts commit c7f6451abe5b518693afca519e09dcc594da688e.
It needs a newer NetworkManager than we have in Leap 42.3.
---
autotests/settings/ipv6settingtest.cpp | 89 ++----------
src/settings/ipv6setting.cpp | 254 ---------------------------------
src/settings/ipv6setting.h | 49 -------
src/settings/ipv6setting_p.h | 10 --
4 files changed, 12 insertions(+), 390 deletions(-)
diff --git a/autotests/settings/ipv6settingtest.cpp b/autotests/settings/ipv6settingtest.cpp
index 7c040dd..1662290 100644
--- a/autotests/settings/ipv6settingtest.cpp
+++ b/autotests/settings/ipv6settingtest.cpp
@@ -47,17 +47,6 @@ void IPv6SettingTest::testSetting_data()
QTest::addColumn<bool>("neverDefault");
QTest::addColumn<bool>("mayFail");
QTest::addColumn<quint32>("privacy");
- QTest::addColumn<quint32>("dadTimeout");
- QTest::addColumn<quint32>("addressGenMode");
- QTest::addColumn<quint32>("dhcpTimeout");
- QTest::addColumn<QString>("dhcpHostname");
- QTest::addColumn<QString>("dhcpDuid");
- QTest::addColumn<QString>("token");
- QTest::addColumn<QStringList>("dnsOptions");
- QTest::addColumn<NMVariantMapList>("addressData");
- QTest::addColumn<NMVariantMapList>("routeData");
- QTest::addColumn<quint32>("routeTable");
-
QStringList dnsSearch;
dnsSearch << "foo.com";
@@ -82,44 +71,18 @@ void IPv6SettingTest::testSetting_data()
route.metric = 1024;
routes << route;
- 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
- << dnsSearch // dnsSearch
- << addresses // addresses
- << routes // routes
- << 100 // routeMetric
- << true // ignoreAutoRoutes
- << true // ignoreAutoDns
- << true // neverDefault
- << false // mayFail
- << (quint32) 0 // privacy
- << (quint32) 1101 // dadTimeout
- << (quint32) 0 // addressGenMode
- << (quint32) 110 // dhcpTimeout
- << QString("dhcp-hostname") // dhcpHostname
- << QString("dhcp-duid") // dhcpDuid
- << QString("token") // token
- << QStringList {QString("option1"), QString("option2")} // dnsOptions
- << addressData // addressData
- << routeData // routeData
- << (quint32) 1; // routeTable
+ << QString("auto") // method
+ << dns // dns
+ << dnsSearch // dnsSearch
+ << addresses // addresses
+ << routes // routes
+ << 100 // routeMetric
+ << true // ignoreAutoRoutes
+ << true // ignoreAutoDns
+ << true // neverDefault
+ << false // mayFail
+ << (quint32) 0; // privacy
}
void IPv6SettingTest::testSetting()
@@ -135,16 +98,6 @@ void IPv6SettingTest::testSetting()
QFETCH(bool, neverDefault);
QFETCH(bool, mayFail);
QFETCH(quint32, privacy);
- QFETCH(quint32, dadTimeout);
- QFETCH(quint32, addressGenMode);
- QFETCH(quint32, dhcpTimeout);
- QFETCH(QString, dhcpHostname);
- QFETCH(QString, dhcpDuid);
- QFETCH(QString, token);
- QFETCH(QStringList, dnsOptions);
- QFETCH(NMVariantMapList, addressData);
- QFETCH(NMVariantMapList, routeData);
- QFETCH(quint32, routeTable);
QVariantMap map;
@@ -159,17 +112,6 @@ void IPv6SettingTest::testSetting()
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT), neverDefault);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_MAY_FAIL), mayFail);
map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY), privacy);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT), dadTimeout);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE), addressGenMode);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT), dhcpTimeout);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME), dhcpHostname);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_DUID), dhcpDuid);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_TOKEN), token);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS), dnsOptions);
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA), QVariant::fromValue(addressData));
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA), QVariant::fromValue(routeData));
- map.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE), routeTable);
-
NetworkManager::Ipv6Setting setting;
setting.fromMap(map);
@@ -181,9 +123,7 @@ void IPv6SettingTest::testSetting()
while (it != map.constEnd()) {
if (it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS) &&
it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESSES) &&
- it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES) &&
- it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA) &&
- it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA)) {
+ it.key() != QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTES)) {
QCOMPARE(it.value(), map1.value(it.key()));
}
++it;
@@ -228,11 +168,6 @@ void IPv6SettingTest::testSetting()
QCOMPARE(nexthop1, nexthop2);
QCOMPARE(routes1.at(i).metric, routes2.at(i).metric);
}
-
- QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA))),
- qdbus_cast<NMVariantMapList>(map1.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA))));
- QCOMPARE(qdbus_cast<NMVariantMapList>(map.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA))),
- qdbus_cast<NMVariantMapList>(map1.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA))));
}
QTEST_MAIN(IPv6SettingTest)
diff --git a/src/settings/ipv6setting.cpp b/src/settings/ipv6setting.cpp
index e1efcd8..b9387f2 100644
--- a/src/settings/ipv6setting.cpp
+++ b/src/settings/ipv6setting.cpp
@@ -37,10 +37,6 @@ NetworkManager::Ipv6SettingPrivate::Ipv6SettingPrivate()
, neverDefault(false)
, mayFail(true)
, privacy(NetworkManager::Ipv6Setting::Unknown)
- , dadTimeout(-1)
- , addressGenMode(NetworkManager::Ipv6Setting::StablePrivacy)
- , dhcpTimeout(0)
- , routeTable(0)
{ }
NetworkManager::Ipv6Setting::Ipv6Setting()
@@ -62,16 +58,6 @@ NetworkManager::Ipv6Setting::Ipv6Setting(const Ptr &other)
setIgnoreAutoDns(other->ignoreAutoDns());
setNeverDefault(other->neverDefault());
setMayFail(other->mayFail());
- setDadTimeout(other->dadTimeout());
- setAddressGenMode(other->addressGenMode());
- setDhcpTimeout(other->dhcpTimeout());
- setDhcpHostname(other->dhcpHostname());
- setDhcpDuid(other->dhcpDuid());
- setToken(other->token());
- setDnsOptions(other->dnsOptions());
- setAddressData(other->addressData());
- setRouteData(other->routeData());
- setRouteTable(other->routeTable());
}
NetworkManager::Ipv6Setting::~Ipv6Setting()
@@ -240,146 +226,6 @@ NetworkManager::Ipv6Setting::IPv6Privacy NetworkManager::Ipv6Setting::privacy()
return d->privacy;
}
-void NetworkManager::Ipv6Setting::setDadTimeout(qint32 timeout)
-{
- Q_D(Ipv6Setting);
-
- d->dadTimeout = timeout;
-}
-
-qint32 NetworkManager::Ipv6Setting::dadTimeout() const
-{
- Q_D(const Ipv6Setting);
-
- return d->dadTimeout;
-}
-
-void NetworkManager::Ipv6Setting::setDhcpTimeout(qint32 timeout)
-{
- Q_D(Ipv6Setting);
-
- d->dhcpTimeout = timeout;
-}
-
-qint32 NetworkManager::Ipv6Setting::dhcpTimeout() const
-{
- Q_D(const Ipv6Setting);
-
- return d->dhcpTimeout;
-}
-
-void NetworkManager::Ipv6Setting::setDhcpHostname(const QString &hostname)
-{
- Q_D(Ipv6Setting);
-
- d->dhcpHostname = hostname;
-}
-
-QString NetworkManager::Ipv6Setting::dhcpHostname() const
-{
- Q_D(const Ipv6Setting);
-
- return d->dhcpHostname;
-}
-
-void NetworkManager::Ipv6Setting::setDhcpDuid(const QString &duid)
-{
- Q_D(Ipv6Setting);
-
- d->dhcpDuid = duid;
-}
-
-QString NetworkManager::Ipv6Setting::dhcpDuid() const
-{
- Q_D(const Ipv6Setting);
-
- return d->dhcpDuid;
-}
-
-void NetworkManager::Ipv6Setting::setDnsOptions(const QStringList &options)
-{
- Q_D(Ipv6Setting);
-
- d->dnsOptions = options;
-}
-
-QStringList NetworkManager::Ipv6Setting::dnsOptions() const
-{
- Q_D(const Ipv6Setting);
-
- return d->dnsOptions;
-}
-
-void NetworkManager::Ipv6Setting::setAddressData(const NMVariantMapList &addressData)
-{
- Q_D(Ipv6Setting);
-
- d->addressData = addressData;
-}
-
-NMVariantMapList NetworkManager::Ipv6Setting::addressData() const
-{
- Q_D(const Ipv6Setting);
-
- return d->addressData;
-}
-
-void NetworkManager::Ipv6Setting::setAddressGenMode(IPv6AddressGenMode mode)
-{
- Q_D(Ipv6Setting);
-
- d->addressGenMode = mode;
-}
-
-NetworkManager::Ipv6Setting::IPv6AddressGenMode NetworkManager::Ipv6Setting::addressGenMode() const
-{
- Q_D(const Ipv6Setting);
-
- return d->addressGenMode;
-}
-
-void NetworkManager::Ipv6Setting::setRouteData(const NMVariantMapList &routeData)
-{
- Q_D(Ipv6Setting);
-
- d->routeData = routeData;
-}
-
-NMVariantMapList NetworkManager::Ipv6Setting::routeData() const
-{
- Q_D(const Ipv6Setting);
-
- return d->routeData;
-}
-
-void NetworkManager::Ipv6Setting::setToken(const QString &token)
-{
- Q_D(Ipv6Setting);
-
- d->token = token;
-}
-
-QString NetworkManager::Ipv6Setting::token() const
-{
- Q_D(const Ipv6Setting);
-
- return d->token;
-}
-
-void NetworkManager::Ipv6Setting::setRouteTable(quint32 routeTable)
-{
- Q_D(Ipv6Setting);
-
- d->routeTable = routeTable;
-}
-
-quint32 NetworkManager::Ipv6Setting::routeTable() const
-{
- Q_D(const Ipv6Setting);
-
- return d->routeTable;
-}
-
void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
{
if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_METHOD))) {
@@ -502,46 +348,6 @@ void NetworkManager::Ipv6Setting::fromMap(const QVariantMap &setting)
if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY))) {
setPrivacy((IPv6Privacy)setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY)).toUInt());
}
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT))) {
- setDadTimeout(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT)).toUInt());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT))) {
- setDhcpTimeout(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT)).toUInt());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE))) {
- setAddressGenMode(static_cast<IPv6AddressGenMode>(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE)).toUInt()));
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME))) {
- setDhcpHostname(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME)).toString());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_DUID))) {
- setDhcpDuid(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_DUID)).toString());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_TOKEN))) {
- setToken(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_TOKEN)).toString());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS))) {
- setDnsOptions(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS)).toStringList());
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA))) {
- setRouteData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA))));
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA))) {
- setAddressData(qdbus_cast<NMVariantMapList>(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA))));
- }
-
- if (setting.contains(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE))) {
- setRouteTable(setting.value(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE)).toUInt());
- }
}
QVariantMap NetworkManager::Ipv6Setting::toMap() const
@@ -623,44 +429,6 @@ QVariantMap NetworkManager::Ipv6Setting::toMap() const
setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY), privacy());
}
- if (dadTimeout() >= 0) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT), dadTimeout());
- }
-
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE), addressGenMode());
-
- if (dhcpTimeout() > 0) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT), dhcpTimeout());
- }
-
- if (!dhcpHostname().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME), dhcpHostname());
- }
-
- if (!dhcpDuid().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DHCP_DUID), dhcpDuid());
- }
-
- if (!token().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_TOKEN), token());
- }
-
- if (!dnsOptions().isEmpty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS), dnsOptions());
- }
-
- if (!addressData().empty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA), QVariant::fromValue(addressData()));
- }
-
- if (!routeData().empty()) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_DATA), QVariant::fromValue(routeData()));
- }
-
- if (routeTable() > 0) {
- setting.insert(QLatin1String(NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE), routeTable());
- }
-
return setting;
}
@@ -689,28 +457,6 @@ QDebug NetworkManager::operator <<(QDebug dbg, const NetworkManager::Ipv6Setting
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_NEVER_DEFAULT << ": " << setting.neverDefault() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_MAY_FAIL << ": " << setting.mayFail() << '\n';
dbg.nospace() << NMQT_SETTING_IP6_CONFIG_IP6_PRIVACY << ": " << setting.privacy() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT << ": " << setting.dadTimeout() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE << ": " << setting.addressGenMode() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT << ": " << setting.dhcpTimeout() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME << ": " << setting.dhcpHostname() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DHCP_DUID << ": " << setting.dhcpDuid() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_TOKEN << ": " << setting.token() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS << ": " << setting.dnsOptions() << '\n';
- dbg.nospace() << NMQT_SETTING_IP6_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_IP6_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';
- }
- }
- dbg.nospace() << NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE << ": " << setting.routeTable() << '\n';
return dbg.maybeSpace();
}
diff --git a/src/settings/ipv6setting.h b/src/settings/ipv6setting.h
index 918b0f0..8a7c957 100644
--- a/src/settings/ipv6setting.h
+++ b/src/settings/ipv6setting.h
@@ -50,24 +50,6 @@
#define NMQT_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL
#define NMQT_SETTING_IP6_CONFIG_METHOD_MANUAL NM_SETTING_IP6_CONFIG_METHOD_MANUAL
#define NMQT_SETTING_IP6_CONFIG_METHOD_SHARED NM_SETTING_IP6_CONFIG_METHOD_SHARED
-#define NMQT_SETTING_IP6_CONFIG_DAD_TIMEOUT NM_SETTING_IP_CONFIG_DAD_TIMEOUT
-#define NMQT_SETTING_IP6_CONFIG_DHCP_TIMEOUT NM_SETTING_IP_CONFIG_DHCP_TIMEOUT
-#define NMQT_SETTING_IP6_CONFIG_DHCP_HOSTNAME NM_SETTING_IP_CONFIG_DHCP_HOSTNAME
-#define NMQT_SETTING_IP6_CONFIG_ADDRESS_GEN_MODE NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE
-#if NM_CHECK_VERSION(1, 12, 0)
-#define NMQT_SETTING_IP6_CONFIG_DHCP_DUID NM_SETTING_IP6_CONFIG_DHCP_DUID
-#else
-#define NMQT_SETTING_IP6_CONFIG_DHCP_DUID "dhcp-duid"
-#endif
-#define NMQT_SETTING_IP6_CONFIG_TOKEN NM_SETTING_IP6_CONFIG_TOKEN
-#define NMQT_SETTING_IP6_CONFIG_DNS_OPTIONS NM_SETTING_IP_CONFIG_DNS_OPTIONS
-#define NMQT_SETTING_IP6_CONFIG_ROUTE_DATA "route-data"
-#define NMQT_SETTING_IP6_CONFIG_ADDRESS_DATA "address-data"
-#if NM_CHECK_VERSION(1, 10, 0)
-#define NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE NM_SETTING_IP_CONFIG_ROUTE_TABLE
-#else
-#define NMQT_SETTING_IP6_CONFIG_ROUTE_TABLE "route-table"
-#endif
namespace NetworkManager
{
@@ -84,7 +66,6 @@ public:
typedef QList<Ptr> List;
enum ConfigMethod {Automatic, Dhcp, LinkLocal, Manual, Ignored};
enum IPv6Privacy {Unknown = -1, Disabled, PreferPublic, PreferTemporary};
- enum IPv6AddressGenMode {Eui64, StablePrivacy};
Ipv6Setting();
explicit Ipv6Setting(const Ptr &other);
@@ -129,36 +110,6 @@ public:
QVariantMap toMap() const override;
- void setDadTimeout(qint32 timeout);
- qint32 dadTimeout() const;
-
- void setAddressGenMode(IPv6AddressGenMode mode);
- IPv6AddressGenMode addressGenMode() const;
-
- void setDhcpTimeout(qint32 timeout);
- qint32 dhcpTimeout() const;
-
- void setDhcpHostname(const QString &hostname);
- QString dhcpHostname() const;
-
- void setDhcpDuid(const QString &duid);
- QString dhcpDuid() const;
-
- void setToken(const QString &token);
- QString token() const;
-
- void setDnsOptions(const QStringList &options);
- QStringList dnsOptions() const;
-
- void setAddressData(const NMVariantMapList &addressData);
- NMVariantMapList addressData() const;
-
- void setRouteData(const NMVariantMapList &routeData);
- NMVariantMapList routeData() const;
-
- void setRouteTable(quint32 routeTable);
- quint32 routeTable() const;
-
protected:
Ipv6SettingPrivate *const d_ptr;
diff --git a/src/settings/ipv6setting_p.h b/src/settings/ipv6setting_p.h
index c1f62b6..cbd3262 100644
--- a/src/settings/ipv6setting_p.h
+++ b/src/settings/ipv6setting_p.h
@@ -46,16 +46,6 @@ public:
bool neverDefault;
bool mayFail;
NetworkManager::Ipv6Setting::IPv6Privacy privacy;
- qint32 dadTimeout;
- NetworkManager::Ipv6Setting::IPv6AddressGenMode addressGenMode;
- qint32 dhcpTimeout;
- QString dhcpHostname;
- QString dhcpDuid;
- QString token;
- QStringList dnsOptions;
- NMVariantMapList addressData;
- NMVariantMapList routeData;
- qint32 routeTable;
};
}
--
2.16.4
