Merge lp:~morphis/aethercast/add-urfkill-support into lp:aethercast

[Simon Fels]

Add URfkill support to manage kill switches on selected devices

Some devices don't use the rfkill provided from the kernel to managed the kill state of WiFi. They are using a libhardware_legacy from Android through libhybris to manage the WiFi power state. We have to use urfkill in those cases rather than relying on the rfkill provided from the kernel.

Fixes LP #1579676

Add URfkill support to manage kill switches on selected devices

Some devices don't use the rfkill provided from the kernel to managed the kill state of WiFi. They are using a libhardware_legacy from Android through libhybris to manage the WiFi power state. We have to use urfkill in those cases rather than relying on the rfkill provided from the kernel.

Unmerged revisions

153. By Simon Fels on 2016-06-27

w11tng: refactor rfkill manager into a kernel specific and base class

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-05-19 10:36:36 +0000
+++ src/CMakeLists.txt	2016-06-28 08:31:28 +0000
@@ -120,6 +120,7 @@
 
   w11tng/networkmanager.cpp
   w11tng/rfkillmanager.cpp
+  w11tng/kernelrfkillmanager.cpp
   w11tng/networkdevice.cpp
   w11tng/interfaceselector.cpp
   w11tng/p2pdevicestub.cpp

=== modified file 'src/w11tng/networkmanager.cpp'
--- src/w11tng/networkmanager.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/networkmanager.cpp	2016-06-28 08:31:28 +0000
@@ -24,8 +24,9 @@
 #include <ac/keep_alive.h>
 #include <ac/networkutils.h>
 
-#include "networkmanager.h"
-#include "informationelement.h"
+#include "w11tng/networkmanager.h"
+#include "w11tng/informationelement.h"
+#include "w11tng/kernelrfkillmanager.h"
 
 namespace {
 // We take two minutes as timeout here which corresponds to what wpa
@@ -51,7 +52,7 @@
         return sp;
     }
 
-    rfkill_manager_ = RfkillManager::Create();
+    rfkill_manager_ = KernelRfkillManager::Create();
     rfkill_manager_->SetDelegate(sp);
 
     return sp;

=== modified file 'src/w11tng/rfkillmanager.cpp'
--- src/w11tng/rfkillmanager.cpp	2016-05-19 05:24:46 +0000
+++ src/w11tng/rfkillmanager.cpp	2016-06-28 08:31:28 +0000
@@ -15,78 +15,10 @@
  *
  */
 
-#include <string.h>
-#include <errno.h>
-
-#include "ac/logger.h"
-#include "ac/keep_alive.h"
-
-#include "rfkillmanager.h"
-
-namespace {
-constexpr const char *kDevRfkillPath{"/dev/rfkill"};
-
-struct RfkillEvent {
-    uint32_t idx;
-    uint8_t type;
-    uint8_t op;
-    uint8_t soft;
-    uint8_t hard;
-};
-
-enum RfkillOp {
-    kRfkillOpAdd = 0,
-    kRfkillOpDel,
-    kRfkillOpChange,
-    kRfkillOpChangeAll,
-};
-}
+#include "w11tng/rfkillmanager.h"
 
 namespace w11tng {
-
-RfkillManager::Ptr RfkillManager::Create() {
-    return std::shared_ptr<RfkillManager>(new RfkillManager)->FinalizeConstruction();
-}
-
-RfkillManager::RfkillManager() :
-    watch_(0) {
-}
-
 RfkillManager::~RfkillManager() {
-    if (watch_)
-        g_source_remove(watch_);
-}
-
-RfkillManager::Ptr RfkillManager::FinalizeConstruction() {
-    auto sp = shared_from_this();
-
-    auto fd = ::open(kDevRfkillPath, O_RDWR | O_CLOEXEC);
-    if (fd < 0) {
-        AC_ERROR("Failed to open rfkill device at %s: %s",
-                  kDevRfkillPath, ::strerror(errno));
-        return sp;
-    }
-
-    channel_.reset(g_io_channel_unix_new(fd));
-    g_io_channel_set_close_on_unref(channel_.get(), TRUE);
-    g_io_channel_set_encoding(channel_.get(), nullptr, nullptr);
-    g_io_channel_set_buffered(channel_.get(), FALSE);
-
-    int flags = g_io_channel_get_flags(channel_.get());
-    flags |= G_IO_FLAG_NONBLOCK;
-    g_io_channel_set_flags(channel_.get(), GIOFlags(flags), nullptr);
-
-    // We're reading the current state of all rfkill items to make sure
-    // have everything in sync
-    while (ProcessRfkillEvents());
-
-    watch_ = g_io_add_watch_full(channel_.get(), G_PRIORITY_DEFAULT,
-                GIOCondition(G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR),
-                OnRfkillEvent,
-                new ac::WeakKeepAlive<RfkillManager>(sp),
-                [](gpointer user_data) { delete static_cast<ac::WeakKeepAlive<RfkillManager>*>(user_data); });
-
-    return sp;
 }
 
 void RfkillManager::SetDelegate(const std::weak_ptr<Delegate> &delegate) {
@@ -96,60 +28,4 @@
 void RfkillManager::ResetDelegate() {
     delegate_.reset();
 }
-
-bool RfkillManager::IsBlocked(const Type &type) {
-    if (block_status_.find(type) == block_status_.end())
-        return false;
-
-    return block_status_[type];
-}
-
-bool RfkillManager::ProcessRfkillEvents() {
-    RfkillEvent event;
-    ::memset(&event, 0, sizeof(RfkillEvent));
-
-    gsize len = 0;
-    auto status = g_io_channel_read_chars(channel_.get(), reinterpret_cast<gchar*>(&event),
-                                          sizeof(RfkillEvent),
-                                          &len, nullptr);
-
-    if (status != G_IO_STATUS_NORMAL)
-        return false;
-
-    if (len != sizeof(RfkillEvent))
-        return false;
-
-    auto type = static_cast<Type>(event.type);
-
-    switch (event.op) {
-    case RfkillOp::kRfkillOpAdd:
-    case RfkillOp::kRfkillOpChange:
-
-        block_status_[type] = (event.soft || event.hard);
-
-        AC_DEBUG("rfkill type %d is now %s",
-                  static_cast<int>(event.type),
-                  block_status_[type] ? "blocked" : "not blocked");
-
-        if (auto sp = delegate_.lock())
-            sp->OnRfkillChanged(type);
-        break;
-    default:
-        break;
-    }
-
-    return true;
-}
-
-gboolean RfkillManager::OnRfkillEvent(GIOChannel *channel, GIOCondition cond, gpointer data) {
-    auto thiz = static_cast<ac::WeakKeepAlive<RfkillManager>*>(data)->GetInstance().lock();
-    if (!thiz)
-        return FALSE;
-
-    if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
-        return FALSE;
-
-    return static_cast<gboolean>(thiz->ProcessRfkillEvents());
-}
-
 } // namespace w11tng

=== modified file 'src/w11tng/rfkillmanager.h'
--- src/w11tng/rfkillmanager.h	2016-05-19 05:24:46 +0000
+++ src/w11tng/rfkillmanager.h	2016-06-28 08:31:28 +0000
@@ -18,23 +18,13 @@
 #ifndef W11TNG_RFKILL_MANAGER_H_
 #define W11TNG_RFKILL_MANAGER_H_
 
-#include <memory>
-#include <map>
-
 #include "ac/non_copyable.h"
 #include "ac/glib_wrapper.h"
 
+#include <memory>
+
 namespace w11tng {
-
-template<typename T>
-struct GIOChannelDeleter {
-    void operator()(T *object) const {
-        if (object)
-            g_io_channel_unref(object);
-    }
-};
-
-class RfkillManager : public std::enable_shared_from_this<RfkillManager> {
+class RfkillManager {
 public:
     typedef std::shared_ptr<RfkillManager> Ptr;
 
@@ -53,29 +43,16 @@
         virtual void OnRfkillChanged(const Type &type) = 0;
     };
 
-    static Ptr Create();
-
-    ~RfkillManager();
+    virtual ~RfkillManager();
 
     void SetDelegate(const std::weak_ptr<Delegate> &delegate);
     void ResetDelegate();
 
-    bool IsBlocked(const Type &type);
-
-private:
-    RfkillManager();
-
-    Ptr FinalizeConstruction();
-
-    bool ProcessRfkillEvents();
-
-    static gboolean OnRfkillEvent(GIOChannel *channel, GIOCondition cond, gpointer data);
-
-private:
+    virtual bool IsBlocked(const Type &type) = 0;
+
+protected:
     std::weak_ptr<Delegate> delegate_;
-    std::unique_ptr<GIOChannel, GIOChannelDeleter<GIOChannel>> channel_;
-    guint watch_;
-    std::map<Type,bool> block_status_;
+
 };
 } // namespace w11tng