diff --git a/autotests/settings/iptunnelsettingtest.cpp b/autotests/settings/iptunnelsettingtest.cpp --- a/autotests/settings/iptunnelsettingtest.cpp +++ b/autotests/settings/iptunnelsettingtest.cpp @@ -76,19 +76,19 @@ QVariantMap map; - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE), mode); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY), pathMtuDiscovery); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT), encapsulationLimit); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS), flags); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL), flowLabel); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU), mtu); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS), tos); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL), ttl); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY), inputKey); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL), local); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT), parent); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY), outputKey); - map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE), remote); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MODE), mode); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY), pathMtuDiscovery); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), encapsulationLimit); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS), flags); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL), flowLabel); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MTU), mtu); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TOS), tos); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TTL), ttl); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY), inputKey); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL), local); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT), parent); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), outputKey); + map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE), remote); NetworkManager::IpTunnelSetting setting; setting.fromMap(map); diff --git a/src/settings/connectionsettings.h b/src/settings/connectionsettings.h --- a/src/settings/connectionsettings.h +++ b/src/settings/connectionsettings.h @@ -65,8 +65,9 @@ Wireless, Team, Generic, - Tun - }; + Tun, + IpTunnel + }; // Please suggest a name/group for new setting enum AutoconnectSlaves { SlavesDefault = -1, diff --git a/src/settings/connectionsettings.cpp b/src/settings/connectionsettings.cpp --- a/src/settings/connectionsettings.cpp +++ b/src/settings/connectionsettings.cpp @@ -35,6 +35,7 @@ #include "gsmsetting.h" #include "cdmasetting.h" #include "infinibandsetting.h" +#include "iptunnelsetting.h" #include "ipv4setting.h" #include "ipv6setting.h" #include "pppsetting.h" @@ -44,7 +45,6 @@ #include "vlansetting.h" #include "vpnsetting.h" #include "wimaxsetting.h" -#include "iptunnelsetting.h" #undef signals #include @@ -192,6 +192,8 @@ addSetting(Setting::Ptr(new TunSetting())); addSetting(Setting::Ptr(new Ipv4Setting())); addSetting(Setting::Ptr(new Ipv6Setting())); + break; + case ConnectionSettings::IpTunnel: addSetting(Setting::Ptr(new IpTunnelSetting())); break; case ConnectionSettings::Unknown: @@ -310,6 +312,8 @@ addSetting(connectionSettings->setting(Setting::Ipv4)); addSetting(connectionSettings->setting(Setting::Ipv6)); break; + case ConnectionSettings::IpTunnel: + addSetting(connectionSettings->setting(Setting::IpTunnel)); case ConnectionSettings::Unknown: default: break; @@ -354,6 +358,8 @@ type = Generic; } else if (typeString == QLatin1String(NM_SETTING_TUN_SETTING_NAME)) { type = Tun; + } else if (typeString == QLatin1String(NM_SETTING_IP_TUNNEL_SETTING_NAME)) { + type = IpTunnel; } return type; @@ -415,6 +421,9 @@ case Tun: typeString = QLatin1String(NM_SETTING_TUN_SETTING_NAME); break; + case IpTunnel: + typeString = QLatin1String(NM_SETTING_IP_TUNNEL_SETTING_NAME); + break; default: break; }; diff --git a/src/settings/iptunnelsetting.h b/src/settings/iptunnelsetting.h --- a/src/settings/iptunnelsetting.h +++ b/src/settings/iptunnelsetting.h @@ -26,21 +26,6 @@ #include -#define NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT -#define NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS "flags"//NM_SETTING_IP_TUNNEL_FLAGS -#define NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL NM_SETTING_IP_TUNNEL_FLOW_LABEL -#define NMQT_SETTING_IP_TUNNEL_CONFIG_MTU NM_SETTING_IP_TUNNEL_MTU -#define NMQT_SETTING_IP_TUNNEL_CONFIG_TOS NM_SETTING_IP_TUNNEL_TOS -#define NMQT_SETTING_IP_TUNNEL_CONFIG_TTL NM_SETTING_IP_TUNNEL_TTL -#define NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY NM_SETTING_IP_TUNNEL_INPUT_KEY -#define NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL NM_SETTING_IP_TUNNEL_LOCAL -#define NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY NM_SETTING_IP_TUNNEL_OUTPUT_KEY -#define NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE NM_SETTING_IP_TUNNEL_REMOTE -#define NMQT_SETTING_IP_TUNNEL_CONFIG_MODE NM_SETTING_IP_TUNNEL_MODE -#define NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY -#define NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT NM_SETTING_IP_TUNNEL_PARENT - - namespace NetworkManager { diff --git a/src/settings/iptunnelsetting.cpp b/src/settings/iptunnelsetting.cpp --- a/src/settings/iptunnelsetting.cpp +++ b/src/settings/iptunnelsetting.cpp @@ -248,56 +248,56 @@ void NetworkManager::IpTunnelSetting::fromMap(const QVariantMap &setting) { - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE))) { - setMode((Mode)setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_MODE))) { + setMode((Mode)setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_MODE)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY))) { - setPathMtuDiscovery(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY)).toBool()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY))) { + setPathMtuDiscovery(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY)).toBool()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT))) { - setEncapsulationLimit(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT))) { + setEncapsulationLimit(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS))) { - setFlags(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS))) { + setFlags(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL))) { - setFlowLabel(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL))) { + setFlowLabel(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU))) { - setMtu(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_MTU))) { + setMtu(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_MTU)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS))) { - setTos(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_TOS))) { + setTos(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_TOS)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL))) { - setTtl(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL)).toUInt()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_TTL))) { + setTtl(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_TTL)).toUInt()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY))) { - setInputKey(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY)).toString()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY))) { + setInputKey(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY)).toString()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL))) { - setLocal(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL)).toString()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL))) { + setLocal(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL)).toString()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT))) { - setParent(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT)).toString()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT))) { + setParent(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT)).toString()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY))) { - setOutputKey(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY)).toString()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY))) { + setOutputKey(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY)).toString()); } - if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE))) { - setRemote(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE)).toString()); + if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE))) { + setRemote(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE)).toString()); } } @@ -305,54 +305,54 @@ { QVariantMap setting; - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY), pathMtuDiscovery()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY), pathMtuDiscovery()); if ((int)mode() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE), (int)mode()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MODE), (int)mode()); } if (encapsulationLimit() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT), encapsulationLimit()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT), encapsulationLimit()); } if (flags() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS), flags()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS), flags()); } if (flowLabel() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL), flowLabel()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL), flowLabel()); } if (mtu() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU), mtu()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MTU), mtu()); } if (tos() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS), tos()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TOS), tos()); } if (ttl() > 0) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL), ttl()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TTL), ttl()); } if (!inputKey().isEmpty()) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY), inputKey()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY), inputKey()); } if (!local().isEmpty()) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL), local()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL), local()); } if (!parent().isEmpty()) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT), parent()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT), parent()); } if (!outputKey().isEmpty()) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY), outputKey()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), outputKey()); } if (!remote().isEmpty()) { - setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE), remote()); + setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE), remote()); } return setting; @@ -363,20 +363,20 @@ dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n'; dbg.nospace() << "initialized: " << !setting.isNull() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_MODE << ": " << setting.mode() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY << ": " << setting.pathMtuDiscovery() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_MODE << ": " << setting.mode() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY << ": " << setting.pathMtuDiscovery() << '\n'; //////////////////// - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT << ": " << setting.encapsulationLimit() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS << ": " << setting.flags() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL << ": " << setting.flowLabel() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_MTU << ": " << setting.mtu() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_TOS << ": " << setting.tos() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_TTL << ": " << setting.ttl() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY << ": " << setting.inputKey() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL << ": " << setting.local() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT << ": " << setting.parent() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY << ": " << setting.outputKey() << '\n'; - dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE << ": " << setting.remote() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT << ": " << setting.encapsulationLimit() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_FLAGS << ": " << setting.flags() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_FLOW_LABEL << ": " << setting.flowLabel() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_MTU << ": " << setting.mtu() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_TOS << ": " << setting.tos() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_TTL << ": " << setting.ttl() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_INPUT_KEY << ": " << setting.inputKey() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_LOCAL << ": " << setting.local() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_PARENT << ": " << setting.parent() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_OUTPUT_KEY << ": " << setting.outputKey() << '\n'; + dbg.nospace() << NM_SETTING_IP_TUNNEL_REMOTE << ": " << setting.remote() << '\n'; return dbg.maybeSpace(); }