Merge lp:~jpakkane/indicator-network/grace into lp:indicator-network/14.10

[Jussi Pakkanen]

Exit gracefully on dbus error conditions.

As requested by Antti, in case of irrecoverable dbus-cpp bugs, print out an error message and exit gracefully.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/172/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/172/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

See inlined comments (r414).

review: Needs Fixing

[lp:~jpakkane/indicator-network/grace]

415. By Jussi Pakkanen on 2014-08-26

Fixed review issues.

[Jussi Pakkanen (jpakkane)]

DBus bug here: https://bugs.launchpad.net/dbus-cpp/+bug/1361642

Other issues fixed.

[Antti Kaijanmäki (kaijanmaki)]

> DBus bug here: https://bugs.launchpad.net/dbus-cpp/+bug/1361642
>
> Other issues fixed.

Thanks! please add this bug link to the catch{} section.

// @bug default timeout expired: LP(#1361642)

review: Needs Fixing

[lp:~jpakkane/indicator-network/grace]

416. By Jussi Pakkanen on 2014-08-26

Link the bug.

[Jussi Pakkanen (jpakkane)]

Added.

[Antti Kaijanmäki (kaijanmaki)]

Wunderbar!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:415
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/173/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/173/rebuild

review: Approve (continuous-integration)

=== modified file 'src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp'
--- src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-08-26 13:21:02 +0000
@@ -359,23 +359,31 @@
     /// @todo oh, and check more parameters than just the ssid
 
     core::dbus::types::ObjectPath ac;
-    if (found) {
-        ac = p->nm.activate_connection(found->object->path(),
-                p->dev.object->path(),
-                ap->object_path());
-    } else {
-        std::map<std::string, std::map<std::string, dbus::types::Variant> > conf;
-
-        /// @todo getting the ssid multiple times over dbus is stupid.
-
-        std::map<std::string, dbus::types::Variant> wireless_conf;
-        wireless_conf["ssid"] = dbus::types::Variant::encode<std::vector<std::int8_t>>(ap->get_ap().ssid->get());
-
-        conf["802-11-wireless"] = wireless_conf;
-        auto ret = p->nm.add_and_activate_connection(conf,
-                p->dev.object->path(),
-                ap->object_path());
-        ac = std::get<1>(ret);
+    try {
+        if (found) {
+            ac = p->nm.activate_connection(found->object->path(),
+                    p->dev.object->path(),
+                    ap->object_path());
+        } else {
+            std::map<std::string, std::map<std::string, dbus::types::Variant> > conf;
+
+            /// @todo getting the ssid multiple times over dbus is stupid.
+
+            std::map<std::string, dbus::types::Variant> wireless_conf;
+            wireless_conf["ssid"] = dbus::types::Variant::encode<std::vector<std::int8_t>>(ap->get_ap().ssid->get());
+
+            conf["802-11-wireless"] = wireless_conf;
+            auto ret = p->nm.add_and_activate_connection(conf,
+                    p->dev.object->path(),
+                    ap->object_path());
+            ac = std::get<1>(ret);
+        }
+    } catch(const std::exception &e) {
+        // @bug default timeout expired: LP(#1361642)
+        // If this happens, indicator-network is in an unknown state with no clear way of
+        // recovering. The only reasonable way out is a graceful exit.
+        std::cerr << __PRETTY_FUNCTION__ << " Failed to activate connection: " << e.what() << std::endl;
+        exit(0);
     }
     updateActiveConnection(ac);
     p->connecting = false;