technology: return already enabled when tethering is enabled

[framework/connectivity/connman.git] / src / rfkill.c

diff --git a/src/rfkill.c b/src/rfkill.c
index fd38db9..77c5b92 100644 (file)
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -39,6 +40,9 @@ enum rfkill_type {
        RFKILL_TYPE_UWB,
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
+       RFKILL_TYPE_GPS,
+       RFKILL_TYPE_FM,
+       NUM_RFKILL_TYPES,
 };
 
 enum rfkill_operation {
@@ -56,14 +60,53 @@ struct rfkill_event {
        uint8_t  hard;
 };
 
+static enum connman_service_type convert_type(uint8_t type)
+{
+       switch (type) {
+       case RFKILL_TYPE_WLAN:
+               return CONNMAN_SERVICE_TYPE_WIFI;
+       case RFKILL_TYPE_BLUETOOTH:
+               return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+       case RFKILL_TYPE_WIMAX:
+               return CONNMAN_SERVICE_TYPE_WIMAX;
+       case RFKILL_TYPE_WWAN:
+               return CONNMAN_SERVICE_TYPE_CELLULAR;
+       }
+
+       return CONNMAN_SERVICE_TYPE_UNKNOWN;
+}
+
+static enum rfkill_type convert_service_type(enum connman_service_type type)
+{
+       switch (type) {
+       case CONNMAN_SERVICE_TYPE_WIFI:
+               return RFKILL_TYPE_WLAN;
+       case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+               return RFKILL_TYPE_BLUETOOTH;
+       case CONNMAN_SERVICE_TYPE_WIMAX:
+               return RFKILL_TYPE_WIMAX;
+       case CONNMAN_SERVICE_TYPE_CELLULAR:
+               return RFKILL_TYPE_WWAN;
+       case CONNMAN_SERVICE_TYPE_GPS:
+               return RFKILL_TYPE_GPS;
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_VPN:
+       case CONNMAN_SERVICE_TYPE_GADGET:
+       case CONNMAN_SERVICE_TYPE_UNKNOWN:
+               return NUM_RFKILL_TYPES;
+       }
+
+       return NUM_RFKILL_TYPES;
+}
+
 static GIOStatus rfkill_process(GIOChannel *chan)
 {
-       GIOStatus status = G_IO_STATUS_NORMAL;
        unsigned char buf[32];
        struct rfkill_event *event = (void *) buf;
-       char sysname[32];
-       connman_bool_t blocked;
+       enum connman_service_type type;
        gsize len;
+       GIOStatus status;
 
        DBG("");
 
@@ -78,18 +121,23 @@ static GIOStatus rfkill_process(GIOChannel *chan)
        if (len != sizeof(struct rfkill_event))
                return status;
 
-       DBG("idx %u type %u op %u soft %u hard %u",
-                               event->idx, event->type, event->op,
-                                       event->soft, event->hard);
+       DBG("idx %u type %u op %u soft %u hard %u", event->idx,
+                                               event->type, event->op,
+                                               event->soft, event->hard);
 
-       snprintf(sysname, sizeof(sysname) - 1, "rfkill%d", event->idx);
+       type = convert_type(event->type);
 
-       blocked = (event->soft || event->hard) ? TRUE : FALSE;
-
-       switch (event->type) {
-       case RFKILL_TYPE_ALL:
-       case RFKILL_TYPE_WLAN:
-               __connman_udev_rfkill(sysname, blocked);
+       switch (event->op) {
+       case RFKILL_OP_ADD:
+               __connman_technology_add_rfkill(event->idx, type,
+                                               event->soft, event->hard);
+               break;
+       case RFKILL_OP_DEL:
+               __connman_technology_remove_rfkill(event->idx, type);
+               break;
+       case RFKILL_OP_CHANGE:
+               __connman_technology_update_rfkill(event->idx, type,
+                                               event->soft, event->hard);
                break;
        default:
                break;
@@ -101,13 +149,10 @@ static GIOStatus rfkill_process(GIOChannel *chan)
 static gboolean rfkill_event(GIOChannel *chan,
                                GIOCondition cond, gpointer data)
 {
-       GIOStatus status;
-
        if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
                return FALSE;
 
-       status = rfkill_process(chan);
-       if (status == G_IO_STATUS_ERROR)
+       if (rfkill_process(chan) == G_IO_STATUS_ERROR)
                return FALSE;
 
        return TRUE;
@@ -115,6 +160,37 @@ static gboolean rfkill_event(GIOChannel *chan,
 
 static GIOChannel *channel = NULL;
 
+int __connman_rfkill_block(enum connman_service_type type, connman_bool_t block)
+{
+       uint8_t rfkill_type;
+       struct rfkill_event event;
+       ssize_t len;
+       int fd;
+
+       DBG("type %d block %d", type, block);
+
+       rfkill_type = convert_service_type(type);
+       if (rfkill_type == NUM_RFKILL_TYPES)
+               return -EINVAL;
+
+       fd = open("/dev/rfkill", O_RDWR | O_CLOEXEC);
+       if (fd < 0)
+               return fd;
+
+       memset(&event, 0, sizeof(event));
+       event.op = RFKILL_OP_CHANGE_ALL;
+       event.type = rfkill_type;
+       event.soft = block;
+
+       len = write(fd, &event, sizeof(event));
+       if (len < 0)
+               connman_error("Failed to change RFKILL state");
+
+       close(fd);
+
+       return 0;
+}
+
 int __connman_rfkill_init(void)
 {
        GIOFlags flags;
@@ -122,7 +198,7 @@ int __connman_rfkill_init(void)
 
        DBG("");
 
-       fd = open("/dev/rfkill", O_RDWR);
+       fd = open("/dev/rfkill", O_RDWR | O_CLOEXEC);
        if (fd < 0) {
                connman_error("Failed to open RFKILL control device");
                return -EIO;
@@ -131,13 +207,15 @@ int __connman_rfkill_init(void)
        channel = g_io_channel_unix_new(fd);
        g_io_channel_set_close_on_unref(channel, TRUE);
 
+       g_io_channel_set_encoding(channel, NULL, NULL);
+       g_io_channel_set_buffered(channel, FALSE);
+
        flags = g_io_channel_get_flags(channel);
        flags |= G_IO_FLAG_NONBLOCK;
        g_io_channel_set_flags(channel, flags, NULL);
 
        /* Process current RFKILL events sent on device open */
-       while (rfkill_process(channel) == G_IO_STATUS_NORMAL)
-               ;
+       while (rfkill_process(channel) == G_IO_STATUS_NORMAL);
 
        g_io_add_watch(channel, G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
                                                        rfkill_event, NULL);