Differential D17185 Diff 46380 src/settings/iptunnelsetting.cpp

Changeset View

Standalone View

View Options

src/settings/iptunnelsetting.cpp

Context not available.
248 248​
249void NetworkManager::IpTunnelSetting::fromMap(const QVariantMap &setting) 249​void NetworkManager::IpTunnelSetting::fromMap(const QVariantMap &setting)
250{ 250​{
251 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE))) { 251​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_MODE))) {
252 setMode((Mode)setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE)).toUInt()); 252​ setMode((Mode)setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_MODE)).toUInt());
253 } 253​ }
254 254​
255 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY))) { 255​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY))) {
256 setPathMtuDiscovery(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY)).toBool()); 256​ setPathMtuDiscovery(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY)).toBool());
257 } 257​ }
258 258​
259 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT))) { 259​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT))) {
260 setEncapsulationLimit(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT)).toUInt()); 260​ setEncapsulationLimit(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT)).toUInt());
261 } 261​ }
262 262​
263 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS))) { 263​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS))) {
264 setFlags(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS)).toUInt()); 264​ setFlags(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS)).toUInt());
265 } 265​ }
266 266​
267 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL))) { 267​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL))) {
268 setFlowLabel(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL)).toUInt()); 268​ setFlowLabel(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL)).toUInt());
269 } 269​ }
270 270​
271 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU))) { 271​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_MTU))) {
272 setMtu(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU)).toUInt()); 272​ setMtu(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_MTU)).toUInt());
273 } 273​ }
274 274​
275 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS))) { 275​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_TOS))) {
276 setTos(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS)).toUInt()); 276​ setTos(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_TOS)).toUInt());
277 } 277​ }
278 278​
279 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL))) { 279​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_TTL))) {
280 setTtl(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL)).toUInt()); 280​ setTtl(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_TTL)).toUInt());
281 } 281​ }
282 282​
283 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY))) { 283​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY))) {
284 setInputKey(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY)).toString()); 284​ setInputKey(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY)).toString());
285 } 285​ }
286 286​
287 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL))) { 287​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL))) {
288 setLocal(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL)).toString()); 288​ setLocal(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL)).toString());
289 } 289​ }
290 290​
291 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT))) { 291​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT))) {
292 setParent(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT)).toString()); 292​ setParent(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT)).toString());
293 } 293​ }
294 294​
295 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY))) { 295​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY))) {
296 setOutputKey(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY)).toString()); 296​ setOutputKey(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY)).toString());
297 } 297​ }
298 298​
299 if (setting.contains(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE))) { 299​ if (setting.contains(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE))) {
300 setRemote(setting.value(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE)).toString()); 300​ setRemote(setting.value(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE)).toString());
301 } 301​ }
302} 302​}
303 303​
Context not available.
305{ 305​{
306 QVariantMap setting; 306​ QVariantMap setting;
307 307​
308 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY), pathMtuDiscovery()); 308​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY), pathMtuDiscovery());
309 309​
310 if ((int)mode() > 0) { 310​ if ((int)mode() > 0) {
311 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE), (int)mode()); 311​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MODE), (int)mode());
312 } 312​ }
313 313​
314 if (encapsulationLimit() > 0) { 314​ if (encapsulationLimit() > 0) {
315 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT), encapsulationLimit()); 315​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT), encapsulationLimit());
316 } 316​ }
317 317​
318 if (flags() > 0) { 318​ if (flags() > 0) {
319 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS), flags()); 319​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS), flags());
320 } 320​ }
321 321​
322 if (flowLabel() > 0) { 322​ if (flowLabel() > 0) {
323 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL), flowLabel()); 323​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL), flowLabel());
324 } 324​ }
325 325​
326 if (mtu() > 0) { 326​ if (mtu() > 0) {
327 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU), mtu()); 327​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MTU), mtu());
328 } 328​ }
329 329​
330 if (tos() > 0) { 330​ if (tos() > 0) {
331 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS), tos()); 331​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TOS), tos());
332 } 332​ }
333 333​
334 if (ttl() > 0) { 334​ if (ttl() > 0) {
335 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL), ttl()); 335​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TTL), ttl());
336 } 336​ }
337 337​
338 if (!inputKey().isEmpty()) { 338​ if (!inputKey().isEmpty()) {
339 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY), inputKey()); 339​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY), inputKey());
340 } 340​ }
341 341​
342 if (!local().isEmpty()) { 342​ if (!local().isEmpty()) {
343 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL), local()); 343​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL), local());
344 } 344​ }
345 345​
346 if (!parent().isEmpty()) { 346​ if (!parent().isEmpty()) {
347 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT), parent()); 347​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT), parent());
348 } 348​ }
349 349​
350 if (!outputKey().isEmpty()) { 350​ if (!outputKey().isEmpty()) {
351 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY), outputKey()); 351​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), outputKey());
352 } 352​ }
353 353​
354 if (!remote().isEmpty()) { 354​ if (!remote().isEmpty()) {
355 setting.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE), remote()); 355​ setting.insert(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE), remote());
356 } 356​ }
357 357​
358 return setting; 358​ return setting;
Context not available.
363 dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n'; 363​ dbg.nospace() << "type: " << setting.typeAsString(setting.type()) << '\n';
364 dbg.nospace() << "initialized: " << !setting.isNull() << '\n'; 364​ dbg.nospace() << "initialized: " << !setting.isNull() << '\n';
365 365​
366 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_MODE << ": " << setting.mode() << '\n'; 366​ dbg.nospace() << NM_SETTING_IP_TUNNEL_MODE << ": " << setting.mode() << '\n';
367 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY << ": " << setting.pathMtuDiscovery() << '\n'; 367​ dbg.nospace() << NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY << ": " << setting.pathMtuDiscovery() << '\n';
368//////////////////// 368​////////////////////
369 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT << ": " << setting.encapsulationLimit() << '\n'; 369​ dbg.nospace() << NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT << ": " << setting.encapsulationLimit() << '\n';
370 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS << ": " << setting.flags() << '\n'; 370​ dbg.nospace() << NM_SETTING_IP_TUNNEL_FLAGS << ": " << setting.flags() << '\n';
371 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL << ": " << setting.flowLabel() << '\n'; 371​ dbg.nospace() << NM_SETTING_IP_TUNNEL_FLOW_LABEL << ": " << setting.flowLabel() << '\n';
372 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_MTU << ": " << setting.mtu() << '\n'; 372​ dbg.nospace() << NM_SETTING_IP_TUNNEL_MTU << ": " << setting.mtu() << '\n';
373 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_TOS << ": " << setting.tos() << '\n'; 373​ dbg.nospace() << NM_SETTING_IP_TUNNEL_TOS << ": " << setting.tos() << '\n';
374 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_TTL << ": " << setting.ttl() << '\n'; 374​ dbg.nospace() << NM_SETTING_IP_TUNNEL_TTL << ": " << setting.ttl() << '\n';
375 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY << ": " << setting.inputKey() << '\n'; 375​ dbg.nospace() << NM_SETTING_IP_TUNNEL_INPUT_KEY << ": " << setting.inputKey() << '\n';
376 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL << ": " << setting.local() << '\n'; 376​ dbg.nospace() << NM_SETTING_IP_TUNNEL_LOCAL << ": " << setting.local() << '\n';
377 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT << ": " << setting.parent() << '\n'; 377​ dbg.nospace() << NM_SETTING_IP_TUNNEL_PARENT << ": " << setting.parent() << '\n';
378 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY << ": " << setting.outputKey() << '\n'; 378​ dbg.nospace() << NM_SETTING_IP_TUNNEL_OUTPUT_KEY << ": " << setting.outputKey() << '\n';
379 dbg.nospace() << NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE << ": " << setting.remote() << '\n'; 379​ dbg.nospace() << NM_SETTING_IP_TUNNEL_REMOTE << ": " << setting.remote() << '\n';
380 380​
381 return dbg.maybeSpace(); 381​ return dbg.maybeSpace();
382} 382​}
Context not available.