mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
libnm: add support for WPAN devices
This commit is contained in:
parent
179909a4f2
commit
a3baf1ca21
|
@ -797,6 +797,7 @@ libnm_lib_h_pub_real = \
|
|||
libnm/nm-device-vxlan.h \
|
||||
libnm/nm-device-wifi.h \
|
||||
libnm/nm-device-wimax.h \
|
||||
libnm/nm-device-wpan.h \
|
||||
libnm/nm-device.h \
|
||||
libnm/nm-dhcp-config.h \
|
||||
libnm/nm-ip-config.h \
|
||||
|
@ -853,6 +854,7 @@ libnm_lib_c_real = \
|
|||
libnm/nm-device-vxlan.c \
|
||||
libnm/nm-device-wifi.c \
|
||||
libnm/nm-device-wimax.c \
|
||||
libnm/nm-device-wpan.c \
|
||||
libnm/nm-device.c \
|
||||
libnm/nm-dhcp-config.c \
|
||||
libnm/nm-dhcp4-config.c \
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
#include "nm-device-vxlan.h"
|
||||
#include "nm-device-wifi.h"
|
||||
#include "nm-device-wimax.h"
|
||||
#include "nm-device-wpan.h"
|
||||
#include "nm-device.h"
|
||||
#include "nm-dhcp-config.h"
|
||||
#include "nm-enum-types.h"
|
||||
|
|
|
@ -1351,6 +1351,7 @@ global:
|
|||
nm_connection_get_setting_tc_config;
|
||||
nm_device_ip_tunnel_get_flags;
|
||||
nm_device_wifi_get_last_scan;
|
||||
nm_device_wpan_get_type;
|
||||
nm_ip_tunnel_flags_get_type;
|
||||
nm_remote_connection_get_filename;
|
||||
nm_remote_connection_get_flags;
|
||||
|
|
|
@ -56,6 +56,7 @@ libnm_headers = files(
|
|||
'nm-device-vxlan.h',
|
||||
'nm-device-wifi.h',
|
||||
'nm-device-wimax.h',
|
||||
'nm-device-wpan.h',
|
||||
'nm-dhcp-config.h',
|
||||
'nm-ip-config.h',
|
||||
'nm-object.h',
|
||||
|
@ -117,6 +118,7 @@ libnm_sources = files(
|
|||
'nm-device-vxlan.c',
|
||||
'nm-device-wifi.c',
|
||||
'nm-device-wimax.c',
|
||||
'nm-device-wpan.c',
|
||||
'nm-dhcp-config.c',
|
||||
'nm-dhcp4-config.c',
|
||||
'nm-dhcp6-config.c',
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright 2007 - 2008 Novell, Inc.
|
||||
* Copyright 2007 - 2014 Red Hat, Inc.
|
||||
* Copyright 2007 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
@ -74,6 +74,7 @@
|
|||
#include "nm-device-vxlan.h"
|
||||
#include "nm-device-wifi.h"
|
||||
#include "nm-device-wimax.h"
|
||||
#include "nm-device-wpan.h"
|
||||
#include "nm-dhcp4-config.h"
|
||||
#include "nm-dhcp6-config.h"
|
||||
#include "nm-dhcp-config.h"
|
||||
|
@ -2563,6 +2564,8 @@ obj_nm_for_gdbus_object (NMClient *self, GDBusObject *object, GDBusObjectManager
|
|||
type = NM_TYPE_DEVICE_TUN;
|
||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_VLAN) == 0)
|
||||
type = NM_TYPE_DEVICE_VLAN;
|
||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WPAN) == 0)
|
||||
type = NM_TYPE_DEVICE_WPAN;
|
||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_VXLAN) == 0)
|
||||
type = NM_TYPE_DEVICE_VXLAN;
|
||||
else if (strcmp (ifname, NM_DBUS_INTERFACE_DEVICE_WIRELESS) == 0)
|
||||
|
|
179
libnm/nm-device-wpan.c
Normal file
179
libnm/nm-device-wpan.c
Normal file
|
@ -0,0 +1,179 @@
|
|||
/*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright 2018 Lubomir Rintel <lkundrak@v3.sk>
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "nm-device-wpan.h"
|
||||
#include "nm-object-private.h"
|
||||
#include "nm-setting-wpan.h"
|
||||
#include "nm-setting-connection.h"
|
||||
|
||||
enum {
|
||||
PROP_0,
|
||||
PROP_HW_ADDRESS,
|
||||
|
||||
LAST_PROP
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
char *hw_address;
|
||||
} NMDeviceWpanPrivate;
|
||||
|
||||
/**
|
||||
* NMDeviceWpan:
|
||||
*/
|
||||
struct _NMDeviceWpan {
|
||||
NMDevice parent;
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
NMDeviceClass parent;
|
||||
} NMDeviceWpanClass;
|
||||
|
||||
G_DEFINE_TYPE (NMDeviceWpan, nm_device_wpan, NM_TYPE_DEVICE)
|
||||
|
||||
#define NM_DEVICE_WPAN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_WPAN, NMDeviceWpanPrivate))
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
/**
|
||||
* nm_device_wpan_get_hw_address:
|
||||
* @device: a #NMDeviceWpan
|
||||
*
|
||||
* Gets the active hardware (MAC) address of the #NMDeviceWpan
|
||||
*
|
||||
* Returns: the active hardware address. This is the internal string used by the
|
||||
* device, and must not be modified.
|
||||
**/
|
||||
const char *
|
||||
nm_device_wpan_get_hw_address (NMDeviceWpan *device)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_DEVICE_WPAN (device), NULL);
|
||||
|
||||
return nm_str_not_empty (NM_DEVICE_WPAN_GET_PRIVATE (device)->hw_address);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
|
||||
{
|
||||
if (!NM_DEVICE_CLASS (nm_device_wpan_parent_class)->connection_compatible (device, connection, error))
|
||||
return FALSE;
|
||||
|
||||
if (!nm_connection_is_type (connection, NM_SETTING_WPAN_SETTING_NAME)) {
|
||||
g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
|
||||
_("The connection was not a wpan connection."));
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static GType
|
||||
get_setting_type (NMDevice *device)
|
||||
{
|
||||
return NM_TYPE_SETTING_WPAN;
|
||||
}
|
||||
|
||||
static const char *
|
||||
get_hw_address (NMDevice *device)
|
||||
{
|
||||
return nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (device));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
static void
|
||||
get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
|
||||
{
|
||||
switch (prop_id) {
|
||||
case PROP_HW_ADDRESS:
|
||||
g_value_set_string (value, nm_device_wpan_get_hw_address (NM_DEVICE_WPAN (object)));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_wpan_init (NMDeviceWpan *device)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
init_dbus (NMObject *object)
|
||||
{
|
||||
NMDeviceWpanPrivate *priv = NM_DEVICE_WPAN_GET_PRIVATE (object);
|
||||
const NMPropertiesInfo property_info[] = {
|
||||
{ NM_DEVICE_WPAN_HW_ADDRESS, &priv->hw_address },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
NM_OBJECT_CLASS (nm_device_wpan_parent_class)->init_dbus (object);
|
||||
|
||||
_nm_object_register_properties (object,
|
||||
NM_DBUS_INTERFACE_DEVICE_WPAN,
|
||||
property_info);
|
||||
}
|
||||
|
||||
static void
|
||||
finalize (GObject *object)
|
||||
{
|
||||
NMDeviceWpanPrivate *priv = NM_DEVICE_WPAN_GET_PRIVATE (object);
|
||||
|
||||
g_free (priv->hw_address);
|
||||
|
||||
G_OBJECT_CLASS (nm_device_wpan_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
nm_device_wpan_class_init (NMDeviceWpanClass *wpan_class)
|
||||
{
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (wpan_class);
|
||||
NMObjectClass *nm_object_class = NM_OBJECT_CLASS (wpan_class);
|
||||
NMDeviceClass *device_class = NM_DEVICE_CLASS (wpan_class);
|
||||
|
||||
g_type_class_add_private (wpan_class, sizeof (NMDeviceWpanPrivate));
|
||||
|
||||
/* virtual methods */
|
||||
object_class->finalize = finalize;
|
||||
object_class->get_property = get_property;
|
||||
|
||||
nm_object_class->init_dbus = init_dbus;
|
||||
|
||||
device_class->connection_compatible = connection_compatible;
|
||||
device_class->get_setting_type = get_setting_type;
|
||||
device_class->get_hw_address = get_hw_address;
|
||||
|
||||
/* properties */
|
||||
|
||||
/**
|
||||
* NMDeviceWpan:hw-address:
|
||||
*
|
||||
* The active hardware (MAC) address of the device.
|
||||
**/
|
||||
g_object_class_install_property
|
||||
(object_class, PROP_HW_ADDRESS,
|
||||
g_param_spec_string (NM_DEVICE_WPAN_HW_ADDRESS, "", "",
|
||||
NULL,
|
||||
G_PARAM_READABLE |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
}
|
48
libnm/nm-device-wpan.h
Normal file
48
libnm/nm-device-wpan.h
Normal file
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright 2018 Lubomir Rintel <lkundrak@v3.sk>
|
||||
*/
|
||||
|
||||
#ifndef __NM_DEVICE_WPAN_H__
|
||||
#define __NM_DEVICE_WPAN_H__
|
||||
|
||||
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
|
||||
#error "Only <NetworkManager.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#include "nm-device.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#define NM_TYPE_DEVICE_WPAN (nm_device_wpan_get_type ())
|
||||
#define NM_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpan))
|
||||
#define NM_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass))
|
||||
#define NM_IS_DEVICE_WPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_WPAN))
|
||||
#define NM_IS_DEVICE_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_WPAN))
|
||||
#define NM_DEVICE_WPAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_WPAN, NMDeviceWpanClass))
|
||||
|
||||
#define NM_DEVICE_WPAN_HW_ADDRESS "hw-address"
|
||||
|
||||
NM_AVAILABLE_IN_1_14
|
||||
GType nm_device_wpan_get_type (void);
|
||||
|
||||
NM_AVAILABLE_IN_1_14
|
||||
const char *nm_device_wpan_get_hw_address (NMDeviceWpan *device);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __NM_DEVICE_WPAN_H__ */
|
|
@ -15,7 +15,7 @@
|
|||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright 2014 Red Hat, Inc.
|
||||
* Copyright 2014 - 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_TYPES_H__
|
||||
|
@ -54,6 +54,7 @@ typedef struct _NMDeviceVlan NMDeviceVlan;
|
|||
typedef struct _NMDeviceVxlan NMDeviceVxlan;
|
||||
typedef struct _NMDeviceWifi NMDeviceWifi;
|
||||
typedef struct _NMDeviceWimax NMDeviceWimax;
|
||||
typedef struct _NMDeviceWpan NMDeviceWpan;
|
||||
typedef struct _NMDhcpConfig NMDhcpConfig;
|
||||
typedef struct _NMIPConfig NMIPConfig;
|
||||
typedef struct _NMObject NMObject;
|
||||
|
|
|
@ -151,6 +151,7 @@ libnm/nm-device-vlan.c
|
|||
libnm/nm-device-vxlan.c
|
||||
libnm/nm-device-wifi.c
|
||||
libnm/nm-device-wimax.c
|
||||
libnm/nm-device-wpan.c
|
||||
libnm/nm-device.c
|
||||
libnm/nm-manager.c
|
||||
libnm/nm-object.c
|
||||
|
|
Loading…
Reference in a new issue