--- /dev/null
+#!/usr/bin/env python
+# vim: ft=python ts=4 sts=4 sw=4 et ai
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright (C) 2014 Red Hat, Inc.
+#
+
+# This example lists all devices, both real and placeholder ones
+
+from gi.repository import GLib, NM
+
+if __name__ == "__main__":
+ client = NM.Client.new(None)
+ devices = client.get_all_devices()
+
+ print "Real devices"
+ print "------------"
+ for d in devices:
+ if d.is_real():
+ print "%s (%s): %s" % (d.get_iface(), d.get_type_description(), d.get_state())
+
+ print "\nUnrealized/placeholder devices"
+ print "------------------------------"
+ for d in devices:
+ if not d.is_real():
+ print "%s (%s): %s" % (d.get_iface(), d.get_type_description(), d.get_state())
+
nm_client_error_quark;
nm_client_get_activating_connection;
nm_client_get_active_connections;
+ nm_client_get_all_devices;
nm_client_get_connectivity;
nm_client_get_device_by_iface;
nm_client_get_device_by_path;
NMState state;
gboolean startup;
GPtrArray *devices;
+ GPtrArray *all_devices;
GPtrArray *active_connections;
NMConnectivityState connectivity;
NMActiveConnection *primary_connection;
PROP_PRIMARY_CONNECTION,
PROP_ACTIVATING_CONNECTION,
PROP_DEVICES,
+ PROP_ALL_DEVICES,
LAST_PROP
};
enum {
DEVICE_ADDED,
DEVICE_REMOVED,
+ ANY_DEVICE_ADDED,
+ ANY_DEVICE_REMOVED,
PERMISSION_CHANGED,
LAST_SIGNAL
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
int i;
- for (i = 0; priv->devices && (i < priv->devices->len); i++) {
- NMDevice *device = g_ptr_array_index (priv->devices, i);
+ for (i = 0; priv->all_devices && (i < priv->all_devices->len); i++) {
+ NMDevice *device = g_ptr_array_index (priv->all_devices, i);
if (NM_IS_DEVICE_WIFI (device))
_nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
{ NM_CLIENT_PRIMARY_CONNECTION, &priv->primary_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
{ NM_CLIENT_ACTIVATING_CONNECTION, &priv->activating_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
{ NM_CLIENT_DEVICES, &priv->devices, NULL, NM_TYPE_DEVICE, "device" },
+ { NM_CLIENT_ALL_DEVICES, &priv->all_devices, NULL, NM_TYPE_DEVICE, "any-device" },
{ NULL },
};
return handle_ptr_array_return (NM_CLIENT_GET_PRIVATE (client)->devices);
}
+/**
+ * nm_client_get_all_devices:
+ * @client: a #NMClient
+ *
+ * Gets both real devices and device placeholders (eg, software devices which
+ * do not currently exist, but could be created automatically by NetworkManager
+ * if one of their NMDevice::ActivatableConnections was activated). Use
+ * nm_device_is_real() to determine whether each device is a real device or
+ * a placeholder.
+ *
+ * Use nm_device_get_type() or the NM_IS_DEVICE_XXXX() functions to determine
+ * what kind of device each member of the returned array is, and then you may
+ * use device-specific methods such as nm_device_ethernet_get_hw_address().
+ *
+ * Returns: (transfer none) (element-type NMDevice): a #GPtrArray
+ * containing all the #NMDevices. The returned array is owned by the
+ * #NMClient object and should not be modified.
+ *
+ * Since: 1.2
+ **/
+const GPtrArray *
+nm_client_get_all_devices (NMClient *client)
+{
+ g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+
+ return NM_CLIENT_GET_PRIVATE (client)->all_devices;
+}
+
/**
* nm_client_get_device_by_path:
* @client: a #NMClient
/****************************************************************/
static void
-free_devices (NMClient *client, gboolean emit_signals)
+free_devices (NMClient *client, gboolean in_dispose)
{
NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
- GPtrArray *devices;
- NMDevice *device;
- int i;
+ gs_unref_ptrarray GPtrArray *real_devices = NULL;
+ gs_unref_ptrarray GPtrArray *all_devices = NULL;
+ GPtrArray *devices = NULL;
+ guint i, j;
- if (!priv->devices)
- return;
+ real_devices = priv->devices;
+ all_devices = priv->all_devices;
- devices = priv->devices;
- priv->devices = NULL;
- for (i = 0; i < devices->len; i++) {
- device = devices->pdata[i];
- if (emit_signals)
- g_signal_emit (client, signals[DEVICE_REMOVED], 0, device);
- g_object_unref (device);
+ if (in_dispose) {
+ priv->devices = NULL;
+ priv->all_devices = NULL;
+ } else {
+ priv->devices = g_ptr_array_new ();
+ priv->all_devices = g_ptr_array_new ();
+ }
+
+ if (all_devices && all_devices->len > 0)
+ devices = all_devices;
+ else if (devices && devices->len > 0)
+ devices = real_devices;
+
+ if (real_devices && devices != real_devices) {
+ for (i = 0; i < real_devices->len; i++) {
+ NMDevice *d = real_devices->pdata[i];
+
+ if (all_devices) {
+ for (j = 0; j < all_devices->len; j++) {
+ if (d == all_devices->pdata[j])
+ goto next;
+ }
+ }
+ if (!in_dispose)
+ g_signal_emit (client, signals[DEVICE_REMOVED], 0, d);
+next:
+ g_object_unref (d);
+ }
+ }
+ if (devices) {
+ for (i = 0; i < devices->len; i++) {
+ NMDevice *d = devices->pdata[i];
+
+ if (!in_dispose)
+ g_signal_emit (client, signals[DEVICE_REMOVED], 0, d);
+ g_object_unref (d);
+ }
}
- g_ptr_array_free (devices, TRUE);
}
static void
_nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
_nm_object_suppress_property_updates (NM_OBJECT (client), TRUE);
poke_wireless_devices_with_rf_status (client);
- free_devices (client, TRUE);
+ free_devices (client, FALSE);
free_active_connections (client, TRUE);
update_permissions (client, NULL);
priv->wireless_enabled = FALSE;
g_clear_object (&priv->client_proxy);
g_clear_object (&priv->bus_proxy);
- free_devices (client, FALSE);
+ free_devices (client, TRUE);
free_active_connections (client, FALSE);
g_clear_object (&priv->primary_connection);
g_clear_object (&priv->activating_connection);
case PROP_DEVICES:
g_value_set_boxed (value, nm_client_get_devices (self));
break;
+ case PROP_ALL_DEVICES:
+ g_value_set_boxed (value, nm_client_get_all_devices (self));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
/**
* NMClient:devices:
*
- * List of known network devices.
+ * List of real network devices. Does not include placeholder devices.
*
* Since: 0.9.10
**/
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
+ /**
+ * NMClient:all-devices:
+ *
+ * List of both real devices and device placeholders.
+ *
+ * Since: 1.2
+ **/
+ g_object_class_install_property
+ (object_class, PROP_ALL_DEVICES,
+ g_param_spec_boxed (NM_CLIENT_ALL_DEVICES, "", "",
+ NM_TYPE_OBJECT_ARRAY,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
+
/* signals */
/**
* @client: the client that received the signal
* @device: (type NMDevice): the new device
*
- * Notifies that a #NMDevice is added.
+ * Notifies that a #NMDevice is added. This signal is not emitted for
+ * placeholder devices.
**/
signals[DEVICE_ADDED] =
g_signal_new ("device-added",
* @client: the client that received the signal
* @device: (type NMDevice): the removed device
*
- * Notifies that a #NMDevice is removed.
+ * Notifies that a #NMDevice is removed. This signal is not emitted for
+ * placeholder devices.
**/
signals[DEVICE_REMOVED] =
g_signal_new ("device-removed",
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
+ /**
+ * NMClient::any-device-added:
+ * @client: the client that received the signal
+ * @device: (type NMDevice): the new device
+ *
+ * Notifies that a #NMDevice is added. This signal is emitted for both
+ * regular devices and placeholder devices.
+ **/
+ signals[ANY_DEVICE_ADDED] =
+ g_signal_new ("any-device-added",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
+
+ /**
+ * NMClient::any-device-removed:
+ * @client: the client that received the signal
+ * @device: (type NMDevice): the removed device
+ *
+ * Notifies that a #NMDevice is removed. This signal is emitted for both
+ * regular devices and placeholder devices.
+ **/
+ signals[ANY_DEVICE_REMOVED] =
+ g_signal_new ("any-device-removed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
+
/**
* NMClient::permission-changed:
* @client: the client that received the signal
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
#define NM_CLIENT_DEVICES "devices"
+#define NM_CLIENT_ALL_DEVICES "all-devices"
/**
* NMClientPermission:
GError **error);
const GPtrArray *nm_client_get_devices (NMClient *client);
+NM_AVAILABLE_IN_1_2
+const GPtrArray *nm_client_get_all_devices(NMClient *client);
NMDevice *nm_client_get_device_by_path (NMClient *client, const char *object_path);
NMDevice *nm_client_get_device_by_iface (NMClient *client, const char *iface);
static void
da_check_quit (DaInfo *info)
{
+ g_assert (info->quit_count > 0);
info->quit_count--;
if (info->quit_count == 0) {
g_source_remove (info->quit_id);
nm_connection_get_setting_ip_tunnel;
nm_connection_verify_secrets;
nm_device_ethernet_get_s390_subchannels;
+ nm_client_get_all_devices;
nm_device_get_lldp_neighbors;
nm_device_get_metered;
nm_device_ip_tunnel_get_encapsulation_limit;
nm_lldp_neighbor_new;
nm_lldp_neighbor_ref;
nm_lldp_neighbor_unref;
+ nm_manager_get_all_devices;
nm_metered_get_type;
nm_setting_802_1x_check_cert_scheme;
nm_setting_bridge_get_multicast_snooping;
PROP_PRIMARY_CONNECTION,
PROP_ACTIVATING_CONNECTION,
PROP_DEVICES,
+ PROP_ALL_DEVICES,
PROP_CONNECTIONS,
PROP_HOSTNAME,
PROP_CAN_MODIFY,
enum {
DEVICE_ADDED,
DEVICE_REMOVED,
+ ANY_DEVICE_ADDED,
+ ANY_DEVICE_REMOVED,
PERMISSION_CHANGED,
CONNECTION_ADDED,
CONNECTION_REMOVED,
return nm_manager_get_devices (NM_CLIENT_GET_PRIVATE (client)->manager);
}
+/**
+ * nm_client_get_all_devices:
+ * @client: a #NMClient
+ *
+ * Gets both real devices and device placeholders (eg, software devices which
+ * do not currently exist, but could be created automatically by NetworkManager
+ * if one of their NMDevice::ActivatableConnections was activated). Use
+ * nm_device_is_real() to determine whether each device is a real device or
+ * a placeholder.
+ *
+ * Use nm_device_get_type() or the NM_IS_DEVICE_XXXX() functions to determine
+ * what kind of device each member of the returned array is, and then you may
+ * use device-specific methods such as nm_device_ethernet_get_hw_address().
+ *
+ * Returns: (transfer none) (element-type NMDevice): a #GPtrArray
+ * containing all the #NMDevices. The returned array is owned by the
+ * #NMClient object and should not be modified.
+ *
+ * Since: 1.2
+ **/
+const GPtrArray *
+nm_client_get_all_devices (NMClient *client)
+{
+ g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
+
+ return nm_manager_get_all_devices (NM_CLIENT_GET_PRIVATE (client)->manager);
+}
+
/**
* nm_client_get_device_by_path:
* @client: a #NMClient
{
g_signal_emit (client, signals[DEVICE_ADDED], 0, device);
}
+
static void
manager_device_removed (NMManager *manager,
NMDevice *device,
g_signal_emit (client, signals[DEVICE_REMOVED], 0, device);
}
+static void
+manager_any_device_added (NMManager *manager,
+ NMDevice *device,
+ gpointer client)
+{
+ g_signal_emit (client, signals[ANY_DEVICE_ADDED], 0, device);
+}
+
+static void
+manager_any_device_removed (NMManager *manager,
+ NMDevice *device,
+ gpointer client)
+{
+ g_signal_emit (client, signals[ANY_DEVICE_REMOVED], 0, device);
+}
+
static void
manager_permission_changed (NMManager *manager,
NMClientPermission permission,
G_CALLBACK (manager_device_added), client);
g_signal_connect (priv->manager, "device-removed",
G_CALLBACK (manager_device_removed), client);
+ g_signal_connect (priv->manager, "any-device-added",
+ G_CALLBACK (manager_any_device_added), client);
+ g_signal_connect (priv->manager, "any-device-removed",
+ G_CALLBACK (manager_any_device_removed), client);
g_signal_connect (priv->manager, "permission-changed",
G_CALLBACK (manager_permission_changed), client);
case PROP_ACTIVATING_CONNECTION:
case PROP_DEVICES:
case PROP_METERED:
+ case PROP_ALL_DEVICES:
g_object_get_property (G_OBJECT (NM_CLIENT_GET_PRIVATE (object)->manager),
pspec->name, value);
break;
/**
* NMClient:devices:
*
- * List of known network devices.
+ * List of real network devices. Does not include placeholder devices.
*
* Element-type: NMDevice
**/
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
+ /**
+ * NMClient:all-devices:
+ *
+ * List of both real devices and device placeholders.
+ *
+ * Element-type: NMDevice
+ * Since: 1.2
+ **/
+ g_object_class_install_property
+ (object_class, PROP_ALL_DEVICES,
+ g_param_spec_boxed (NM_CLIENT_ALL_DEVICES, "", "",
+ G_TYPE_PTR_ARRAY,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
+
/**
* NMClient:connections:
*
* @client: the client that received the signal
* @device: (type NMDevice): the new device
*
- * Notifies that a #NMDevice is added.
+ * Notifies that a #NMDevice is added. This signal is not emitted for
+ * placeholder devices.
**/
signals[DEVICE_ADDED] =
g_signal_new (NM_CLIENT_DEVICE_ADDED,
* @client: the client that received the signal
* @device: (type NMDevice): the removed device
*
- * Notifies that a #NMDevice is removed.
+ * Notifies that a #NMDevice is removed. This signal is not emitted for
+ * placeholder devices.
**/
signals[DEVICE_REMOVED] =
g_signal_new (NM_CLIENT_DEVICE_REMOVED,
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
+ /**
+ * NMClient::any-device-added:
+ * @client: the client that received the signal
+ * @device: (type NMDevice): the new device
+ *
+ * Notifies that a #NMDevice is added. This signal is emitted for both
+ * regular devices and placeholder devices.
+ **/
+ signals[ANY_DEVICE_ADDED] =
+ g_signal_new (NM_CLIENT_ANY_DEVICE_ADDED,
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMClientClass, any_device_added),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
+
+ /**
+ * NMClient::any-device-removed:
+ * @client: the client that received the signal
+ * @device: (type NMDevice): the removed device
+ *
+ * Notifies that a #NMDevice is removed. This signal is emitted for both
+ * regular devices and placeholder devices.
+ **/
+ signals[ANY_DEVICE_REMOVED] =
+ g_signal_new (NM_CLIENT_ANY_DEVICE_REMOVED,
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (NMClientClass, any_device_removed),
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
+
/**
* NMClient::permission-changed:
* @client: the client that received the signal
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
#define NM_CLIENT_DEVICES "devices"
+#define NM_CLIENT_ALL_DEVICES "all-devices"
#define NM_CLIENT_CONNECTIONS "connections"
#define NM_CLIENT_HOSTNAME "hostname"
#define NM_CLIENT_CAN_MODIFY "can-modify"
#define NM_CLIENT_DEVICE_ADDED "device-added"
#define NM_CLIENT_DEVICE_REMOVED "device-removed"
+#define NM_CLIENT_ANY_DEVICE_ADDED "any-device-added"
+#define NM_CLIENT_ANY_DEVICE_REMOVED "any-device-removed"
#define NM_CLIENT_PERMISSION_CHANGED "permission-changed"
#define NM_CLIENT_CONNECTION_ADDED "connection-added"
#define NM_CLIENT_CONNECTION_REMOVED "connection-removed"
/* Signals */
void (*device_added) (NMClient *client, NMDevice *device);
void (*device_removed) (NMClient *client, NMDevice *device);
+ void (*any_device_added) (NMClient *client, NMDevice *device);
+ void (*any_device_removed) (NMClient *client, NMDevice *device);
void (*permission_changed) (NMClient *client,
NMClientPermission permission,
NMClientPermissionResult result);
void (*connection_removed) (NMClient *client, NMRemoteConnection *connection);
/*< private >*/
- gpointer padding[8];
+ gpointer padding[6];
} NMClientClass;
GType nm_client_get_type (void);
/* Devices */
const GPtrArray *nm_client_get_devices (NMClient *client);
+NM_AVAILABLE_IN_1_2
+const GPtrArray *nm_client_get_all_devices(NMClient *client);
NMDevice *nm_client_get_device_by_path (NMClient *client, const char *object_path);
NMDevice *nm_client_get_device_by_iface (NMClient *client, const char *iface);
NMState state;
gboolean startup;
GPtrArray *devices;
+ GPtrArray *all_devices;
GPtrArray *active_connections;
NMConnectivityState connectivity;
NMActiveConnection *primary_connection;
PROP_ACTIVATING_CONNECTION,
PROP_DEVICES,
PROP_METERED,
+ PROP_ALL_DEVICES,
LAST_PROP
};
enum {
DEVICE_ADDED,
DEVICE_REMOVED,
+ ANY_DEVICE_ADDED,
+ ANY_DEVICE_REMOVED,
ACTIVE_CONNECTION_ADDED,
ACTIVE_CONNECTION_REMOVED,
PERMISSION_CHANGED,
priv->permissions = g_hash_table_new (g_direct_hash, g_direct_equal);
priv->devices = g_ptr_array_new ();
+ priv->all_devices = g_ptr_array_new ();
priv->active_connections = g_ptr_array_new ();
}
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
int i;
- for (i = 0; i < priv->devices->len; i++) {
- NMDevice *device = g_ptr_array_index (priv->devices, i);
+ for (i = 0; i < priv->all_devices->len; i++) {
+ NMDevice *device = g_ptr_array_index (priv->all_devices, i);
if (NM_IS_DEVICE_WIFI (device))
_nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
{ NM_MANAGER_ACTIVATING_CONNECTION, &priv->activating_connection, NULL, NM_TYPE_ACTIVE_CONNECTION },
{ NM_MANAGER_DEVICES, &priv->devices, NULL, NM_TYPE_DEVICE, "device" },
{ NM_MANAGER_METERED, &priv->metered },
+ { NM_MANAGER_ALL_DEVICES, &priv->all_devices, NULL, NM_TYPE_DEVICE, "any-device" },
{ NULL },
};
return NM_MANAGER_GET_PRIVATE (manager)->devices;
}
+const GPtrArray *
+nm_manager_get_all_devices (NMManager *manager)
+{
+ g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
+
+ return NM_MANAGER_GET_PRIVATE (manager)->all_devices;
+}
+
NMDevice *
nm_manager_get_device_by_path (NMManager *manager, const char *object_path)
{
free_devices (NMManager *manager, gboolean in_dispose)
{
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (manager);
- GPtrArray *devices;
- NMDevice *device;
- int i;
+ gs_unref_ptrarray GPtrArray *real_devices = NULL;
+ gs_unref_ptrarray GPtrArray *all_devices = NULL;
+ GPtrArray *devices = NULL;
+ guint i, j;
- if (!priv->devices)
+ real_devices = priv->devices;
+ all_devices = priv->all_devices;
+
+ if (in_dispose) {
+ priv->devices = NULL;
+ priv->all_devices = NULL;
return;
+ }
- devices = priv->devices;
+ priv->devices = g_ptr_array_new_with_free_func (g_object_unref);
+ priv->all_devices = g_ptr_array_new_with_free_func (g_object_unref);
- if (in_dispose)
- priv->devices = NULL;
- else {
- priv->devices = g_ptr_array_new ();
+ if (all_devices && all_devices->len > 0)
+ devices = all_devices;
+ else if (devices && devices->len > 0)
+ devices = real_devices;
+
+ if (real_devices && devices != real_devices) {
+ for (i = 0; i < real_devices->len; i++) {
+ NMDevice *d = real_devices->pdata[i];
- for (i = 0; i < devices->len; i++) {
- device = devices->pdata[i];
- g_signal_emit (manager, signals[DEVICE_REMOVED], 0, device);
+ if (all_devices) {
+ for (j = 0; j < all_devices->len; j++) {
+ if (d == all_devices->pdata[j])
+ goto next;
+ }
+ }
+ g_signal_emit (manager, signals[DEVICE_REMOVED], 0, d);
+next:
+ ;
}
}
-
- g_ptr_array_unref (devices);
+ if (devices) {
+ for (i = 0; i < devices->len; i++)
+ g_signal_emit (manager, signals[DEVICE_REMOVED], 0, devices->pdata[i]);
+ }
}
static void
case PROP_METERED:
g_value_set_uint (value, priv->metered);
break;
+ case PROP_ALL_DEVICES:
+ g_value_take_boxed (value, _nm_utils_copy_object_array (nm_manager_get_all_devices (self)));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
+ g_object_class_install_property
+ (object_class, PROP_ALL_DEVICES,
+ g_param_spec_boxed (NM_MANAGER_ALL_DEVICES, "", "",
+ G_TYPE_PTR_ARRAY,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
+
/* signals */
signals[DEVICE_ADDED] =
NULL, NULL, NULL,
G_TYPE_NONE, 1,
G_TYPE_OBJECT);
+ signals[ANY_DEVICE_ADDED] =
+ g_signal_new ("any-device-added",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
+ signals[ANY_DEVICE_REMOVED] =
+ g_signal_new ("any-device-removed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_FIRST,
+ 0,
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 1,
+ G_TYPE_OBJECT);
signals[ACTIVE_CONNECTION_ADDED] =
g_signal_new ("active-connection-added",
G_OBJECT_CLASS_TYPE (object_class),
#define NM_MANAGER_ACTIVATING_CONNECTION "activating-connection"
#define NM_MANAGER_DEVICES "devices"
#define NM_MANAGER_METERED "metered"
+#define NM_MANAGER_ALL_DEVICES "all-devices"
typedef struct {
NMObject parent;
void (*permission_changed) (NMManager *manager,
NMClientPermission permission,
NMClientPermissionResult result);
+
+ /* Beware: no more slots. Cannot extend struct without breaking ABI. */
} NMManagerClass;
GType nm_manager_get_type (void);
/* Devices */
const GPtrArray *nm_manager_get_devices (NMManager *manager);
+NM_AVAILABLE_IN_1_2
+const GPtrArray *nm_manager_get_all_devices(NMManager *manager);
NMDevice *nm_manager_get_device_by_path (NMManager *manager, const char *object_path);
NMDevice *nm_manager_get_device_by_iface (NMManager *manager, const char *iface);
_dbus_error_name = IFACE_NM + '.UnknownConnection'
PM_DEVICES = 'Devices'
+PM_ALL_DEVICES = 'AllDevices'
PM_NETWORKING_ENABLED = 'NetworkingEnabled'
PM_WWAN_ENABLED = 'WwanEnabled'
PM_WWAN_HARDWARE_ENABLED = 'WwanHardwareEnabled'
def GetDevices(self):
return to_path_array(self.devices)
+ @dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='ao')
+ def GetAllDevices(self):
+ return to_path_array(self.devices)
+
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='s', out_signature='o')
def GetDeviceByIpIface(self, ip_iface):
for d in self.devices:
def add_device(self, device):
self.devices.append(device)
self.__notify(PM_DEVICES)
+ self.__notify(PM_ALL_DEVICES)
self.DeviceAdded(to_path(device))
@dbus.service.signal(IFACE_NM, signature='o')
def remove_device(self, device):
self.devices.remove(device)
self.__notify(PM_DEVICES)
+ self.__notify(PM_ALL_DEVICES)
self.DeviceRemoved(to_path(device))
################# D-Bus Properties interface
def __get_props(self):
props = {}
props[PM_DEVICES] = to_path_array(self.devices)
+ props[PM_ALL_DEVICES] = to_path_array(self.devices)
props[PM_NETWORKING_ENABLED] = True
props[PM_WWAN_ENABLED] = True
props[PM_WWAN_HARDWARE_ENABLED] = True
projects / NetworkManager.git / commitdiff