Merge lp:~morphis/aethercast/mtk-miracast-mode into lp:aethercast

[Simon Fels]

Use a different network device on some devices for sending private driver commands

On devices where we have a dedicated p2p network interface we need to use the real wifi network interface to send private commands to the driver. Otherwise they can't be handled by the driver for the p2p network interface.

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve (code)

[lp:~morphis/aethercast/mtk-miracast-mode]

150. By Simon Fels on 2016-07-14

Move variable definition to avoid merge conflict

151. By Simon Fels on 2016-07-20

Prevent crash on interface setup

=== modified file 'conf/aethercast.conf.in'
--- conf/aethercast.conf.in	2016-05-31 13:43:18 +0000
+++ conf/aethercast.conf.in	2016-07-20 12:32:23 +0000
@@ -17,6 +17,12 @@
 			# not cause any for those which doesn't need any firmware as
 			# the Android WiFi firmware loader should just pass through
 			export AETHERCAST_NEED_FIRMWARE=1
+
+			# Not optimal but works for all devices we support right
+			# now. Generally if something uses a dedicated p2p device we
+			# we need to use the real wifi device to send any private
+			# commands to the driver.
+			export AETHERCAST_DRIVER_CMD_IFACE=`getprop wifi.interface`
 		fi
 	fi
 

=== modified file 'src/w11tng/networkmanager.cpp'
--- src/w11tng/networkmanager.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/networkmanager.cpp	2016-07-20 12:32:23 +0000
@@ -166,6 +166,8 @@
 
     if (mgmt_interface_)
         mgmt_interface_.reset();
+
+    driver_cmd_iface_.clear();
 }
 
 void NetworkManager::SetDelegate(ac::NetworkManager::Delegate *delegate) {
@@ -429,8 +431,8 @@
     device->SetState(state);
 
     if (state == ac::kDisconnected) {
-        if (ac::NetworkUtils::SendDriverPrivateCommand(mgmt_interface_->Ifname(),
-                                                        BuildMiracastModeCommand(MiracastMode::kOff)) < 0)
+        if (ac::NetworkUtils::SendDriverPrivateCommand(driver_cmd_iface_,
+                                                       BuildMiracastModeCommand(MiracastMode::kOff)) < 0)
             AC_DEBUG("Failed to disable WiFi driver miracast mode (not supported?)");
         else
             AC_DEBUG("Disabled WiFi driver miracast mode");
@@ -687,6 +689,8 @@
 }
 
 void NetworkManager::OnManagementInterfaceReady() {
+    driver_cmd_iface_ = ac::Utils::GetEnvValue("AETHERCAST_DRIVER_CMD_IFACE",
+                                               mgmt_interface_->Ifname());
 }
 
 std::string NetworkManager::BuildMiracastModeCommand(MiracastMode mode) {
@@ -702,8 +706,8 @@
     // Android WiFi drivers have a special mode build in when they should
     // perform well for Miracast which we enable here. If the command is
     // not available this is a no-op.
-    if (ac::NetworkUtils::SendDriverPrivateCommand(mgmt_interface_->Ifname(),
-                                                    BuildMiracastModeCommand(MiracastMode::kSource)) < 0)
+    if (ac::NetworkUtils::SendDriverPrivateCommand(driver_cmd_iface_,
+                                                   BuildMiracastModeCommand(MiracastMode::kSource)) < 0)
         AC_WARNING("Failed to activate miracast mode of WiFi driver (not supported?)");
     else
         AC_DEBUG("Enabled WiFi driver miracast mode");

=== modified file 'src/w11tng/networkmanager.h'
--- src/w11tng/networkmanager.h	2016-05-19 05:24:46 +0000
+++ src/w11tng/networkmanager.h	2016-07-20 12:32:23 +0000
@@ -148,6 +148,7 @@
     ac::NetworkManager::Delegate *delegate_;
     std::shared_ptr<ManagerStub> manager_;
     std::shared_ptr<InterfaceStub> mgmt_interface_;
+    std::string driver_cmd_iface_;
     std::shared_ptr<P2PDeviceStub> p2p_device_;
     std::unordered_map<std::string,w11tng::NetworkDevice::Ptr> devices_;
     NetworkDevice::Ptr current_device_;