system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-08 19:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

device: remove NMDeviceGre

Browse Source 
As per previous commit, GRE tunnels are now represented as generic IP
tunnel devices.
This commit is contained in:
Beniamino Galvani 2015-11-12 17:28:51 +01:00
parent 570fdce93f
commit 3dfeec75e5
6 changed files with 1 additions and 426 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
introspection/Makefile.am
View File

@ -31,8 +31,6 @@ nodist_libnmdbus_la_SOURCES = \
nmdbus-device.h \
nmdbus-device-generic.c \
nmdbus-device-generic.h \
nmdbus-device-gre.c \
nmdbus-device-gre.h \
nmdbus-device-infiniband.c \
nmdbus-device-infiniband.h \
nmdbus-device-ip-tunnel.c \
@ -110,7 +108,6 @@ EXTRA_DIST = \
nm-device-bt.xml \
nm-device-ethernet.xml \
nm-device-generic.xml \
nm-device-gre.xml \
nm-device-infiniband.xml \
nm-device-ip-tunnel.xml \
nm-device-macvlan.xml \

81
introspection/nm-device-gre.xml
View File

@ -1,81 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="org.freedesktop.NetworkManager.Device.Gre">
<property name="Parent" type="o" access="read">
<tp:docstring>
The object path of the parent device.
</tp:docstring>
</property>
<property name="InputFlags" type="q" access="read">
<tp:docstring>
The expected set of GRE flags for incoming packets. (The
values are specified by the GRE specification. On Linux, they
are defined in &lt;linux/if_tunnel.h&gt;. Eg, GRE_KEY for the
'Key Present' bit.)
</tp:docstring>
</property>
<property name="OutputFlags" type="q" access="read">
<tp:docstring>
The set of GRE flags to use for outgoing packets. (The
values are specified by the GRE specification. On Linux, they
are defined in &lt;linux/if_tunnel.h&gt;. Eg, GRE_KEY for the
'Key Present' bit.)
</tp:docstring>
</property>
<property name="InputKey" type="u" access="read">
<tp:docstring>
Expected input key (if the "Key Present" bit is set in the input flags).
</tp:docstring>
</property>
<property name="OutputKey" type="u" access="read">
<tp:docstring>
Output key (if the "Key Present" bit is set in the output flags).
</tp:docstring>
</property>
<property name="Local" type="s" access="read">
<tp:docstring>
The local end of the tunnel.
</tp:docstring>
</property>
<property name="Remote" type="s" access="read">
<tp:docstring>
The remote end of the tunnel.
</tp:docstring>
</property>
<property name="Ttl" type="y" access="read">
<tp:docstring>
The value to use in the IP TTL field for tunnel packets.
</tp:docstring>
</property>
<property name="Tos" type="y" access="read">
<tp:docstring>
The value to use in the IP ToS field for tunnel packets.
</tp:docstring>
</property>
<property name="PathMtuDiscovery" type="b" access="read">
<tp:docstring>
Whether path MTU discovery is performed.
</tp:docstring>
</property>
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
<tp:docstring>
A dictionary mapping property names to variant boxed values
</tp:docstring>
</arg>
</signal>
</interface>
</node>

2
src/Makefile.am
View File

@ -204,7 +204,6 @@ nm_device_sources = \
devices/nm-device-bond.c \
devices/nm-device-bridge.c \
devices/nm-device-ethernet.c \
devices/nm-device-gre.c \
devices/nm-device-infiniband.c \
devices/nm-device-ip-tunnel.c \
devices/nm-device-macvlan.c \
@ -218,7 +217,6 @@ nm_device_headers = \
devices/nm-device-bond.h \
devices/nm-device-bridge.h \
devices/nm-device-ethernet.h \
devices/nm-device-gre.h \
devices/nm-device-infiniband.h \
devices/nm-device-ip-tunnel.h \
devices/nm-device-macvlan.h \

286
src/devices/nm-device-gre.c
View File

@ -1,286 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright 2013 Red Hat, Inc.
*/
#include "config.h"
#include <string.h>
#include <arpa/inet.h>
#include "nm-device-gre.h"
#include "nm-device-private.h"
#include "nm-default.h"
#include "nm-manager.h"
#include "nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nmdbus-device-gre.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceGre);
G_DEFINE_TYPE (NMDeviceGre, nm_device_gre, NM_TYPE_DEVICE_GENERIC)
#define NM_DEVICE_GRE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_GRE, NMDeviceGrePrivate))
typedef struct {
NMPlatformLnkGre props;
} NMDeviceGrePrivate;
enum {
PROP_0,
PROP_PARENT,
PROP_INPUT_FLAGS,
PROP_OUTPUT_FLAGS,
PROP_INPUT_KEY,
PROP_OUTPUT_KEY,
PROP_LOCAL,
PROP_REMOTE,
PROP_TTL,
PROP_TOS,
PROP_PATH_MTU_DISCOVERY,
LAST_PROP
};
/**************************************************************/
static void
update_properties (NMDevice *device)
{
NMDeviceGre *self = NM_DEVICE_GRE (device);
NMDeviceGrePrivate *priv = NM_DEVICE_GRE_GET_PRIVATE (self);
GObject *object = G_OBJECT (device);
const NMPlatformLnkGre *props;
props = nm_platform_link_get_lnk_gre (NM_PLATFORM_GET, nm_device_get_ifindex (device), NULL);
if (!props) {
_LOGW (LOGD_HW, "could not read gre properties");
return;
}
g_object_freeze_notify (object);
if (priv->props.parent_ifindex != props->parent_ifindex)
g_object_notify (object, NM_DEVICE_GRE_PARENT);
if (priv->props.input_flags != props->input_flags)
g_object_notify (object, NM_DEVICE_GRE_INPUT_FLAGS);
if (priv->props.output_flags != props->output_flags)
g_object_notify (object, NM_DEVICE_GRE_OUTPUT_FLAGS);
if (priv->props.input_key != props->input_key)
g_object_notify (object, NM_DEVICE_GRE_INPUT_KEY);
if (priv->props.output_key != props->output_key)
g_object_notify (object, NM_DEVICE_GRE_OUTPUT_KEY);
if (priv->props.local != props->local)
g_object_notify (object, NM_DEVICE_GRE_LOCAL);
if (priv->props.remote != props->remote)
g_object_notify (object, NM_DEVICE_GRE_REMOTE);
if (priv->props.ttl != props->ttl)
g_object_notify (object, NM_DEVICE_GRE_TTL);
if (priv->props.tos != props->tos)
g_object_notify (object, NM_DEVICE_GRE_TOS);
if (priv->props.path_mtu_discovery != props->path_mtu_discovery)
g_object_notify (object, NM_DEVICE_GRE_PATH_MTU_DISCOVERY);
priv->props = *props;
g_object_thaw_notify (object);
}
static void
link_changed (NMDevice *device, NMPlatformLink *info)
{
NM_DEVICE_CLASS (nm_device_gre_parent_class)->link_changed (device, info);
update_properties (device);
}
/**************************************************************/
static void
nm_device_gre_init (NMDeviceGre *self)
{
}
static void
constructed (GObject *object)
{
update_properties (NM_DEVICE (object));
G_OBJECT_CLASS (nm_device_gre_parent_class)->constructed (object);
}
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMDeviceGrePrivate *priv = NM_DEVICE_GRE_GET_PRIVATE (object);
char buf[INET_ADDRSTRLEN];
NMDevice *parent;
switch (prop_id) {
case PROP_PARENT:
parent = nm_manager_get_device_by_ifindex (nm_manager_get (), priv->props.parent_ifindex);
nm_utils_g_value_set_object_path (value, parent);
break;
case PROP_INPUT_FLAGS:
g_value_set_uint (value, priv->props.input_flags);
break;
case PROP_OUTPUT_FLAGS:
g_value_set_uint (value, priv->props.output_flags);
break;
case PROP_INPUT_KEY:
g_value_set_uint (value, priv->props.input_key);
break;
case PROP_OUTPUT_KEY:
g_value_set_uint (value, priv->props.output_key);
break;
case PROP_LOCAL:
g_value_set_string (value, inet_ntop (AF_INET, &priv->props.local, buf, sizeof (buf)));
break;
case PROP_REMOTE:
g_value_set_string (value, inet_ntop (AF_INET, &priv->props.remote, buf, sizeof (buf)));
break;
case PROP_TTL:
g_value_set_uchar (value, priv->props.ttl);
break;
case PROP_TOS:
g_value_set_uchar (value, priv->props.tos);
break;
case PROP_PATH_MTU_DISCOVERY:
g_value_set_boolean (value, priv->props.path_mtu_discovery);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
nm_device_gre_class_init (NMDeviceGreClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
g_type_class_add_private (klass, sizeof (NMDeviceGrePrivate));
object_class->constructed = constructed;
object_class->get_property = get_property;
device_class->link_changed = link_changed;
/* properties */
g_object_class_install_property
(object_class, PROP_PARENT,
g_param_spec_string (NM_DEVICE_GRE_PARENT, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_INPUT_FLAGS,
g_param_spec_uint (NM_DEVICE_GRE_INPUT_FLAGS, "", "",
0, G_MAXUINT16, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_OUTPUT_FLAGS,
g_param_spec_uint (NM_DEVICE_GRE_OUTPUT_FLAGS, "", "",
0, G_MAXUINT16, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_INPUT_KEY,
g_param_spec_uint (NM_DEVICE_GRE_INPUT_KEY, "", "",
0, G_MAXUINT32, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_OUTPUT_KEY,
g_param_spec_uint (NM_DEVICE_GRE_OUTPUT_KEY, "", "",
0, G_MAXUINT32, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_LOCAL,
g_param_spec_string (NM_DEVICE_GRE_LOCAL, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_REMOTE,
g_param_spec_string (NM_DEVICE_GRE_REMOTE, "", "",
NULL,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_TTL,
g_param_spec_uchar (NM_DEVICE_GRE_TTL, "", "",
0, 255, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_TOS,
g_param_spec_uchar (NM_DEVICE_GRE_TOS, "", "",
0, 255, 0,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_PATH_MTU_DISCOVERY,
g_param_spec_boolean (NM_DEVICE_GRE_PATH_MTU_DISCOVERY, "", "",
FALSE,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
NMDBUS_TYPE_DEVICE_GRE_SKELETON,
NULL);
}
/*************************************************************/
#define NM_TYPE_GRE_FACTORY (nm_gre_factory_get_type ())
#define NM_GRE_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_GRE_FACTORY, NMGreFactory))
static NMDevice *
create_device (NMDeviceFactory *factory,
const char *iface,
NMPlatformLink *plink,
NMConnection *connection,
gboolean *out_ignore)
{
return (NMDevice *) g_object_new (NM_TYPE_DEVICE_GRE,
NM_DEVICE_IFACE, iface,
NM_DEVICE_TYPE_DESC, "Gre",
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_GENERIC,
NULL);
}
NM_DEVICE_FACTORY_DEFINE_INTERNAL (GRE, Gre, gre,
NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_GRE, NM_LINK_TYPE_GRETAP),
factory_iface->create_device = create_device;
)

53
src/devices/nm-device-gre.h
View File

@ -1,53 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright 2013 Red Hat, Inc.
*/
#ifndef __NETWORKMANAGER_DEVICE_GRE_H__
#define __NETWORKMANAGER_DEVICE_GRE_H__
#include "nm-device-generic.h"
G_BEGIN_DECLS
#define NM_TYPE_DEVICE_GRE (nm_device_gre_get_type ())
#define NM_DEVICE_GRE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_GRE, NMDeviceGre))
#define NM_DEVICE_GRE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_GRE, NMDeviceGreClass))
#define NM_IS_DEVICE_GRE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_GRE))
#define NM_IS_DEVICE_GRE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_GRE))
#define NM_DEVICE_GRE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_GRE, NMDeviceGreClass))
#define NM_DEVICE_GRE_PARENT "parent"
#define NM_DEVICE_GRE_INPUT_FLAGS "input-flags"
#define NM_DEVICE_GRE_OUTPUT_FLAGS "output-flags"
#define NM_DEVICE_GRE_INPUT_KEY "input-key"
#define NM_DEVICE_GRE_OUTPUT_KEY "output-key"
#define NM_DEVICE_GRE_LOCAL "local"
#define NM_DEVICE_GRE_REMOTE "remote"
#define NM_DEVICE_GRE_TTL "ttl"
#define NM_DEVICE_GRE_TOS "tos"
#define NM_DEVICE_GRE_PATH_MTU_DISCOVERY "path-mtu-discovery"
typedef NMDeviceGeneric NMDeviceGre;
typedef NMDeviceGenericClass NMDeviceGreClass;
GType nm_device_gre_get_type (void);
G_END_DECLS
#endif /* NM_DEVICE_GRE_H */

2
src/tests/Makefile.am
View File

@ -150,7 +150,7 @@ TESTS = \
if ENABLE_TESTS
check-local:
@for t in bond bridge ethernet gre infiniband ip_tunnel macvlan tun veth vlan vxlan; do \
@for t in bond bridge ethernet infiniband ip_tunnel macvlan tun veth vlan vxlan; do \
# Ensure the device subclass factory registration constructors exist \
# which could inadvertently break if src/Makefile.am gets changed \
if ! LC_ALL=C nm $(top_builddir)/src/NetworkManager | LC_ALL=C grep -q "register_device_factory_internal_$$t" ; then \