static gchar **device_filter = NULL;
static gchar **nodevice_filter = NULL;
+#if defined TIZEN_EXT
+static DBusConnection *connection;
+#endif
+
enum connman_pending_type {
PENDING_NONE = 0,
PENDING_ENABLE = 1,
time_t last_user_selection_time;
char *last_user_selection_ident;
char *last_connected_ident;
+ DBusMessage *pending_reply;
+ int max_scan_ssids;
+ bool is_5_0_ghz_supported;
#endif
};
static void clear_pending_trigger(struct connman_device *device)
{
+#if defined TIZEN_EXT
+ if (device->pending_reply) {
+ dbus_message_unref(device->pending_reply);
+ device->pending_reply = NULL;
+ }
+#endif
if (device->pending_timeout > 0) {
g_source_remove(device->pending_timeout);
device->pending_timeout = 0;
DBG("device %p", device);
+#if defined TIZEN_EXT
+ DBusMessage *reply;
+
+ /* Power request timed out, send ETIMEDOUT. */
+ if (device->pending_reply) {
+ reply = __connman_error_failed(device->pending_reply, ETIMEDOUT);
+ if (reply)
+ g_dbus_send_message(connection, reply);
+
+ dbus_message_unref(device->pending_reply);
+ device->pending_reply = NULL;
+ }
+#endif
/* Power request timedout, reset power pending state. */
device->pending_timeout = 0;
device->powered_pending = PENDING_NONE;
g_free(device);
}
+#if defined TIZEN_EXT
+static void device_send_changed(const char *ifname, enum connman_service_type type,
+ const char *key, bool state)
+{
+ DBusMessage *signal;
+ DBusMessageIter iter, dict;
+ dbus_bool_t value = state;
+ const char *tech_path = connman_techonology_get_path(type);
+
+ if (!tech_path || !ifname)
+ return;
+
+ DBG("%s %s %s", ifname, key, state ? "TRUE" : "FALSE");
+
+ signal = dbus_message_new_signal(tech_path,
+ CONNMAN_TECHNOLOGY_INTERFACE, "DeviceChanged");
+ if (!signal)
+ return;
+
+ dbus_message_iter_init_append(signal, &iter);
+
+ connman_dbus_dict_open(&iter, &dict);
+ connman_dbus_dict_append_basic(&dict, "Ifname",
+ DBUS_TYPE_STRING,
+ &ifname);
+ connman_dbus_dict_append_basic(&dict, key,
+ DBUS_TYPE_BOOLEAN,
+ &value);
+ connman_dbus_dict_close(&iter, &dict);
+
+ dbus_connection_send(connection, signal, NULL);
+ dbus_message_unref(signal);
+}
+
+static void device_send_reply(struct connman_device *device)
+{
+ if (device->pending_reply) {
+ g_dbus_send_reply(connection,
+ device->pending_reply, DBUS_TYPE_INVALID);
+ dbus_message_unref(device->pending_reply);
+ device->pending_reply = NULL;
+ }
+}
+#endif
+
/**
* connman_device_create:
* @node: device node name (for example an address)
if (device->powered == powered)
return -EALREADY;
+#if defined TIZEN_EXT
+ device_send_reply(device);
+#endif
+
clear_pending_trigger(device);
device->powered_pending = PENDING_NONE;
type = __connman_device_get_service_type(device);
+#if defined TIZEN_EXT
+ device_send_changed(device->interface, type, "Powered", powered);
+ technology_save_device(device);
+#endif
+
if (!device->powered) {
__connman_technology_disabled(type);
return 0;
return g_hash_table_lookup(device->networks, identifier);
}
+#if defined TIZEN_EXT
+struct connman_network *connman_device_get_default_network(
+ struct connman_device *device)
+{
+ return device->network;
+}
+
+void connman_device_set_pending_reply(struct connman_device *device,
+ DBusMessage *msg)
+{
+ device->pending_reply = dbus_message_ref(msg);
+}
+
+void connman_device_send_connected_signal(struct connman_device *device,
+ bool connected)
+{
+ enum connman_service_type type;
+
+ if (!device)
+ return;
+
+ type = __connman_device_get_service_type(device);
+ device_send_changed(device->interface, type, "Connected", connected);
+}
+
+void connman_device_set_max_scan_ssids(struct connman_device *device,
+ int max_scan_ssids)
+{
+ device->max_scan_ssids = max_scan_ssids;
+}
+
+int connman_device_get_max_scan_ssids(struct connman_device *device)
+{
+ return device->max_scan_ssids;
+}
+
+void connman_device_set_wifi_5ghz_supported(struct connman_device *device,
+ bool is_5_0_ghz_supported)
+{
+ device->is_5_0_ghz_supported = is_5_0_ghz_supported;
+}
+
+bool connman_device_get_wifi_5ghz_supported(struct connman_device *device)
+{
+ return device->is_5_0_ghz_supported;
+}
+#endif
+
/**
* connman_device_remove_network:
* @device: device structure
}
int __connman_device_request_specific_scan(enum connman_service_type type,
- int scan_type, GSList *specific_scan_list)
+ const char *ifname, int scan_type, GSList *specific_scan_list)
{
bool success = false;
int last_err = -ENOSYS;
continue;
}
+ if (ifname && g_strcmp0(device->interface, ifname) != 0)
+ continue;
+
err = device_specific_scan(type, device, scan_type, specific_scan_list);
if (err == 0 || err == -EINPROGRESS) {
success = true;
return last_err;
}
+int connman_device_request_device_scan(enum connman_service_type type,
+ const char * ifname, bool force_full_scan)
+{
+ bool success = false;
+ int last_err = -ENOSYS;
+ GSList *list;
+ int err;
+
+ switch (type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ case CONNMAN_SERVICE_TYPE_SYSTEM:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ case CONNMAN_SERVICE_TYPE_GPS:
+ case CONNMAN_SERVICE_TYPE_VPN:
+ case CONNMAN_SERVICE_TYPE_GADGET:
+ return -EOPNOTSUPP;
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+ case CONNMAN_SERVICE_TYPE_MESH:
+#endif
+ break;
+ }
+
+ for (list = device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ if (!device_has_service_type(device, type))
+ continue;
+
+ if (g_strcmp0(device->interface, ifname) != 0)
+ continue;
+
+ err = device_scan(type, device, force_full_scan);
+
+ if (err == 0 || err == -EINPROGRESS) {
+ success = true;
+ } else {
+ last_err = err;
+ DBG("device %p err %d", device, err);
+ }
+ break;
+ }
+
+ if (success)
+ return 0;
+
+ return last_err;
+}
+
#if defined TIZEN_EXT_WIFI_MESH
static int device_abort_scan(enum connman_service_type type,
struct connman_device *device)
{
DBG("");
+#if defined TIZEN_EXT
+ connection = connman_dbus_get_connection();
+#endif
+
if (device)
device_filter = g_strsplit(device, ",", -1);
g_strfreev(nodevice_filter);
g_strfreev(device_filter);
+
+#if defined TIZEN_EXT
+ dbus_connection_unref(connection);
+#endif
}
#if defined TIZEN_EXT
#include <stdio.h>
#include <stdlib.h>
+#include <net/if.h>
#endif
#include <gdbus.h>
static bool global_offlinemode;
#if defined TIZEN_EXT
-static connman_scan_type_e g_scan_type = -1;
+struct connman_scan_pending {
+ char *ifname;
+ connman_scan_type_e scan_type;
+ DBusMessage *msg;
+};
+
+struct connman_bssid_pending {
+ char *ifname;
+ unsigned char bssid[6];
+};
#endif
struct connman_rfkill {
bool softblocked;
bool hardblocked;
bool dbus_registered;
+#if defined TIZEN_EXT
+ char **enabled_devices;
+#endif
#if defined TIZEN_EXT_WIFI_MESH
DBusMessage *mesh_dbus_msg;
#endif
-#if defined TIZEN_EXT
- bool is_5_0_ghz_supported;
- int max_scan_ssids;
-#endif
};
static GSList *driver_list = NULL;
}
#if defined TIZEN_EXT
-void connman_techonology_wifi_set_5ghz_supported(struct connman_technology *wifi_technology,
- bool is_5_0_ghz_supported)
+const char *connman_techonology_get_path(enum connman_service_type type)
{
- DBG("");
+ struct connman_technology *technology = technology_find(type);
+
+ if (!technology)
+ return NULL;
- wifi_technology->is_5_0_ghz_supported = is_5_0_ghz_supported;
+ return technology->path;
}
#endif
if (!identifier)
goto done;
+#ifdef TIZEN_EXT
+ gsize length;
+ technology->enabled_devices = g_key_file_get_string_list(keyfile,
+ identifier, "Enable.Devices", &length, NULL);
+ if (technology->enabled_devices && length == 0) {
+ g_strfreev(technology->enabled_devices);
+ technology->enabled_devices = NULL;
+ }
+#endif
+
enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
if (!error)
technology->enable_persistent = enable;
return offlinemode;
}
+#if defined TIZEN_EXT
+static void append_devices(DBusMessageIter *iter, void *user_data)
+{
+ GSList *list;
+ dbus_bool_t val;
+ struct connman_technology *technology = user_data;
+
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ const char *str = connman_device_get_string(device, "Interface");
+ struct connman_network *network = connman_device_get_default_network(device);
+ struct connman_service *service = connman_service_lookup_from_network(network);
+
+ connman_dbus_dict_append_basic(iter, "Ifname",
+ DBUS_TYPE_STRING, &str);
+
+ val = connman_device_get_powered(device);
+ connman_dbus_dict_append_basic(iter, "Powered",
+ DBUS_TYPE_BOOLEAN, &val);
+
+ if (__connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV4) ||
+ __connman_service_is_connected_state(service, CONNMAN_IPCONFIG_TYPE_IPV6))
+ val = TRUE;
+ else
+ val = FALSE;
+
+ connman_dbus_dict_append_basic(iter, "Connected",
+ DBUS_TYPE_BOOLEAN, &val);
+
+ str = connman_device_get_string(device, "Address");
+ connman_dbus_dict_append_basic(iter, "MAC.Address",
+ DBUS_TYPE_STRING, &str);
+ }
+}
+#endif
+
static void append_properties(DBusMessageIter *iter,
struct connman_technology *technology)
{
connman_dbus_dict_append_basic(&dict, "TetheringPassphrase",
DBUS_TYPE_STRING,
&technology->tethering_passphrase);
-
+#if defined TIZEN_EXT
+ if (technology->type == CONNMAN_SERVICE_TYPE_WIFI)
+ connman_dbus_dict_append_dict(&dict, "Device.List",
+ append_devices, technology);
+#endif
connman_dbus_dict_close(iter, &dict);
}
}
#if defined TIZEN_EXT
-int set_connman_bssid(enum bssid_type mode, char *bssid)
+int set_connman_bssid(enum bssid_type mode, char *bssid, const char *ifname)
{
- static unsigned char bssid_for_connect[6];
static int bssid_len;
+ static const char *def_ifname = "default";
+ static GSList *bssid_list = NULL;
+ GSList *list;
+ const char *local_ifname = ifname;
+ bool found = false;
+ struct connman_bssid_pending *bssid_info;
- DBG("mode : %d", mode);
+ DBG("mode: %d, ifname: %s", mode, ifname);
+
+ if (!ifname)
+ local_ifname = def_ifname;
+
+ for (list = bssid_list; list; list = list->next) {
+ bssid_info = list->data;
+
+ if (g_strcmp0(bssid_info->ifname, local_ifname) == 0) {
+ found = true;
+ break;
+ }
+ }
if (mode == CHECK_BSSID) {
- return bssid_len;
+ if (found)
+ return 6;
+
+ return 0;
}
if (mode == GET_BSSID && bssid) {
- memcpy(bssid, bssid_for_connect, 6);
- return bssid_len;
+ if (found) {
+ memcpy(bssid, bssid_info->bssid, 6);
+ return 6;
+ }
+ return 0;
}
if (mode == RESET_BSSID) {
- bssid_len = 0;
- return bssid_len;
+ if (found) {
+ bssid_list = g_slist_remove(bssid_list, bssid_info);
+ g_free(bssid_info->ifname);
+ g_free(bssid_info);
+ }
+ return 0;
}
if (mode != SET_BSSID || !bssid) {
return 0;
}
+ if (found) {
+ bssid_list = g_slist_remove(bssid_list, bssid_info);
+ g_free(bssid_info->ifname);
+ g_free(bssid_info);
+ }
+
+ bssid_info = g_try_malloc0(sizeof(struct connman_bssid_pending));
+ if (!bssid_info) {
+ DBG("Failed to allocate memory");
+ return 0;
+ }
+
+ unsigned char *bssid_data = bssid_info->bssid;
+
bssid_len = sscanf(bssid, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
- &bssid_for_connect[0], &bssid_for_connect[1], &bssid_for_connect[2],
- &bssid_for_connect[3], &bssid_for_connect[4], &bssid_for_connect[5]);
+ &bssid_data[0], &bssid_data[1], &bssid_data[2],
+ &bssid_data[3], &bssid_data[4], &bssid_data[5]);
if (bssid_len != 6) {
DBG("Incorrect BSSID format. bssid_len = %d", bssid_len);
- bssid_len = 0;
+ g_free(bssid_info);
+ return 0;
}
- DBG("SET BSSID len : %d, BSSID : %02x:%02x:%02x:%02x:%02x:%02x", bssid_len,
- bssid_for_connect[0], bssid_for_connect[1], bssid_for_connect[2],
- bssid_for_connect[3], bssid_for_connect[4], bssid_for_connect[5]);
+ DBG("SET BSSID len: %d, BSSID: %02x:%02x:%02x:%02x:%02x:%02x ifname: %s",
+ bssid_len,
+ bssid_data[0], bssid_data[1], bssid_data[2],
+ bssid_data[3], bssid_data[4], bssid_data[5],
+ ifname);
+
+ bssid_info->ifname = g_strdup(ifname);
+ bssid_list = g_slist_prepend(bssid_list, bssid_info);
return bssid_len;
}
dbus_message_iter_get_basic(&value, &key);
DBG("BSSID %s", key);
- set_connman_bssid(SET_BSSID, key);
+ set_connman_bssid(SET_BSSID, key, NULL);
#endif
} else
return __connman_error_invalid_property(msg);
DBG("technology %p err %d", technology, err);
while (technology->scan_pending) {
+#if defined TIZEN_EXT
+ struct connman_scan_pending *pending_data = technology->scan_pending->data;
+ DBusMessage *msg = pending_data->msg;
+#else
DBusMessage *msg = technology->scan_pending->data;
-
+#endif
DBG("reply to %s", dbus_message_get_sender(msg));
if (err == 0)
technology->scan_pending =
g_slist_delete_link(technology->scan_pending,
technology->scan_pending);
+#if defined TIZEN_EXT
+ g_free(pending_data->ifname);
+ g_free(pending_data);
+#endif
}
}
return result;
dbus_message_iter_init_append(signal, &iter);
- connman_dbus_property_append_basic(&iter, key, DBUS_TYPE_BOOLEAN, val);
+ if (key)
+ connman_dbus_property_append_basic(&iter, key, DBUS_TYPE_BOOLEAN, val);
+ else
+ connman_dbus_property_append_basic(&iter, "", DBUS_TYPE_BOOLEAN, val);
result = dbus_connection_send(connection, signal, NULL);
dbus_message_unref(signal);
return result;
}
-void __connman_technology_notify_scan_done(int val)
+void __connman_technology_notify_scan_done(const char *ifname, int val)
{
DBG("");
DBusMessage *signal;
return;
dbus_message_iter_init_append(signal, &iter);
- connman_dbus_property_append_basic(&iter, "Scantype",
- DBUS_TYPE_INT32, &val);
+ if (ifname)
+ connman_dbus_property_append_basic(&iter, ifname,
+ DBUS_TYPE_INT32, &val);
+ else
+ connman_dbus_property_append_basic(&iter, "",
+ DBUS_TYPE_INT32, &val);
dbus_connection_send(connection, signal, NULL);
dbus_message_unref(signal);
- DBG("Successfuly sent signal");
+ DBG("Successfuly sent ScanDone signal");
+}
+
+static void reply_scan_pending_device(
+ struct connman_technology *technology, const char *ifname, int count)
+{
+ DBusMessage *reply;
+ GSList *list;
+ dbus_bool_t status = 0;
+ connman_scan_type_e scan_type = CONNMAN_SCAN_TYPE_UNKNOWN;
+
+ DBG("technology %p ifname %d count %d", technology, ifname, count);
+
+ list = technology->scan_pending;
+
+ while (list) {
+ struct connman_scan_pending *pending_data = list->data;
+ DBusMessage *msg = pending_data->msg;
+ list = list->next;
+
+ if (scan_type == CONNMAN_SCAN_TYPE_UNKNOWN)
+ scan_type = pending_data->scan_type;
+
+ if (count != 0 && g_strcmp0(pending_data->ifname, ifname) != 0)
+ continue;
+
+ scan_type = pending_data->scan_type;
+
+ DBG("reply to %s", dbus_message_get_sender(msg));
+ reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+ g_dbus_send_message(connection, reply);
+ dbus_message_unref(msg);
+
+ technology->scan_pending =
+ g_slist_remove(technology->scan_pending, pending_data);
+
+ g_free(pending_data->ifname);
+ g_free(pending_data);
+ }
+
+ if (scan_type == CONNMAN_SCAN_TYPE_UNKNOWN)
+ scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+
+ __connman_technology_notify_scan_changed(ifname, &status);
+ __connman_technology_notify_scan_done(ifname, scan_type);
+}
+
+static void __connman_technology_notify_device_detected(
+ struct connman_technology *technology, const char *ifname, bool val)
+{
+ DBG("");
+ DBusMessage *signal;
+ DBusMessageIter iter;
+ dbus_bool_t detected = val;
+
+ if (!ifname)
+ return;
+
+ signal = dbus_message_new_signal(technology->path,
+ CONNMAN_TECHNOLOGY_INTERFACE, "DeviceDetected");
+ if (!signal)
+ return;
+
+ dbus_message_iter_init_append(signal, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &ifname);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &detected);
+
+ dbus_connection_send(connection, signal, NULL);
+ dbus_message_unref(signal);
+
+ DBG("Successfuly sent DeviceDetected signal");
}
#endif
DBG("device %p", device);
#if defined TIZEN_EXT
dbus_bool_t status = 1;
- __connman_technology_notify_scan_changed("scan_started", &status);
+ const char *ifname = connman_device_get_string(device, "Interface");
+
+ __connman_technology_notify_scan_changed(ifname, &status);
#endif
}
}
#if defined TIZEN_EXT
- if (count == 0) {
- dbus_bool_t status = 0;
-
- __connman_technology_notify_scan_changed("scan_done", &status);
- __connman_technology_notify_scan_done((int)g_scan_type);
- reply_scan_pending(technology, 0);
+ const char *ifname = connman_device_get_string(device, "Interface");
+ reply_scan_pending_device(technology, ifname, count);
- DBG("Successfuly sent ScanDone signal");
- }
-#else
+ return;
+#endif
if (count == 0)
reply_scan_pending(technology, 0);
-#endif
}
void __connman_technology_notify_regdom_by_device(struct connman_device *device,
!technology->enabled)
return __connman_error_permission_denied(msg);
- dbus_message_ref(msg);
#if !defined TIZEN_EXT
+ dbus_message_ref(msg);
technology->scan_pending =
g_slist_prepend(technology->scan_pending, msg);
#endif
#endif
#if defined TIZEN_EXT
- if (err == 0) {
- g_scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
- DBG("g_scan_type %d", g_scan_type);
- }
+ struct connman_scan_pending *pending_data =
+ g_try_malloc0(sizeof(struct connman_scan_pending));
+ if (!pending_data)
+ return __connman_error_failed(msg, ENOMEM);
+
+ pending_data->scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+ DBG("scan_type %d", pending_data->scan_type);
+
+ pending_data->msg = dbus_message_ref(msg);
+
technology->scan_pending =
- g_slist_prepend(technology->scan_pending, msg);
+ g_slist_prepend(technology->scan_pending, pending_data);
#endif
return NULL;
}
#if defined TIZEN_EXT
+static DBusMessage *scan_device(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+ struct connman_technology *technology = data;
+ DBusMessageIter iter;
+ const char *ifname;
+ int err;
+
+ DBG("technology %p request from %s", technology,
+ dbus_message_get_sender(msg));
+
+ if (!dbus_message_iter_init(msg, &iter))
+ return __connman_error_invalid_arguments(msg);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_get_basic(&iter, &ifname);
+ DBG("Interface name %s", ifname);
+
+ if (!ifname || strlen(ifname) == 0)
+ return __connman_error_invalid_arguments(msg);
+
+ err = connman_device_request_device_scan(technology->type, ifname, true);
+ if (err < 0)
+ return __connman_error_failed(msg, -err);
+
+ struct connman_scan_pending *pending_data =
+ g_try_malloc0(sizeof(struct connman_scan_pending));
+ if (!pending_data)
+ return __connman_error_failed(msg, ENOMEM);
+
+ pending_data->ifname = g_strdup(ifname);
+ if (pending_data->ifname == NULL) {
+ g_free(pending_data);
+ return __connman_error_failed(msg, ENOMEM);
+ }
+
+ pending_data->scan_type = CONNMAN_SCAN_TYPE_FULL_CHANNEL;
+ DBG("scan_type %d", pending_data->scan_type);
+
+ pending_data->msg = dbus_message_ref(msg);
+
+ technology->scan_pending =
+ g_slist_prepend(technology->scan_pending, pending_data);
+
+ return NULL;
+}
+
static DBusMessage *specific_scan(DBusConnection *conn, DBusMessage *msg, void *data)
{
struct connman_technology *technology = data;
int scan_type = 0;
const char *name = NULL;
const char *freq = NULL;
+ const char *ifname = NULL;
DBusMessageIter iter, dict;
int err;
dbus_message_iter_recurse(&entry, &value2);
type = dbus_message_iter_get_arg_type(&value2);
- if (g_str_equal(key, "SSID")) {
+ if (g_str_equal(key, "Ifname") && type == DBUS_TYPE_STRING) {
+
+ dbus_message_iter_get_basic(&value2, &ifname);
+ DBG("ifname %s", ifname);
+ } else if (g_str_equal(key, "SSID")) {
if (type != DBUS_TYPE_STRING) {
g_slist_free_full(specific_scan_list, g_free);
return __connman_error_invalid_arguments(msg);
scan_type = CONNMAN_MULTI_SCAN_SSID_FREQ; /* SSID & Frequency mixed scan */
dbus_message_iter_get_basic(&value2, &name);
- connman_multi_scan_ap_s *ap = (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
+ connman_multi_scan_ap_s *ap =
+ (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
if (ap) {
g_strlcpy(ap->str, name, strlen(name) + 1);
ap->flag = true;
scan_type = CONNMAN_MULTI_SCAN_SSID_FREQ; /* SSID & Frequency mixed scan */
dbus_message_iter_get_basic(&value2, &freq);
- connman_multi_scan_ap_s *ap = (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
+ connman_multi_scan_ap_s *ap =
+ (connman_multi_scan_ap_s*)g_try_malloc0(sizeof(connman_multi_scan_ap_s));
if (ap) {
g_strlcpy(ap->str, freq, strlen(freq) + 1);
ap->flag = false;
dbus_message_iter_next(&dict);
}
- dbus_message_ref(msg);
-
- err = __connman_device_request_specific_scan(technology->type, scan_type, specific_scan_list);
+ err = __connman_device_request_specific_scan(technology->type, ifname, scan_type, specific_scan_list);
if (err < 0)
return __connman_error_failed(msg, -err);
- if (err == 0) {
- guint list_size = g_slist_length(specific_scan_list);
- if (list_size == 1)
- g_scan_type = CONNMAN_SCAN_TYPE_SPECIFIC_AP;
- else
- g_scan_type = CONNMAN_SCAN_TYPE_MULTI_AP;
- DBG("list_size %u g_scan_type %d", list_size, g_scan_type);
- }
- technology->scan_pending =
- g_slist_prepend(technology->scan_pending, msg);
+ guint list_size = g_slist_length(specific_scan_list);
if (scan_type == CONNMAN_MULTI_SCAN_SSID ||
- scan_type == CONNMAN_MULTI_SCAN_SSID_FREQ) {
+ scan_type == CONNMAN_MULTI_SCAN_SSID_FREQ)
g_slist_free_full(specific_scan_list, g_free);
- scan_type = 0;
+
+ struct connman_scan_pending *pending_data =
+ g_try_malloc0(sizeof(struct connman_scan_pending));
+ if (!pending_data)
+ return __connman_error_failed(msg, ENOMEM);
+
+ if (ifname) {
+ pending_data->ifname = g_strdup(ifname);
+ if (pending_data->ifname == NULL) {
+ g_free(pending_data);
+ return __connman_error_failed(msg, ENOMEM);
+ }
}
+
+ if (list_size == 1)
+ pending_data->scan_type = CONNMAN_SCAN_TYPE_SPECIFIC_AP;
+ else
+ pending_data->scan_type = CONNMAN_SCAN_TYPE_MULTI_AP;
+ DBG("list_size %u scan_type %d", list_size, pending_data->scan_type);
+
+ pending_data->msg = dbus_message_ref(msg);
+
+ technology->scan_pending =
+ g_slist_prepend(technology->scan_pending, pending_data);
+
return NULL;
}
-#if defined TIZEN_EXT
static DBusMessage *get_5ghz_supported(DBusConnection *conn, DBusMessage *msg, void *data)
{
DBusMessage *reply;
DBusMessageIter iter, dict;
+ GSList *list;
struct connman_technology *technology = data;
- dbus_bool_t supported = technology->is_5_0_ghz_supported;
+ dbus_bool_t supported = false;
+ const char *ifname = NULL;
DBG("technology %p", technology);
return NULL;
dbus_message_iter_init_append(reply, &iter);
-
connman_dbus_dict_open(&iter, &dict);
- connman_dbus_dict_append_basic(&dict, "Is5GhzSupported",
- DBUS_TYPE_BOOLEAN,
- &supported);
+
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ supported = connman_device_get_wifi_5ghz_supported(device);
+ ifname = connman_device_get_string(device, "Interface");
+
+ DBG("ifname %s supported : %d", ifname, supported);
+ connman_dbus_dict_append_basic(&dict, ifname,
+ DBUS_TYPE_BOOLEAN,
+ &supported);
+ }
connman_dbus_dict_close(&iter, &dict);
return reply;
}
-#endif
static DBusMessage *get_scan_state(DBusConnection *conn, DBusMessage *msg, void *data)
{
GSList *list;
struct connman_technology *technology = data;
dbus_bool_t scanning = false;
+ const char *ifname = NULL;
DBG("technology %p", technology);
+ reply = dbus_message_new_method_return(msg);
+ if (!reply)
+ return NULL;
+
+ dbus_message_iter_init_append(reply, &iter);
+ connman_dbus_dict_open(&iter, &dict);
+
for (list = technology->device_list; list; list = list->next) {
struct connman_device *device = list->data;
- scanning = connman_device_get_scanning(device,
- connman_device_get_type(device));
- if(scanning)
- break;
+
+ scanning = connman_device_get_scanning(device, technology->type);
+ ifname = connman_device_get_string(device, "Interface");
+
+ DBG("ifname %s scanning : %d", ifname, scanning);
+ connman_dbus_dict_append_basic(&dict, ifname,
+ DBUS_TYPE_BOOLEAN,
+ &scanning);
}
- DBG("scanning : %d", scanning);
+ connman_dbus_dict_close(&iter, &dict);
+
+ return reply;
+}
+
+static DBusMessage *get_max_scan_ssid(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+ DBusMessage *reply;
+ DBusMessageIter iter, dict;
+ GSList *list;
+ struct connman_technology *technology = data;
+ dbus_int32_t max_scan_ssids = 0;
+ const char *ifname = NULL;
+
+ DBG("technology %p", technology);
+
reply = dbus_message_new_method_return(msg);
if (!reply)
return NULL;
dbus_message_iter_init_append(reply, &iter);
-
connman_dbus_dict_open(&iter, &dict);
- connman_dbus_dict_append_basic(&dict, "Scanstate",
- DBUS_TYPE_BOOLEAN,
- &scanning);
+
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ max_scan_ssids = connman_device_get_max_scan_ssids(device);
+ ifname = connman_device_get_string(device, "Interface");
+
+ DBG("ifname %s max_scan_ssids : %d", ifname, max_scan_ssids);
+ connman_dbus_dict_append_basic(&dict, ifname,
+ DBUS_TYPE_INT32,
+ &max_scan_ssids);
+ }
connman_dbus_dict_close(&iter, &dict);
return reply;
}
-void connman_techonology_set_max_scan_ssids(struct connman_technology *technology,
- int max_scan_ssids)
-{
- DBG("");
- technology->max_scan_ssids = max_scan_ssids;
-}
-
-static DBusMessage *get_max_scan_ssid(DBusConnection *conn, DBusMessage *msg, void *data)
+static DBusMessage *get_interfaces(DBusConnection *conn, DBusMessage *msg, void *data)
{
DBusMessage *reply;
- DBusMessageIter iter, dict;
+ DBusMessageIter iter, array;
+ GSList *list;
struct connman_technology *technology = data;
- dbus_int32_t max_scan_ssids = technology->max_scan_ssids;
+ const char *default_interface = connman_option_get_string("DefaultWifiInterface");
DBG("technology %p", technology);
if (!reply)
return NULL;
+ if (technology->type != CONNMAN_SERVICE_TYPE_WIFI)
+ return NULL;
+
dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &array);
- connman_dbus_dict_open(&iter, &dict);
- connman_dbus_dict_append_basic(&dict, "MaxScanSSID",
- DBUS_TYPE_INT32,
- &max_scan_ssids);
+ dbus_message_iter_append_basic(&array,
+ DBUS_TYPE_STRING, &default_interface);
- connman_dbus_dict_close(&iter, &dict);
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+ const char *str = connman_device_get_string(device, "Interface");
+ if (g_strcmp0(default_interface, str) == 0)
+ continue;
+
+ dbus_message_iter_append_basic(&array,
+ DBUS_TYPE_STRING, &str);
+ }
+
+ dbus_message_iter_close_container(&iter, &array);
return reply;
}
+
+static int technology_enable_device(struct connman_technology *technology,
+ bool enable_device, const char *ifname, struct connman_device **device_out)
+{
+ int err = 0;
+ GSList *list;
+
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+ const char *str = connman_device_get_string(device, "Interface");
+
+ if (g_strcmp0(str, ifname) != 0)
+ continue;
+
+ if (enable_device)
+ err = __connman_device_enable(device);
+ else
+ err = __connman_device_disable(device);
+
+ *device_out = device;
+ return err;
+ }
+
+ return -ENXIO;
+}
+
+static DBusMessage *technology_set_device_powered(struct connman_technology *technology,
+ DBusMessage *msg, bool powered, const char *ifname)
+{
+ DBusMessage *reply = NULL;
+ struct connman_device *device = NULL;
+ int err = 0;
+
+ err = technology_enable_device(technology, powered, ifname, &device);
+
+ if (err == -EINPROGRESS) {
+ if (device)
+ connman_device_set_pending_reply(device, msg);
+ return reply;
+ } else if (err == -EALREADY) {
+ if (powered)
+ reply = __connman_error_already_enabled(msg);
+ else
+ reply = __connman_error_already_disabled(msg);
+ } else if (err < 0)
+ reply = __connman_error_failed(msg, -err);
+ else
+ reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+
+ return reply;
+}
+
+static DBusMessage *set_device_power(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ struct connman_technology *technology = data;
+ DBusMessageIter iter;
+ const char *name;
+ int len;
+ dbus_bool_t enable;
+
+ DBG("conn %p", conn);
+
+ if (!dbus_message_iter_init(msg, &iter))
+ return __connman_error_invalid_arguments(msg);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_get_basic(&iter, &name);
+ dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_BOOLEAN)
+ return __connman_error_invalid_arguments(msg);
+
+ DBG("interface name %s", name);
+
+ len = strlen(name);
+
+ if (len + 1 > IFNAMSIZ)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_get_basic(&iter, &enable);
+ DBG("powered %s", enable ? "TRUE" : "FALSE");
+
+ return technology_set_device_powered(technology, msg, enable, name);
+}
+
+static DBusMessage *set_bssid(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBusMessageIter iter;
+ char *name, *bssid;
+ int len;
+
+ DBG("conn %p", conn);
+
+ if (!dbus_message_iter_init(msg, &iter))
+ return __connman_error_invalid_arguments(msg);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_get_basic(&iter, &name);
+ dbus_message_iter_next(&iter);
+
+ if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+ return __connman_error_invalid_arguments(msg);
+
+ dbus_message_iter_get_basic(&iter, &bssid);
+
+ DBG("interface name %s bssid %s", name, bssid);
+
+ len = strlen(name);
+
+ if (len + 1 > IFNAMSIZ)
+ return __connman_error_invalid_arguments(msg);
+
+ set_connman_bssid(SET_BSSID, bssid, name);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+static struct connman_technology *technology_get(enum connman_service_type type);
+
+void technology_save_device(struct connman_device *device)
+{
+ struct connman_technology *technology;
+ enum connman_service_type type;
+
+ type = __connman_device_get_service_type(device);
+ technology = technology_get(type);
+ if (!technology)
+ return;
+
+ GKeyFile *keyfile;
+ gchar *identifier;
+ const char *name = get_name(technology->type);
+
+ DBG("technology %p type %d name %s", technology, technology->type,
+ name);
+ if (!name)
+ return;
+
+ keyfile = __connman_storage_load_global();
+ if (!keyfile)
+ keyfile = g_key_file_new();
+
+ identifier = g_strdup_printf("%s", name);
+ if (!identifier)
+ goto done;
+
+ GSList *list = NULL;
+ gchar **ifname_list = NULL;
+ guint dev_count = g_slist_length(technology->device_list);
+
+ if (dev_count > 1) {
+ GString *ifname_str = g_string_new(NULL);
+
+ if (ifname_str) {
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ if (connman_device_get_powered(device)) {
+ const char *ifname = connman_device_get_string(device, "Interface");
+
+ if (ifname_str->len > 0)
+ g_string_append_printf(ifname_str, " %s", ifname);
+ else
+ g_string_append(ifname_str, ifname);
+ }
+ }
+
+ if (ifname_str->len > 0) {
+ ifname_list = g_strsplit_set(ifname_str->str, " ", 0);
+ dev_count = g_strv_length(ifname_list);
+ g_key_file_set_string_list(keyfile, identifier, "Enable.Devices",
+ (const gchar **) ifname_list, dev_count);
+
+ technology->enable_persistent = true;
+ } else {
+ g_key_file_remove_key(keyfile, identifier, "Enable.Devices", NULL);
+ technology->enable_persistent = false;
+ }
+
+ g_strfreev(ifname_list);
+ g_string_free(ifname_str, TRUE);
+ }
+ }
+
+ g_key_file_set_boolean(keyfile, identifier, "Enable",
+ technology->enable_persistent);
+
+ g_key_file_set_boolean(keyfile, identifier, "Tethering",
+ technology->tethering_persistent);
+
+ if (technology->tethering_ident)
+ g_key_file_set_string(keyfile, identifier,
+ "Tethering.Identifier",
+ technology->tethering_ident);
+
+ if (technology->tethering_passphrase)
+ g_key_file_set_string(keyfile, identifier,
+ "Tethering.Passphrase",
+ technology->tethering_passphrase);
+
+done:
+ g_free(identifier);
+
+ __connman_storage_save_global(keyfile);
+
+ g_key_file_free(keyfile);
+}
#endif
#if defined TIZEN_EXT_WIFI_MESH
DBG("MeshID %s Frequency %d sender %s", name, freq,
dbus_message_get_sender(msg));
- dbus_message_ref(msg);
+ struct connman_scan_pending *pending_data =
+ g_try_malloc0(sizeof(struct connman_scan_pending));
+ if (!pending_data)
+ return __connman_error_failed(msg, ENOMEM);
+
+ pending_data->msg = dbus_message_ref(msg);
+
technology->scan_pending =
- g_slist_prepend(technology->scan_pending, msg);
+ g_slist_prepend(technology->scan_pending, pending_data);
err = __connman_device_request_mesh_specific_scan(technology->type,
name, freq);
NULL, set_property) },
{ GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
#if defined TIZEN_EXT
+ { GDBUS_ASYNC_METHOD("ScanDevice", GDBUS_ARGS({ "interface_name", "s" }),
+ NULL, scan_device) },
{ GDBUS_ASYNC_METHOD("SpecificScan", GDBUS_ARGS({ "specificscan", "a{sv}" }),
NULL, specific_scan) },
{ GDBUS_METHOD("GetScanState", NULL, GDBUS_ARGS({ "scan_state", "a{sv}" }),
get_5ghz_supported) },
{ GDBUS_METHOD("GetMaxScanSsid", NULL, GDBUS_ARGS({ "maxscanssid", "a{sv}" }),
get_max_scan_ssid) },
+ { GDBUS_METHOD("GetInterfaces", NULL, GDBUS_ARGS({ "interface_list", "as" }),
+ get_interfaces) },
+ { GDBUS_ASYNC_METHOD("SetDevicePower",
+ GDBUS_ARGS({ "ifname", "s" }, { "value", "b" }),
+ NULL, set_device_power) },
+ { GDBUS_ASYNC_METHOD("SetBSSID",
+ GDBUS_ARGS({ "ifname", "s" }, { "bssid", "s" }),
+ NULL, set_bssid) },
#endif
#if defined TIZEN_EXT_WIFI_MESH
{ GDBUS_ASYNC_METHOD("MeshCommands",
static const GDBusSignalTable technology_signals[] = {
{ GDBUS_SIGNAL("PropertyChanged",
GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+#if defined TIZEN_EXT
+ { GDBUS_SIGNAL("DeviceChanged",
+ GDBUS_ARGS({ "device_property", "a{sv}" })) },
+ { GDBUS_SIGNAL("DeviceDetected",
+ GDBUS_ARGS({ "ifname", "s" }, { "detected", "b" })) },
+#endif
{ },
};
g_source_remove(technology->pending_timeout);
technology->pending_timeout = 0;
}
-
+#ifdef TIZEN_EXT
+ g_strfreev(technology->enabled_devices);
+#endif
g_free(technology->path);
g_free(technology->regdom);
g_free(technology->tethering_ident);
if (technology->enable_persistent &&
!global_offlinemode) {
+#if defined TIZEN_EXT
+ bool found = true;
+ int err = 0;
+ if (technology->enabled_devices) {
+ int i = 0;
+ found = false;
+ const char *ifname = connman_device_get_string(device, "Interface");
+
+ while (technology->enabled_devices[i]) {
+ if (g_strcmp0(technology->enabled_devices[i], ifname) == 0) {
+ found = true;
+ break;
+ }
+ i++;
+ }
+ }
+
+ if (found)
+ err = __connman_device_enable(device);
+#else
int err = __connman_device_enable(device);
+#endif
/*
* connman_technology_add_device() calls __connman_device_enable()
* but since the device is already enabled, the call does not
technology->device_list = g_slist_prepend(technology->device_list,
device);
+#if defined TIZEN_EXT
+ const char *ifname = connman_device_get_string(device, "Interface");
+ __connman_technology_notify_device_detected(technology, ifname, true);
+#endif
return 0;
}
technology->device_list = g_slist_remove(technology->device_list,
device);
+#if defined TIZEN_EXT
+ const char *ifname = connman_device_get_string(device, "Interface");
+ __connman_technology_notify_device_detected(technology, ifname, false);
+#endif
+
if (technology->tethering)
set_tethering(technology, false);
projects / platform / upstream / connman.git / commitdiff