device: add NMDeviceIPTunnel
authorBeniamino Galvani <bgalvani@redhat.com>
Fri, 30 Oct 2015 14:14:23 +0000 (15:14 +0100)
committerBeniamino Galvani <bgalvani@redhat.com>
Tue, 1 Dec 2015 16:39:41 +0000 (17:39 +0100)
The new object type represents tunnels over IPv4 and IPv6.

We have a single setting type (NMSettingIPTunnel) for tunnels and it
can't be shared among different device factories. So we define also a
single device type for all tunnels.

This new object will also represent GRE tunnels, which before were
instantiated as NMDeviceGre and had a ".Device.Gre" D-Bus
interface. This commit introduces a change in behavior.

introspection/Makefile.am
introspection/nm-device-ip-tunnel.xml [new file with mode: 0644]
libnm-core/nm-connection.c
libnm-core/nm-dbus-interface.h
po/POTFILES.in
src/Makefile.am
src/devices/nm-device-gre.c
src/devices/nm-device-ip-tunnel.c [new file with mode: 0644]
src/devices/nm-device-ip-tunnel.h [new file with mode: 0644]
src/devices/nm-device.c
src/tests/Makefile.am

index c8a70cf..c3721fc 100644 (file)
@@ -35,6 +35,8 @@ nodist_libnmdbus_la_SOURCES = \
        nmdbus-device-gre.h \
        nmdbus-device-infiniband.c \
        nmdbus-device-infiniband.h \
+       nmdbus-device-ip-tunnel.c \
+       nmdbus-device-ip-tunnel.h \
        nmdbus-device-macvlan.c \
        nmdbus-device-macvlan.h \
        nmdbus-device-modem.c \
@@ -110,6 +112,7 @@ EXTRA_DIST = \
        nm-device-generic.xml \
        nm-device-gre.xml \
        nm-device-infiniband.xml \
+       nm-device-ip-tunnel.xml \
        nm-device-macvlan.xml \
        nm-device-modem.xml \
        nm-device-olpc-mesh.xml \
diff --git a/introspection/nm-device-ip-tunnel.xml b/introspection/nm-device-ip-tunnel.xml
new file mode 100644 (file)
index 0000000..db5335b
--- /dev/null
@@ -0,0 +1,71 @@
+<?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.IPTunnel">
+
+    <property name="Mode" type="u" access="read">
+      <tp:docstring>
+        The tunneling mode.
+      </tp:docstring>
+    </property>
+
+    <property name="Parent" type="o" access="read">
+      <tp:docstring>
+        The object path of the parent device.
+      </tp:docstring>
+    </property>
+
+    <property name="Local" type="s" access="read">
+      <tp:docstring>
+        The local endpoint of the tunnel.
+      </tp:docstring>
+    </property>
+
+    <property name="Remote" type="s" access="read">
+      <tp:docstring>
+        The remote endpoint of the tunnel.
+      </tp:docstring>
+    </property>
+
+    <property name="Ttl" type="y" access="read">
+      <tp:docstring>
+        The TTL assigned to tunneled packets. 0 is a special value
+        meaning that packets inherit the TTL value
+      </tp:docstring>
+    </property>
+
+    <property name="Tos" type="y" access="read">
+      <tp:docstring>
+        The type of service (IPv4) or traffic class (IPv6) assigned to
+        tunneled packets.
+      </tp:docstring>
+    </property>
+
+    <property name="PathMtuDiscovery" type="b" access="read">
+      <tp:docstring>
+        Whether path MTU discovery is enabled on this tunnel.
+      </tp:docstring>
+    </property>
+
+    <property name="InputKey" type="s" access="read">
+      <tp:docstring>
+        The key used for incoming packets.
+      </tp:docstring>
+    </property>
+
+    <property name="OutputKey" type="s" access="read">
+      <tp:docstring>
+        The key used for outgoing packets.
+      </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>
index 0f59998..e801f2f 100644 (file)
@@ -1595,7 +1595,8 @@ nm_connection_is_virtual (NMConnection *connection)
            || !strcmp (type, NM_SETTING_TEAM_SETTING_NAME)
            || !strcmp (type, NM_SETTING_BRIDGE_SETTING_NAME)
            || !strcmp (type, NM_SETTING_VLAN_SETTING_NAME)
-           || !strcmp (type, NM_SETTING_TUN_SETTING_NAME))
+           || !strcmp (type, NM_SETTING_TUN_SETTING_NAME)
+           || !strcmp (type, NM_SETTING_IP_TUNNEL_SETTING_NAME))
                return TRUE;
 
        if (!strcmp (type, NM_SETTING_INFINIBAND_SETTING_NAME)) {
index e81f081..f901028 100644 (file)
@@ -173,6 +173,7 @@ typedef enum {
        NM_DEVICE_TYPE_GENERIC    = 14,
        NM_DEVICE_TYPE_TEAM       = 15,
        NM_DEVICE_TYPE_TUN        = 16,
+       NM_DEVICE_TYPE_IP_TUNNEL  = 17,
 } NMDeviceType;
 
 /**
index ba861b7..c0f79bf 100644 (file)
@@ -149,6 +149,7 @@ src/devices/nm-device-bridge.c
 src/devices/nm-device-ethernet.c
 src/devices/nm-device-ethernet-utils.c
 src/devices/nm-device-infiniband.c
+src/devices/nm-device-ip-tunnel.c
 src/devices/nm-device-tun.c
 src/devices/nm-device-vlan.c
 src/devices/team/nm-device-team.c
index 89681f1..b7c773e 100644 (file)
@@ -206,6 +206,7 @@ nm_device_sources = \
        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 \
        devices/nm-device-tun.c \
        devices/nm-device-veth.c \
@@ -219,6 +220,7 @@ nm_device_headers = \
        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 \
        devices/nm-device-tun.h \
        devices/nm-device-veth.h \
index 9b9ffc9..3bb1ed7 100644 (file)
@@ -262,7 +262,6 @@ nm_device_gre_class_init (NMDeviceGreClass *klass)
 }
 
 /*************************************************************/
-
 #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))
 
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
new file mode 100644 (file)
index 0000000..4d338ec
--- /dev/null
@@ -0,0 +1,762 @@
+/* -*- 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 2015 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <netinet/in.h>
+#include <linux/if.h>
+#include <linux/ip.h>
+#include <linux/if_tunnel.h>
+
+#include "nm-device-ip-tunnel.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 "nm-connection-provider.h"
+#include "nm-activation-request.h"
+
+#include "nmdbus-device-ip-tunnel.h"
+
+#include "nm-device-logging.h"
+_LOG_DECLARE_SELF(NMDeviceIPTunnel);
+
+G_DEFINE_TYPE (NMDeviceIPTunnel, nm_device_ip_tunnel, NM_TYPE_DEVICE)
+
+#define NM_DEVICE_IP_TUNNEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnelPrivate))
+
+typedef struct {
+       NMIPTunnelMode mode;
+       NMDevice *parent;
+       int parent_ifindex;
+       char *local;
+       char *remote;
+       guint8 ttl;
+       guint8 tos;
+       gboolean path_mtu_discovery;
+       int addr_family;
+       char *input_key;
+       char *output_key;
+} NMDeviceIPTunnelPrivate;
+
+enum {
+       PROP_0,
+       PROP_MODE,
+       PROP_PARENT,
+       PROP_LOCAL,
+       PROP_REMOTE,
+       PROP_TTL,
+       PROP_TOS,
+       PROP_PATH_MTU_DISCOVERY,
+       PROP_INPUT_KEY,
+       PROP_OUTPUT_KEY,
+
+       LAST_PROP
+};
+
+/**************************************************************/
+
+static gboolean
+address_equal_pp (int family, const char *a, const char *b)
+{
+       char buffer1[sizeof (struct in6_addr)] = { };
+       char buffer2[sizeof (struct in6_addr)] = { };
+
+       g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE);
+
+       if (a)
+               inet_pton (family, a, buffer1);
+       if (b)
+               inet_pton (family, b, buffer2);
+
+       return !memcmp (buffer1, buffer2,
+                       family == AF_INET ? sizeof (in_addr_t) : sizeof (struct in6_addr));
+}
+
+static gboolean
+address_equal_pn (int family, const char *a, const void *b)
+{
+       char buffer1[sizeof (struct in6_addr)] = { };
+
+       g_return_val_if_fail (family == AF_INET || family == AF_INET6, FALSE);
+
+       if (a)
+               inet_pton (family, a, buffer1);
+
+       return !memcmp (buffer1, b,
+                       family == AF_INET ? sizeof (in_addr_t) : sizeof (struct in6_addr));
+
+}
+
+static void
+update_properties (NMDevice *device)
+{
+       NMDeviceIPTunnel *self = NM_DEVICE_IP_TUNNEL (device);
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (self);
+       GObject *object = G_OBJECT (device);
+       NMDevice *parent;
+       int parent_ifindex;
+       in_addr_t local4, remote4;
+       struct in6_addr local6, remote6;
+       guint8 ttl, tos;
+       gboolean pmtud;
+       char *key;
+
+       if (priv->mode == NM_IP_TUNNEL_MODE_GRE) {
+               const NMPlatformLnkGre *lnk;
+
+               lnk = nm_platform_link_get_lnk_gre (NM_PLATFORM_GET, nm_device_get_ifindex (device), NULL);
+               if (!lnk) {
+                       _LOGW (LOGD_HW, "could not read %s properties", "gre");
+                       return;
+               }
+
+               parent_ifindex = lnk->parent_ifindex;
+               local4 = lnk->local;
+               remote4 = lnk->remote;
+               ttl = lnk->ttl;
+               tos = lnk->tos;
+               pmtud = lnk->path_mtu_discovery;
+
+               if (NM_FLAGS_HAS (lnk->input_flags, NM_GRE_KEY)) {
+                       key = g_strdup_printf ("%u", lnk->input_key);
+                       if (g_strcmp0 (priv->input_key, key)) {
+                               g_free (priv->input_key);
+                               priv->input_key = key;
+                               g_object_notify (object, NM_DEVICE_IP_TUNNEL_INPUT_KEY);
+                       } else
+                               g_free (key);
+               } else {
+                       if (priv->input_key) {
+                               g_clear_pointer (&priv->input_key, g_free);
+                               g_object_notify (object, NM_DEVICE_IP_TUNNEL_INPUT_KEY);
+                       }
+               }
+
+               if (NM_FLAGS_HAS (lnk->output_flags, NM_GRE_KEY)) {
+                       key = g_strdup_printf ("%u", lnk->output_key);
+                       if (g_strcmp0 (priv->output_key, key)) {
+                               g_free (priv->output_key);
+                               priv->output_key = key;
+                               g_object_notify (object, NM_DEVICE_IP_TUNNEL_OUTPUT_KEY);
+                       } else
+                               g_free (key);
+               } else {
+                       if (priv->output_key) {
+                               g_clear_pointer (&priv->output_key, g_free);
+                               g_object_notify (object, NM_DEVICE_IP_TUNNEL_OUTPUT_KEY);
+                       }
+               }
+       } else
+               g_return_if_reached ();
+
+       if (priv->parent_ifindex != parent_ifindex) {
+               g_clear_object (&priv->parent);
+               priv->parent_ifindex = parent_ifindex;
+               parent = nm_manager_get_device_by_ifindex (nm_manager_get (), parent_ifindex);
+               if (parent)
+                       priv->parent = g_object_ref (parent);
+               g_object_notify (object, NM_DEVICE_IP_TUNNEL_PARENT);
+       }
+
+       if (priv->addr_family == AF_INET) {
+               if (!address_equal_pn (AF_INET, priv->local, &local4)) {
+                       g_clear_pointer (&priv->local, g_free);
+                       if (local4)
+                               priv->local = g_strdup (nm_utils_inet4_ntop (local4, NULL));
+                       g_object_notify (object, NM_DEVICE_IP_TUNNEL_LOCAL);
+               }
+
+               if (!address_equal_pn (AF_INET, priv->remote, &remote4)) {
+                       g_clear_pointer (&priv->remote, g_free);
+                       if (remote4)
+                               priv->remote = g_strdup (nm_utils_inet4_ntop (remote4, NULL));
+                       g_object_notify (object, NM_DEVICE_IP_TUNNEL_REMOTE);
+               }
+       } else {
+               if (!address_equal_pn (AF_INET6, priv->local, &local6)) {
+                       g_clear_pointer (&priv->local, g_free);
+                       if (memcmp (&local6, &in6addr_any, sizeof (in6addr_any)))
+                               priv->local = g_strdup (nm_utils_inet6_ntop (&local6, NULL));
+                       g_object_notify (object, NM_DEVICE_IP_TUNNEL_LOCAL);
+               }
+
+               if (!address_equal_pn (AF_INET6, priv->remote, &remote6)) {
+                       g_clear_pointer (&priv->remote, g_free);
+                       if (memcmp (&remote6, &in6addr_any, sizeof (in6addr_any)))
+                               priv->remote = g_strdup (nm_utils_inet6_ntop (&remote6, NULL));
+                       g_object_notify (object, NM_DEVICE_IP_TUNNEL_REMOTE);
+               }
+       }
+
+       if (priv->ttl != ttl) {
+               priv->ttl = ttl;
+               g_object_notify (object, NM_DEVICE_IP_TUNNEL_TTL);
+       }
+
+       if (priv->tos != tos) {
+               priv->tos = tos;
+               g_object_notify (object, NM_DEVICE_IP_TUNNEL_TOS);
+       }
+
+       if (priv->path_mtu_discovery != pmtud) {
+               priv->path_mtu_discovery = pmtud;
+               g_object_notify (object, NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY);
+       }
+}
+
+static void
+link_changed (NMDevice *device, NMPlatformLink *info)
+{
+       NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->link_changed (device, info);
+       update_properties (device);
+}
+
+static gboolean
+complete_connection (NMDevice *device,
+                     NMConnection *connection,
+                     const char *specific_object,
+                     const GSList *existing_connections,
+                     GError **error)
+{
+       NMSettingIPTunnel *s_ip_tunnel;
+
+       nm_utils_complete_generic (connection,
+                                  NM_SETTING_IP_TUNNEL_SETTING_NAME,
+                                  existing_connections,
+                                  NULL,
+                                  _("IP tunnel connection"),
+                                  NULL,
+                                  TRUE);
+
+       s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       if (!s_ip_tunnel) {
+               g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_INVALID_CONNECTION,
+                                    "A 'tunnel' setting is required.");
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+static void
+update_connection (NMDevice *device, NMConnection *connection)
+{
+       NMDeviceIPTunnel *self = NM_DEVICE_IP_TUNNEL (device);
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (self);
+       NMSettingIPTunnel *s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       NMDevice *parent = NULL;
+       const char *setting_parent, *new_parent;
+
+       if (!s_ip_tunnel) {
+               s_ip_tunnel = (NMSettingIPTunnel *) nm_setting_ip_tunnel_new ();
+               nm_connection_add_setting (connection, (NMSetting *) s_ip_tunnel);
+       }
+
+       update_properties (device);
+
+       if (nm_setting_ip_tunnel_get_mode (s_ip_tunnel) != priv->mode)
+               g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_MODE, priv->mode, NULL);
+
+       if (priv->parent_ifindex > 0)
+               parent = nm_manager_get_device_by_ifindex (nm_manager_get (), priv->parent_ifindex);
+
+       /* Update parent in the connection; default to parent's interface name */
+       if (parent) {
+               new_parent = nm_device_get_iface (parent);
+               setting_parent = nm_setting_ip_tunnel_get_parent (s_ip_tunnel);
+               if (setting_parent && nm_utils_is_uuid (setting_parent)) {
+                       NMConnection *parent_connection;
+
+                       /* Don't change a parent specified by UUID if it's still valid */
+                       parent_connection = nm_connection_provider_get_connection_by_uuid (nm_connection_provider_get (),
+                                                                                          setting_parent);
+                       if (parent_connection && nm_device_check_connection_compatible (parent, parent_connection))
+                               new_parent = NULL;
+               }
+               if (new_parent)
+                       g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_PARENT, new_parent, NULL);
+       } else
+               g_object_set (s_ip_tunnel, NM_SETTING_IP_TUNNEL_PARENT, NULL, NULL);
+
+       if (!address_equal_pp (priv->addr_family,
+                              nm_setting_ip_tunnel_get_local (s_ip_tunnel),
+                              priv->local))
+               g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_LOCAL, priv->local, NULL);
+
+       if (!address_equal_pp (priv->addr_family,
+                              nm_setting_ip_tunnel_get_remote (s_ip_tunnel),
+                              priv->remote))
+               g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_REMOTE, priv->remote, NULL);
+
+       if (nm_setting_ip_tunnel_get_ttl (s_ip_tunnel) != priv->ttl)
+               g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_TTL, priv->ttl, NULL);
+
+       if (nm_setting_ip_tunnel_get_tos (s_ip_tunnel) != priv->tos)
+               g_object_set (G_OBJECT (s_ip_tunnel), NM_SETTING_IP_TUNNEL_TOS, priv->tos, NULL);
+
+       if (nm_setting_ip_tunnel_get_path_mtu_discovery (s_ip_tunnel) != priv->path_mtu_discovery) {
+               g_object_set (G_OBJECT (s_ip_tunnel),
+                             NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY,
+                             priv->path_mtu_discovery,
+                             NULL);
+       }
+
+       if (priv->mode == NM_IP_TUNNEL_MODE_GRE || priv->mode == NM_IP_TUNNEL_MODE_IP6GRE) {
+               if (g_strcmp0 (nm_setting_ip_tunnel_get_input_key (s_ip_tunnel), priv->input_key)) {
+                       g_object_set (G_OBJECT (s_ip_tunnel),
+                                     NM_SETTING_IP_TUNNEL_INPUT_KEY,
+                                     priv->input_key,
+                                     NULL);
+               }
+               if (g_strcmp0 (nm_setting_ip_tunnel_get_output_key (s_ip_tunnel), priv->output_key)) {
+                       g_object_set (G_OBJECT (s_ip_tunnel),
+                                     NM_SETTING_IP_TUNNEL_OUTPUT_KEY,
+                                     priv->output_key,
+                                     NULL);
+               }
+       }
+}
+
+static gboolean
+realize (NMDevice *self, NMPlatformLink *plink, GError **error)
+{
+       update_properties (self);
+       return TRUE;
+}
+
+static gboolean
+match_parent (NMDevice *dev_parent, const char *setting_parent)
+{
+       g_return_val_if_fail (setting_parent, FALSE);
+
+       if (!dev_parent)
+               return FALSE;
+
+       if (nm_utils_is_uuid (setting_parent)) {
+               NMActRequest *parent_req;
+               NMConnection *parent_connection;
+
+               /* If the parent is a UUID, the connection matches if our parent
+                * device has that connection activated.
+                */
+               parent_req = nm_device_get_act_request (dev_parent);
+               if (!parent_req)
+                       return FALSE;
+
+               parent_connection = nm_active_connection_get_applied_connection (NM_ACTIVE_CONNECTION (parent_req));
+               if (!parent_connection)
+                       return FALSE;
+
+               if (g_strcmp0 (setting_parent, nm_connection_get_uuid (parent_connection)) != 0)
+                       return FALSE;
+       } else {
+               /* interface name */
+               if (g_strcmp0 (setting_parent, nm_device_get_ip_iface (dev_parent)) != 0)
+                       return FALSE;
+       }
+
+       return TRUE;
+}
+
+static gboolean
+check_connection_compatible (NMDevice *device, NMConnection *connection)
+{
+       NMDeviceIPTunnel *self = NM_DEVICE_IP_TUNNEL (device);
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (self);
+       NMSettingIPTunnel *s_ip_tunnel;
+       const char *parent;
+
+       if (!NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->check_connection_compatible (device, connection))
+               return FALSE;
+
+       s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       if (!s_ip_tunnel)
+               return FALSE;
+
+       update_properties (device);
+
+       /* Check parent interface; could be an interface name or a UUID */
+       parent = nm_setting_ip_tunnel_get_parent (s_ip_tunnel);
+       if (parent) {
+               if (!match_parent (priv->parent, parent))
+                       return FALSE;
+       }
+
+       if (nm_setting_ip_tunnel_get_mode (s_ip_tunnel) != priv->mode)
+               return FALSE;
+
+       if (!address_equal_pp (priv->addr_family,
+                              nm_setting_ip_tunnel_get_local (s_ip_tunnel),
+                              priv->local))
+               return FALSE;
+
+       if (!address_equal_pp (priv->addr_family,
+                              nm_setting_ip_tunnel_get_remote (s_ip_tunnel),
+                              priv->remote))
+               return FALSE;
+
+       if (nm_setting_ip_tunnel_get_ttl (s_ip_tunnel) != priv->ttl)
+               return FALSE;
+
+       if (nm_setting_ip_tunnel_get_tos (s_ip_tunnel) != priv->tos)
+               return FALSE;
+
+       if (nm_setting_ip_tunnel_get_path_mtu_discovery (s_ip_tunnel) != priv->path_mtu_discovery)
+               return FALSE;
+
+       return TRUE;
+}
+
+static NMIPTunnelMode
+platform_link_to_tunnel_mode (const NMPlatformLink *link)
+{
+       switch (link->type) {
+       case NM_LINK_TYPE_GRE:
+               return NM_IP_TUNNEL_MODE_GRE;
+       default:
+               g_return_val_if_reached (NM_IP_TUNNEL_MODE_UKNOWN);
+       }
+}
+
+/**************************************************************/
+
+static void
+nm_device_ip_tunnel_init (NMDeviceIPTunnel *self)
+{
+}
+
+static void
+constructed (GObject *object)
+{
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (object);
+
+       priv->addr_family = AF_INET; /* at the moment we support only IPv4 tunnels */
+
+       G_OBJECT_CLASS (nm_device_ip_tunnel_parent_class)->constructed (object);
+}
+
+static gboolean
+create_and_realize (NMDevice *device,
+                    NMConnection *connection,
+                    NMDevice *parent,
+                    NMPlatformLink *out_plink,
+                    GError **error)
+{
+       const char *iface = nm_device_get_iface (device);
+       NMSettingIPTunnel *s_ip_tunnel;
+       NMPlatformError plerr;
+       NMPlatformLnkGre lnk_gre = { };
+       const char *str;
+       gint64 val;
+
+       s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       g_assert (s_ip_tunnel);
+       g_assert (out_plink);
+
+       switch (nm_setting_ip_tunnel_get_mode (s_ip_tunnel)) {
+       case NM_IP_TUNNEL_MODE_GRE:
+               if (parent)
+                       lnk_gre.parent_ifindex = nm_device_get_ifindex (parent);
+
+               str = nm_setting_ip_tunnel_get_local (s_ip_tunnel);
+               if (str)
+                       inet_pton (AF_INET, str, &lnk_gre.local);
+
+               str = nm_setting_ip_tunnel_get_remote (s_ip_tunnel);
+               g_assert (str);
+               inet_pton (AF_INET, str, &lnk_gre.remote);
+
+               lnk_gre.ttl = nm_setting_ip_tunnel_get_ttl (s_ip_tunnel);
+               lnk_gre.tos = nm_setting_ip_tunnel_get_tos (s_ip_tunnel);
+               lnk_gre.path_mtu_discovery = nm_setting_ip_tunnel_get_path_mtu_discovery (s_ip_tunnel);
+
+               val = _nm_utils_ascii_str_to_int64 (nm_setting_ip_tunnel_get_input_key (s_ip_tunnel),
+                                                   10,
+                                                   0,
+                                                   G_MAXUINT32,
+                                                   -1);
+               if (val != -1) {
+                       lnk_gre.input_key = val;
+                       lnk_gre.input_flags = NM_GRE_KEY;
+               }
+
+               val = _nm_utils_ascii_str_to_int64 (nm_setting_ip_tunnel_get_output_key (s_ip_tunnel),
+                                                   10,
+                                                   0,
+                                                   G_MAXUINT32,
+                                                   -1);
+               if (val != -1) {
+                       lnk_gre.output_key = val;
+                       lnk_gre.output_flags = NM_GRE_KEY;
+               }
+
+               plerr = nm_platform_link_gre_add (NM_PLATFORM_GET, iface, &lnk_gre, out_plink);
+               if (plerr != NM_PLATFORM_ERROR_SUCCESS && plerr != NM_PLATFORM_ERROR_EXISTS) {
+                       g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
+                                    "Failed to create GRE interface '%s' for '%s': %s",
+                                    iface,
+                                    nm_connection_get_id (connection),
+                                    nm_platform_error_to_string (plerr));
+                       return FALSE;
+               }
+               break;
+       default:
+               g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
+                            "Failed to create IP tunnel interface '%s' for '%s': mode %d not supported",
+                            iface,
+                            nm_connection_get_id (connection),
+                            (int) nm_setting_ip_tunnel_get_mode (s_ip_tunnel));
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+static void
+setup (NMDevice *device, NMPlatformLink *plink)
+{
+       NM_DEVICE_CLASS (nm_device_ip_tunnel_parent_class)->setup (device, plink);
+
+       update_properties (device);
+}
+
+static void
+get_property (GObject *object, guint prop_id,
+              GValue *value, GParamSpec *pspec)
+{
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (object);
+       NMDevice *parent;
+
+       switch (prop_id) {
+       case PROP_MODE:
+               g_value_set_uint (value, priv->mode);
+               break;
+       case PROP_PARENT:
+               parent = nm_manager_get_device_by_ifindex (nm_manager_get (), priv->parent_ifindex);
+               nm_utils_g_value_set_object_path (value, parent);
+               break;
+       case PROP_LOCAL:
+               g_value_set_string (value, priv->local);
+               break;
+       case PROP_REMOTE:
+               g_value_set_string (value, priv->remote);
+               break;
+       case PROP_TTL:
+               g_value_set_uchar (value, priv->ttl);
+               break;
+       case PROP_TOS:
+               g_value_set_uchar (value, priv->tos);
+               break;
+       case PROP_PATH_MTU_DISCOVERY:
+               g_value_set_boolean (value, priv->path_mtu_discovery);
+               break;
+       case PROP_INPUT_KEY:
+               g_value_set_string (value, priv->input_key);
+               break;
+       case PROP_OUTPUT_KEY:
+               g_value_set_string (value, priv->output_key);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+               break;
+       }
+}
+
+static void
+set_property (GObject *object, guint prop_id,
+                         const GValue *value, GParamSpec *pspec)
+{
+       NMDeviceIPTunnelPrivate *priv = NM_DEVICE_IP_TUNNEL_GET_PRIVATE (object);
+
+       switch (prop_id) {
+       case PROP_MODE:
+               priv->mode = g_value_get_uint (value);
+               break;
+       default:
+               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       }
+}
+
+static void
+nm_device_ip_tunnel_class_init (NMDeviceIPTunnelClass *klass)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
+       NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
+
+       g_type_class_add_private (klass, sizeof (NMDeviceIPTunnelPrivate));
+
+       object_class->constructed = constructed;
+       object_class->get_property = get_property;
+       object_class->set_property = set_property;
+
+       device_class->link_changed = link_changed;
+       device_class->complete_connection = complete_connection;
+       device_class->update_connection = update_connection;
+       device_class->check_connection_compatible = check_connection_compatible;
+       device_class->create_and_realize = create_and_realize;
+       device_class->realize = realize;
+       device_class->setup = setup;
+
+       device_class->connection_type = NM_SETTING_IP_TUNNEL_SETTING_NAME;
+
+       /* properties */
+       g_object_class_install_property
+               (object_class, PROP_MODE,
+                g_param_spec_uint (NM_DEVICE_IP_TUNNEL_MODE, "", "",
+                                   0, G_MAXUINT, 0,
+                                   G_PARAM_READWRITE |
+                                   G_PARAM_CONSTRUCT_ONLY |
+                                   G_PARAM_STATIC_STRINGS));
+
+       /* properties */
+       g_object_class_install_property
+               (object_class, PROP_PARENT,
+                g_param_spec_string (NM_DEVICE_IP_TUNNEL_PARENT, "", "",
+                                     NULL,
+                                     G_PARAM_READABLE |
+                                     G_PARAM_STATIC_STRINGS));
+
+       g_object_class_install_property
+               (object_class, PROP_LOCAL,
+                g_param_spec_string (NM_DEVICE_IP_TUNNEL_LOCAL, "", "",
+                                     NULL,
+                                     G_PARAM_READABLE |
+                                     G_PARAM_STATIC_STRINGS));
+
+       g_object_class_install_property
+               (object_class, PROP_REMOTE,
+                g_param_spec_string (NM_DEVICE_IP_TUNNEL_REMOTE, "", "",
+                                     NULL,
+                                     G_PARAM_READABLE |
+                                     G_PARAM_STATIC_STRINGS));
+
+       g_object_class_install_property
+               (object_class, PROP_TTL,
+                g_param_spec_uchar (NM_DEVICE_IP_TUNNEL_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_IP_TUNNEL_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_IP_TUNNEL_PATH_MTU_DISCOVERY, "", "",
+                                      FALSE,
+                                      G_PARAM_READABLE |
+                                      G_PARAM_STATIC_STRINGS));
+
+       g_object_class_install_property
+               (object_class, PROP_INPUT_KEY,
+                g_param_spec_string (NM_DEVICE_IP_TUNNEL_INPUT_KEY, "", "",
+                                     NULL,
+                                     G_PARAM_READABLE |
+                                     G_PARAM_STATIC_STRINGS));
+
+       g_object_class_install_property
+               (object_class, PROP_OUTPUT_KEY,
+                g_param_spec_string (NM_DEVICE_IP_TUNNEL_OUTPUT_KEY, "", "",
+                                     NULL,
+                                     G_PARAM_READABLE |
+                                     G_PARAM_STATIC_STRINGS));
+
+       nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
+                                               NMDBUS_TYPE_DEVICE_IPTUNNEL_SKELETON,
+                                               NULL);
+}
+/*************************************************************/
+
+#define NM_TYPE_IP_TUNNEL_FACTORY (nm_ip_tunnel_factory_get_type ())
+#define NM_IP_TUNNEL_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IP_TUNNEL_FACTORY, NMIPTunnelFactory))
+
+static NMDevice *
+create_device (NMDeviceFactory *factory,
+               const char *iface,
+               NMPlatformLink *plink,
+               NMConnection *connection,
+               gboolean *out_ignore)
+{
+       NMSettingIPTunnel *s_ip_tunnel;
+       NMIPTunnelMode mode;
+
+       if (connection) {
+               s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+               mode = nm_setting_ip_tunnel_get_mode (s_ip_tunnel);
+       } else
+               mode = platform_link_to_tunnel_mode (plink);
+
+       return (NMDevice *) g_object_new (NM_TYPE_DEVICE_IP_TUNNEL,
+                                         NM_DEVICE_IFACE, iface,
+                                         NM_DEVICE_TYPE_DESC, "IPTunnel",
+                                         NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_IP_TUNNEL,
+                                         NM_DEVICE_IP_TUNNEL_MODE, mode,
+                                         NULL);
+}
+
+static const char *
+get_connection_parent (NMDeviceFactory *factory, NMConnection *connection)
+{
+       NMSettingIPTunnel *s_ip_tunnel;
+
+       g_return_val_if_fail (nm_connection_is_type (connection, NM_SETTING_IP_TUNNEL_SETTING_NAME), NULL);
+
+       s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       g_assert (s_ip_tunnel);
+
+       return nm_setting_ip_tunnel_get_parent (s_ip_tunnel);
+}
+
+static char *
+get_virtual_iface_name (NMDeviceFactory *factory,
+                        NMConnection *connection,
+                        const char *parent_iface)
+{
+       const char *ifname;
+       NMSettingIPTunnel *s_ip_tunnel;
+
+       g_return_val_if_fail (nm_connection_is_type (connection, NM_SETTING_IP_TUNNEL_SETTING_NAME), NULL);
+
+       s_ip_tunnel = nm_connection_get_setting_ip_tunnel (connection);
+       g_assert (s_ip_tunnel);
+
+       if (nm_setting_ip_tunnel_get_parent (s_ip_tunnel) && !parent_iface)
+               return NULL;
+
+       ifname = nm_connection_get_interface_name (connection);
+
+       return g_strdup (ifname);
+}
+
+NM_DEVICE_FACTORY_DEFINE_INTERNAL (IP_TUNNEL, IPTunnel, ip_tunnel,
+       NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_GRE)
+       NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_IP_TUNNEL_SETTING_NAME),
+       factory_iface->create_device = create_device;
+       factory_iface->get_connection_parent = get_connection_parent;
+       factory_iface->get_virtual_iface_name = get_virtual_iface_name;
+)
diff --git a/src/devices/nm-device-ip-tunnel.h b/src/devices/nm-device-ip-tunnel.h
new file mode 100644 (file)
index 0000000..fdd92f3
--- /dev/null
@@ -0,0 +1,58 @@
+/* -*- 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 2015 Red Hat, Inc.
+ */
+
+#ifndef __NETWORKMANAGER_DEVICE_IP_TUNNEL_H__
+#define __NETWORKMANAGER_DEVICE_IP_TUNNEL_H__
+
+#include "nm-core-types.h"
+#include "nm-device.h"
+
+G_BEGIN_DECLS
+
+#define NM_TYPE_DEVICE_IP_TUNNEL            (nm_device_ip_tunnel_get_type ())
+#define NM_DEVICE_IP_TUNNEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnel))
+#define NM_DEVICE_IP_TUNNEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnelClass))
+#define NM_IS_DEVICE_IP_TUNNEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_IP_TUNNEL))
+#define NM_IS_DEVICE_IP_TUNNEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_DEVICE_IP_TUNNEL))
+#define NM_DEVICE_IP_TUNNEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_DEVICE_IP_TUNNEL, NMDeviceIPTunnelClass))
+
+#define NM_DEVICE_IP_TUNNEL_MODE                "mode"
+#define NM_DEVICE_IP_TUNNEL_PARENT              "parent"
+#define NM_DEVICE_IP_TUNNEL_LOCAL               "local"
+#define NM_DEVICE_IP_TUNNEL_REMOTE              "remote"
+#define NM_DEVICE_IP_TUNNEL_TTL                 "ttl"
+#define NM_DEVICE_IP_TUNNEL_TOS                 "tos"
+#define NM_DEVICE_IP_TUNNEL_PATH_MTU_DISCOVERY  "path-mtu-discovery"
+#define NM_DEVICE_IP_TUNNEL_INPUT_KEY           "input-key"
+#define NM_DEVICE_IP_TUNNEL_OUTPUT_KEY          "output-key"
+
+typedef struct {
+       NMDevice parent;
+} NMDeviceIPTunnel;
+
+typedef struct {
+       NMDeviceClass parent;
+} NMDeviceIPTunnelClass;
+
+GType nm_device_ip_tunnel_get_type (void);
+
+G_END_DECLS
+
+#endif /* NM_DEVICE_IP_TUNNEL_H */
index 6a78ed4..459d4ac 100644 (file)
@@ -760,6 +760,8 @@ nm_device_get_priority (NMDevice *self)
                return 600;
        case NM_DEVICE_TYPE_OLPC_MESH:
                return 650;
+       case NM_DEVICE_TYPE_IP_TUNNEL:
+               return 675;
        case NM_DEVICE_TYPE_MODEM:
                return 700;
        case NM_DEVICE_TYPE_BT:
index 219e027..2278e5a 100644 (file)
@@ -150,7 +150,7 @@ TESTS = \
 if ENABLE_TESTS
 
 check-local:
-       @for t in bond bridge ethernet gre infiniband macvlan tun veth vlan vxlan; do \
+       @for t in bond bridge ethernet gre 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 \