Merge pull request #10669 from danderson/networkd-6rd
networkd: add 6rd support for sit netdevs
This commit is contained in:
Yu Watanabe
GitHub
commit
bf877a54c7
|
|
@ -911,6 +911,14 @@
|
|||
<para>Accepts the same key as <literal>[FooOverUDP]</literal></para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><varname>IPv6RapidDeploymentPrefix=</varname></term>
|
||||
<listitem>
|
||||
<para>Reconfigure the tunnel for <ulink url="https://tools.ietf.org/html/rfc5569">IPv6 Rapid
|
||||
Deployment</ulink>, also known as 6rd. The value is an ISP-specific IPv6 prefix with a non-zero length. Only
|
||||
applicable to SIT tunnels.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
|
|
@ -1519,6 +1527,18 @@ Local=10.65.223.238
|
|||
Remote=10.65.223.239</programlisting>
|
||||
</example>
|
||||
|
||||
<example>
|
||||
<title>/etc/systemd/network/25-6rd.netdev</title>
|
||||
<programlisting>[NetDev]
|
||||
Name=6rd-tun
|
||||
Kind=sit
|
||||
MTUBytes=1480
|
||||
|
||||
[Tunnel]
|
||||
Local=10.65.223.238
|
||||
IPv6RapidDeploymentPrefix=2602::/24</programlisting>
|
||||
</example>
|
||||
|
||||
<example>
|
||||
<title>/etc/systemd/network/25-gre.netdev</title>
|
||||
<programlisting>[NetDev]
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ Tunnel.FooOverUDP, config_parse_bool, 0,
|
|||
Tunnel.FOUDestinationPort, config_parse_ip_port, 0, offsetof(Tunnel, fou_destination_port)
|
||||
Tunnel.FOUSourcePort, config_parse_ip_port, 0, offsetof(Tunnel, encap_src_port)
|
||||
Tunnel.Encapsulation, config_parse_fou_encap_type, 0, offsetof(Tunnel, fou_encap_type)
|
||||
Tunnel.IPv6RapidDeploymentPrefix, config_parse_6rd_prefix, 0, 0
|
||||
FooOverUDP.Protocol, config_parse_uint8, 0, offsetof(FouTunnel, fou_protocol)
|
||||
FooOverUDP.Encapsulation, config_parse_fou_encap_type, 0, offsetof(FouTunnel, fou_encap_type)
|
||||
FooOverUDP.Port, config_parse_ip_port, 0, offsetof(FouTunnel, port)
|
||||
|
|
|
|||
|
|
@ -114,6 +114,18 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_netlink
|
|||
if (r < 0)
|
||||
return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPTUN_PMTUDISC attribute: %m");
|
||||
|
||||
if (t->sixrd_prefixlen > 0) {
|
||||
r = sd_netlink_message_append_in6_addr(m, IFLA_IPTUN_6RD_PREFIX, &t->sixrd_prefix);
|
||||
if (r < 0)
|
||||
return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPTUN_6RD_PREFIX attribute: %m");
|
||||
/* u16 is deliberate here, even though we're passing a netmask that can never be >128. The kernel is
|
||||
* expecting to receive the prefixlen as a u16.
|
||||
*/
|
||||
r = sd_netlink_message_append_u16(m, IFLA_IPTUN_6RD_PREFIXLEN, t->sixrd_prefixlen);
|
||||
if (r < 0)
|
||||
return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPTUN_6RD_PREFIXLEN attribute: %m");
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
|
|
@ -617,6 +629,42 @@ int config_parse_encap_limit(const char* unit,
|
|||
return 0;
|
||||
}
|
||||
|
||||
int config_parse_6rd_prefix(const char* unit,
|
||||
const char *filename,
|
||||
unsigned line,
|
||||
const char *section,
|
||||
unsigned section_line,
|
||||
const char *lvalue,
|
||||
int ltype,
|
||||
const char *rvalue,
|
||||
void *data,
|
||||
void *userdata) {
|
||||
Tunnel *t = userdata;
|
||||
|
||||
assert(filename);
|
||||
assert(lvalue);
|
||||
assert(rvalue);
|
||||
|
||||
union in_addr_union p;
|
||||
uint8_t l;
|
||||
int r;
|
||||
|
||||
r = in_addr_prefix_from_string(rvalue, AF_INET6, &p, &l);
|
||||
if (r < 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse 6rd prefix \"%s\", ignoring: %m", rvalue);
|
||||
return 0;
|
||||
}
|
||||
if (l == 0) {
|
||||
log_syntax(unit, LOG_ERR, filename, line, 0, "6rd prefix length of \"%s\" must be greater than zero, ignoring", rvalue);
|
||||
return 0;
|
||||
}
|
||||
|
||||
t->sixrd_prefix = p.in6;
|
||||
t->sixrd_prefixlen = l;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ipip_init(NetDev *n) {
|
||||
Tunnel *t = IPIP(n);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
#include "in-addr-util.h"
|
||||
|
||||
#include "conf-parser.h"
|
||||
#include "netdev/netdev.h"
|
||||
#include "netdev/fou-tunnel.h"
|
||||
|
||||
|
|
@ -50,6 +51,9 @@ typedef struct Tunnel {
|
|||
|
||||
uint16_t encap_src_port;
|
||||
uint16_t fou_destination_port;
|
||||
|
||||
struct in6_addr sixrd_prefix;
|
||||
uint8_t sixrd_prefixlen;
|
||||
} Tunnel;
|
||||
|
||||
DEFINE_NETDEV_CAST(IPIP, Tunnel);
|
||||
|
|
@ -108,3 +112,5 @@ int config_parse_tunnel_key(const char *unit, const char *filename,
|
|||
unsigned section_line, const char *lvalue,
|
||||
int ltype, const char *rvalue, void *data,
|
||||
void *userdata);
|
||||
|
||||
CONFIG_PARSER_PROTOTYPE(config_parse_6rd_prefix);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
[NetDev]
|
||||
Name=6rdtun99
|
||||
Kind=sit
|
||||
|
||||
[Tunnel]
|
||||
Local=10.65.223.238
|
||||
Remote=10.65.223.239
|
||||
IPv6RapidDeploymentPrefix=2602::/24
|
||||
|
|
@ -73,6 +73,7 @@ CopyDSCP=
|
|||
EncapsulationLimit=
|
||||
TTL=
|
||||
FOUSourcePort=
|
||||
IPv6RapidDeploymentPrefix=
|
||||
[VXLAN]
|
||||
UDP6ZeroChecksumRx=
|
||||
ARPProxy=
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
[NetDev]
|
||||
Name=sittun99
|
||||
Kind=sit
|
||||
|
||||
[Tunnel]
|
||||
Local=10.65.223.238
|
||||
IPv6RapidDeploymentPrefix=2602::/24
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
[Match]
|
||||
Name=dummy98
|
||||
|
||||
[Network]
|
||||
Tunnel=sittun99
|
||||
|
|
@ -148,18 +148,18 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
|
|||
|
||||
links =['bridge99', 'bond99', 'bond99', 'vlan99', 'test1', 'macvtap99',
|
||||
'macvlan99', 'ipvlan99', 'vxlan99', 'veth99', 'vrf99', 'tun99',
|
||||
'tap99', 'vcan99', 'geneve99', 'dummy98', 'ipiptun99', 'sittun99',
|
||||
'tap99', 'vcan99', 'geneve99', 'dummy98', 'ipiptun99', 'sittun99', '6rdtun99',
|
||||
'gretap99', 'vtitun99', 'vti6tun99','ip6tnl99', 'gretun99', 'ip6gretap99', 'wg99']
|
||||
|
||||
units = ['25-bridge.netdev', '25-bond.netdev', '21-vlan.netdev', '11-dummy.netdev', '21-vlan.network',
|
||||
'21-macvtap.netdev', 'macvtap.network', '21-macvlan.netdev', 'macvlan.network', 'vxlan.network',
|
||||
'25-vxlan.netdev', '25-ipvlan.netdev', 'ipvlan.network', '25-veth.netdev', '25-vrf.netdev',
|
||||
'25-tun.netdev', '25-tun.netdev', '25-vcan.netdev', '25-geneve.netdev', '25-ipip-tunnel.netdev',
|
||||
'25-ip6tnl-tunnel.netdev', '25-ip6gre-tunnel.netdev','25-sit-tunnel.netdev', '25-gre-tunnel.netdev',
|
||||
'25-gretap-tunnel.netdev', '25-vti-tunnel.netdev', '25-vti6-tunnel.netdev', '12-dummy.netdev',
|
||||
'gre.network', 'ipip.network', 'ip6gretap.network', 'gretun.network', 'ip6tnl.network', '25-tap.netdev',
|
||||
'vti6.network', 'vti.network', 'gretap.network', 'sit.network', '25-ipip-tunnel-independent.netdev',
|
||||
'25-wireguard.netdev']
|
||||
'25-ip6tnl-tunnel.netdev', '25-ip6gre-tunnel.netdev','25-sit-tunnel.netdev', '25-6rd-tunnel.netdev',
|
||||
'25-gre-tunnel.netdev', '25-gretap-tunnel.netdev', '25-vti-tunnel.netdev', '25-vti6-tunnel.netdev',
|
||||
'12-dummy.netdev', 'gre.network', 'ipip.network', 'ip6gretap.network', 'gretun.network',
|
||||
'ip6tnl.network', '25-tap.netdev', 'vti6.network', 'vti.network', 'gretap.network', 'sit.network',
|
||||
'25-ipip-tunnel-independent.netdev', '25-wireguard.netdev', '6rd.network']
|
||||
|
||||
def setUp(self):
|
||||
self.link_remove(self.links)
|
||||
|
|
@ -361,6 +361,13 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
|
|||
self.assertTrue(self.link_exits('dummy98'))
|
||||
self.assertTrue(self.link_exits('sittun99'))
|
||||
|
||||
def test_6rd_tunnel(self):
|
||||
self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-6rd-tunnel.netdev', '6rd.network')
|
||||
self.start_networkd()
|
||||
|
||||
self.assertTrue(self.link_exits('dummy98'))
|
||||
self.assertTrue(self.link_exits('sittun99'))
|
||||
|
||||
def test_tunnel_independent(self):
|
||||
self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev')
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue