Differential D17185 Diff 46395 src/settings/connectionsettings.cpp

Changeset View

Standalone View

View Options

src/settings/connectionsettings.cpp

Context not available.
35#include "gsmsetting.h" 35​#include "gsmsetting.h"
36#include "cdmasetting.h" 36​#include "cdmasetting.h"
37#include "infinibandsetting.h" 37​#include "infinibandsetting.h"
38​#include "iptunnelsetting.h"
38#include "ipv4setting.h" 39​#include "ipv4setting.h"
39#include "ipv6setting.h" 40​#include "ipv6setting.h"
40#include "pppsetting.h" 41​#include "pppsetting.h"
Context not available.
192 addSetting(Setting::Ptr(new Ipv4Setting())); 193​ addSetting(Setting::Ptr(new Ipv4Setting()));
193 addSetting(Setting::Ptr(new Ipv6Setting())); 194​ addSetting(Setting::Ptr(new Ipv6Setting()));
194 break; 195​ break;
jgrulichUnsubmitted
Done

IpTunnel setting is not part of Tun connection, it should be completely separated connection type.

jgrulich: IpTunnel setting is not part of Tun connection, it should be completely separated connection…
pranavgadeAuthorUnsubmitted
Done

What should the new connection type be called?

pranavgade: What should the new connection type be called?
jgrulichUnsubmitted
Done

You just add it the same way as for example this Tun connection type is addded.

jgrulich: You just add it the same way as for example this Tun connection type is addded.
196​ case ConnectionSettings::IpTunnel:
197​ addSetting(Setting::Ptr(new Ipv4Setting()));
jgrulichUnsubmitted
Done

You need to add also IPv4 and IPv6 settings.

jgrulich: You need to add also IPv4 and IPv6 settings.
198​ addSetting(Setting::Ptr(new Ipv6Setting()));
199​ addSetting(Setting::Ptr(new IpTunnelSetting()));
200​ break;
195 case ConnectionSettings::Unknown: 201​ case ConnectionSettings::Unknown:
196 default: 202​ default:
197 break; 203​ break;
Context not available.
308 addSetting(connectionSettings->setting(Setting::Ipv4)); 314​ addSetting(connectionSettings->setting(Setting::Ipv4));
309 addSetting(connectionSettings->setting(Setting::Ipv6)); 315​ addSetting(connectionSettings->setting(Setting::Ipv6));
310 break; 316​ break;
317​ case ConnectionSettings::IpTunnel:
318​ addSetting(connectionSettings->setting(Setting::Ipv4));
jgrulichUnsubmitted
Done

Same here.

jgrulich: Same here.
319​ addSetting(connectionSettings->setting(Setting::Ipv6));
320​ addSetting(connectionSettings->setting(Setting::IpTunnel));
311 case ConnectionSettings::Unknown: 321​ case ConnectionSettings::Unknown:
312 default: 322​ default:
313 break; 323​ break;
Context not available.
352 type = Generic; 362​ type = Generic;
353 } else if (typeString == QLatin1String(NM_SETTING_TUN_SETTING_NAME)) { 363​ } else if (typeString == QLatin1String(NM_SETTING_TUN_SETTING_NAME)) {
354 type = Tun; 364​ type = Tun;
365​ } else if (typeString == QLatin1String(NM_SETTING_IP_TUNNEL_SETTING_NAME)) {
366​ type = IpTunnel;
355 } 367​ }
356 368​
357 return type; 369​ return type;
Context not available.
413 case Tun: 425​ case Tun:
414 typeString = QLatin1String(NM_SETTING_TUN_SETTING_NAME); 426​ typeString = QLatin1String(NM_SETTING_TUN_SETTING_NAME);
415 break; 427​ break;
428​ case IpTunnel:
429​ typeString = QLatin1String(NM_SETTING_IP_TUNNEL_SETTING_NAME);
430​ break;
416 default: 431​ default:
417 break; 432​ break;
418 }; 433​ };
Context not available.
1065 case Setting::Tun: 1080​ case Setting::Tun:
1066 dbg.nospace() << *(settingPtr.staticCast<NetworkManager::TunSetting>().data()); 1081​ dbg.nospace() << *(settingPtr.staticCast<NetworkManager::TunSetting>().data());
1067 break; 1082​ break;
1083​ case Setting::IpTunnel:
1084​ dbg.nospace() << *(settingPtr.staticCast<NetworkManager::IpTunnelSetting>().data());
1085​ break;
1068 default: 1086​ default:
1069 dbg.nospace() << *settingPtr.data(); 1087​ dbg.nospace() << *settingPtr.data();
1070 } 1088​ }
Context not available.