Differential D6116 Diff 15564 src/fakenetwork/fakenetwork.cpp

Changeset View

Standalone View

View Options

src/fakenetwork/fakenetwork.cpp

Show First 20 Lines • Show All 263 Lines • ▼ Show 20 Line(s)260 } else if (device->state() == NetworkManager::Device::CheckingIp) {
264 if (activeConnection) { 264​ if (activeConnection) {
265 QVariantMap activeConnectionMap; 265​ QVariantMap activeConnectionMap;
266 activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Activated); 266​ activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Activated);
267 267​
268 activeConnection->setState(NetworkManager::ActiveConnection::Activated); 268​ activeConnection->setState(NetworkManager::ActiveConnection::Activated);
269 QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged")); 269​ QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged"));
270 message << activeConnectionMap; 270​ message << activeConnectionMap;
271 QDBusConnection::sessionBus().send(message); 271​ QDBusConnection::sessionBus().send(message);
272​
273​#if NM_CHECK_VERSION(1, 8, 0)
274​ QDBusMessage message2 = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("StateChanged"));
275​ message2 << activeConnection->state() << (uint) 0; // Unknown reason;
276​ QDBusConnection::sessionBus().send(message2);
277​#endif
272 } 278​ }
273 // TODO: set dhcp4Config, dhcp6Config, ip4Config, ip6Config 279​ // TODO: set dhcp4Config, dhcp6Config, ip4Config, ip6Config
274 // IP Interface is usually same as interface 280​ // IP Interface is usually same as interface
275 device->setIpInterface(device->interface()); 281​ device->setIpInterface(device->interface());
276 // Set some IP address 282​ // Set some IP address
277 device->setIpv4Address(1763189258); 283​ device->setIpv4Address(1763189258);
278 284​
279 deviceMap.insert(QLatin1Literal("IpInterface"), device->ipInterface()); 285​ deviceMap.insert(QLatin1Literal("IpInterface"), device->ipInterface());
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Line(s)325 if (activeConnection) {
322 QVariantMap activeConnectionMap; 328​ QVariantMap activeConnectionMap;
323 activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Deactivating); 329​ activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Deactivating);
324 330​
325 activeConnection->setState(NetworkManager::ActiveConnection::Activated); 331​ activeConnection->setState(NetworkManager::ActiveConnection::Activated);
326 QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged")); 332​ QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged"));
327 message << activeConnectionMap; 333​ message << activeConnectionMap;
328 QDBusConnection::sessionBus().send(message); 334​ QDBusConnection::sessionBus().send(message);
329 335​
336​#if NM_CHECK_VERSION(1, 8, 0)
337​ QDBusMessage message2 = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("StateChanged"));
338​ message2 << activeConnection->state() << (uint) 0; // Unknown reason;
339​ QDBusConnection::sessionBus().send(message2);
340​#endif
341​
330 Device *device = m_devices.value(activeConnection->devices().first()); 342​ Device *device = m_devices.value(activeConnection->devices().first());
331 if (device) { 343​ if (device) {
332 m_deactivatedDevice = device->devicePath(); 344​ m_deactivatedDevice = device->devicePath();
333 device->setState(NetworkManager::Device::Deactivating); 345​ device->setState(NetworkManager::Device::Deactivating);
334 QTimer::singleShot(100, this, SLOT(updateDeactivatingState())); 346​ QTimer::singleShot(100, this, SLOT(updateDeactivatingState()));
335 } 347​ }
336 348​
337 // Update FakeNetwork state, connectivity, primary connection 349​ // Update FakeNetwork state, connectivity, primary connection
Show All 22 Lines371 if (activeConnection) {
360 QVariantMap activeConnectionMap; 372​ QVariantMap activeConnectionMap;
361 activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Deactivated); 373​ activeConnectionMap.insert(QLatin1Literal("State"), NetworkManager::ActiveConnection::Deactivated);
362 374​
363 activeConnection->setState(NetworkManager::ActiveConnection::Activated); 375​ activeConnection->setState(NetworkManager::ActiveConnection::Activated);
364 QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged")); 376​ QDBusMessage message = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("PropertiesChanged"));
365 message << activeConnectionMap; 377​ message << activeConnectionMap;
366 QDBusConnection::sessionBus().send(message); 378​ QDBusConnection::sessionBus().send(message);
367 379​
380​#if NM_CHECK_VERSION(1, 8, 0)
381​ QDBusMessage message2 = QDBusMessage::createSignal(activeConnection->activeConnectionPath(), QLatin1Literal("org.kde.fakenetwork.Connection.Active"), QLatin1Literal("StateChanged"));
382​ message2 << activeConnection->state() << (uint) 0; // Unknown reason;
383​ QDBusConnection::sessionBus().send(message2);
384​#endif
385​
368 removeActiveConnection(QDBusObjectPath(activeConnection->activeConnectionPath())); 386​ removeActiveConnection(QDBusObjectPath(activeConnection->activeConnectionPath()));
369 } 387​ }
370 388​
371 device->setActiveConnection(QLatin1Literal("/")); 389​ device->setActiveConnection(QLatin1Literal("/"));
372 device->setState(NetworkManager::Device::Disconnected); 390​ device->setState(NetworkManager::Device::Disconnected);
373 // TODO: set dhcp4Config, dhcp6Config, ip4Config, ip6Config 391​ // TODO: set dhcp4Config, dhcp6Config, ip4Config, ip6Config
374 // IP Interface is usually same as interface 392​ // IP Interface is usually same as interface
375 device->setIpInterface(""); 393​ device->setIpInterface("");
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines