merge: add some missing D-Bus interface properties (bgo #715186)
Add properties for things that previously were missing to help out Qt bindings, among others. Also converts libnm-glib over to use the new properties, and adds some testcases to ensure libnm-glib works correctly with them. https://bugzilla.gnome.org/show_bug.cgi?id=715186
This commit is contained in:
Dan Williams
1
.gitignore
vendored
1
.gitignore
vendored
@@ -177,6 +177,7 @@ valgrind-*.log
|
||||
/libnm-util/tests/test-secrets
|
||||
/libnm-util/tests/test-setting-8021x
|
||||
/libnm-util/tests/test-setting-dcb
|
||||
/libnm-glib/tests/test-nm-client
|
||||
/libnm-glib/tests/test-remote-settings-client
|
||||
/src/tests/test-dcb
|
||||
/src/tests/test-dhcp-options
|
||||
|
||||
@@ -512,8 +512,8 @@ fill_output_access_point (gpointer data, gpointer user_data)
|
||||
const GByteArray *ssid;
|
||||
const char *bssid;
|
||||
NM80211Mode mode;
|
||||
char *channel_str, *freq_str, *ssid_str, *ssid_hex_str, *bitrate_str,
|
||||
*strength_str, *wpa_flags_str, *rsn_flags_str;
|
||||
char *channel_str, *freq_str, *ssid_str = NULL, *ssid_hex_str = NULL,
|
||||
*bitrate_str, *strength_str, *wpa_flags_str, *rsn_flags_str;
|
||||
GString *security_str;
|
||||
char *ap_name;
|
||||
const char *sig_level_0 = "____";
|
||||
@@ -541,8 +541,10 @@ fill_output_access_point (gpointer data, gpointer user_data)
|
||||
strength = MIN (nm_access_point_get_strength (ap), 100);
|
||||
|
||||
/* Convert to strings */
|
||||
ssid_str = nm_utils_ssid_to_utf8 (ssid);
|
||||
ssid_hex_str = ssid_to_hex ((const char *)ssid->data, ssid->len);
|
||||
if (ssid) {
|
||||
ssid_str = nm_utils_ssid_to_utf8 (ssid);
|
||||
ssid_hex_str = ssid_to_hex ((const char *) ssid->data, ssid->len);
|
||||
}
|
||||
channel_str = g_strdup_printf ("%u", nm_utils_wifi_freq_to_channel (freq));
|
||||
freq_str = g_strdup_printf (_("%u MHz"), freq);
|
||||
bitrate_str = g_strdup_printf (_("%u MB/s"), bitrate/1000);
|
||||
@@ -1942,16 +1944,20 @@ find_ap_on_device (NMDevice *device, GByteArray *bssid, const char *ssid)
|
||||
|
||||
if (ssid) {
|
||||
/* Parameter is SSID */
|
||||
const GByteArray *candidate_ssid = nm_access_point_get_ssid (candidate_ap);
|
||||
char *ssid_tmp = nm_utils_ssid_to_utf8 (candidate_ssid);
|
||||
const GByteArray *candidate_ssid;
|
||||
|
||||
/* Compare SSIDs */
|
||||
if (strcmp (ssid, ssid_tmp) == 0) {
|
||||
ap = candidate_ap;
|
||||
candidate_ssid = nm_access_point_get_ssid (candidate_ap);
|
||||
if (candidate_ssid) {
|
||||
char *ssid_tmp = nm_utils_ssid_to_utf8 (candidate_ssid);
|
||||
|
||||
/* Compare SSIDs */
|
||||
if (strcmp (ssid, ssid_tmp) == 0) {
|
||||
ap = candidate_ap;
|
||||
g_free (ssid_tmp);
|
||||
break;
|
||||
}
|
||||
g_free (ssid_tmp);
|
||||
break;
|
||||
}
|
||||
g_free (ssid_tmp);
|
||||
} else if (bssid) {
|
||||
/* Parameter is BSSID */
|
||||
const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap);
|
||||
|
||||
@@ -6,11 +6,27 @@
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
|
||||
<arg name="access_points" type="ao" direction="out">
|
||||
<tp:docstring>
|
||||
List of access point object paths
|
||||
List of access point object paths.
|
||||
</tp:docstring>
|
||||
</arg>
|
||||
<tp:docstring>
|
||||
Get the list of access points visible to this device.
|
||||
DEPRECATED. Get the list of access points visible to this device. Note
|
||||
that this list does not include access points which hide their SSID. To
|
||||
retrieve a list of all access points (including hidden ones) use the
|
||||
GetAllAccessPoints() method.
|
||||
</tp:docstring>
|
||||
</method>
|
||||
|
||||
<method name="GetAllAccessPoints">
|
||||
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_all_access_points"/>
|
||||
<arg name="access_points" type="ao" direction="out">
|
||||
<tp:docstring>
|
||||
List of access point object paths.
|
||||
</tp:docstring>
|
||||
</arg>
|
||||
<tp:docstring>
|
||||
Get the list of all access points visible to this device, including
|
||||
hidden ones for which the SSID is not yet known.
|
||||
</tp:docstring>
|
||||
</method>
|
||||
|
||||
@@ -50,11 +66,19 @@
|
||||
The bit rate currently used by the wireless device, in kilobits/second (Kb/s).
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="AccessPoints" type="ao" access="read">
|
||||
<tp:docstring>
|
||||
List of object paths of access point visible to this wireless device.
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="ActiveAccessPoint" type="o" access="read">
|
||||
<tp:docstring>
|
||||
Object path of the access point currently used by the wireless device.
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="WirelessCapabilities" type="u" access="read" tp:type="NM_802_11_DEVICE_CAP">
|
||||
<tp:docstring>
|
||||
The capabilities of the wireless device.
|
||||
|
||||
@@ -14,6 +14,13 @@
|
||||
</tp:docstring>
|
||||
</method>
|
||||
|
||||
<property name="Nsps" type="ao" access="read">
|
||||
<tp:docstring>
|
||||
List of object paths of Network Service Providers (NSPs) visible to this
|
||||
WiMAX device.
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="HwAddress" type="s" access="read">
|
||||
<tp:docstring>
|
||||
Hardware address of the device.
|
||||
|
||||
@@ -275,6 +275,12 @@
|
||||
<arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
|
||||
</method>
|
||||
|
||||
<property name="Devices" type="ao" access="read">
|
||||
<tp:docstring>
|
||||
The list of network devices/interfaces NetworkManager knows about.
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="NetworkingEnabled" type="b" access="read">
|
||||
<tp:docstring>
|
||||
Indicates if overall networking is currently enabled or not. See the
|
||||
|
||||
@@ -115,8 +115,9 @@
|
||||
<tp:docstring>
|
||||
Emitted when this connection is no longer available. This
|
||||
happens when the connection is deleted or if it is no longer
|
||||
accessable by any of the system's logged-in users. After
|
||||
receipt of this signal, the object no longer exists.
|
||||
accessible by any of the system's logged-in users. After
|
||||
receipt of this signal, the object no longer exists. Also
|
||||
see the Settings.ConnectionRemoved signal.
|
||||
</tp:docstring>
|
||||
</signal>
|
||||
|
||||
|
||||
@@ -147,6 +147,12 @@
|
||||
</arg>
|
||||
</method>
|
||||
|
||||
<property name="Connections" type="ao" access="read">
|
||||
<tp:docstring>
|
||||
List of object paths of available network connection profiles.
|
||||
</tp:docstring>
|
||||
</property>
|
||||
|
||||
<property name="Hostname" type="s" access="read">
|
||||
<tp:docstring>
|
||||
The machine hostname stored in persistent configuration.
|
||||
@@ -185,6 +191,21 @@
|
||||
</arg>
|
||||
</signal>
|
||||
|
||||
<signal name="ConnectionRemoved">
|
||||
<tp:docstring>
|
||||
Emitted when a connection is no longer available. This happens when
|
||||
the connection is deleted or if it is no longer accessible by any of
|
||||
the system's logged-in users. After receipt of this signal, the
|
||||
connection no longer exists and cannot be used. Also see the
|
||||
Settings.Connection.Removed signal.
|
||||
</tp:docstring>
|
||||
<arg name="connection" type="o">
|
||||
<tp:docstring>
|
||||
Object path of the removed connection.
|
||||
</tp:docstring>
|
||||
</arg>
|
||||
</signal>
|
||||
|
||||
</interface>
|
||||
</node>
|
||||
|
||||
|
||||
@@ -72,16 +72,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_FLAGS "Flags"
|
||||
#define DBUS_PROP_WPA_FLAGS "WpaFlags"
|
||||
#define DBUS_PROP_RSN_FLAGS "RsnFlags"
|
||||
#define DBUS_PROP_SSID "Ssid"
|
||||
#define DBUS_PROP_FREQUENCY "Frequency"
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_MODE "Mode"
|
||||
#define DBUS_PROP_MAX_BITRATE "MaxBitrate"
|
||||
#define DBUS_PROP_STRENGTH "Strength"
|
||||
|
||||
/**
|
||||
* nm_access_point_new:
|
||||
* @connection: the #DBusGConnection
|
||||
|
||||
@@ -100,6 +100,7 @@ enum {
|
||||
PROP_CONNECTIVITY,
|
||||
PROP_PRIMARY_CONNECTION,
|
||||
PROP_ACTIVATING_CONNECTION,
|
||||
PROP_DEVICES,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
@@ -120,9 +121,6 @@ static void proxy_name_owner_changed (DBusGProxy *proxy,
|
||||
const char *new_owner,
|
||||
gpointer user_data);
|
||||
|
||||
static void client_device_added (NMObject *client, NMObject *device);
|
||||
static void client_device_removed (NMObject *client, NMObject *device);
|
||||
|
||||
/**********************************************************************/
|
||||
|
||||
/**
|
||||
@@ -195,20 +193,13 @@ register_properties (NMClient *client)
|
||||
{ NM_CLIENT_CONNECTIVITY, &priv->connectivity },
|
||||
{ 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" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
_nm_object_register_properties (NM_OBJECT (client),
|
||||
priv->client_proxy,
|
||||
property_info);
|
||||
|
||||
_nm_object_register_pseudo_property (NM_OBJECT (client),
|
||||
priv->client_proxy,
|
||||
"Devices",
|
||||
&priv->devices,
|
||||
NM_TYPE_DEVICE,
|
||||
client_device_added,
|
||||
client_device_removed);
|
||||
}
|
||||
|
||||
#define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK "org.freedesktop.NetworkManager.enable-disable-network"
|
||||
@@ -1402,18 +1393,6 @@ proxy_name_owner_changed (DBusGProxy *proxy,
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
client_device_added (NMObject *client, NMObject *device)
|
||||
{
|
||||
g_signal_emit (client, signals[DEVICE_ADDED], 0, device);
|
||||
}
|
||||
|
||||
static void
|
||||
client_device_removed (NMObject *client, NMObject *device)
|
||||
{
|
||||
g_signal_emit (client, signals[DEVICE_REMOVED], 0, device);
|
||||
}
|
||||
|
||||
/**
|
||||
* nm_client_get_connectivity:
|
||||
* @client: an #NMClient
|
||||
@@ -2161,6 +2140,9 @@ get_property (GObject *object,
|
||||
case PROP_ACTIVATING_CONNECTION:
|
||||
g_value_set_object (value, priv->activating_connection);
|
||||
break;
|
||||
case PROP_DEVICES:
|
||||
g_value_set_boxed (value, nm_client_get_devices (self));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -2389,6 +2371,21 @@ nm_client_class_init (NMClientClass *client_class)
|
||||
NM_TYPE_ACTIVE_CONNECTION,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/**
|
||||
* NMClient:devices:
|
||||
*
|
||||
* List of known network devices.
|
||||
*
|
||||
* Since: 0.9.10
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_DEVICES,
|
||||
g_param_spec_boxed (NM_CLIENT_DEVICES,
|
||||
"Devices",
|
||||
"Devices",
|
||||
NM_TYPE_OBJECT_ARRAY,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/* signals */
|
||||
|
||||
/**
|
||||
|
||||
@@ -58,6 +58,7 @@ G_BEGIN_DECLS
|
||||
#define NM_CLIENT_CONNECTIVITY "connectivity"
|
||||
#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection"
|
||||
#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection"
|
||||
#define NM_CLIENT_DEVICES "devices"
|
||||
|
||||
/**
|
||||
* NMClientPermission:
|
||||
|
||||
@@ -46,7 +46,6 @@ enum {
|
||||
PROP_CARRIER,
|
||||
LAST_PROP
|
||||
};
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
|
||||
/**
|
||||
* nm_device_adsl_error_quark:
|
||||
|
||||
@@ -56,10 +56,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
#define DBUS_PROP_SLAVES "Slaves"
|
||||
|
||||
/**
|
||||
* nm_device_bond_error_quark:
|
||||
*
|
||||
|
||||
@@ -56,10 +56,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
#define DBUS_PROP_SLAVES "Slaves"
|
||||
|
||||
/**
|
||||
* nm_device_bridge_error_quark:
|
||||
*
|
||||
|
||||
@@ -55,10 +55,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_NAME "Name"
|
||||
#define DBUS_PROP_BT_CAPABILITIES "BtCapabilities"
|
||||
|
||||
/**
|
||||
* nm_device_bt_error_quark:
|
||||
*
|
||||
|
||||
@@ -58,11 +58,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_PERM_HW_ADDRESS "PermHwAddress"
|
||||
#define DBUS_PROP_SPEED "Speed"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
|
||||
/**
|
||||
* nm_device_ethernet_error_quark:
|
||||
*
|
||||
|
||||
@@ -48,9 +48,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_TYPE_DESCRIPTION "TypeDescription"
|
||||
|
||||
/**
|
||||
* nm_device_generic_error_quark:
|
||||
*
|
||||
|
||||
@@ -54,9 +54,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
|
||||
/**
|
||||
* nm_device_infiniband_error_quark:
|
||||
*
|
||||
|
||||
@@ -54,9 +54,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_MODEM_CAPS "ModemCapabilities"
|
||||
#define DBUS_PROP_CURRENT_CAPS "CurrentCapabilities"
|
||||
|
||||
/**
|
||||
* nm_device_modem_error_quark:
|
||||
*
|
||||
|
||||
@@ -55,10 +55,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_COMPANION "Companion"
|
||||
#define DBUS_PROP_ACTIVE_CHANNEL "ActiveChannel"
|
||||
|
||||
/**
|
||||
* nm_device_olpc_mesh_error_quark:
|
||||
*
|
||||
|
||||
@@ -54,10 +54,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
#define DBUS_PROP_SLAVES "Slaves"
|
||||
|
||||
/**
|
||||
* nm_device_team_error_quark:
|
||||
*
|
||||
|
||||
@@ -55,10 +55,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_CARRIER "Carrier"
|
||||
#define DBUS_PROP_VLAN_ID "VlanId"
|
||||
|
||||
/**
|
||||
* nm_device_vlan_error_quark:
|
||||
*
|
||||
|
||||
@@ -73,24 +73,17 @@ enum {
|
||||
PROP_BITRATE,
|
||||
PROP_ACTIVE_ACCESS_POINT,
|
||||
PROP_WIRELESS_CAPABILITIES,
|
||||
PROP_ACCESS_POINTS,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_PERM_HW_ADDRESS "PermHwAddress"
|
||||
#define DBUS_PROP_MODE "Mode"
|
||||
#define DBUS_PROP_BITRATE "Bitrate"
|
||||
#define DBUS_PROP_ACTIVE_ACCESS_POINT "ActiveAccessPoint"
|
||||
#define DBUS_PROP_WIRELESS_CAPABILITIES "WirelessCapabilities"
|
||||
|
||||
enum {
|
||||
ACCESS_POINT_ADDED,
|
||||
ACCESS_POINT_REMOVED,
|
||||
|
||||
LAST_SIGNAL
|
||||
};
|
||||
|
||||
static guint signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
/**
|
||||
@@ -389,31 +382,6 @@ nm_device_wifi_request_scan_simple (NMDeviceWifi *device,
|
||||
g_hash_table_unref (options);
|
||||
}
|
||||
|
||||
static void
|
||||
access_point_added (NMObject *self, NMObject *ap)
|
||||
{
|
||||
g_signal_emit (self, signals[ACCESS_POINT_ADDED], 0, ap);
|
||||
}
|
||||
|
||||
static void
|
||||
access_point_removed (NMObject *self_obj, NMObject *ap_obj)
|
||||
{
|
||||
NMDeviceWifi *self = NM_DEVICE_WIFI (self_obj);
|
||||
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
|
||||
NMAccessPoint *ap = NM_ACCESS_POINT (ap_obj);
|
||||
|
||||
if (ap == priv->active_ap) {
|
||||
g_object_unref (priv->active_ap);
|
||||
priv->active_ap = NULL;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
|
||||
|
||||
priv->rate = 0;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIFI_BITRATE);
|
||||
}
|
||||
|
||||
g_signal_emit (self, signals[ACCESS_POINT_REMOVED], 0, ap);
|
||||
}
|
||||
|
||||
static void
|
||||
clean_up_aps (NMDeviceWifi *self, gboolean notify)
|
||||
{
|
||||
@@ -598,6 +566,9 @@ get_property (GObject *object,
|
||||
case PROP_WIRELESS_CAPABILITIES:
|
||||
g_value_set_uint (value, nm_device_wifi_get_capabilities (self));
|
||||
break;
|
||||
case PROP_ACCESS_POINTS:
|
||||
g_value_set_boxed (value, nm_device_wifi_get_access_points (self));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -641,20 +612,28 @@ register_properties (NMDeviceWifi *device)
|
||||
{ NM_DEVICE_WIFI_BITRATE, &priv->rate },
|
||||
{ NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, &priv->active_ap, NULL, NM_TYPE_ACCESS_POINT },
|
||||
{ NM_DEVICE_WIFI_CAPABILITIES, &priv->wireless_caps },
|
||||
{ NM_DEVICE_WIFI_ACCESS_POINTS, &priv->aps, NULL, NM_TYPE_ACCESS_POINT, "access-point" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
_nm_object_register_properties (NM_OBJECT (device),
|
||||
priv->proxy,
|
||||
property_info);
|
||||
}
|
||||
|
||||
_nm_object_register_pseudo_property (NM_OBJECT (device),
|
||||
priv->proxy,
|
||||
"AccessPoints",
|
||||
&priv->aps,
|
||||
NM_TYPE_ACCESS_POINT,
|
||||
access_point_added,
|
||||
access_point_removed);
|
||||
static void
|
||||
access_point_removed (NMDeviceWifi *self, NMAccessPoint *ap)
|
||||
{
|
||||
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
|
||||
|
||||
if (ap == priv->active_ap) {
|
||||
g_object_unref (priv->active_ap);
|
||||
priv->active_ap = NULL;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
|
||||
|
||||
priv->rate = 0;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIFI_BITRATE);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -726,6 +705,7 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class)
|
||||
object_class->finalize = finalize;
|
||||
device_class->connection_compatible = connection_compatible;
|
||||
device_class->get_hw_address = get_hw_address;
|
||||
wifi_class->access_point_removed = access_point_removed;
|
||||
|
||||
/* properties */
|
||||
|
||||
@@ -807,6 +787,21 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class)
|
||||
0, G_MAXUINT32, 0,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/**
|
||||
* NMDeviceWifi:access-points:
|
||||
*
|
||||
* List of all Wi-Fi access points the device can see.
|
||||
*
|
||||
* Since: 0.9.10
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_ACCESS_POINTS,
|
||||
g_param_spec_boxed (NM_DEVICE_WIFI_ACCESS_POINTS,
|
||||
"AccessPoints",
|
||||
"Access Points",
|
||||
NM_TYPE_OBJECT_ARRAY,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/* signals */
|
||||
|
||||
/**
|
||||
|
||||
@@ -67,6 +67,7 @@ GQuark nm_device_wifi_error_quark (void);
|
||||
#define NM_DEVICE_WIFI_BITRATE "bitrate"
|
||||
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
|
||||
#define NM_DEVICE_WIFI_CAPABILITIES "wireless-capabilities"
|
||||
#define NM_DEVICE_WIFI_ACCESS_POINTS "access-points"
|
||||
|
||||
typedef struct {
|
||||
NMDevice parent;
|
||||
|
||||
@@ -66,25 +66,17 @@ enum {
|
||||
PROP_CINR,
|
||||
PROP_TX_POWER,
|
||||
PROP_BSID,
|
||||
PROP_NSPS,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_HW_ADDRESS "HwAddress"
|
||||
#define DBUS_PROP_ACTIVE_NSP "ActiveNsp"
|
||||
#define DBUS_PROP_CENTER_FREQUENCY "CenterFrequency"
|
||||
#define DBUS_PROP_RSSI "Rssi"
|
||||
#define DBUS_PROP_CINR "Cinr"
|
||||
#define DBUS_PROP_TX_POWER "TxPower"
|
||||
#define DBUS_PROP_BSID "Bsid"
|
||||
|
||||
enum {
|
||||
NSP_ADDED,
|
||||
NSP_REMOVED,
|
||||
|
||||
LAST_SIGNAL
|
||||
};
|
||||
|
||||
static guint signals[LAST_SIGNAL] = { 0 };
|
||||
|
||||
/**
|
||||
@@ -236,28 +228,6 @@ nm_device_wimax_get_nsp_by_path (NMDeviceWimax *wimax,
|
||||
return nsp;
|
||||
}
|
||||
|
||||
static void
|
||||
nsp_added (NMObject *self, NMObject *nsp)
|
||||
{
|
||||
g_signal_emit (self, signals[NSP_ADDED], 0, nsp);
|
||||
}
|
||||
|
||||
static void
|
||||
nsp_removed (NMObject *self_obj, NMObject *nsp_obj)
|
||||
{
|
||||
NMDeviceWimax *self = NM_DEVICE_WIMAX (self_obj);
|
||||
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
|
||||
NMWimaxNsp *nsp = NM_WIMAX_NSP (nsp_obj);
|
||||
|
||||
if (nsp == priv->active_nsp) {
|
||||
g_object_unref (priv->active_nsp);
|
||||
priv->active_nsp = NULL;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIMAX_ACTIVE_NSP);
|
||||
}
|
||||
|
||||
g_signal_emit (self, signals[NSP_REMOVED], 0, nsp);
|
||||
}
|
||||
|
||||
static void
|
||||
clean_up_nsps (NMDeviceWimax *self, gboolean notify)
|
||||
{
|
||||
@@ -473,6 +443,9 @@ get_property (GObject *object,
|
||||
case PROP_BSID:
|
||||
g_value_set_string (value, nm_device_wimax_get_bsid (self));
|
||||
break;
|
||||
case PROP_NSPS:
|
||||
g_value_set_boxed (value, nm_device_wimax_get_nsps (self));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -548,27 +521,32 @@ register_properties (NMDeviceWimax *wimax)
|
||||
{
|
||||
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (wimax);
|
||||
const NMPropertiesInfo property_info[] = {
|
||||
{ NM_DEVICE_WIMAX_HW_ADDRESS, &priv->hw_address },
|
||||
{ NM_DEVICE_WIMAX_ACTIVE_NSP, &priv->active_nsp, NULL, NM_TYPE_WIMAX_NSP },
|
||||
{ NM_DEVICE_WIMAX_HW_ADDRESS, &priv->hw_address },
|
||||
{ NM_DEVICE_WIMAX_ACTIVE_NSP, &priv->active_nsp, NULL, NM_TYPE_WIMAX_NSP },
|
||||
{ NM_DEVICE_WIMAX_CENTER_FREQUENCY, &priv->center_freq },
|
||||
{ NM_DEVICE_WIMAX_RSSI, &priv->rssi },
|
||||
{ NM_DEVICE_WIMAX_CINR, &priv->cinr },
|
||||
{ NM_DEVICE_WIMAX_TX_POWER, &priv->tx_power },
|
||||
{ NM_DEVICE_WIMAX_BSID, &priv->bsid },
|
||||
{ NM_DEVICE_WIMAX_RSSI, &priv->rssi },
|
||||
{ NM_DEVICE_WIMAX_CINR, &priv->cinr },
|
||||
{ NM_DEVICE_WIMAX_TX_POWER, &priv->tx_power },
|
||||
{ NM_DEVICE_WIMAX_BSID, &priv->bsid },
|
||||
{ NM_DEVICE_WIMAX_NSPS, &priv->nsps, NULL, NM_TYPE_WIMAX_NSP, "nsp" },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
_nm_object_register_properties (NM_OBJECT (wimax),
|
||||
priv->proxy,
|
||||
property_info);
|
||||
}
|
||||
|
||||
_nm_object_register_pseudo_property (NM_OBJECT (wimax),
|
||||
priv->proxy,
|
||||
"NspList",
|
||||
&priv->nsps,
|
||||
NM_TYPE_WIMAX_NSP,
|
||||
nsp_added,
|
||||
nsp_removed);
|
||||
static void
|
||||
nsp_removed (NMDeviceWimax *self, NMWimaxNsp *nsp)
|
||||
{
|
||||
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
|
||||
|
||||
if (nsp == priv->active_nsp) {
|
||||
g_object_unref (priv->active_nsp);
|
||||
priv->active_nsp = NULL;
|
||||
_nm_object_queue_notify (NM_OBJECT (self), NM_DEVICE_WIMAX_ACTIVE_NSP);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -622,6 +600,7 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *wimax_class)
|
||||
object_class->dispose = dispose;
|
||||
device_class->connection_compatible = connection_compatible;
|
||||
device_class->get_hw_address = get_hw_address;
|
||||
wimax_class->nsp_removed = nsp_removed;
|
||||
|
||||
/* properties */
|
||||
|
||||
@@ -726,6 +705,21 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *wimax_class)
|
||||
NULL,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/**
|
||||
* NMDeviceWimax:nsps:
|
||||
*
|
||||
* List of all WiMAX Network Service Providers the device can see.
|
||||
*
|
||||
* Since: 0.9.10
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_NSPS,
|
||||
g_param_spec_boxed (NM_DEVICE_WIMAX_NSPS,
|
||||
"NSPs",
|
||||
"Network Service Providers",
|
||||
NM_TYPE_OBJECT_ARRAY,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/* signals */
|
||||
|
||||
/**
|
||||
|
||||
@@ -62,6 +62,7 @@ GQuark nm_device_wimax_error_quark (void);
|
||||
#define NM_DEVICE_WIMAX_CINR "cinr"
|
||||
#define NM_DEVICE_WIMAX_TX_POWER "tx-power"
|
||||
#define NM_DEVICE_WIMAX_BSID "bsid"
|
||||
#define NM_DEVICE_WIMAX_NSPS "nsps"
|
||||
|
||||
typedef struct {
|
||||
NMDevice parent;
|
||||
|
||||
@@ -37,6 +37,7 @@ typedef struct {
|
||||
gpointer field;
|
||||
PropertyMarshalFunc func;
|
||||
GType object_type;
|
||||
const char *signal_prefix;
|
||||
} NMPropertiesInfo;
|
||||
|
||||
DBusGProxy *_nm_object_new_proxy (NMObject *self,
|
||||
@@ -58,17 +59,6 @@ gboolean _nm_object_reload_properties_finish (NMObject *object,
|
||||
GAsyncResult *result,
|
||||
GError **error);
|
||||
|
||||
typedef void (*NMPseudoPropertyChangedFunc) (NMObject *self, NMObject *changed);
|
||||
void _nm_object_register_pseudo_property (NMObject *object,
|
||||
DBusGProxy *proxy,
|
||||
const char *name,
|
||||
gpointer field,
|
||||
GType object_type,
|
||||
NMPseudoPropertyChangedFunc added_func,
|
||||
NMPseudoPropertyChangedFunc removed_func);
|
||||
void _nm_object_reload_pseudo_property (NMObject *object,
|
||||
const char *name);
|
||||
|
||||
void _nm_object_queue_notify (NMObject *object, const char *property);
|
||||
|
||||
void _nm_object_suppress_property_updates (NMObject *object, gboolean suppress);
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <string.h>
|
||||
#include <gio/gio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <nm-utils.h>
|
||||
#include "NetworkManager.h"
|
||||
#include "nm-object.h"
|
||||
@@ -52,23 +53,12 @@ static GHashTable *type_funcs, *type_async_funcs;
|
||||
typedef struct {
|
||||
PropertyMarshalFunc func;
|
||||
GType object_type;
|
||||
|
||||
gpointer field;
|
||||
const char *signal_prefix;
|
||||
} PropertyInfo;
|
||||
|
||||
static void reload_complete (NMObject *object);
|
||||
|
||||
typedef struct {
|
||||
PropertyInfo pi;
|
||||
|
||||
NMObject *self;
|
||||
DBusGProxy *proxy;
|
||||
|
||||
char *get_method;
|
||||
NMPseudoPropertyChangedFunc added_func;
|
||||
NMPseudoPropertyChangedFunc removed_func;
|
||||
} PseudoPropertyInfo;
|
||||
|
||||
typedef struct {
|
||||
DBusGConnection *connection;
|
||||
DBusGProxy *bus_proxy;
|
||||
@@ -78,7 +68,6 @@ typedef struct {
|
||||
DBusGProxy *properties_proxy;
|
||||
GSList *property_interfaces;
|
||||
GSList *property_tables;
|
||||
GHashTable *pseudo_properties;
|
||||
NMObject *parent;
|
||||
gboolean suppress_property_updates;
|
||||
|
||||
@@ -342,9 +331,6 @@ finalize (GObject *object)
|
||||
g_slist_free_full (priv->property_tables, (GDestroyNotify) g_hash_table_destroy);
|
||||
g_free (priv->path);
|
||||
|
||||
if (priv->pseudo_properties)
|
||||
g_hash_table_destroy (priv->pseudo_properties);
|
||||
|
||||
G_OBJECT_CLASS (nm_object_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
@@ -761,31 +747,121 @@ typedef struct {
|
||||
const char *property_name;
|
||||
} ObjectCreatedData;
|
||||
|
||||
/* Places items from 'needles' that are not in 'haystack' into 'diff' */
|
||||
static void
|
||||
array_diff (GPtrArray *needles, GPtrArray *haystack, GPtrArray *diff)
|
||||
{
|
||||
guint i, j;
|
||||
GObject *obj;
|
||||
|
||||
g_assert (needles);
|
||||
g_assert (haystack);
|
||||
g_assert (diff);
|
||||
|
||||
for (i = 0; i < needles->len; i++) {
|
||||
obj = g_ptr_array_index (needles, i);
|
||||
|
||||
for (j = 0; j < haystack->len; j++) {
|
||||
if (g_ptr_array_index (haystack, j) == obj)
|
||||
break;
|
||||
}
|
||||
|
||||
if (j == haystack->len)
|
||||
g_ptr_array_add (diff, obj);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
emit_added_removed_signal (NMObject *self,
|
||||
const char *signal_prefix,
|
||||
NMObject *changed,
|
||||
gboolean added)
|
||||
{
|
||||
char buf[50];
|
||||
int ret;
|
||||
|
||||
ret = snprintf (buf, sizeof (buf), "%s-%s", signal_prefix, added ? "added" : "removed");
|
||||
g_assert (ret > 0);
|
||||
g_assert (ret < sizeof (buf));
|
||||
g_signal_emit_by_name (self, buf, changed);
|
||||
}
|
||||
|
||||
static void
|
||||
object_property_complete (ObjectCreatedData *odata)
|
||||
{
|
||||
NMObject *self = odata->self;
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (self);
|
||||
PropertyInfo *pi = odata->pi;
|
||||
gboolean different = TRUE;
|
||||
|
||||
if (odata->array) {
|
||||
GPtrArray **array = pi->field;
|
||||
GPtrArray *old = *((GPtrArray **) pi->field);
|
||||
GPtrArray *new;
|
||||
int i;
|
||||
|
||||
if (*array)
|
||||
g_boxed_free (NM_TYPE_OBJECT_ARRAY, *array);
|
||||
*array = g_ptr_array_sized_new (odata->length);
|
||||
/* Build up new array */
|
||||
new = g_ptr_array_sized_new (odata->length);
|
||||
for (i = 0; i < odata->length; i++)
|
||||
add_to_object_array_unique (*array, odata->objects[i]);
|
||||
add_to_object_array_unique (new, odata->objects[i]);
|
||||
|
||||
if (pi->signal_prefix) {
|
||||
GPtrArray *added = g_ptr_array_sized_new (3);
|
||||
GPtrArray *removed = g_ptr_array_sized_new (3);
|
||||
|
||||
if (old) {
|
||||
/* Find objects in 'old' that do not exist in 'new' */
|
||||
array_diff (old, new, removed);
|
||||
|
||||
/* Find objects in 'new' that do not exist in old */
|
||||
array_diff (new, old, added);
|
||||
} else {
|
||||
for (i = 0; i < new->len; i++)
|
||||
g_ptr_array_add (added, g_ptr_array_index (new, i));
|
||||
}
|
||||
|
||||
*((GPtrArray **) pi->field) = new;
|
||||
|
||||
/* Emit added & removed */
|
||||
for (i = 0; i < removed->len; i++) {
|
||||
emit_added_removed_signal (self,
|
||||
pi->signal_prefix,
|
||||
g_ptr_array_index (removed, i),
|
||||
FALSE);
|
||||
}
|
||||
|
||||
for (i = 0; i < added->len; i++) {
|
||||
emit_added_removed_signal (self,
|
||||
pi->signal_prefix,
|
||||
g_ptr_array_index (added, i),
|
||||
TRUE);
|
||||
}
|
||||
|
||||
different = removed->len || added->len;
|
||||
g_ptr_array_free (added, TRUE);
|
||||
g_ptr_array_free (removed, TRUE);
|
||||
} else {
|
||||
/* No added/removed signals to send, just replace the property with
|
||||
* the new values.
|
||||
*/
|
||||
*((GPtrArray **) pi->field) = new;
|
||||
different = TRUE;
|
||||
}
|
||||
|
||||
/* Free old array last since it will release references, thus freeing
|
||||
* any objects in the 'removed' array.
|
||||
*/
|
||||
if (old)
|
||||
g_boxed_free (NM_TYPE_OBJECT_ARRAY, old);
|
||||
} else {
|
||||
GObject **obj_p = pi->field;
|
||||
|
||||
different = (*obj_p != odata->objects[0]);
|
||||
if (*obj_p)
|
||||
g_object_unref (*obj_p);
|
||||
*obj_p = odata->objects[0];
|
||||
}
|
||||
|
||||
if (odata->property_name)
|
||||
if (different && odata->property_name)
|
||||
_nm_object_queue_notify (self, odata->property_name);
|
||||
|
||||
if (priv->reload_results && --priv->reload_remaining == 0)
|
||||
@@ -1135,6 +1211,7 @@ _nm_object_register_properties (NMObject *object,
|
||||
pi->func = tmp->func ? tmp->func : demarshal_generic;
|
||||
pi->object_type = tmp->object_type;
|
||||
pi->field = tmp->field;
|
||||
pi->signal_prefix = tmp->signal_prefix;
|
||||
g_hash_table_insert (instance, g_strdup (tmp->name), pi);
|
||||
}
|
||||
}
|
||||
@@ -1145,8 +1222,6 @@ _nm_object_reload_properties (NMObject *object, GError **error)
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
|
||||
GHashTable *props = NULL;
|
||||
GSList *p;
|
||||
GHashTableIter pp;
|
||||
gpointer name, info;
|
||||
|
||||
if (!priv->property_interfaces || !priv->nm_running)
|
||||
return TRUE;
|
||||
@@ -1163,12 +1238,6 @@ _nm_object_reload_properties (NMObject *object, GError **error)
|
||||
g_hash_table_destroy (props);
|
||||
}
|
||||
|
||||
if (priv->pseudo_properties) {
|
||||
g_hash_table_iter_init (&pp, priv->pseudo_properties);
|
||||
while (g_hash_table_iter_next (&pp, &name, &info))
|
||||
_nm_object_reload_pseudo_property (object, name);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -1268,166 +1337,6 @@ _nm_object_set_property (NMObject *object,
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
pseudo_property_object_created (GObject *obj, const char *path, gpointer user_data)
|
||||
{
|
||||
PseudoPropertyInfo *ppi = user_data;
|
||||
|
||||
if (obj) {
|
||||
GPtrArray **list_p = (GPtrArray **)ppi->pi.field;
|
||||
|
||||
if (!*list_p)
|
||||
*list_p = g_ptr_array_new ();
|
||||
add_to_object_array_unique (*list_p, obj);
|
||||
ppi->added_func (ppi->self, NM_OBJECT (obj));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
pseudo_property_added (DBusGProxy *proxy, const char *path, gpointer user_data)
|
||||
{
|
||||
PseudoPropertyInfo *ppi = user_data;
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (ppi->self);
|
||||
NMObject *obj;
|
||||
|
||||
if (priv->suppress_property_updates)
|
||||
return;
|
||||
|
||||
obj = _nm_object_cache_get (path);
|
||||
if (obj)
|
||||
pseudo_property_object_created (G_OBJECT (obj), path, ppi);
|
||||
else {
|
||||
_nm_object_create_async (ppi->pi.object_type, priv->connection, path,
|
||||
pseudo_property_object_created, ppi);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
pseudo_property_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
|
||||
{
|
||||
PseudoPropertyInfo *ppi = user_data;
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (ppi->self);
|
||||
GPtrArray *list = *(GPtrArray **)ppi->pi.field;
|
||||
NMObject *obj = NULL;
|
||||
int i;
|
||||
|
||||
if (!list || priv->suppress_property_updates)
|
||||
return;
|
||||
|
||||
for (i = 0; i < list->len; i++) {
|
||||
obj = list->pdata[i];
|
||||
if (!strcmp (path, nm_object_get_path (obj))) {
|
||||
g_ptr_array_remove_index (list, i);
|
||||
ppi->removed_func (ppi->self, obj);
|
||||
g_object_unref (obj);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
free_pseudo_property (PseudoPropertyInfo *ppi)
|
||||
{
|
||||
g_object_unref (ppi->proxy);
|
||||
g_free (ppi->get_method);
|
||||
g_slice_free (PseudoPropertyInfo, ppi);
|
||||
}
|
||||
|
||||
void
|
||||
_nm_object_register_pseudo_property (NMObject *object,
|
||||
DBusGProxy *proxy,
|
||||
const char *name,
|
||||
gpointer field,
|
||||
GType object_type,
|
||||
NMPseudoPropertyChangedFunc added_func,
|
||||
NMPseudoPropertyChangedFunc removed_func)
|
||||
{
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
|
||||
PseudoPropertyInfo *ppi;
|
||||
int basename_len;
|
||||
char *added_signal, *removed_signal;
|
||||
|
||||
g_return_if_fail (NM_IS_OBJECT (object));
|
||||
g_return_if_fail (proxy != NULL);
|
||||
|
||||
ppi = g_slice_new0 (PseudoPropertyInfo);
|
||||
ppi->pi.field = field;
|
||||
ppi->pi.object_type = object_type;
|
||||
ppi->self = object;
|
||||
ppi->proxy = g_object_ref (proxy);
|
||||
ppi->added_func = added_func;
|
||||
ppi->removed_func = removed_func;
|
||||
|
||||
basename_len = strlen (name);
|
||||
if (basename_len > 4 && !strcmp (name + basename_len - 4, "List"))
|
||||
basename_len -= 4;
|
||||
else if (basename_len > 1 && name[basename_len - 1] == 's')
|
||||
basename_len--;
|
||||
else
|
||||
g_assert_not_reached ();
|
||||
|
||||
ppi->get_method = g_strdup_printf ("Get%s", name);
|
||||
added_signal = g_strdup_printf ("%.*sAdded", basename_len, name);
|
||||
removed_signal = g_strdup_printf ("%.*sRemoved", basename_len, name);
|
||||
|
||||
if (!priv->pseudo_properties) {
|
||||
priv->pseudo_properties = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
g_free, (GDestroyNotify) free_pseudo_property);
|
||||
}
|
||||
g_hash_table_insert (priv->pseudo_properties, g_strdup (name), ppi);
|
||||
|
||||
dbus_g_proxy_add_signal (proxy, added_signal,
|
||||
DBUS_TYPE_G_OBJECT_PATH,
|
||||
G_TYPE_INVALID);
|
||||
dbus_g_proxy_connect_signal (proxy, added_signal,
|
||||
G_CALLBACK (pseudo_property_added),
|
||||
ppi, NULL);
|
||||
|
||||
dbus_g_proxy_add_signal (proxy, removed_signal,
|
||||
DBUS_TYPE_G_OBJECT_PATH,
|
||||
G_TYPE_INVALID);
|
||||
dbus_g_proxy_connect_signal (proxy, removed_signal,
|
||||
G_CALLBACK (pseudo_property_removed),
|
||||
ppi, NULL);
|
||||
|
||||
g_free (added_signal);
|
||||
g_free (removed_signal);
|
||||
}
|
||||
|
||||
void
|
||||
_nm_object_reload_pseudo_property (NMObject *object,
|
||||
const char *name)
|
||||
{
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
|
||||
PseudoPropertyInfo *ppi;
|
||||
GPtrArray *temp;
|
||||
GError *error = NULL;
|
||||
GValue value = G_VALUE_INIT;
|
||||
|
||||
g_return_if_fail (NM_IS_OBJECT (object));
|
||||
g_return_if_fail (name != NULL);
|
||||
|
||||
if (!NM_OBJECT_GET_PRIVATE (object)->nm_running)
|
||||
return;
|
||||
|
||||
ppi = g_hash_table_lookup (priv->pseudo_properties, name);
|
||||
g_return_if_fail (ppi != NULL);
|
||||
|
||||
if (!dbus_g_proxy_call (ppi->proxy, ppi->get_method, &error,
|
||||
G_TYPE_INVALID,
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &temp,
|
||||
G_TYPE_INVALID)) {
|
||||
g_warning ("%s: error calling %s: %s", __func__, ppi->get_method, error->message);
|
||||
g_error_free (error);
|
||||
return;
|
||||
}
|
||||
|
||||
g_value_init (&value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH);
|
||||
g_value_take_boxed (&value, temp);
|
||||
handle_object_array_property (object, NULL, &value, &ppi->pi, TRUE);
|
||||
g_value_unset (&value);
|
||||
}
|
||||
|
||||
static void
|
||||
reload_complete (NMObject *object)
|
||||
{
|
||||
@@ -1481,36 +1390,6 @@ reload_got_properties (DBusGProxy *proxy, DBusGProxyCall *call,
|
||||
reload_complete (object);
|
||||
}
|
||||
|
||||
static void
|
||||
reload_got_pseudo_property (DBusGProxy *proxy, DBusGProxyCall *call,
|
||||
gpointer user_data)
|
||||
{
|
||||
PseudoPropertyInfo *ppi = user_data;
|
||||
NMObject *object = ppi->self;
|
||||
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
|
||||
GPtrArray *temp;
|
||||
GValue value = G_VALUE_INIT;
|
||||
GError *error = NULL;
|
||||
|
||||
if (dbus_g_proxy_end_call (proxy, call, &error,
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &temp,
|
||||
G_TYPE_INVALID)) {
|
||||
g_value_init (&value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH);
|
||||
g_value_take_boxed (&value, temp);
|
||||
if (!priv->suppress_property_updates)
|
||||
handle_object_array_property (object, NULL, &value, &ppi->pi, FALSE);
|
||||
g_value_unset (&value);
|
||||
} else {
|
||||
if (priv->reload_error)
|
||||
g_error_free (error);
|
||||
else
|
||||
priv->reload_error = error;
|
||||
}
|
||||
|
||||
if (--priv->reload_remaining == 0)
|
||||
reload_complete (object);
|
||||
}
|
||||
|
||||
void
|
||||
_nm_object_reload_properties_async (NMObject *object, GAsyncReadyCallback callback, gpointer user_data)
|
||||
{
|
||||
@@ -1521,7 +1400,7 @@ _nm_object_reload_properties_async (NMObject *object, GAsyncReadyCallback callba
|
||||
simple = g_simple_async_result_new (G_OBJECT (object), callback,
|
||||
user_data, _nm_object_reload_properties_async);
|
||||
|
||||
if (!priv->property_interfaces && !priv->pseudo_properties) {
|
||||
if (!priv->property_interfaces) {
|
||||
g_simple_async_result_complete_in_idle (simple);
|
||||
g_object_unref (simple);
|
||||
return;
|
||||
@@ -1543,21 +1422,6 @@ _nm_object_reload_properties_async (NMObject *object, GAsyncReadyCallback callba
|
||||
G_TYPE_STRING, p->data,
|
||||
G_TYPE_INVALID);
|
||||
}
|
||||
|
||||
if (priv->pseudo_properties) {
|
||||
GHashTableIter iter;
|
||||
gpointer key, value;
|
||||
PseudoPropertyInfo *ppi;
|
||||
|
||||
g_hash_table_iter_init (&iter, priv->pseudo_properties);
|
||||
while (g_hash_table_iter_next (&iter, &key, &value)) {
|
||||
ppi = value;
|
||||
priv->reload_remaining++;
|
||||
dbus_g_proxy_begin_call (ppi->proxy, ppi->get_method,
|
||||
reload_got_pseudo_property, ppi, NULL,
|
||||
G_TYPE_INVALID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gboolean
|
||||
|
||||
@@ -46,9 +46,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_VPN_STATE "VpnState"
|
||||
#define DBUS_PROP_BANNER "Banner"
|
||||
|
||||
enum {
|
||||
VPN_STATE_CHANGED,
|
||||
|
||||
|
||||
@@ -55,10 +55,6 @@ enum {
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
#define DBUS_PROP_NAME "Name"
|
||||
#define DBUS_PROP_SIGNAL_QUALITY "SignalQuality"
|
||||
#define DBUS_PROP_NETWORK_TYPE "NetworkType"
|
||||
|
||||
/**
|
||||
* nm_wimax_nsp_new:
|
||||
* @connection: the #DBusGConnection
|
||||
|
||||
@@ -9,7 +9,18 @@ AM_CPPFLAGS = \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(DBUS_CFLAGS)
|
||||
|
||||
noinst_PROGRAMS = test-remote-settings-client
|
||||
noinst_PROGRAMS = test-nm-client test-remote-settings-client
|
||||
|
||||
####### NMClient and non-settings tests #######
|
||||
|
||||
test_nm_client_SOURCES = \
|
||||
test-nm-client.c
|
||||
|
||||
test_nm_client_LDADD = \
|
||||
$(top_builddir)/libnm-util/libnm-util.la \
|
||||
$(top_builddir)/libnm-glib/libnm-glib-test.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(DBUS_LIBS)
|
||||
|
||||
####### remote settings client test #######
|
||||
|
||||
@@ -24,14 +35,17 @@ test_remote_settings_client_LDADD = \
|
||||
|
||||
###########################################
|
||||
|
||||
TEST_NM_BIN = test-fake-nm.py
|
||||
TEST_RSS_BIN = test-remote-settings-service.py
|
||||
|
||||
EXTRA_DIST = $(TEST_RSS_BIN)
|
||||
EXTRA_DIST = $(TEST_RSS_BIN) $(TEST_NM_BIN)
|
||||
|
||||
check-local: test-remote-settings-client
|
||||
check-local: test-nm-client test-remote-settings-client
|
||||
if test -z "$$DBUS_SESSION_BUS_ADDRESS" ; then \
|
||||
dbus-launch --exit-with-session $(abs_builddir)/test-nm-client $(abs_srcdir) $(TEST_NM_BIN); \
|
||||
dbus-launch --exit-with-session $(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN); \
|
||||
else \
|
||||
$(abs_builddir)/test-nm-client $(abs_srcdir) $(TEST_NM_BIN); \
|
||||
$(abs_builddir)/test-remote-settings-client $(abs_srcdir) $(TEST_RSS_BIN); \
|
||||
fi;
|
||||
|
||||
|
||||
776
libnm-glib/tests/test-fake-nm.py
Executable file
776
libnm-glib/tests/test-fake-nm.py
Executable file
@@ -0,0 +1,776 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from gi.repository import GLib, GObject
|
||||
import sys
|
||||
import dbus
|
||||
import dbus.service
|
||||
import dbus.mainloop.glib
|
||||
import random
|
||||
|
||||
mainloop = GObject.MainLoop()
|
||||
quit_id = 0
|
||||
|
||||
# NM State
|
||||
NM_STATE_UNKNOWN = 0
|
||||
NM_STATE_ASLEEP = 10
|
||||
NM_STATE_DISCONNECTED = 20
|
||||
NM_STATE_DISCONNECTING = 30
|
||||
NM_STATE_CONNECTING = 40
|
||||
NM_STATE_CONNECTED_LOCAL = 50
|
||||
NM_STATE_CONNECTED_SITE = 60
|
||||
NM_STATE_CONNECTED_GLOBAL = 70
|
||||
|
||||
# Device state
|
||||
NM_DEVICE_STATE_UNKNOWN = 0
|
||||
NM_DEVICE_STATE_UNMANAGED = 10
|
||||
NM_DEVICE_STATE_UNAVAILABLE = 20
|
||||
NM_DEVICE_STATE_DISCONNECTED = 30
|
||||
NM_DEVICE_STATE_PREPARE = 40
|
||||
NM_DEVICE_STATE_CONFIG = 50
|
||||
NM_DEVICE_STATE_NEED_AUTH = 60
|
||||
NM_DEVICE_STATE_IP_CONFIG = 70
|
||||
NM_DEVICE_STATE_IP_CHECK = 80
|
||||
NM_DEVICE_STATE_SECONDARIES = 90
|
||||
NM_DEVICE_STATE_ACTIVATED = 100
|
||||
NM_DEVICE_STATE_DEACTIVATING = 110
|
||||
NM_DEVICE_STATE_FAILED = 120
|
||||
|
||||
NM_DEVICE_TYPE_UNKNOWN = 0
|
||||
NM_DEVICE_TYPE_ETHERNET = 1
|
||||
NM_DEVICE_TYPE_WIFI = 2
|
||||
NM_DEVICE_TYPE_UNUSED1 = 3
|
||||
NM_DEVICE_TYPE_UNUSED2 = 4
|
||||
NM_DEVICE_TYPE_BT = 5
|
||||
NM_DEVICE_TYPE_OLPC_MESH = 6
|
||||
NM_DEVICE_TYPE_WIMAX = 7
|
||||
NM_DEVICE_TYPE_MODEM = 8
|
||||
NM_DEVICE_TYPE_INFINIBAND = 9
|
||||
NM_DEVICE_TYPE_BOND = 10
|
||||
NM_DEVICE_TYPE_VLAN = 11
|
||||
NM_DEVICE_TYPE_ADSL = 12
|
||||
NM_DEVICE_TYPE_BRIDGE = 13
|
||||
NM_DEVICE_TYPE_GENERIC = 14
|
||||
NM_DEVICE_TYPE_TEAM = 15
|
||||
|
||||
#########################################################
|
||||
IFACE_DBUS = 'org.freedesktop.DBus'
|
||||
|
||||
class UnknownInterfaceException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_DBUS + '.UnknownInterface'
|
||||
|
||||
class UnknownPropertyException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_DBUS + '.UnknownProperty'
|
||||
|
||||
def to_path_array(src):
|
||||
array = dbus.Array([], signature=dbus.Signature('o'))
|
||||
for o in src:
|
||||
array.append(o.path)
|
||||
return array
|
||||
|
||||
def to_path(src):
|
||||
if src:
|
||||
return dbus.ObjectPath(src.path)
|
||||
return dbus.ObjectPath("/")
|
||||
|
||||
class ExportedObj(dbus.service.Object):
|
||||
def __init__(self, bus, object_path):
|
||||
dbus.service.Object.__init__(self, bus, object_path)
|
||||
self._bus = bus
|
||||
self.path = object_path
|
||||
self.__dbus_ifaces = {}
|
||||
|
||||
def add_dbus_interface(self, dbus_iface, get_props_func):
|
||||
self.__dbus_ifaces[dbus_iface] = get_props_func
|
||||
|
||||
def _get_dbus_properties(self, iface):
|
||||
return self.__dbus_ifaces[iface]()
|
||||
|
||||
@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE, in_signature='s', out_signature='a{sv}')
|
||||
def GetAll(self, iface):
|
||||
if iface not in self.__dbus_ifaces.keys():
|
||||
raise UnknownInterfaceException()
|
||||
return self._get_dbus_properties(iface)
|
||||
|
||||
@dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE, in_signature='ss', out_signature='v')
|
||||
def Get(self, iface, name):
|
||||
if iface not in self.__dbus_ifaces.keys():
|
||||
raise UnknownInterfaceException()
|
||||
props = self._get_dbus_properties(iface)
|
||||
if not name in props.keys():
|
||||
raise UnknownPropertyException()
|
||||
return props[name]
|
||||
|
||||
###################################################################
|
||||
IFACE_DEVICE = 'org.freedesktop.NetworkManager.Device'
|
||||
|
||||
PD_UDI = "Udi"
|
||||
PD_IFACE = "Interface"
|
||||
PD_DRIVER = "Driver"
|
||||
PD_STATE = "State"
|
||||
PD_ACTIVE_CONNECTION = "ActiveConnection"
|
||||
PD_IP4_CONFIG = "Ip4Config"
|
||||
PD_IP6_CONFIG = "Ip6Config"
|
||||
PD_DHCP4_CONFIG = "Dhcp4Config"
|
||||
PD_DHCP6_CONFIG = "Dhcp6Config"
|
||||
PD_MANAGED = "Managed"
|
||||
PD_AUTOCONNECT = "Autoconnect"
|
||||
PD_DEVICE_TYPE = "DeviceType"
|
||||
PD_AVAILABLE_CONNECTIONS = "AvailableConnections"
|
||||
|
||||
class Device(ExportedObj):
|
||||
counter = 1
|
||||
|
||||
def __init__(self, bus, iface, devtype):
|
||||
object_path = "/org/freedesktop/NetworkManager/Devices/%d" % Device.counter
|
||||
Device.counter = Device.counter + 1
|
||||
ExportedObj.__init__(self, bus, object_path)
|
||||
self.add_dbus_interface(IFACE_DEVICE, self.__get_props)
|
||||
|
||||
self.iface = iface
|
||||
self.udi = "/sys/devices/virtual/%s" % iface
|
||||
self.devtype = devtype
|
||||
self.active_connection = None
|
||||
self.state = NM_DEVICE_STATE_UNAVAILABLE
|
||||
self.ip4_config = None
|
||||
self.ip6_config = None
|
||||
self.dhcp4_config = None
|
||||
self.dhcp6_config = None
|
||||
self.available_connections = []
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PD_UDI] = self.udi
|
||||
props[PD_IFACE] = self.iface
|
||||
props[PD_DRIVER] = "virtual"
|
||||
props[PD_STATE] = dbus.UInt32(self.state)
|
||||
props[PD_ACTIVE_CONNECTION] = to_path(self.active_connection)
|
||||
props[PD_IP4_CONFIG] = to_path(self.ip4_config)
|
||||
props[PD_IP6_CONFIG] = to_path(self.ip6_config)
|
||||
props[PD_DHCP4_CONFIG] = to_path(self.dhcp4_config)
|
||||
props[PD_DHCP6_CONFIG] = to_path(self.dhcp6_config)
|
||||
props[PD_MANAGED] = True
|
||||
props[PD_AUTOCONNECT] = True
|
||||
props[PD_DEVICE_TYPE] = dbus.UInt32(self.devtype)
|
||||
props[PD_AVAILABLE_CONNECTIONS] = to_path_array(self.available_connections)
|
||||
return props
|
||||
|
||||
# methods
|
||||
@dbus.service.method(dbus_interface=IFACE_DEVICE, in_signature='', out_signature='')
|
||||
def Disconnect(self):
|
||||
pass
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_DEVICE)
|
||||
changed = { propname: props[propname] }
|
||||
Device.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_DEVICE, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
|
||||
###################################################################
|
||||
|
||||
def random_mac():
|
||||
return '%02X:%02X:%02X:%02X:%02X:%02X' % (
|
||||
random.randint(0, 255), random.randint(0, 255), random.randint(0, 255),
|
||||
random.randint(0, 255), random.randint(0, 255), random.randint(0, 255)
|
||||
)
|
||||
|
||||
###################################################################
|
||||
IFACE_WIRED = 'org.freedesktop.NetworkManager.Device.Wired'
|
||||
|
||||
PE_HW_ADDRESS = "HwAddress"
|
||||
PE_PERM_HW_ADDRESS = "PermHwAddress"
|
||||
PE_SPEED = "Speed"
|
||||
PE_CARRIER = "Carrier"
|
||||
|
||||
class WiredDevice(Device):
|
||||
def __init__(self, bus, iface):
|
||||
Device.__init__(self, bus, iface, NM_DEVICE_TYPE_ETHERNET)
|
||||
self.add_dbus_interface(IFACE_WIRED, self.__get_props)
|
||||
|
||||
self.mac = random_mac()
|
||||
self.carrier = False
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PE_HW_ADDRESS] = self.mac
|
||||
props[PE_PERM_HW_ADDRESS] = self.mac
|
||||
props[PE_SPEED] = dbus.UInt32(100)
|
||||
props[PE_CARRIER] = self.carrier
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_WIRED)
|
||||
changed = { propname: props[propname] }
|
||||
WiredDevice.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_WIRED, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
###################################################################
|
||||
IFACE_WIFI_AP = 'org.freedesktop.NetworkManager.AccessPoint'
|
||||
|
||||
PP_FLAGS = "Flags"
|
||||
PP_WPA_FLAGS = "WpaFlags"
|
||||
PP_RSN_FLAGS = "RsnFlags"
|
||||
PP_SSID = "Ssid"
|
||||
PP_FREQUENCY = "Frequency"
|
||||
PP_HW_ADDRESS = "HwAddress"
|
||||
PP_MODE = "Mode"
|
||||
PP_MAX_BITRATE = "MaxBitrate"
|
||||
PP_STRENGTH = "Strength"
|
||||
|
||||
class WifiAp(ExportedObj):
|
||||
counter = 0
|
||||
|
||||
def __init__(self, bus, ssid, mac, flags, wpaf, rsnf, freq):
|
||||
path = "/org/freedesktop/NetworkManager/AccessPoint/%d" % WifiAp.counter
|
||||
WifiAp.counter = WifiAp.counter + 1
|
||||
ExportedObj.__init__(self, bus, path)
|
||||
self.add_dbus_interface(IFACE_WIFI_AP, self.__get_props)
|
||||
|
||||
self.ssid = ssid
|
||||
if mac:
|
||||
self.bssid = mac
|
||||
else:
|
||||
self.bssid = random_mac()
|
||||
self.flags = flags
|
||||
self.wpaf = wpaf
|
||||
self.rsnf = rsnf
|
||||
self.freq = freq
|
||||
self.strength = random.randint(0, 100)
|
||||
self.strength_id = GLib.timeout_add_seconds(10, self.strength_cb, None)
|
||||
|
||||
def __del__(self):
|
||||
if self.strength_id > 0:
|
||||
GLib.source_remove(self.strength_id)
|
||||
self.strength_id = 0
|
||||
|
||||
def strength_cb(self, ignored):
|
||||
self.strength = random.randint(0, 100)
|
||||
self.__notify(PP_STRENGTH)
|
||||
return True
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PP_FLAGS] = dbus.UInt32(self.flags)
|
||||
props[PP_WPA_FLAGS] = dbus.UInt32(self.wpaf)
|
||||
props[PP_RSN_FLAGS] = dbus.UInt32(self.rsnf)
|
||||
props[PP_SSID] = dbus.ByteArray(self.ssid)
|
||||
props[PP_FREQUENCY] = dbus.UInt32(self.freq)
|
||||
props[PP_HW_ADDRESS] = self.bssid
|
||||
props[PP_MODE] = dbus.UInt32(2) # NM_802_11_MODE_INFRA
|
||||
props[PP_MAX_BITRATE] = dbus.UInt32(54000)
|
||||
props[PP_STRENGTH] = dbus.Byte(self.strength)
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_WIFI_AP)
|
||||
changed = { propname: props[propname] }
|
||||
WifiAp.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_WIFI_AP, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
###################################################################
|
||||
IFACE_WIFI = 'org.freedesktop.NetworkManager.Device.Wireless'
|
||||
|
||||
class ApNotFoundException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_WIFI + '.AccessPointNotFound'
|
||||
|
||||
PW_HW_ADDRESS = "HwAddress"
|
||||
PW_PERM_HW_ADDRESS = "PermHwAddress"
|
||||
PW_MODE = "Mode"
|
||||
PW_BITRATE = "Bitrate"
|
||||
PW_ACCESS_POINTS = "AccessPoints"
|
||||
PW_ACTIVE_ACCESS_POINT = "ActiveAccessPoint"
|
||||
PW_WIRELESS_CAPABILITIES = "WirelessCapabilities"
|
||||
|
||||
class WifiDevice(Device):
|
||||
def __init__(self, bus, iface):
|
||||
Device.__init__(self, bus, iface, NM_DEVICE_TYPE_WIFI)
|
||||
self.add_dbus_interface(IFACE_WIFI, self.__get_props)
|
||||
|
||||
self.mac = random_mac()
|
||||
self.aps = []
|
||||
self.active_ap = None
|
||||
|
||||
# methods
|
||||
@dbus.service.method(dbus_interface=IFACE_WIFI, in_signature='', out_signature='ao')
|
||||
def GetAccessPoints(self):
|
||||
# only include non-hidden APs
|
||||
array = []
|
||||
for a in self.aps:
|
||||
if a.ssid():
|
||||
array.append(a)
|
||||
return to_path_array(array)
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_WIFI, in_signature='', out_signature='ao')
|
||||
def GetAllAccessPoints(self):
|
||||
# include all APs including hidden ones
|
||||
return to_path_array(self.aps)
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_WIFI, in_signature='a{sv}', out_signature='')
|
||||
def RequestScan(self, props):
|
||||
pass
|
||||
|
||||
@dbus.service.signal(IFACE_WIFI, signature='o')
|
||||
def AccessPointAdded(self, ap_path):
|
||||
pass
|
||||
|
||||
def add_ap(self, ap):
|
||||
self.aps.append(ap)
|
||||
self.__notify(PW_ACCESS_POINTS)
|
||||
self.AccessPointAdded(to_path(ap))
|
||||
|
||||
@dbus.service.signal(IFACE_WIFI, signature='o')
|
||||
def AccessPointRemoved(self, ap_path):
|
||||
pass
|
||||
|
||||
def remove_ap(self, ap):
|
||||
self.aps.remove(ap)
|
||||
self.__notify(PW_ACCESS_POINTS)
|
||||
self.AccessPointRemoved(to_path(ap))
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PW_HW_ADDRESS] = self.mac
|
||||
props[PW_PERM_HW_ADDRESS] = self.mac
|
||||
props[PW_MODE] = dbus.UInt32(3) # NM_802_11_MODE_INFRA
|
||||
props[PW_BITRATE] = dbus.UInt32(21000)
|
||||
props[PW_WIRELESS_CAPABILITIES] = dbus.UInt32(0xFF)
|
||||
props[PW_ACCESS_POINTS] = to_path_array(self.aps)
|
||||
props[PW_ACTIVE_ACCESS_POINT] = to_path(self.active_ap)
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_WIFI)
|
||||
changed = { propname: props[propname] }
|
||||
WifiDevice.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_WIFI, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
# test functions
|
||||
def add_test_ap(self, ssid, mac):
|
||||
ap = WifiAp(self._bus, ssid, mac, 0x1, 0x1cc, 0x1cc, 2412)
|
||||
self.add_ap(ap)
|
||||
return ap.path
|
||||
|
||||
def remove_ap_by_path(self, path):
|
||||
for ap in self.aps:
|
||||
if ap.path == path:
|
||||
self.remove_ap(ap)
|
||||
return
|
||||
raise ApNotFoundException("AP %s not found" % path)
|
||||
|
||||
|
||||
###################################################################
|
||||
IFACE_WIMAX_NSP = 'org.freedesktop.NetworkManager.WiMax.Nsp'
|
||||
|
||||
PN_NAME = "Name"
|
||||
PN_SIGNAL_QUALITY = "SignalQuality"
|
||||
PN_NETWORK_TYPE = "NetworkType"
|
||||
|
||||
class WimaxNsp(ExportedObj):
|
||||
counter = 0
|
||||
|
||||
def __init__(self, bus, name):
|
||||
path = "/org/freedesktop/NetworkManager/Nsp/%d" % WimaxNsp.counter
|
||||
WimaxNsp.counter = WimaxNsp.counter + 1
|
||||
ExportedObj.__init__(self, bus, path)
|
||||
self.add_dbus_interface(IFACE_WIMAX_NSP, self.__get_props)
|
||||
|
||||
self.name = name
|
||||
self.strength = random.randint(0, 100)
|
||||
self.strength_id = GLib.timeout_add_seconds(10, self.strength_cb, None)
|
||||
|
||||
def __del__(self):
|
||||
if self.strength_id > 0:
|
||||
GLib.source_remove(self.strength_id)
|
||||
self.strength_id = 0
|
||||
|
||||
def strength_cb(self, ignored):
|
||||
self.strength = random.randint(0, 100)
|
||||
self.__notify(PN_SIGNAL_QUALITY)
|
||||
return True
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PN_NAME] = self.name
|
||||
props[PN_SIGNAL_QUALITY] = dbus.UInt32(self.strength)
|
||||
props[PN_NETWORK_TYPE] = dbus.UInt32(0x1) # NM_WIMAX_NSP_NETWORK_TYPE_HOME
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_WIMAX_NSP)
|
||||
changed = { propname: props[propname] }
|
||||
WimaxNsp.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_WIMAX_NSP, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
###################################################################
|
||||
IFACE_WIMAX = 'org.freedesktop.NetworkManager.Device.WiMax'
|
||||
|
||||
class NspNotFoundException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_WIMAX + '.NspNotFound'
|
||||
|
||||
PX_NSPS = "Nsps"
|
||||
PX_HW_ADDRESS = "HwAddress"
|
||||
PX_CENTER_FREQUENCY = "CenterFrequency"
|
||||
PX_RSSI = "Rssi"
|
||||
PX_CINR = "Cinr"
|
||||
PX_TX_POWER = "TxPower"
|
||||
PX_BSID = "Bsid"
|
||||
PX_ACTIVE_NSP = "ActiveNsp"
|
||||
|
||||
class WimaxDevice(Device):
|
||||
def __init__(self, bus, iface):
|
||||
Device.__init__(self, bus, iface, NM_DEVICE_TYPE_WIMAX)
|
||||
self.add_dbus_interface(IFACE_WIMAX, self.__get_props)
|
||||
|
||||
self.mac = random_mac()
|
||||
self.bsid = random_mac()
|
||||
self.nsps = []
|
||||
self.active_nsp = None
|
||||
|
||||
# methods
|
||||
@dbus.service.method(dbus_interface=IFACE_WIMAX, in_signature='', out_signature='ao')
|
||||
def GetNspList(self):
|
||||
# include all APs including hidden ones
|
||||
return to_path_array(self.nsps)
|
||||
|
||||
@dbus.service.signal(IFACE_WIMAX, signature='o')
|
||||
def NspAdded(self, nsp_path):
|
||||
pass
|
||||
|
||||
def add_nsp(self, nsp):
|
||||
self.nsps.append(nsp)
|
||||
self.__notify(PX_NSPS)
|
||||
self.NspAdded(to_path(nsp))
|
||||
|
||||
@dbus.service.signal(IFACE_WIMAX, signature='o')
|
||||
def NspRemoved(self, nsp_path):
|
||||
pass
|
||||
|
||||
def remove_nsp(self, nsp):
|
||||
self.nsps.remove(nsp)
|
||||
self.__notify(PX_NSPS)
|
||||
self.NspRemoved(to_path(nsp))
|
||||
|
||||
# Properties interface
|
||||
def __get_props(self):
|
||||
props = {}
|
||||
props[PX_HW_ADDRESS] = self.mac
|
||||
props[PX_CENTER_FREQUENCY] = dbus.UInt32(2525)
|
||||
props[PX_RSSI] = dbus.Int32(-48)
|
||||
props[PX_CINR] = dbus.Int32(24)
|
||||
props[PX_TX_POWER] = dbus.Int32(9)
|
||||
props[PX_BSID] = self.bsid
|
||||
props[PX_NSPS] = to_path_array(self.nsps)
|
||||
props[PX_ACTIVE_NSP] = to_path(self.active_nsp)
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_WIMAX)
|
||||
changed = { propname: props[propname] }
|
||||
WimaxDevice.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_WIMAX, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
# test functions
|
||||
def add_test_nsp(self, name):
|
||||
nsp = WimaxNsp(self._bus, name)
|
||||
self.add_nsp(nsp)
|
||||
return nsp.path
|
||||
|
||||
def remove_nsp_by_path(self, path):
|
||||
for nsp in self.nsps:
|
||||
if nsp.path == path:
|
||||
self.remove_nsp(nsp)
|
||||
return
|
||||
raise NspNotFoundException("NSP %s not found" % path)
|
||||
|
||||
###################################################################
|
||||
IFACE_TEST = 'org.freedesktop.NetworkManager.LibnmGlibTest'
|
||||
IFACE_NM = 'org.freedesktop.NetworkManager'
|
||||
|
||||
class PermissionDeniedException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_NM + '.PermissionDenied'
|
||||
|
||||
class UnknownDeviceException(dbus.DBusException):
|
||||
_dbus_error_name = IFACE_NM + '.UnknownDevice'
|
||||
|
||||
PM_DEVICES = 'Devices'
|
||||
PM_NETWORKING_ENABLED = 'NetworkingEnabled'
|
||||
PM_WWAN_ENABLED = 'WwanEnabled'
|
||||
PM_WWAN_HARDWARE_ENABLED = 'WwanHardwareEnabled'
|
||||
PM_WIRELESS_ENABLED = 'WirelessEnabled'
|
||||
PM_WIRELESS_HARDWARE_ENABLED = 'WirelessHardwareEnabled'
|
||||
PM_WIMAX_ENABLED = 'WimaxEnabled'
|
||||
PM_WIMAX_HARDWARE_ENABLED = 'WimaxHardwareEnabled'
|
||||
PM_ACTIVE_CONNECTIONS = 'ActiveConnections'
|
||||
PM_PRIMARY_CONNECTION = 'PrimaryConnection'
|
||||
PM_ACTIVATING_CONNECTION = 'ActivatingConnection'
|
||||
PM_STARTUP = 'Startup'
|
||||
PM_STATE = 'State'
|
||||
PM_VERSION = 'Version'
|
||||
PM_CONNECTIVITY = 'Connectivity'
|
||||
|
||||
class NetworkManager(ExportedObj):
|
||||
def __init__(self, bus, object_path):
|
||||
ExportedObj.__init__(self, bus, object_path)
|
||||
self.add_dbus_interface(IFACE_NM, self.__get_props)
|
||||
|
||||
self.devices = []
|
||||
self.active_connections = []
|
||||
self.primary_connection = None
|
||||
self.activating_connection = None
|
||||
self.state = NM_STATE_DISCONNECTED
|
||||
self.connectivity = 1
|
||||
|
||||
@dbus.service.signal(IFACE_NM, signature='u')
|
||||
def StateChanged(self, new_state):
|
||||
pass
|
||||
|
||||
def set_state(self, new_state):
|
||||
self.state = new_state
|
||||
self.__notify(PM_STATE)
|
||||
self.StateChanged(dbus.UInt32(self.state))
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='ao')
|
||||
def GetDevices(self):
|
||||
return self._get_dbus_properties(IFACE_NM)[PM_DEVICES]
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='s', out_signature='o')
|
||||
def GetDeviceByIpIface(self, ip_iface):
|
||||
for d in self.devices:
|
||||
# ignore iface/ip_iface distinction for now
|
||||
if d.iface == ip_iface:
|
||||
return d.path
|
||||
raise UnknownDeviceException("No device found for the requested iface.")
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='ooo', out_signature='o')
|
||||
def ActivateConnection(self, conpath, devpath, specific_object):
|
||||
device = None
|
||||
for d in self.devices:
|
||||
if d.path == devpath:
|
||||
device = d
|
||||
break
|
||||
if not device:
|
||||
raise UnknownDeviceException("No device found for the requested iface.")
|
||||
raise PermissionDeniedException("Not yet implemented")
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='a{sa{sv}}oo', out_signature='oo')
|
||||
def AddAndActivateConnection(self, connection, devpath, specific_object):
|
||||
device = None
|
||||
for d in self.devices:
|
||||
if d.path == devpath:
|
||||
device = d
|
||||
break
|
||||
if not device:
|
||||
raise UnknownDeviceException("No device found for the requested iface.")
|
||||
raise PermissionDeniedException("Not yet implemented")
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='o', out_signature='')
|
||||
def DeactivateConnection(self, active_connection):
|
||||
pass
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='b', out_signature='')
|
||||
def Sleep(self, do_sleep):
|
||||
if do_sleep:
|
||||
self.state = NM_STATE_ASLEEP
|
||||
else:
|
||||
self.state = NM_STATE_DISCONNECTED
|
||||
self.__notify(PM_STATE)
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='b', out_signature='')
|
||||
def Enable(self, do_enable):
|
||||
pass
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='a{ss}')
|
||||
def GetPermissions(self):
|
||||
return { "org.freedesktop.NetworkManager.enable-disable-network": "yes",
|
||||
"org.freedesktop.NetworkManager.sleep-wake": "no",
|
||||
"org.freedesktop.NetworkManager.enable-disable-wifi": "yes",
|
||||
"org.freedesktop.NetworkManager.enable-disable-wwan": "yes",
|
||||
"org.freedesktop.NetworkManager.enable-disable-wimax": "yes",
|
||||
"org.freedesktop.NetworkManager.network-control": "yes",
|
||||
"org.freedesktop.NetworkManager.wifi.share.protected": "yes",
|
||||
"org.freedesktop.NetworkManager.wifi.share.open": "yes",
|
||||
"org.freedesktop.NetworkManager.settings.modify.own": "yes",
|
||||
"org.freedesktop.NetworkManager.settings.modify.system": "yes",
|
||||
"org.freedesktop.NetworkManager.settings.modify.hostname": "yes" }
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='ss', out_signature='')
|
||||
def SetLogging(self, level, domains):
|
||||
pass
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='ss')
|
||||
def GetLogging(self):
|
||||
return ("info", "HW,RFKILL,CORE,DEVICE,WIFI,ETHER")
|
||||
|
||||
@dbus.service.method(dbus_interface=IFACE_NM, in_signature='', out_signature='u')
|
||||
def CheckConnectivity(self):
|
||||
raise PermissionDeniedException("You fail")
|
||||
|
||||
@dbus.service.signal(IFACE_NM, signature='o')
|
||||
def DeviceAdded(self, devpath):
|
||||
pass
|
||||
|
||||
def add_device(self, device):
|
||||
self.devices.append(device)
|
||||
self.__notify(PM_DEVICES)
|
||||
self.DeviceAdded(to_path(device))
|
||||
|
||||
@dbus.service.signal(IFACE_NM, signature='o')
|
||||
def DeviceRemoved(self, devpath):
|
||||
pass
|
||||
|
||||
def remove_device(self, device):
|
||||
self.devices.remove(device)
|
||||
self.__notify(PM_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_NETWORKING_ENABLED] = True
|
||||
props[PM_WWAN_ENABLED] = True
|
||||
props[PM_WWAN_HARDWARE_ENABLED] = True
|
||||
props[PM_WIRELESS_ENABLED] = True
|
||||
props[PM_WIRELESS_HARDWARE_ENABLED] = True
|
||||
props[PM_WIMAX_ENABLED] = True
|
||||
props[PM_WIMAX_HARDWARE_ENABLED] = True
|
||||
props[PM_ACTIVE_CONNECTIONS] = to_path_array(self.active_connections)
|
||||
props[PM_PRIMARY_CONNECTION] = to_path(self.primary_connection)
|
||||
props[PM_ACTIVATING_CONNECTION] = to_path(self.activating_connection)
|
||||
props[PM_STARTUP] = False
|
||||
props[PM_STATE] = dbus.UInt32(self.state)
|
||||
props[PM_VERSION] = "0.9.9.0"
|
||||
props[PM_CONNECTIVITY] = dbus.UInt32(self.connectivity)
|
||||
return props
|
||||
|
||||
def __notify(self, propname):
|
||||
props = self._get_dbus_properties(IFACE_NM)
|
||||
changed = { propname: props[propname] }
|
||||
NetworkManager.PropertiesChanged(self, changed)
|
||||
|
||||
@dbus.service.signal(IFACE_NM, signature='a{sv}')
|
||||
def PropertiesChanged(self, changed):
|
||||
pass
|
||||
|
||||
################# Testing methods
|
||||
@dbus.service.method(IFACE_TEST, in_signature='', out_signature='')
|
||||
def Quit(self):
|
||||
mainloop.quit()
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='s', out_signature='o')
|
||||
def AddWiredDevice(self, ifname):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
raise PermissionDeniedError("Device already added")
|
||||
dev = WiredDevice(self._bus, ifname)
|
||||
self.add_device(dev)
|
||||
return dbus.ObjectPath(dev.path)
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='s', out_signature='o')
|
||||
def AddWifiDevice(self, ifname):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
raise PermissionDeniedError("Device already added")
|
||||
dev = WifiDevice(self._bus, ifname)
|
||||
self.add_device(dev)
|
||||
return dbus.ObjectPath(dev.path)
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='s', out_signature='o')
|
||||
def AddWimaxDevice(self, ifname):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
raise PermissionDeniedError("Device already added")
|
||||
dev = WimaxDevice(self._bus, ifname)
|
||||
self.add_device(dev)
|
||||
return dbus.ObjectPath(dev.path)
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='o', out_signature='')
|
||||
def RemoveDevice(self, path):
|
||||
for d in self.devices:
|
||||
if d.path == path:
|
||||
self.remove_device(d)
|
||||
return
|
||||
raise UnknownDeviceException("Device not found")
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='sss', out_signature='o')
|
||||
def AddWifiAp(self, ifname, ssid, mac):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
return dbus.ObjectPath(d.add_test_ap(ssid, mac))
|
||||
raise UnknownDeviceException("Device not found")
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='so', out_signature='')
|
||||
def RemoveWifiAp(self, ifname, ap_path):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
d.remove_ap_by_path(ap_path)
|
||||
return
|
||||
raise UnknownDeviceException("Device not found")
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='ss', out_signature='o')
|
||||
def AddWimaxNsp(self, ifname, name):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
return dbus.ObjectPath(d.add_test_nsp(name))
|
||||
raise UnknownDeviceException("Device not found")
|
||||
|
||||
@dbus.service.method(IFACE_TEST, in_signature='so', out_signature='')
|
||||
def RemoveWimaxNsp(self, ifname, nsp_path):
|
||||
for d in self.devices:
|
||||
if d.iface == ifname:
|
||||
d.remove_nsp_by_path(nsp_path)
|
||||
return
|
||||
raise UnknownDeviceException("Device not found")
|
||||
|
||||
def quit_cb(user_data):
|
||||
mainloop.quit()
|
||||
|
||||
def main():
|
||||
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
|
||||
|
||||
random.seed()
|
||||
|
||||
bus = dbus.SessionBus()
|
||||
nm = NetworkManager(bus, "/org/freedesktop/NetworkManager")
|
||||
if not bus.request_name("org.freedesktop.NetworkManager"):
|
||||
sys.exit(1)
|
||||
|
||||
# quit after inactivity to ensure we don't stick around if tests fail
|
||||
quit_id = GLib.timeout_add_seconds(20, quit_cb, None)
|
||||
|
||||
try:
|
||||
mainloop.run()
|
||||
except Exception as e:
|
||||
pass
|
||||
|
||||
sys.exit(0)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
951
libnm-glib/tests/test-nm-client.c
Normal file
951
libnm-glib/tests/test-nm-client.c
Normal file
@@ -0,0 +1,951 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; 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, 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) 2010 - 2014 Red Hat, Inc.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <dbus/dbus.h>
|
||||
#include <dbus/dbus-glib.h>
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include <NetworkManager.h>
|
||||
#include "nm-client.h"
|
||||
#include "nm-device-wifi.h"
|
||||
#include "nm-device-ethernet.h"
|
||||
#include "nm-device-wimax.h"
|
||||
#include "nm-glib-compat.h"
|
||||
|
||||
static const char *fake_path;
|
||||
static const char *fake_bin;
|
||||
static const char *fake_exec;
|
||||
static GMainLoop *loop = NULL;
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
typedef struct {
|
||||
GDBusConnection *bus;
|
||||
GDBusProxy *proxy;
|
||||
GPid pid;
|
||||
NMClient *client;
|
||||
} ServiceInfo;
|
||||
|
||||
#define test_assert(condition) \
|
||||
do { \
|
||||
if (!G_LIKELY (condition)) \
|
||||
service_cleanup (); \
|
||||
g_assert (condition); \
|
||||
} while (0)
|
||||
|
||||
#define test_assert_cmpint(a, b, c) \
|
||||
do { \
|
||||
if (!G_LIKELY (a b c)) \
|
||||
service_cleanup (); \
|
||||
g_assert_cmpint (a, b, c); \
|
||||
} while (0)
|
||||
|
||||
#define test_assert_cmpstr(a, b, c) \
|
||||
do { \
|
||||
if (!G_LIKELY (g_str_hash (a) b g_str_hash (c))) \
|
||||
service_cleanup (); \
|
||||
g_assert_cmpstr (a, b, c); \
|
||||
} while (0)
|
||||
|
||||
#define test_assert_no_error(e) \
|
||||
do { \
|
||||
if (G_UNLIKELY (e)) \
|
||||
service_cleanup (); \
|
||||
g_assert_no_error (e); \
|
||||
} while (0)
|
||||
|
||||
static ServiceInfo * sinfo_static = NULL;
|
||||
|
||||
static void
|
||||
service_cleanup (void)
|
||||
{
|
||||
ServiceInfo *info = sinfo_static;
|
||||
|
||||
sinfo_static = NULL;
|
||||
|
||||
if (info) {
|
||||
if (info->proxy)
|
||||
g_object_unref (info->proxy);
|
||||
if (info->bus)
|
||||
g_object_unref (info->bus);
|
||||
if (info->client)
|
||||
g_object_unref (info->client);
|
||||
if (info->pid)
|
||||
kill (info->pid, SIGTERM);
|
||||
memset (info, 0, sizeof (*info));
|
||||
g_free (info);
|
||||
} else
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
static gboolean
|
||||
name_exists (GDBusConnection *c, const char *name)
|
||||
{
|
||||
GVariant *reply;
|
||||
gboolean exists = FALSE;
|
||||
|
||||
reply = g_dbus_connection_call_sync (c,
|
||||
DBUS_SERVICE_DBUS,
|
||||
DBUS_PATH_DBUS,
|
||||
DBUS_INTERFACE_DBUS,
|
||||
"GetNameOwner",
|
||||
g_variant_new ("(s)", name),
|
||||
NULL,
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
-1,
|
||||
NULL,
|
||||
NULL);
|
||||
if (reply != NULL) {
|
||||
exists = TRUE;
|
||||
g_variant_unref (reply);
|
||||
}
|
||||
|
||||
return exists;
|
||||
}
|
||||
|
||||
static ServiceInfo *
|
||||
service_init (void)
|
||||
{
|
||||
ServiceInfo *sinfo;
|
||||
const char *args[2] = { fake_exec, NULL };
|
||||
GError *error = NULL;
|
||||
int i = 100;
|
||||
|
||||
g_assert (!sinfo_static);
|
||||
|
||||
sinfo = g_malloc0 (sizeof (*sinfo));
|
||||
|
||||
sinfo_static = sinfo;
|
||||
|
||||
sinfo->bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
|
||||
test_assert (sinfo->bus);
|
||||
|
||||
if (!g_spawn_async (fake_path, (char **) args, NULL, 0, NULL, NULL, &sinfo->pid, &error))
|
||||
test_assert_no_error (error);
|
||||
|
||||
/* Wait until the service is registered on the bus */
|
||||
while (i > 0) {
|
||||
g_usleep (G_USEC_PER_SEC / 50);
|
||||
if (name_exists (sinfo->bus, "org.freedesktop.NetworkManager"))
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
test_assert (i > 0);
|
||||
|
||||
/* Grab a proxy to our fake NM service to trigger tests */
|
||||
sinfo->proxy = g_dbus_proxy_new_sync (sinfo->bus,
|
||||
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
|
||||
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
|
||||
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
|
||||
NULL,
|
||||
NM_DBUS_SERVICE,
|
||||
NM_DBUS_PATH,
|
||||
"org.freedesktop.NetworkManager.LibnmGlibTest",
|
||||
NULL, NULL);
|
||||
test_assert (sinfo->proxy);
|
||||
|
||||
sinfo->client = nm_client_new ();
|
||||
test_assert (sinfo->client != NULL);
|
||||
|
||||
return sinfo;
|
||||
}
|
||||
|
||||
static ServiceInfo *
|
||||
service_get (void)
|
||||
{
|
||||
g_assert (sinfo_static);
|
||||
return sinfo_static;
|
||||
}
|
||||
|
||||
#define _sinfo (service_get ())
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
static gboolean
|
||||
loop_quit (gpointer user_data)
|
||||
{
|
||||
g_main_loop_quit ((GMainLoop *) user_data);
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
add_device (const char *method, const char *ifname, char **out_path)
|
||||
{
|
||||
GError *error = NULL;
|
||||
GVariant *ret;
|
||||
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
method,
|
||||
g_variant_new ("(s)", ifname),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
test_assert (ret);
|
||||
test_assert_cmpstr (g_variant_get_type_string (ret), ==, "(o)");
|
||||
if (out_path)
|
||||
g_variant_get (ret, "(o)", out_path);
|
||||
g_variant_unref (ret);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
typedef struct {
|
||||
GMainLoop *loop;
|
||||
gboolean signaled;
|
||||
gboolean notified;
|
||||
guint quit_count;
|
||||
guint quit_id;
|
||||
} DeviceAddedInfo;
|
||||
|
||||
static void
|
||||
device_add_check_quit (DeviceAddedInfo *info)
|
||||
{
|
||||
info->quit_count--;
|
||||
if (info->quit_count == 0) {
|
||||
g_source_remove (info->quit_id);
|
||||
info->quit_id = 0;
|
||||
g_main_loop_quit (info->loop);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
device_added_cb (NMClient *c,
|
||||
NMDevice *device,
|
||||
DeviceAddedInfo *info)
|
||||
{
|
||||
test_assert (device);
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "eth0");
|
||||
info->signaled = TRUE;
|
||||
device_add_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
devices_notify_cb (NMClient *c,
|
||||
GParamSpec *pspec,
|
||||
DeviceAddedInfo *info)
|
||||
{
|
||||
const GPtrArray *devices;
|
||||
NMDevice *device;
|
||||
|
||||
devices = nm_client_get_devices (c);
|
||||
test_assert (devices);
|
||||
test_assert_cmpint (devices->len, ==, 1);
|
||||
|
||||
device = g_ptr_array_index (devices, 0);
|
||||
test_assert (device);
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "eth0");
|
||||
|
||||
info->notified = TRUE;
|
||||
|
||||
device_add_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
test_device_added (void)
|
||||
{
|
||||
const GPtrArray *devices;
|
||||
NMDevice *device;
|
||||
DeviceAddedInfo info = { loop, FALSE, FALSE, 0, 0 };
|
||||
|
||||
service_init ();
|
||||
|
||||
/* Give NMClient a chance to initialize */
|
||||
g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
devices = nm_client_get_devices (_sinfo->client);
|
||||
test_assert (devices == NULL);
|
||||
|
||||
/* Tell the test service to add a new device */
|
||||
add_device ("AddWiredDevice", "eth0", NULL);
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"device-added",
|
||||
(GCallback) device_added_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"notify::devices",
|
||||
(GCallback) devices_notify_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
/* Wait for libnm-glib to find the device */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.signaled);
|
||||
test_assert (info.notified);
|
||||
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, device_added_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, devices_notify_cb, &info);
|
||||
|
||||
devices = nm_client_get_devices (_sinfo->client);
|
||||
test_assert (devices);
|
||||
test_assert_cmpint (devices->len, ==, 1);
|
||||
|
||||
device = g_ptr_array_index (devices, 0);
|
||||
test_assert (device);
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "eth0");
|
||||
|
||||
service_cleanup ();
|
||||
}
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
static const char *expected_bssid = "66:55:44:33:22:11";
|
||||
|
||||
typedef struct {
|
||||
GMainLoop *loop;
|
||||
gboolean found;
|
||||
char *ap_path;
|
||||
gboolean signaled;
|
||||
gboolean notified;
|
||||
guint quit_id;
|
||||
guint quit_count;
|
||||
} WifiApInfo;
|
||||
|
||||
static void
|
||||
wifi_check_quit (WifiApInfo *info)
|
||||
{
|
||||
info->quit_count--;
|
||||
if (info->quit_count == 0) {
|
||||
g_source_remove (info->quit_id);
|
||||
info->quit_id = 0;
|
||||
g_main_loop_quit (info->loop);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
wifi_device_added_cb (NMClient *c,
|
||||
NMDevice *device,
|
||||
WifiApInfo *info)
|
||||
{
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "wlan0");
|
||||
info->found = TRUE;
|
||||
wifi_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
got_ap_path (WifiApInfo *info, const char *path)
|
||||
{
|
||||
if (info->ap_path)
|
||||
test_assert_cmpstr (info->ap_path, ==, path);
|
||||
else
|
||||
info->ap_path = g_strdup (path);
|
||||
}
|
||||
|
||||
static void
|
||||
wifi_ap_added_cb (NMDeviceWifi *w,
|
||||
NMAccessPoint *ap,
|
||||
WifiApInfo *info)
|
||||
{
|
||||
test_assert (ap);
|
||||
test_assert_cmpstr (nm_access_point_get_bssid (ap), ==, expected_bssid);
|
||||
got_ap_path (info, nm_object_get_path (NM_OBJECT (ap)));
|
||||
|
||||
info->signaled = TRUE;
|
||||
wifi_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wifi_ap_add_notify_cb (NMDeviceWifi *w,
|
||||
GParamSpec *pspec,
|
||||
WifiApInfo *info)
|
||||
{
|
||||
const GPtrArray *aps;
|
||||
NMAccessPoint *ap;
|
||||
|
||||
aps = nm_device_wifi_get_access_points (w);
|
||||
test_assert (aps);
|
||||
test_assert_cmpint (aps->len, ==, 1);
|
||||
|
||||
ap = g_ptr_array_index (aps, 0);
|
||||
test_assert (ap);
|
||||
test_assert_cmpstr (nm_access_point_get_bssid (ap), ==, "66:55:44:33:22:11");
|
||||
got_ap_path (info, nm_object_get_path (NM_OBJECT (ap)));
|
||||
|
||||
info->notified = TRUE;
|
||||
wifi_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wifi_ap_removed_cb (NMDeviceWifi *w,
|
||||
NMAccessPoint *ap,
|
||||
WifiApInfo *info)
|
||||
{
|
||||
test_assert (ap);
|
||||
test_assert_cmpstr (info->ap_path, ==, nm_object_get_path (NM_OBJECT (ap)));
|
||||
|
||||
info->signaled = TRUE;
|
||||
wifi_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wifi_ap_remove_notify_cb (NMDeviceWifi *w,
|
||||
GParamSpec *pspec,
|
||||
WifiApInfo *info)
|
||||
{
|
||||
const GPtrArray *aps;
|
||||
|
||||
aps = nm_device_wifi_get_access_points (w);
|
||||
test_assert (aps == NULL);
|
||||
|
||||
info->notified = TRUE;
|
||||
wifi_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
test_wifi_ap_added_removed (void)
|
||||
{
|
||||
NMDeviceWifi *wifi;
|
||||
WifiApInfo info = { loop, FALSE, FALSE, 0, 0 };
|
||||
GVariant *ret;
|
||||
GError *error = NULL;
|
||||
char *expected_path = NULL;
|
||||
|
||||
service_init ();
|
||||
|
||||
/* Give NMClient a chance to initialize */
|
||||
g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
/*************************************/
|
||||
/* Add the wifi device */
|
||||
add_device ("AddWifiDevice", "wlan0", NULL);
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"device-added",
|
||||
(GCallback) wifi_device_added_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
/* Wait for libnm-glib to find the device */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.found);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, wifi_device_added_cb, &info);
|
||||
|
||||
wifi = (NMDeviceWifi *) nm_client_get_device_by_iface (_sinfo->client, "wlan0");
|
||||
test_assert (NM_IS_DEVICE_WIFI (wifi));
|
||||
|
||||
/*************************************/
|
||||
/* Add the wifi device */
|
||||
info.signaled = FALSE;
|
||||
info.notified = FALSE;
|
||||
info.quit_id = 0;
|
||||
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
"AddWifiAp",
|
||||
g_variant_new ("(sss)", "wlan0", "test-ap", expected_bssid),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
test_assert (ret);
|
||||
test_assert_cmpstr (g_variant_get_type_string (ret), ==, "(o)");
|
||||
g_variant_get (ret, "(o)", &expected_path);
|
||||
g_variant_unref (ret);
|
||||
|
||||
g_signal_connect (wifi,
|
||||
"access-point-added",
|
||||
(GCallback) wifi_ap_added_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
g_signal_connect (wifi,
|
||||
"notify::access-points",
|
||||
(GCallback) wifi_ap_add_notify_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
/* Wait for libnm-glib to find the AP */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.signaled);
|
||||
test_assert (info.notified);
|
||||
test_assert (info.ap_path);
|
||||
test_assert_cmpstr (info.ap_path, ==, expected_path);
|
||||
g_signal_handlers_disconnect_by_func (wifi, wifi_ap_added_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (wifi, wifi_ap_add_notify_cb, &info);
|
||||
|
||||
/*************************************/
|
||||
/* Remove the wifi device */
|
||||
info.signaled = FALSE;
|
||||
info.notified = FALSE;
|
||||
info.quit_id = 0;
|
||||
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
"RemoveWifiAp",
|
||||
g_variant_new ("(so)", "wlan0", expected_path),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
g_clear_pointer (&ret, g_variant_unref);
|
||||
|
||||
g_signal_connect (wifi,
|
||||
"access-point-removed",
|
||||
(GCallback) wifi_ap_removed_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
g_signal_connect (wifi,
|
||||
"notify::access-points",
|
||||
(GCallback) wifi_ap_remove_notify_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
/* Wait for libnm-glib to find the AP */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.signaled);
|
||||
test_assert (info.notified);
|
||||
g_signal_handlers_disconnect_by_func (wifi, wifi_ap_removed_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (wifi, wifi_ap_remove_notify_cb, &info);
|
||||
|
||||
g_free (info.ap_path);
|
||||
g_free (expected_path);
|
||||
service_cleanup ();
|
||||
}
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
static const char *expected_nsp_name = "Clear";
|
||||
|
||||
typedef struct {
|
||||
GMainLoop *loop;
|
||||
gboolean found;
|
||||
char *nsp_path;
|
||||
gboolean signaled;
|
||||
gboolean notified;
|
||||
guint quit_id;
|
||||
guint quit_count;
|
||||
} WimaxNspInfo;
|
||||
|
||||
static void
|
||||
wimax_check_quit (WimaxNspInfo *info)
|
||||
{
|
||||
info->quit_count--;
|
||||
if (info->quit_count == 0) {
|
||||
g_source_remove (info->quit_id);
|
||||
info->quit_id = 0;
|
||||
g_main_loop_quit (info->loop);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
wimax_device_added_cb (NMClient *c,
|
||||
NMDevice *device,
|
||||
WimaxNspInfo *info)
|
||||
{
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "wmx0");
|
||||
info->found = TRUE;
|
||||
wimax_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
got_nsp_path (WimaxNspInfo *info, const char *path)
|
||||
{
|
||||
if (info->nsp_path)
|
||||
test_assert_cmpstr (info->nsp_path, ==, path);
|
||||
else
|
||||
info->nsp_path = g_strdup (path);
|
||||
}
|
||||
|
||||
static void
|
||||
wimax_nsp_added_cb (NMDeviceWimax *w,
|
||||
NMWimaxNsp *nsp,
|
||||
WimaxNspInfo *info)
|
||||
{
|
||||
test_assert (nsp);
|
||||
test_assert_cmpstr (nm_wimax_nsp_get_name (nsp), ==, expected_nsp_name);
|
||||
got_nsp_path (info, nm_object_get_path (NM_OBJECT (nsp)));
|
||||
|
||||
info->signaled = TRUE;
|
||||
wimax_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wimax_nsp_add_notify_cb (NMDeviceWimax *w,
|
||||
GParamSpec *pspec,
|
||||
WimaxNspInfo *info)
|
||||
{
|
||||
const GPtrArray *nsps;
|
||||
NMWimaxNsp *nsp;
|
||||
|
||||
nsps = nm_device_wimax_get_nsps (w);
|
||||
test_assert (nsps);
|
||||
test_assert_cmpint (nsps->len, ==, 1);
|
||||
|
||||
nsp = g_ptr_array_index (nsps, 0);
|
||||
test_assert (nsp);
|
||||
test_assert_cmpstr (nm_wimax_nsp_get_name (nsp), ==, expected_nsp_name);
|
||||
got_nsp_path (info, nm_object_get_path (NM_OBJECT (nsp)));
|
||||
|
||||
info->notified = TRUE;
|
||||
wimax_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wimax_nsp_removed_cb (NMDeviceWimax *w,
|
||||
NMWimaxNsp *nsp,
|
||||
WimaxNspInfo *info)
|
||||
{
|
||||
test_assert (nsp);
|
||||
test_assert_cmpstr (info->nsp_path, ==, nm_object_get_path (NM_OBJECT (nsp)));
|
||||
|
||||
info->signaled = TRUE;
|
||||
wimax_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
wimax_nsp_remove_notify_cb (NMDeviceWimax *w,
|
||||
GParamSpec *pspec,
|
||||
WimaxNspInfo *info)
|
||||
{
|
||||
const GPtrArray *nsps;
|
||||
|
||||
nsps = nm_device_wimax_get_nsps (w);
|
||||
test_assert (nsps == NULL);
|
||||
|
||||
info->notified = TRUE;
|
||||
wimax_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
test_wimax_nsp_added_removed (void)
|
||||
{
|
||||
NMDeviceWimax *wimax;
|
||||
WimaxNspInfo info = { loop, FALSE, FALSE, 0, 0 };
|
||||
GVariant *ret;
|
||||
GError *error = NULL;
|
||||
char *expected_path = NULL;
|
||||
|
||||
service_init ();
|
||||
|
||||
/* Give NMClient a chance to initialize */
|
||||
g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
/*************************************/
|
||||
/* Add the wimax device */
|
||||
add_device ("AddWimaxDevice", "wmx0", NULL);
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"device-added",
|
||||
(GCallback) wimax_device_added_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
/* Wait for libnm-glib to find the device */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.found);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, wimax_device_added_cb, &info);
|
||||
|
||||
wimax = (NMDeviceWimax *) nm_client_get_device_by_iface (_sinfo->client, "wmx0");
|
||||
test_assert (NM_IS_DEVICE_WIMAX (wimax));
|
||||
|
||||
/*************************************/
|
||||
/* Add the wimax NSP */
|
||||
info.signaled = FALSE;
|
||||
info.notified = FALSE;
|
||||
info.quit_id = 0;
|
||||
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
"AddWimaxNsp",
|
||||
g_variant_new ("(ss)", "wmx0", expected_nsp_name),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
test_assert (ret);
|
||||
test_assert_cmpstr (g_variant_get_type_string (ret), ==, "(o)");
|
||||
g_variant_get (ret, "(o)", &expected_path);
|
||||
g_variant_unref (ret);
|
||||
|
||||
g_signal_connect (wimax,
|
||||
"nsp-added",
|
||||
(GCallback) wimax_nsp_added_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
g_signal_connect (wimax,
|
||||
"notify::nsps",
|
||||
(GCallback) wimax_nsp_add_notify_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
/* Wait for libnm-glib to find the AP */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.signaled);
|
||||
test_assert (info.notified);
|
||||
test_assert (info.nsp_path);
|
||||
test_assert_cmpstr (info.nsp_path, ==, expected_path);
|
||||
g_signal_handlers_disconnect_by_func (wimax, wimax_nsp_added_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (wimax, wimax_nsp_add_notify_cb, &info);
|
||||
|
||||
/*************************************/
|
||||
/* Remove the wimax NSP */
|
||||
info.signaled = FALSE;
|
||||
info.notified = FALSE;
|
||||
info.quit_id = 0;
|
||||
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
"RemoveWimaxNsp",
|
||||
g_variant_new ("(so)", "wmx0", expected_path),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
g_clear_pointer (&ret, g_variant_unref);
|
||||
|
||||
g_signal_connect (wimax,
|
||||
"nsp-removed",
|
||||
(GCallback) wimax_nsp_removed_cb,
|
||||
&info);
|
||||
info.quit_count = 1;
|
||||
|
||||
g_signal_connect (wimax,
|
||||
"notify::nsps",
|
||||
(GCallback) wimax_nsp_remove_notify_cb,
|
||||
&info);
|
||||
info.quit_count++;
|
||||
|
||||
/* Wait for libnm-glib to find the AP */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert (info.signaled);
|
||||
test_assert (info.notified);
|
||||
g_signal_handlers_disconnect_by_func (wimax, wimax_nsp_removed_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (wimax, wimax_nsp_remove_notify_cb, &info);
|
||||
|
||||
g_free (info.nsp_path);
|
||||
g_free (expected_path);
|
||||
service_cleanup ();
|
||||
}
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
typedef struct {
|
||||
GMainLoop *loop;
|
||||
gboolean signaled;
|
||||
gboolean notified;
|
||||
guint quit_count;
|
||||
guint quit_id;
|
||||
} DaInfo;
|
||||
|
||||
static void
|
||||
da_check_quit (DaInfo *info)
|
||||
{
|
||||
info->quit_count--;
|
||||
if (info->quit_count == 0) {
|
||||
g_source_remove (info->quit_id);
|
||||
info->quit_id = 0;
|
||||
g_main_loop_quit (info->loop);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
da_device_added_cb (NMClient *c,
|
||||
NMDevice *device,
|
||||
DaInfo *info)
|
||||
{
|
||||
da_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
da_device_removed_cb (NMClient *c,
|
||||
NMDevice *device,
|
||||
DaInfo *info)
|
||||
{
|
||||
test_assert_cmpstr (nm_device_get_iface (device), ==, "eth0");
|
||||
info->signaled = TRUE;
|
||||
da_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
da_devices_notify_cb (NMClient *c,
|
||||
GParamSpec *pspec,
|
||||
DaInfo *info)
|
||||
{
|
||||
const GPtrArray *devices;
|
||||
NMDevice *device;
|
||||
guint i;
|
||||
const char *iface;
|
||||
|
||||
devices = nm_client_get_devices (c);
|
||||
test_assert (devices);
|
||||
test_assert_cmpint (devices->len, ==, 2);
|
||||
|
||||
for (i = 0; i < devices->len; i++) {
|
||||
device = g_ptr_array_index (devices, i);
|
||||
iface = nm_device_get_iface (device);
|
||||
|
||||
test_assert (!strcmp (iface, "wlan0") || !strcmp (iface, "eth1"));
|
||||
}
|
||||
|
||||
info->notified = TRUE;
|
||||
da_check_quit (info);
|
||||
}
|
||||
|
||||
static void
|
||||
test_devices_array (void)
|
||||
{
|
||||
DaInfo info = { loop };
|
||||
char *paths[3] = { NULL, NULL, NULL };
|
||||
NMDevice *device;
|
||||
const GPtrArray *devices;
|
||||
GError *error = NULL;
|
||||
GVariant *ret;
|
||||
|
||||
service_init ();
|
||||
|
||||
/* Give NMClient a chance to initialize */
|
||||
g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
/*************************************/
|
||||
/* Add some devices */
|
||||
add_device ("AddWifiDevice", "wlan0", &paths[0]);
|
||||
add_device ("AddWiredDevice", "eth0", &paths[1]);
|
||||
add_device ("AddWiredDevice", "eth1", &paths[2]);
|
||||
info.quit_count = 3;
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"device-added",
|
||||
(GCallback) da_device_added_cb,
|
||||
&info);
|
||||
|
||||
/* Wait for libnm-glib to find the device */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert_cmpint (info.quit_count, ==, 0);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, da_device_added_cb, &info);
|
||||
|
||||
/* Ensure the devices now exist */
|
||||
devices = nm_client_get_devices (_sinfo->client);
|
||||
test_assert (devices);
|
||||
test_assert_cmpint (devices->len, ==, 3);
|
||||
|
||||
device = nm_client_get_device_by_iface (_sinfo->client, "wlan0");
|
||||
test_assert (NM_IS_DEVICE_WIFI (device));
|
||||
|
||||
device = nm_client_get_device_by_iface (_sinfo->client, "eth0");
|
||||
test_assert (NM_IS_DEVICE_ETHERNET (device));
|
||||
|
||||
device = nm_client_get_device_by_iface (_sinfo->client, "eth1");
|
||||
test_assert (NM_IS_DEVICE_ETHERNET (device));
|
||||
|
||||
/********************************/
|
||||
/* Now remove the device in the middle */
|
||||
ret = g_dbus_proxy_call_sync (_sinfo->proxy,
|
||||
"RemoveDevice",
|
||||
g_variant_new ("(o)", paths[1]),
|
||||
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
3000,
|
||||
NULL,
|
||||
&error);
|
||||
test_assert_no_error (error);
|
||||
test_assert (ret);
|
||||
g_variant_unref (ret);
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"device-removed",
|
||||
(GCallback) da_device_removed_cb,
|
||||
&info);
|
||||
|
||||
g_signal_connect (_sinfo->client,
|
||||
"notify::devices",
|
||||
(GCallback) da_devices_notify_cb,
|
||||
&info);
|
||||
info.quit_count = 2;
|
||||
|
||||
/* Wait for libnm-glib to find the device */
|
||||
info.quit_id = g_timeout_add_seconds (5, loop_quit, loop);
|
||||
g_main_loop_run (loop);
|
||||
|
||||
test_assert_cmpint (info.quit_count, ==, 0);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, da_device_removed_cb, &info);
|
||||
g_signal_handlers_disconnect_by_func (_sinfo->client, da_devices_notify_cb, &info);
|
||||
|
||||
/* Ensure only two are left */
|
||||
devices = nm_client_get_devices (_sinfo->client);
|
||||
test_assert (devices);
|
||||
test_assert_cmpint (devices->len, ==, 2);
|
||||
|
||||
device = nm_client_get_device_by_iface (_sinfo->client, "wlan0");
|
||||
test_assert (NM_IS_DEVICE_WIFI (device));
|
||||
|
||||
device = nm_client_get_device_by_iface (_sinfo->client, "eth1");
|
||||
test_assert (NM_IS_DEVICE_ETHERNET (device));
|
||||
|
||||
g_free (paths[0]);
|
||||
g_free (paths[1]);
|
||||
g_free (paths[2]);
|
||||
service_cleanup ();
|
||||
}
|
||||
|
||||
/*******************************************************************/
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
g_assert (argc == 3);
|
||||
|
||||
g_type_init ();
|
||||
|
||||
g_test_init (&argc, &argv, NULL);
|
||||
|
||||
fake_path = argv[1];
|
||||
fake_bin = argv[2];
|
||||
fake_exec = g_strdup_printf ("%s/%s", argv[1], argv[2]);
|
||||
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
|
||||
g_test_add_func ("/libnm-glib/device-added", test_device_added);
|
||||
g_test_add_func ("/libnm-glib/wifi-ap-added-removed", test_wifi_ap_added_removed);
|
||||
g_test_add_func ("/libnm-glib/wimax-nsp-added-removed", test_wimax_nsp_added_removed);
|
||||
g_test_add_func ("/libnm-glib/devices-array", test_devices_array);
|
||||
|
||||
return g_test_run ();
|
||||
}
|
||||
|
||||
@@ -58,11 +58,17 @@
|
||||
#include "nm-settings-connection.h"
|
||||
#include "nm-enum-types.h"
|
||||
#include "wifi-utils.h"
|
||||
#include "nm-dbus-glib-types.h"
|
||||
|
||||
|
||||
static gboolean impl_device_get_access_points (NMDeviceWifi *device,
|
||||
GPtrArray **aps,
|
||||
GError **err);
|
||||
|
||||
static gboolean impl_device_get_all_access_points (NMDeviceWifi *device,
|
||||
GPtrArray **aps,
|
||||
GError **err);
|
||||
|
||||
static void impl_device_request_scan (NMDeviceWifi *device,
|
||||
GHashTable *options,
|
||||
DBusGMethodInvocation *context);
|
||||
@@ -87,6 +93,7 @@ enum {
|
||||
PROP_PERM_HW_ADDRESS,
|
||||
PROP_MODE,
|
||||
PROP_BITRATE,
|
||||
PROP_ACCESS_POINTS,
|
||||
PROP_ACTIVE_ACCESS_POINT,
|
||||
PROP_CAPABILITIES,
|
||||
PROP_SCANNING,
|
||||
@@ -808,6 +815,7 @@ remove_access_point (NMDeviceWifi *device,
|
||||
|
||||
priv->ap_list = g_slist_remove (priv->ap_list, ap);
|
||||
g_signal_emit (device, signals[ACCESS_POINT_REMOVED], 0, ap);
|
||||
g_object_notify (G_OBJECT (device), NM_DEVICE_WIFI_ACCESS_POINTS);
|
||||
g_object_unref (ap);
|
||||
}
|
||||
|
||||
@@ -1372,9 +1380,8 @@ impl_device_get_access_points (NMDeviceWifi *self,
|
||||
GSList *elt;
|
||||
|
||||
*aps = g_ptr_array_new ();
|
||||
|
||||
for (elt = priv->ap_list; elt; elt = g_slist_next (elt)) {
|
||||
NMAccessPoint * ap = NM_AP (elt->data);
|
||||
NMAccessPoint *ap = NM_AP (elt->data);
|
||||
|
||||
if (nm_ap_get_ssid (ap))
|
||||
g_ptr_array_add (*aps, g_strdup (nm_ap_get_dbus_path (ap)));
|
||||
@@ -1382,6 +1389,20 @@ impl_device_get_access_points (NMDeviceWifi *self,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
impl_device_get_all_access_points (NMDeviceWifi *self,
|
||||
GPtrArray **aps,
|
||||
GError **err)
|
||||
{
|
||||
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
|
||||
GSList *elt;
|
||||
|
||||
*aps = g_ptr_array_new ();
|
||||
for (elt = priv->ap_list; elt; elt = g_slist_next (elt))
|
||||
g_ptr_array_add (*aps, g_strdup (nm_ap_get_dbus_path (NM_AP (elt->data))));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
request_scan_cb (NMDevice *device,
|
||||
DBusGMethodInvocation *context,
|
||||
@@ -1865,6 +1886,7 @@ merge_scanned_ap (NMDeviceWifi *self,
|
||||
priv->ap_list = g_slist_prepend (priv->ap_list, merge_ap);
|
||||
nm_ap_export_to_dbus (merge_ap);
|
||||
g_signal_emit (self, signals[ACCESS_POINT_ADDED], 0, merge_ap);
|
||||
g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_ACCESS_POINTS);
|
||||
nm_device_recheck_available_connections (NM_DEVICE (self));
|
||||
}
|
||||
}
|
||||
@@ -2875,6 +2897,7 @@ act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason)
|
||||
g_object_freeze_notify (G_OBJECT (self));
|
||||
set_current_ap (self, ap, FALSE, FALSE);
|
||||
g_signal_emit (self, signals[ACCESS_POINT_ADDED], 0, ap);
|
||||
g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_ACCESS_POINTS);
|
||||
g_object_thaw_notify (G_OBJECT (self));
|
||||
nm_device_recheck_available_connections (NM_DEVICE (self));
|
||||
nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req), nm_ap_get_dbus_path (ap));
|
||||
@@ -3462,6 +3485,8 @@ get_property (GObject *object, guint prop_id,
|
||||
{
|
||||
NMDeviceWifi *device = NM_DEVICE_WIFI (object);
|
||||
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
|
||||
GPtrArray *array;
|
||||
GSList *iter;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_PERM_HW_ADDRESS:
|
||||
@@ -3476,6 +3501,12 @@ get_property (GObject *object, guint prop_id,
|
||||
case PROP_CAPABILITIES:
|
||||
g_value_set_uint (value, priv->capabilities);
|
||||
break;
|
||||
case PROP_ACCESS_POINTS:
|
||||
array = g_ptr_array_sized_new (4);
|
||||
for (iter = priv->ap_list; iter; iter = g_slist_next (iter))
|
||||
g_ptr_array_add (array, g_strdup (nm_ap_get_dbus_path (NM_AP (iter->data))));
|
||||
g_value_take_boxed (value, array);
|
||||
break;
|
||||
case PROP_ACTIVE_ACCESS_POINT:
|
||||
if (priv->current_ap)
|
||||
g_value_set_boxed (value, nm_ap_get_dbus_path (priv->current_ap));
|
||||
@@ -3571,6 +3602,14 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
|
||||
0, G_MAXUINT32, 0,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_ACCESS_POINTS,
|
||||
g_param_spec_boxed (NM_DEVICE_WIFI_ACCESS_POINTS,
|
||||
"Access points",
|
||||
"Access points",
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_ACTIVE_ACCESS_POINT,
|
||||
g_param_spec_boxed (NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT,
|
||||
"Active access point",
|
||||
|
||||
@@ -54,6 +54,7 @@ typedef enum {
|
||||
#define NM_DEVICE_WIFI_PERMANENT_HW_ADDRESS "perm-hw-address"
|
||||
#define NM_DEVICE_WIFI_MODE "mode"
|
||||
#define NM_DEVICE_WIFI_BITRATE "bitrate"
|
||||
#define NM_DEVICE_WIFI_ACCESS_POINTS "access-points"
|
||||
#define NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT "active-access-point"
|
||||
#define NM_DEVICE_WIFI_CAPABILITIES "wireless-capabilities"
|
||||
#define NM_DEVICE_WIFI_SCANNING "scanning"
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
#include "nm-rfkill-manager.h"
|
||||
#include "iwmxsdk.h"
|
||||
#include "nm-enum-types.h"
|
||||
#include "nm-dbus-glib-types.h"
|
||||
|
||||
static gboolean impl_device_get_nsp_list (NMDeviceWimax *device, GPtrArray **list, GError **error);
|
||||
|
||||
@@ -53,6 +54,7 @@ G_DEFINE_TYPE (NMDeviceWimax, nm_device_wimax, NM_TYPE_DEVICE)
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_NSPS,
|
||||
PROP_ACTIVE_NSP,
|
||||
PROP_CENTER_FREQ,
|
||||
PROP_RSSI,
|
||||
@@ -231,6 +233,7 @@ remove_all_nsps (NMDeviceWimax *self)
|
||||
|
||||
priv->nsp_list = g_slist_remove (priv->nsp_list, nsp);
|
||||
g_signal_emit (self, signals[NSP_REMOVED], 0, nsp);
|
||||
g_object_notify (G_OBJECT (self), NM_DEVICE_WIMAX_NSPS);
|
||||
g_object_unref (nsp);
|
||||
}
|
||||
|
||||
@@ -1023,6 +1026,7 @@ wmx_scan_result_cb (struct wmxsdk *wmxsdk,
|
||||
priv->nsp_list = g_slist_append (priv->nsp_list, nsp);
|
||||
nm_wimax_nsp_export_to_dbus (nsp);
|
||||
g_signal_emit (self, signals[NSP_ADDED], 0, nsp);
|
||||
g_object_notify (G_OBJECT (self), NM_DEVICE_WIMAX_NSPS);
|
||||
nm_device_recheck_available_connections (NM_DEVICE (self));
|
||||
}
|
||||
}
|
||||
@@ -1313,8 +1317,16 @@ get_property (GObject *object, guint prop_id,
|
||||
{
|
||||
NMDeviceWimax *self = NM_DEVICE_WIMAX (object);
|
||||
NMDeviceWimaxPrivate *priv = NM_DEVICE_WIMAX_GET_PRIVATE (self);
|
||||
GPtrArray *array;
|
||||
GSList *iter;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_NSPS:
|
||||
array = g_ptr_array_sized_new (4);
|
||||
for (iter = priv->nsp_list; iter; iter = g_slist_next (iter))
|
||||
g_ptr_array_add (array, g_strdup (nm_wimax_nsp_get_dbus_path (NM_WIMAX_NSP (iter->data))));
|
||||
g_value_take_boxed (value, array);
|
||||
break;
|
||||
case PROP_ACTIVE_NSP:
|
||||
if (priv->current_nsp)
|
||||
g_value_set_boxed (value, nm_wimax_nsp_get_dbus_path (priv->current_nsp));
|
||||
@@ -1404,6 +1416,14 @@ nm_device_wimax_class_init (NMDeviceWimaxClass *klass)
|
||||
device_class->state_changed = device_state_changed;
|
||||
|
||||
/* Properties */
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_NSPS,
|
||||
g_param_spec_boxed (NM_DEVICE_WIMAX_NSPS,
|
||||
"Network access points",
|
||||
"Network access points",
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property (object_class, PROP_ACTIVE_NSP,
|
||||
g_param_spec_boxed (NM_DEVICE_WIMAX_ACTIVE_NSP,
|
||||
"Active NSP",
|
||||
|
||||
@@ -43,6 +43,7 @@ typedef enum
|
||||
NM_WIMAX_ERROR_NSP_NOT_FOUND, /*< nick=NspNotFound >*/
|
||||
} NMWimaxError;
|
||||
|
||||
#define NM_DEVICE_WIMAX_NSPS "nsps"
|
||||
#define NM_DEVICE_WIMAX_ACTIVE_NSP "active-nsp"
|
||||
#define NM_DEVICE_WIMAX_CENTER_FREQUENCY "center-frequency"
|
||||
#define NM_DEVICE_WIMAX_RSSI "rssi"
|
||||
|
||||
@@ -289,6 +289,7 @@ enum {
|
||||
PROP_CONNECTIVITY,
|
||||
PROP_PRIMARY_CONNECTION,
|
||||
PROP_ACTIVATING_CONNECTION,
|
||||
PROP_DEVICES,
|
||||
|
||||
/* Not exported */
|
||||
PROP_HOSTNAME,
|
||||
@@ -818,6 +819,7 @@ remove_device (NMManager *manager, NMDevice *device, gboolean quitting)
|
||||
|
||||
nm_settings_device_removed (priv->settings, device, quitting);
|
||||
g_signal_emit (manager, signals[DEVICE_REMOVED], 0, device);
|
||||
g_object_notify (G_OBJECT (manager), NM_MANAGER_DEVICES);
|
||||
g_object_unref (device);
|
||||
|
||||
priv->devices = g_slist_remove (priv->devices, device);
|
||||
@@ -1912,6 +1914,7 @@ add_device (NMManager *self, NMDevice *device, gboolean generate_con)
|
||||
|
||||
nm_settings_device_added (priv->settings, device);
|
||||
g_signal_emit (self, signals[DEVICE_ADDED], 0, device);
|
||||
g_object_notify (G_OBJECT (self), NM_MANAGER_DEVICES);
|
||||
|
||||
/* New devices might be master interfaces for virtual interfaces; so we may
|
||||
* need to create new virtual interfaces now.
|
||||
@@ -4840,7 +4843,7 @@ get_property (GObject *object, guint prop_id,
|
||||
NMManager *self = NM_MANAGER (object);
|
||||
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
|
||||
GSList *iter;
|
||||
GPtrArray *active;
|
||||
GPtrArray *array;
|
||||
const char *path;
|
||||
|
||||
switch (prop_id) {
|
||||
@@ -4876,13 +4879,13 @@ get_property (GObject *object, guint prop_id,
|
||||
g_value_set_boolean (value, priv->radio_states[RFKILL_TYPE_WIMAX].hw_enabled);
|
||||
break;
|
||||
case PROP_ACTIVE_CONNECTIONS:
|
||||
active = g_ptr_array_sized_new (3);
|
||||
array = g_ptr_array_sized_new (3);
|
||||
for (iter = priv->active_connections; iter; iter = g_slist_next (iter)) {
|
||||
path = nm_active_connection_get_path (NM_ACTIVE_CONNECTION (iter->data));
|
||||
if (path)
|
||||
g_ptr_array_add (active, g_strdup (path));
|
||||
g_ptr_array_add (array, g_strdup (path));
|
||||
}
|
||||
g_value_take_boxed (value, active);
|
||||
g_value_take_boxed (value, array);
|
||||
break;
|
||||
case PROP_CONNECTIVITY:
|
||||
g_value_set_uint (value, nm_connectivity_get_state (priv->connectivity));
|
||||
@@ -4901,6 +4904,15 @@ get_property (GObject *object, guint prop_id,
|
||||
case PROP_SLEEPING:
|
||||
g_value_set_boolean (value, priv->sleeping);
|
||||
break;
|
||||
case PROP_DEVICES:
|
||||
array = g_ptr_array_sized_new (5);
|
||||
for (iter = priv->devices; iter; iter = g_slist_next (iter)) {
|
||||
path = nm_device_get_path (NM_DEVICE (iter->data));
|
||||
if (path)
|
||||
g_ptr_array_add (array, g_strdup (path));
|
||||
}
|
||||
g_value_take_boxed (value, array);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -5201,6 +5213,14 @@ nm_manager_class_init (NMManagerClass *manager_class)
|
||||
FALSE,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_DEVICES,
|
||||
g_param_spec_boxed (NM_MANAGER_DEVICES,
|
||||
"Devices",
|
||||
"Devices",
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/* signals */
|
||||
signals[DEVICE_ADDED] =
|
||||
g_signal_new ("device-added",
|
||||
|
||||
@@ -65,6 +65,7 @@ typedef enum {
|
||||
#define NM_MANAGER_CONNECTIVITY "connectivity"
|
||||
#define NM_MANAGER_PRIMARY_CONNECTION "primary-connection"
|
||||
#define NM_MANAGER_ACTIVATING_CONNECTION "activating-connection"
|
||||
#define NM_MANAGER_DEVICES "devices"
|
||||
|
||||
/* Not exported */
|
||||
#define NM_MANAGER_HOSTNAME "hostname"
|
||||
|
||||
@@ -164,6 +164,7 @@ enum {
|
||||
PROP_UNMANAGED_SPECS,
|
||||
PROP_HOSTNAME,
|
||||
PROP_CAN_MODIFY,
|
||||
PROP_CONNECTIONS,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
@@ -748,9 +749,12 @@ connection_removed (NMSettingsConnection *connection, gpointer user_data)
|
||||
g_hash_table_remove (NM_SETTINGS_GET_PRIVATE (user_data)->connections,
|
||||
(gpointer) nm_connection_get_path (NM_CONNECTION (connection)));
|
||||
|
||||
/* Re-emit for listeners like NMPolicy */
|
||||
/* Notify D-Bus */
|
||||
g_signal_emit (self, signals[CONNECTION_REMOVED], 0, connection);
|
||||
|
||||
/* Re-emit for listeners like NMPolicy */
|
||||
g_signal_emit_by_name (self, NM_CP_SIGNAL_CONNECTION_REMOVED, connection);
|
||||
g_object_notify (G_OBJECT (self), NM_SETTINGS_CONNECTIONS);
|
||||
|
||||
g_object_unref (connection);
|
||||
}
|
||||
@@ -879,6 +883,7 @@ claim_connection (NMSettings *self,
|
||||
/* Internal added signal */
|
||||
g_signal_emit (self, signals[CONNECTION_ADDED], 0, connection);
|
||||
g_signal_emit_by_name (self, NM_CP_SIGNAL_CONNECTION_ADDED, connection);
|
||||
g_object_notify (G_OBJECT (self), NM_SETTINGS_CONNECTIONS);
|
||||
|
||||
/* Exported D-Bus signal */
|
||||
g_signal_emit (self, signals[NEW_CONNECTION], 0, connection);
|
||||
@@ -1873,8 +1878,12 @@ get_property (GObject *object, guint prop_id,
|
||||
GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
NMSettings *self = NM_SETTINGS (object);
|
||||
NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self);
|
||||
const GSList *specs, *iter;
|
||||
GSList *copy = NULL;
|
||||
GHashTableIter citer;
|
||||
GPtrArray *array;
|
||||
const char *path;
|
||||
|
||||
switch (prop_id) {
|
||||
case PROP_UNMANAGED_SPECS:
|
||||
@@ -1893,6 +1902,13 @@ get_property (GObject *object, guint prop_id,
|
||||
case PROP_CAN_MODIFY:
|
||||
g_value_set_boolean (value, !!get_plugin (self, NM_SYSTEM_CONFIG_INTERFACE_CAP_MODIFY_CONNECTIONS));
|
||||
break;
|
||||
case PROP_CONNECTIONS:
|
||||
array = g_ptr_array_sized_new (g_hash_table_size (priv->connections));
|
||||
g_hash_table_iter_init (&citer, priv->connections);
|
||||
while (g_hash_table_iter_next (&citer, (gpointer) &path, NULL))
|
||||
g_ptr_array_add (array, g_strdup (path));
|
||||
g_value_take_boxed (value, array);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
@@ -1938,6 +1954,14 @@ nm_settings_class_init (NMSettingsClass *class)
|
||||
FALSE,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_CONNECTIONS,
|
||||
g_param_spec_boxed (NM_SETTINGS_CONNECTIONS,
|
||||
"Connections",
|
||||
"Connections",
|
||||
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
|
||||
G_PARAM_READABLE));
|
||||
|
||||
/* signals */
|
||||
signals[PROPERTIES_CHANGED] =
|
||||
g_signal_new ("properties-changed",
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#define NM_SETTINGS_UNMANAGED_SPECS "unmanaged-specs"
|
||||
#define NM_SETTINGS_HOSTNAME "hostname"
|
||||
#define NM_SETTINGS_CAN_MODIFY "can-modify"
|
||||
#define NM_SETTINGS_CONNECTIONS "connections"
|
||||
|
||||
#define NM_SETTINGS_SIGNAL_CONNECTION_ADDED "connection-added"
|
||||
#define NM_SETTINGS_SIGNAL_CONNECTION_UPDATED "connection-updated"
|
||||
|
||||
Reference in New Issue
Block a user