007351657f
Massive fixup of libnm-glib to: a) have all objects (with the exception of VPN) cache their properties and update them asynchronously on PropertiesChanged signals from NM b) return internal const data for most attributes/properties instead of allocated values that the caller must free c) cache wrapped objects such that a given D-Bus path will always map to the same GObject returned by libnm-glib d) remove a few signals and move them to GObject property notifications e) match recent NM D-Bus API changes for activation/deactivation f) remove some private functions from libnm-glib headers git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3491 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
450 lines
12 KiB
C
450 lines
12 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#include "wireless-helper.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include "nm-access-point.h"
|
|
#include "NetworkManager.h"
|
|
#include "nm-types-private.h"
|
|
#include "nm-object-private.h"
|
|
|
|
#include "nm-access-point-bindings.h"
|
|
|
|
G_DEFINE_TYPE (NMAccessPoint, nm_access_point, NM_TYPE_OBJECT)
|
|
|
|
#define NM_ACCESS_POINT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_ACCESS_POINT, NMAccessPointPrivate))
|
|
|
|
typedef struct {
|
|
gboolean disposed;
|
|
DBusGProxy *proxy;
|
|
|
|
guint32 flags;
|
|
guint32 wpa_flags;
|
|
guint32 rsn_flags;
|
|
GByteArray *ssid;
|
|
guint32 frequency;
|
|
char *hw_address;
|
|
int mode;
|
|
guint32 max_bitrate;
|
|
guint8 strength;
|
|
} NMAccessPointPrivate;
|
|
|
|
enum {
|
|
PROP_0,
|
|
PROP_FLAGS,
|
|
PROP_WPA_FLAGS,
|
|
PROP_RSN_FLAGS,
|
|
PROP_SSID,
|
|
PROP_FREQUENCY,
|
|
PROP_HW_ADDRESS,
|
|
PROP_MODE,
|
|
PROP_MAX_BITRATE,
|
|
PROP_STRENGTH,
|
|
|
|
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"
|
|
|
|
GObject *
|
|
nm_access_point_new (DBusGConnection *connection, const char *path)
|
|
{
|
|
g_return_val_if_fail (connection != NULL, NULL);
|
|
g_return_val_if_fail (path != NULL, NULL);
|
|
|
|
return (GObject *) g_object_new (NM_TYPE_ACCESS_POINT,
|
|
NM_OBJECT_DBUS_CONNECTION, connection,
|
|
NM_OBJECT_DBUS_PATH, path,
|
|
NULL);
|
|
}
|
|
|
|
guint32
|
|
nm_access_point_get_flags (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NM_802_11_AP_FLAGS_NONE);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->flags) {
|
|
priv->flags = nm_object_get_uint_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_FLAGS);
|
|
}
|
|
|
|
return priv->flags;
|
|
}
|
|
|
|
guint32
|
|
nm_access_point_get_wpa_flags (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NM_802_11_AP_SEC_NONE);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->wpa_flags) {
|
|
priv->wpa_flags = nm_object_get_uint_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_WPA_FLAGS);
|
|
}
|
|
|
|
return priv->wpa_flags;
|
|
}
|
|
|
|
guint32
|
|
nm_access_point_get_rsn_flags (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NM_802_11_AP_SEC_NONE);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->rsn_flags) {
|
|
priv->rsn_flags = nm_object_get_uint_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_RSN_FLAGS);
|
|
}
|
|
|
|
return priv->rsn_flags;
|
|
}
|
|
|
|
const GByteArray *
|
|
nm_access_point_get_ssid (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NULL);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->ssid) {
|
|
priv->ssid = nm_object_get_byte_array_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_SSID);
|
|
}
|
|
|
|
return priv->ssid;
|
|
}
|
|
|
|
guint32
|
|
nm_access_point_get_frequency (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), 0);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->frequency) {
|
|
priv->frequency = nm_object_get_uint_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_FREQUENCY);
|
|
}
|
|
|
|
return priv->frequency;
|
|
}
|
|
|
|
const char *
|
|
nm_access_point_get_hw_address (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), NULL);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->hw_address) {
|
|
priv->hw_address = nm_object_get_string_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_HW_ADDRESS);
|
|
}
|
|
|
|
return priv->hw_address;
|
|
}
|
|
|
|
int
|
|
nm_access_point_get_mode (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), 0);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->mode) {
|
|
priv->mode = nm_object_get_int_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_MODE);
|
|
}
|
|
|
|
return priv->mode;
|
|
}
|
|
|
|
guint32
|
|
nm_access_point_get_max_bitrate (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), 0);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->max_bitrate) {
|
|
priv->max_bitrate = nm_object_get_uint_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_MAX_BITRATE);
|
|
}
|
|
|
|
return priv->max_bitrate;
|
|
}
|
|
|
|
guint8
|
|
nm_access_point_get_strength (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv;
|
|
|
|
g_return_val_if_fail (NM_IS_ACCESS_POINT (ap), 0);
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
if (!priv->strength) {
|
|
priv->strength = nm_object_get_byte_property (NM_OBJECT (ap),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT,
|
|
DBUS_PROP_STRENGTH);
|
|
}
|
|
|
|
return priv->strength;
|
|
}
|
|
|
|
/************************************************************/
|
|
|
|
static void
|
|
nm_access_point_init (NMAccessPoint *ap)
|
|
{
|
|
}
|
|
|
|
static void
|
|
dispose (GObject *object)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (object);
|
|
|
|
if (priv->disposed) {
|
|
G_OBJECT_CLASS (nm_access_point_parent_class)->dispose (object);
|
|
return;
|
|
}
|
|
|
|
priv->disposed = TRUE;
|
|
|
|
g_object_unref (priv->proxy);
|
|
|
|
G_OBJECT_CLASS (nm_access_point_parent_class)->dispose (object);
|
|
}
|
|
|
|
static void
|
|
finalize (GObject *object)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (object);
|
|
|
|
if (priv->ssid)
|
|
g_byte_array_free (priv->ssid, TRUE);
|
|
|
|
if (priv->hw_address)
|
|
g_free (priv->hw_address);
|
|
|
|
G_OBJECT_CLASS (nm_access_point_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
NMAccessPoint *ap = NM_ACCESS_POINT (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_FLAGS:
|
|
g_value_set_uint (value, nm_access_point_get_flags (ap));
|
|
break;
|
|
case PROP_WPA_FLAGS:
|
|
g_value_set_uint (value, nm_access_point_get_wpa_flags (ap));
|
|
break;
|
|
case PROP_RSN_FLAGS:
|
|
g_value_set_uint (value, nm_access_point_get_rsn_flags (ap));
|
|
break;
|
|
case PROP_SSID:
|
|
g_value_set_boxed (value, nm_access_point_get_ssid (ap));
|
|
break;
|
|
case PROP_FREQUENCY:
|
|
g_value_set_uint (value, nm_access_point_get_frequency (ap));
|
|
break;
|
|
case PROP_HW_ADDRESS:
|
|
g_value_set_string (value, nm_access_point_get_hw_address (ap));
|
|
break;
|
|
case PROP_MODE:
|
|
g_value_set_int (value, nm_access_point_get_mode (ap));
|
|
break;
|
|
case PROP_MAX_BITRATE:
|
|
g_value_set_uint (value, nm_access_point_get_max_bitrate (ap));
|
|
break;
|
|
case PROP_STRENGTH:
|
|
g_value_set_uchar (value, nm_access_point_get_strength (ap));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
demarshal_ssid (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
|
|
{
|
|
if (!nm_ssid_demarshal (value, (GByteArray **) field))
|
|
return FALSE;
|
|
|
|
g_object_notify (G_OBJECT (object), NM_ACCESS_POINT_SSID);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
register_for_property_changed (NMAccessPoint *ap)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
const NMPropertiesChangedInfo property_changed_info[] = {
|
|
{ NM_ACCESS_POINT_FLAGS, nm_object_demarshal_generic, &priv->flags },
|
|
{ NM_ACCESS_POINT_WPA_FLAGS, nm_object_demarshal_generic, &priv->wpa_flags },
|
|
{ NM_ACCESS_POINT_RSN_FLAGS, nm_object_demarshal_generic, &priv->rsn_flags },
|
|
{ NM_ACCESS_POINT_SSID, demarshal_ssid, &priv->ssid },
|
|
{ NM_ACCESS_POINT_FREQUENCY, nm_object_demarshal_generic, &priv->frequency },
|
|
{ NM_ACCESS_POINT_HW_ADDRESS, nm_object_demarshal_generic, &priv->hw_address },
|
|
{ NM_ACCESS_POINT_MODE, nm_object_demarshal_generic, &priv->mode },
|
|
{ NM_ACCESS_POINT_MAX_BITRATE, nm_object_demarshal_generic, &priv->max_bitrate },
|
|
{ NM_ACCESS_POINT_STRENGTH, nm_object_demarshal_generic, &priv->strength },
|
|
{ NULL },
|
|
};
|
|
|
|
nm_object_handle_properties_changed (NM_OBJECT (ap),
|
|
priv->proxy,
|
|
property_changed_info);
|
|
}
|
|
|
|
static GObject*
|
|
constructor (GType type,
|
|
guint n_construct_params,
|
|
GObjectConstructParam *construct_params)
|
|
{
|
|
NMObject *object;
|
|
NMAccessPointPrivate *priv;
|
|
|
|
object = (NMObject *) G_OBJECT_CLASS (nm_access_point_parent_class)->constructor (type,
|
|
n_construct_params,
|
|
construct_params);
|
|
if (!object)
|
|
return NULL;
|
|
|
|
priv = NM_ACCESS_POINT_GET_PRIVATE (object);
|
|
|
|
priv->proxy = dbus_g_proxy_new_for_name (nm_object_get_connection (object),
|
|
NM_DBUS_SERVICE,
|
|
nm_object_get_path (object),
|
|
NM_DBUS_INTERFACE_ACCESS_POINT);
|
|
|
|
register_for_property_changed (NM_ACCESS_POINT (object));
|
|
|
|
return G_OBJECT (object);
|
|
}
|
|
|
|
|
|
static void
|
|
nm_access_point_class_init (NMAccessPointClass *ap_class)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (ap_class);
|
|
|
|
g_type_class_add_private (ap_class, sizeof (NMAccessPointPrivate));
|
|
|
|
/* virtual methods */
|
|
object_class->constructor = constructor;
|
|
object_class->get_property = get_property;
|
|
object_class->dispose = dispose;
|
|
object_class->finalize = finalize;
|
|
|
|
/* properties */
|
|
g_object_class_install_property
|
|
(object_class, PROP_FLAGS,
|
|
g_param_spec_uint (NM_ACCESS_POINT_FLAGS,
|
|
"Flags",
|
|
"Flags",
|
|
NM_802_11_AP_FLAGS_NONE,
|
|
NM_802_11_AP_FLAGS_PRIVACY,
|
|
NM_802_11_AP_FLAGS_NONE,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_WPA_FLAGS,
|
|
g_param_spec_uint (NM_ACCESS_POINT_WPA_FLAGS,
|
|
"WPA Flags",
|
|
"WPA Flags",
|
|
0, G_MAXUINT32, 0,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_RSN_FLAGS,
|
|
g_param_spec_uint (NM_ACCESS_POINT_RSN_FLAGS,
|
|
"RSN Flags",
|
|
"RSN Flags",
|
|
0, G_MAXUINT32, 0,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_SSID,
|
|
g_param_spec_boxed (NM_ACCESS_POINT_SSID,
|
|
"SSID",
|
|
"SSID",
|
|
NM_TYPE_SSID,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_FREQUENCY,
|
|
g_param_spec_uint (NM_ACCESS_POINT_FREQUENCY,
|
|
"Frequency",
|
|
"Frequency",
|
|
0, 10000, 0,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_HW_ADDRESS,
|
|
g_param_spec_string (NM_ACCESS_POINT_HW_ADDRESS,
|
|
"MAC Address",
|
|
"Hardware MAC address",
|
|
NULL,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_MODE,
|
|
g_param_spec_int (NM_ACCESS_POINT_MODE,
|
|
"Mode",
|
|
"Mode",
|
|
IW_MODE_ADHOC, IW_MODE_INFRA, IW_MODE_INFRA,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_MAX_BITRATE,
|
|
g_param_spec_uint (NM_ACCESS_POINT_MAX_BITRATE,
|
|
"Max Bitrate",
|
|
"Max Bitrate",
|
|
0, G_MAXUINT32, 0,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_STRENGTH,
|
|
g_param_spec_uchar (NM_ACCESS_POINT_STRENGTH,
|
|
"Strength",
|
|
"Strength",
|
|
0, G_MAXUINT8, 0,
|
|
G_PARAM_READABLE));
|
|
}
|