a90c522da9
* include/wireless-helper.h include/Makefile.am - One place for all the junk needed for #including wireless.h * test/nm-tool.c src/NetworkManagerAP.c src/wpa.c src/Makefile.am libnm-util/nm-utils.c libnm-util/nm-setting-wireless.c libnm-glib/nm-device-802-11-wireless.c libnm-glib/nm-access-point.c libnm-glib/libnm-glib-test.c - include wireless-helper.h, not iwlib.h * configure.in - Don't need libiw really, just need to check for wireless.h * src/kernel-types.h - Remove; used types moved into wpa.c * src/nm-device-802-11-wireless.c - (nm_device_802_11_wireless_update_signal_strength, real_get_generic_capabilities, nm_device_802_11_wireless_get_mode, nm_device_802_11_wireless_set_mode, nm_device_802_11_wireless_get_frequency, nm_device_802_11_wireless_get_ssid, nm_device_802_11_wireless_set_ssid, nm_device_802_11_wireless_get_bitrate, nm_device_802_11_wireless_get_bssid, nm_device_802_11_wireless_disable_encryption): use ioctl() directly instead of iwlib functions git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3462 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
553 lines
14 KiB
C
553 lines
14 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-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 *ap_proxy;
|
|
guint32 flags;
|
|
guint32 wpa_flags;
|
|
guint32 rsn_flags;
|
|
GByteArray *ssid;
|
|
guint32 frequency;
|
|
char *hw_address;
|
|
int mode;
|
|
guint32 max_bitrate;
|
|
gint8 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"
|
|
|
|
NMAccessPoint *
|
|
nm_access_point_new (DBusGConnection *connection, const char *path)
|
|
{
|
|
return (NMAccessPoint *) g_object_new (NM_TYPE_ACCESS_POINT,
|
|
NM_OBJECT_CONNECTION, connection,
|
|
NM_OBJECT_PATH, path,
|
|
NULL);
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_flags (NMAccessPoint *ap, guint32 flags)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->flags = flags;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_FLAGS);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_wpa_flags (NMAccessPoint *ap, guint32 flags)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->wpa_flags = flags;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_WPA_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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_rsn_flags (NMAccessPoint *ap, guint32 flags)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->rsn_flags = flags;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_RSN_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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_ssid (NMAccessPoint *ap, GArray *ssid)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
if (priv->ssid) {
|
|
g_byte_array_free (priv->ssid, TRUE);
|
|
priv->ssid = NULL;
|
|
}
|
|
|
|
if (ssid && ssid->len > 0) {
|
|
priv->ssid = g_byte_array_sized_new (ssid->len);
|
|
priv->ssid->len = ssid->len;
|
|
memcpy (priv->ssid->data, ssid->data, ssid->len);
|
|
}
|
|
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_SSID);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_frequency (NMAccessPoint *ap, guint32 frequency)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->frequency = frequency;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_FREQUENCY);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_hw_address (NMAccessPoint *ap, const char *address)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
g_free (priv->hw_address);
|
|
priv->hw_address = address ? g_strdup (address) : NULL;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_HW_ADDRESS);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_mode (NMAccessPoint *ap, int mode)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->mode = mode;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_MODE);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_max_bitrate (NMAccessPoint *ap, guint32 bitrate)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->max_bitrate = bitrate;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_MAX_BITRATE);
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
static void
|
|
nm_access_point_set_strength (NMAccessPoint *ap, gint8 strength)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
|
|
|
|
priv->strength = strength;
|
|
g_object_notify (G_OBJECT (ap), NM_ACCESS_POINT_STRENGTH);
|
|
}
|
|
|
|
gint8
|
|
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->ap_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
|
|
set_property (GObject *object, guint prop_id,
|
|
const GValue *value, GParamSpec *pspec)
|
|
{
|
|
NMAccessPoint *ap = NM_ACCESS_POINT (object);
|
|
|
|
switch (prop_id) {
|
|
case PROP_FLAGS:
|
|
nm_access_point_set_flags (ap, g_value_get_uint (value));
|
|
break;
|
|
case PROP_WPA_FLAGS:
|
|
nm_access_point_set_wpa_flags (ap, g_value_get_uint (value));
|
|
break;
|
|
case PROP_RSN_FLAGS:
|
|
nm_access_point_set_rsn_flags (ap, g_value_get_uint (value));
|
|
break;
|
|
case PROP_SSID:
|
|
nm_access_point_set_ssid (ap, (GArray *) g_value_get_boxed (value));
|
|
break;
|
|
case PROP_FREQUENCY:
|
|
nm_access_point_set_frequency (ap, g_value_get_uint (value));
|
|
break;
|
|
case PROP_HW_ADDRESS:
|
|
nm_access_point_set_hw_address (ap, g_value_get_string (value));
|
|
break;
|
|
case PROP_MODE:
|
|
nm_access_point_set_mode (ap, g_value_get_int (value));
|
|
break;
|
|
case PROP_MAX_BITRATE:
|
|
nm_access_point_set_max_bitrate (ap, g_value_get_uint (value));
|
|
break;
|
|
case PROP_STRENGTH:
|
|
nm_access_point_set_strength (ap, g_value_get_char (value));
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
get_property (GObject *object,
|
|
guint prop_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (object);
|
|
GArray * ssid;
|
|
int len;
|
|
int i;
|
|
|
|
switch (prop_id) {
|
|
case PROP_FLAGS:
|
|
g_value_set_uint (value, priv->flags);
|
|
break;
|
|
case PROP_WPA_FLAGS:
|
|
g_value_set_uint (value, priv->wpa_flags);
|
|
break;
|
|
case PROP_RSN_FLAGS:
|
|
g_value_set_uint (value, priv->rsn_flags);
|
|
break;
|
|
case PROP_SSID:
|
|
len = priv->ssid ? priv->ssid->len : 0;
|
|
ssid = g_array_sized_new (FALSE, TRUE, sizeof (unsigned char), len);
|
|
for (i = 0; i < len; i++)
|
|
g_array_append_val (ssid, priv->ssid->data[i]);
|
|
g_value_set_boxed (value, ssid);
|
|
g_array_free (ssid, TRUE);
|
|
break;
|
|
case PROP_FREQUENCY:
|
|
g_value_set_uint (value, priv->frequency);
|
|
break;
|
|
case PROP_HW_ADDRESS:
|
|
g_value_set_string (value, priv->hw_address);
|
|
break;
|
|
case PROP_MODE:
|
|
g_value_set_int (value, priv->mode);
|
|
break;
|
|
case PROP_MAX_BITRATE:
|
|
g_value_set_uint (value, priv->max_bitrate);
|
|
break;
|
|
case PROP_STRENGTH:
|
|
g_value_set_char (value, priv->strength);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
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->ap_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);
|
|
|
|
nm_object_handle_properties_changed (NM_OBJECT (object), priv->ap_proxy);
|
|
|
|
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->set_property = set_property;
|
|
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_READWRITE));
|
|
|
|
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_READWRITE));
|
|
|
|
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_READWRITE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_SSID,
|
|
g_param_spec_boxed (NM_ACCESS_POINT_SSID,
|
|
"SSID",
|
|
"SSID",
|
|
DBUS_TYPE_G_UCHAR_ARRAY,
|
|
G_PARAM_READWRITE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_FREQUENCY,
|
|
g_param_spec_uint (NM_ACCESS_POINT_FREQUENCY,
|
|
"Frequency",
|
|
"Frequency",
|
|
0, 10000, 0,
|
|
G_PARAM_READWRITE));
|
|
|
|
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_READWRITE));
|
|
|
|
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_READWRITE));
|
|
|
|
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_READWRITE));
|
|
|
|
g_object_class_install_property
|
|
(object_class, PROP_STRENGTH,
|
|
g_param_spec_char (NM_ACCESS_POINT_STRENGTH,
|
|
"Strength",
|
|
"Strength",
|
|
G_MININT8, G_MAXINT8, 0,
|
|
G_PARAM_READWRITE));
|
|
}
|