colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: implement link_ipip_add via nm_platform_link_add()

Browse Source
This commit is contained in:
Thomas Haller
2019-12-31 13:57:00 +01:00
parent 16fd8ddf95
commit 14b5627633
3 changed files with 32 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/platform/nm-linux-platform.c
View File

@@ -3892,6 +3892,23 @@ _nl_msg_new_link_set_linkinfo (struct nl_msg *msg,
NLA_PUT_U32 (msg, IFLA_GRE_FLAGS, props->flags);
break;
}
case NM_LINK_TYPE_IPIP: {
const NMPlatformLnkIpIp *props = extra_data;
nm_assert (props);
if (!(data = nla_nest_start (msg, IFLA_INFO_DATA)))
goto nla_put_failure;
if (props->parent_ifindex)
NLA_PUT_U32 (msg, IFLA_IPTUN_LINK, props->parent_ifindex);
NLA_PUT_U32 (msg, IFLA_IPTUN_LOCAL, props->local);
NLA_PUT_U32 (msg, IFLA_IPTUN_REMOTE, props->remote);
NLA_PUT_U8 (msg, IFLA_IPTUN_TTL, props->ttl);
NLA_PUT_U8 (msg, IFLA_IPTUN_TOS, props->tos);
NLA_PUT_U8 (msg, IFLA_IPTUN_PMTUDISC, !!props->path_mtu_discovery);
break;
}
default:
nm_assert (!extra_data);
break;
@@ -7345,47 +7362,6 @@ link_get_dev_id (NMPlatform *platform, int ifindex)
16, 0, G_MAXUINT16, 0);
}
static gboolean
link_ipip_add (NMPlatform *platform,
const char *name,
const NMPlatformLnkIpIp *props,
const NMPlatformLink **out_link)
{
nm_auto_nlmsg struct nl_msg *nlmsg = NULL;
struct nlattr *info;
struct nlattr *data;
nlmsg = _nl_msg_new_link (RTM_NEWLINK,
NLM_F_CREATE | NLM_F_EXCL,
0,
name);
if (!nlmsg)
return FALSE;
if (!(info = nla_nest_start (nlmsg, IFLA_LINKINFO)))
goto nla_put_failure;
NLA_PUT_STRING (nlmsg, IFLA_INFO_KIND, "ipip");
if (!(data = nla_nest_start (nlmsg, IFLA_INFO_DATA)))
goto nla_put_failure;
if (props->parent_ifindex)
NLA_PUT_U32 (nlmsg, IFLA_IPTUN_LINK, props->parent_ifindex);
NLA_PUT_U32 (nlmsg, IFLA_IPTUN_LOCAL, props->local);
NLA_PUT_U32 (nlmsg, IFLA_IPTUN_REMOTE, props->remote);
NLA_PUT_U8 (nlmsg, IFLA_IPTUN_TTL, props->ttl);
NLA_PUT_U8 (nlmsg, IFLA_IPTUN_TOS, props->tos);
NLA_PUT_U8 (nlmsg, IFLA_IPTUN_PMTUDISC, !!props->path_mtu_discovery);
nla_nest_end (nlmsg, data);
nla_nest_end (nlmsg, info);
return (do_add_link_with_lookup (platform, NM_LINK_TYPE_IPIP, name, nlmsg, out_link) >= 0);
nla_put_failure:
g_return_val_if_reached (FALSE);
}
static gboolean
link_macsec_add (NMPlatform *platform,
const char *name,
@@ -9170,7 +9146,6 @@ nm_linux_platform_class_init (NMLinuxPlatformClass *klass)
platform_class->link_macsec_add = link_macsec_add;
platform_class->link_macvlan_add = link_macvlan_add;
platform_class->link_ipip_add = link_ipip_add;
platform_class->link_tun_add = link_tun_add;
platform_class->object_delete = object_delete;

37
src/platform/nm-platform.c
View File

@@ -1240,6 +1240,10 @@ nm_platform_link_add (NMPlatform *self,
nm_utils_strbuf_append_str (&buf_p, &buf_len, ", ");
nm_platform_lnk_ip6tnl_to_string ((const NMPlatformLnkIp6Tnl *) extra_data, buf_p, buf_len);
break;
case NM_LINK_TYPE_IPIP:
nm_utils_strbuf_append_str (&buf_p, &buf_len, ", ");
nm_platform_lnk_ipip_to_string ((const NMPlatformLnkIpIp *) extra_data, buf_p, buf_len);
break;
default:
nm_assert (!extra_data);
break;
@@ -2745,39 +2749,6 @@ nm_platform_link_infiniband_get_properties (NMPlatform *self,
return TRUE;
}
/**
* nm_platform_ipip_add:
* @self: platform instance
* @name: name of the new interface
* @props: interface properties
* @out_link: on success, the link object
*
* Create an IPIP tunnel.
*/
int
nm_platform_link_ipip_add (NMPlatform *self,
const char *name,
const NMPlatformLnkIpIp *props,
const NMPlatformLink **out_link)
{
int r;
_CHECK_SELF (self, klass, -NME_BUG);
g_return_val_if_fail (props, -NME_BUG);
g_return_val_if_fail (name, -NME_BUG);
r = _link_add_check_existing (self, name, NM_LINK_TYPE_IPIP, out_link);
if (r < 0)
return r;
_LOG2D ("adding link %s", nm_platform_lnk_ipip_to_string (props, NULL, 0));
if (!klass->link_ipip_add (self, name, props, out_link))
return -NME_UNSPEC;
return 0;
}
/**
* nm_platform_macsec_add:
* @self: platform instance

19
src/platform/nm-platform.h
View File

@@ -1039,10 +1039,6 @@ typedef struct {
gboolean egress_reset_all,
const NMVlanQosMapping *egress_map,
gsize n_egress_map);
gboolean (*link_ipip_add) (NMPlatform *self,
const char *name,
const NMPlatformLnkIpIp *props,
const NMPlatformLink **out_link);
gboolean (*link_macsec_add) (NMPlatform *self,
const char *name,
int parent,
@@ -1486,6 +1482,17 @@ nm_platform_link_ip6gre_add (NMPlatform *self,
return nm_platform_link_add (self, props->is_tap ? NM_LINK_TYPE_IP6GRETAP : NM_LINK_TYPE_IP6GRE, name, 0, NULL, 0, props, out_link);
}
static inline int
nm_platform_link_ipip_add (NMPlatform *self,
const char *name,
const NMPlatformLnkIpIp *props,
const NMPlatformLink **out_link)
{
g_return_val_if_fail (props, -NME_BUG);
return nm_platform_link_add (self, NM_LINK_TYPE_IPIP, name, 0, NULL, 0, props, out_link);
}
gboolean nm_platform_link_delete (NMPlatform *self, int ifindex);
gboolean nm_platform_link_set_netns (NMPlatform *self, int ifindex, int netns_fd);
@@ -1656,10 +1663,6 @@ const struct in6_addr *nm_platform_ip6_address_get_peer (const NMPlatformIP6Addr
const NMPlatformIP4Address *nm_platform_ip4_address_get (NMPlatform *self, int ifindex, in_addr_t address, guint8 plen, in_addr_t peer_address);
int nm_platform_link_ipip_add (NMPlatform *self,
const char *name,
const NMPlatformLnkIpIp *props,
const NMPlatformLink **out_link);
int nm_platform_link_macsec_add (NMPlatform *self,
const char *name,
int parent,