diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2015-10-30 15:14:23 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2015-12-01 17:39:41 +0100 |
| commit | 570fdce93f44a51dbd84bbfe098913141c94b789 (patch) | |
| tree | dfa8a328b2c1b4397690d0a26fb885842d16dc39 /libnm-core | |
| parent | 1a3448b43bb122243b7f9730e2ed7d62ab0a4c1e (diff) | |
| download | NetworkManager-570fdce93f44a51dbd84bbfe098913141c94b789.tar.gz | |
device: add NMDeviceIPTunnel
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.
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-connection.c | 3 | ||||
| -rw-r--r-- | libnm-core/nm-dbus-interface.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 0f599984c9..e801f2fd47 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -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)) { diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index e81f081dff..f901028f9b 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -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; /** |