Merge lp:~morphis/aethercast/mii-box-fixes into lp:aethercast

[Simon Fels]

Fix several issues which prevent the Mii Box from connecting

* Set GO intent to 0 to always act as group client
* Add a hook for dhclient to prevent default routes being added for p2p devices
* Fix file monitor to react on any file change as the changes-done event from glib is not reliable

The changes above will mostly like make other devices work too.

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

[lp:~morphis/aethercast/mii-box-fixes]

154. By Simon Fels on 2016-07-14

Print debug scan message only when we're successfully scanning

[Matteo Croce (teknoraver)]

review: Approve

=== modified file 'conf/CMakeLists.txt'
--- conf/CMakeLists.txt	2016-01-17 13:40:52 +0000
+++ conf/CMakeLists.txt	2016-07-14 13:38:50 +0000
@@ -8,3 +8,6 @@
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhcpd.conf
         DESTINATION /etc/aethercast/)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhclient-hook-p2p
+        DESTINATION /etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p)

=== added file 'conf/dhclient-hook-p2p'
--- conf/dhclient-hook-p2p	1970-01-01 00:00:00 +0000
+++ conf/dhclient-hook-p2p	2016-07-14 13:38:50 +0000
@@ -0,0 +1,10 @@
+case ${interface} in
+  p2p*)
+    # Prevent any default routes being applied for p2p network devices. We
+    # don't need a default route for those as we just connect to specific
+    # peers in those networks and nothing else.
+    unset new_routers
+    ;;
+  *)
+    ;;
+esac

=== modified file 'debian/aethercast.install'
--- debian/aethercast.install	2016-02-29 12:05:03 +0000
+++ debian/aethercast.install	2016-07-14 13:38:50 +0000
@@ -4,3 +4,4 @@
 etc/init/aethercast.conf
 etc/aethercast/dhcpd.conf
 etc/dbus-1/system.d/aethercast-dbus.conf
+etc/dhcp/dhclient-enter-hooks.d/aethercast-p2p

=== modified file 'src/ac/dbus/controllerskeleton.cpp'
--- src/ac/dbus/controllerskeleton.cpp	2016-06-07 08:21:20 +0000
+++ src/ac/dbus/controllerskeleton.cpp	2016-07-14 13:38:50 +0000
@@ -219,8 +219,6 @@
         return TRUE;
     }
 
-    AC_INFO("Scanning for remote devices");
-
     const auto error = inst->Scan();
     if (error != ac::Error::kNone) {
         g_dbus_method_invocation_return_error(invocation, AETHERCAST_ERROR,
@@ -228,6 +226,8 @@
         return TRUE;
     }
 
+    AC_INFO("Scanning for remote devices");
+
     g_dbus_method_invocation_return_value(invocation, nullptr);
 
     return TRUE;

=== modified file 'src/w11tng/dhcpclient.cpp'
--- src/w11tng/dhcpclient.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/dhcpclient.cpp	2016-07-14 13:38:50 +0000
@@ -76,8 +76,8 @@
     std::vector<std::string> argv = {
         // Disable background on lease (let dhclient not fork)
         "-d",
-        // Don't be verbose
-        "-q",
+        // Be verbose and not quiet on startup
+        "-v",
         // Force us to be IPv4 no matter what the default is
         "-4",
         // Use the temporary lease file we used above to not interfere

=== modified file 'src/w11tng/filemonitor.cpp'
--- src/w11tng/filemonitor.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/filemonitor.cpp	2016-07-14 13:38:50 +0000
@@ -65,7 +65,7 @@
     if (not thiz)
         return;
 
-    if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
+    if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
         return;
 
     if (auto sp = thiz->delegate_.lock())

=== modified file 'src/w11tng/networkmanager.cpp'
--- src/w11tng/networkmanager.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/networkmanager.cpp	2016-07-14 13:38:50 +0000
@@ -31,7 +31,9 @@
 // We take two minutes as timeout here which corresponds to what wpa
 // takes for the group formation.
 static const std::chrono::seconds kConnectTimeout{120};
-static constexpr std::int32_t kSourceGoIntent = 7;
+// As we play the source role we don't intent to be the group owner
+// and therefor use the lowest intent possible.
+static constexpr std::int32_t kSourceGoIntent = 0;
 }
 
 namespace w11tng {