#include <config.h>
#endif
+#include <gdbus.h>
+
#include "connman.h"
+static DBusConnection *connection = NULL;
+
static GSList *notifier_list = NULL;
static gint compare_priority(gconstpointer a, gconstpointer b)
notifier_list = g_slist_remove(notifier_list, notifier);
}
-static void device_enabled(enum connman_device_type type,
- connman_bool_t enabled)
-{
- GSList *list;
-
- DBG("type %d enabled %d", type, enabled);
-
- for (list = notifier_list; list; list = list->next) {
- struct connman_notifier *notifier = list->data;
-
- if (notifier->device_enabled)
- notifier->device_enabled(type, enabled);
- }
-}
-
-static void device_registered(enum connman_device_type type,
- connman_bool_t registered)
-{
- DBG("type %d registered %d", type, registered);
-}
-
-static const char *type2string(enum connman_device_type type)
+static const char *type2string(enum connman_service_type type)
{
switch (type) {
- case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_MBM:
- case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
break;
- case CONNMAN_DEVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
return "ethernet";
- case CONNMAN_DEVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIFI:
return "wifi";
- case CONNMAN_DEVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
return "wimax";
- case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
return "bluetooth";
- case CONNMAN_DEVICE_TYPE_GPS:
- return "gps";
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ return "cellular";
}
return NULL;
}
-static volatile gint registered[20];
-static volatile gint enabled[20];
+#define MAX_TECHNOLOGIES 10
+
+static volatile gint registered[MAX_TECHNOLOGIES];
+static volatile gint enabled[MAX_TECHNOLOGIES];
+static volatile gint connected[MAX_TECHNOLOGIES];
+
+void __connman_notifier_list_registered(DBusMessageIter *iter)
+{
+ int i;
+
+ for (i = 0; i < 10; i++) {
+ const char *type = type2string(i);
+
+ if (type == NULL)
+ continue;
+
+ if (g_atomic_int_get(®istered[i]) > 0)
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING, &type);
+ }
+}
-void __connman_notifier_device_type_list(gboolean powered,
- DBusMessageIter *iter)
+void __connman_notifier_list_enabled(DBusMessageIter *iter)
{
int i;
for (i = 0; i < 10; i++) {
const char *type = type2string(i);
- gint count;
if (type == NULL)
continue;
- if (powered == TRUE)
- count = g_atomic_int_get(&enabled[i]);
- else
- count = g_atomic_int_get(®istered[i]);
+ if (g_atomic_int_get(&enabled[i]) > 0)
+ dbus_message_iter_append_basic(iter,
+ DBUS_TYPE_STRING, &type);
+ }
+}
- if (count > 0)
+void __connman_notifier_list_connected(DBusMessageIter *iter)
+{
+ int i;
+
+ for (i = 0; i < 10; i++) {
+ const char *type = type2string(i);
+
+ if (type == NULL)
+ continue;
+
+ if (g_atomic_int_get(&connected[i]) > 0)
dbus_message_iter_append_basic(iter,
DBUS_TYPE_STRING, &type);
}
}
-void __connman_notifier_device_type_register(enum connman_device_type type)
+static void technology_registered(enum connman_service_type type,
+ connman_bool_t registered)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value, iter;
+ const char *key = "AvailableTechnologies";
+
+ DBG("type %d registered %d", type, registered);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &iter);
+ __connman_notifier_list_registered(&iter);
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+}
+
+static void technology_enabled(enum connman_service_type type,
+ connman_bool_t enabled)
+{
+ GSList *list;
+ DBusMessage *signal;
+ DBusMessageIter entry, value, iter;
+ const char *key = "EnabledTechnologies";
+
+ DBG("type %d enabled %d", type, enabled);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ goto done;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &iter);
+ __connman_notifier_list_enabled(&iter);
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+
+done:
+ for (list = notifier_list; list; list = list->next) {
+ struct connman_notifier *notifier = list->data;
+
+ if (notifier->service_enabled)
+ notifier->service_enabled(type, enabled);
+ }
+}
+
+static void technology_connected(enum connman_service_type type,
+ connman_bool_t connected)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value, iter;
+ const char *key = "ConnectedTechnologies";
+
+ DBG("type %d connected %d", type, connected);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING,
+ &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ DBUS_TYPE_STRING_AS_STRING, &iter);
+ __connman_notifier_list_connected(&iter);
+ dbus_message_iter_close_container(&value, &iter);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+}
+
+void __connman_notifier_register(enum connman_service_type type)
{
DBG("type %d", type);
switch (type) {
- case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_MBM:
- case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
return;
- case CONNMAN_DEVICE_TYPE_ETHERNET:
- case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_WIMAX:
- case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_GPS:
- if (g_atomic_int_exchange_and_add(®istered[type], 1) == 0)
- device_registered(type, TRUE);
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
break;
}
+
+ if (g_atomic_int_exchange_and_add(®istered[type], 1) == 0)
+ technology_registered(type, TRUE);
}
-void __connman_notifier_device_type_unregister(enum connman_device_type type)
+void __connman_notifier_unregister(enum connman_service_type type)
{
DBG("type %d", type);
switch (type) {
- case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_MBM:
- case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
return;
- case CONNMAN_DEVICE_TYPE_ETHERNET:
- case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_WIMAX:
- case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_GPS:
- if (g_atomic_int_dec_and_test(®istered[type]) == TRUE)
- device_registered(type, FALSE);
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
break;
}
+
+ if (g_atomic_int_dec_and_test(®istered[type]) == TRUE)
+ technology_registered(type, FALSE);
}
-void __connman_notifier_device_type_increase(enum connman_device_type type)
+void __connman_notifier_enable(enum connman_service_type type)
{
DBG("type %d", type);
switch (type) {
- case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_MBM:
- case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
return;
- case CONNMAN_DEVICE_TYPE_ETHERNET:
- case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_WIMAX:
- case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_GPS:
- if (g_atomic_int_exchange_and_add(&enabled[type], 1) == 0)
- device_enabled(type, TRUE);
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
break;
}
+
+ if (g_atomic_int_exchange_and_add(&enabled[type], 1) == 0)
+ technology_enabled(type, TRUE);
}
-void __connman_notifier_device_type_decrease(enum connman_device_type type)
+void __connman_notifier_disable(enum connman_service_type type)
{
DBG("type %d", type);
switch (type) {
- case CONNMAN_DEVICE_TYPE_UNKNOWN:
- case CONNMAN_DEVICE_TYPE_MBM:
- case CONNMAN_DEVICE_TYPE_HSO:
- case CONNMAN_DEVICE_TYPE_NOZOMI:
- case CONNMAN_DEVICE_TYPE_HUAWEI:
- case CONNMAN_DEVICE_TYPE_NOVATEL:
- case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
return;
- case CONNMAN_DEVICE_TYPE_ETHERNET:
- case CONNMAN_DEVICE_TYPE_WIFI:
- case CONNMAN_DEVICE_TYPE_WIMAX:
- case CONNMAN_DEVICE_TYPE_BLUETOOTH:
- case CONNMAN_DEVICE_TYPE_GPS:
- if (g_atomic_int_dec_and_test(&enabled[type]) == TRUE)
- device_enabled(type, FALSE);
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
break;
}
+
+ if (g_atomic_int_dec_and_test(&enabled[type]) == TRUE)
+ technology_enabled(type, FALSE);
}
-void __connman_notifier_offline_mode(connman_bool_t enabled)
+void __connman_notifier_connect(enum connman_service_type type)
+{
+ DBG("type %d", type);
+
+ switch (type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ return;
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ break;
+ }
+
+ if (g_atomic_int_exchange_and_add(&connected[type], 1) == 0)
+ technology_connected(type, TRUE);
+}
+
+void __connman_notifier_disconnect(enum connman_service_type type)
+{
+ DBG("type %d", type);
+
+ switch (type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ return;
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+ case CONNMAN_SERVICE_TYPE_CELLULAR:
+ break;
+ }
+
+ if (g_atomic_int_dec_and_test(&connected[type]) == TRUE)
+ technology_connected(type, FALSE);
+}
+
+static void offlinemode_changed(dbus_bool_t enabled)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *key = "OfflineMode";
+
+ DBG("enabled %d", enabled);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ DBUS_TYPE_BOOLEAN_AS_STRING, &value);
+ dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &enabled);
+ dbus_message_iter_close_container(&entry, &value);
+
+ g_dbus_send_message(connection, signal);
+}
+
+void __connman_notifier_offlinemode(connman_bool_t enabled)
{
GSList *list;
DBG("enabled %d", enabled);
+ __connman_profile_changed(FALSE);
+
+ offlinemode_changed(enabled);
+
for (list = notifier_list; list; list = list->next) {
struct connman_notifier *notifier = list->data;
{
DBG("");
+ connection = connman_dbus_get_connection();
+
return 0;
}
void __connman_notifier_cleanup(void)
{
DBG("");
+
+ dbus_connection_unref(connection);
}
projects / platform / upstream / connman.git / blobdiff