dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

networkd: warn when ignoring unsupported tuntap options

Browse Source 
The interface for creating tuntap devices should be ported to rtnl so it would support the same settings
as other kinds. In the meantime, the best one can do is to drop in a .link file to set the desired options.
This commit is contained in:
Tom Gundersen
2014-08-18 12:29:45 +02:00
parent fac9c0d508
commit e0fbf1fcff
2 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
man/systemd.netdev.xml
View File

@@ -177,7 +177,9 @@
<para>The maximum transmission unit in bytes to
set for the device. The usual suffixes K, M, G,
are supported and are understood to the base of
1024.</para>
1024. This key is not currently suported for
<literal>tun</literal> or <literal>tap</literal> devices.
</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -187,6 +189,7 @@
If none is given, one is generated based on
the interface name and the
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
This key is not currently suported for <literal>tun</literal> or <literal>tap</literal> devices.
</para>
</listitem>
</varlistentry>

27
src/network/networkd-netdev-tuntap.c
View File

@@ -172,9 +172,35 @@ static void tuntap_done(NetDev *netdev) {
t->group_name = NULL;
}
static int tuntap_verify(NetDev *netdev, const char *filename) {
TunTap *t = NULL;
assert(netdev);
if (netdev->kind == NETDEV_KIND_TUN)
t = TUN(netdev);
else
t = TAP(netdev);
assert(t);
if (netdev->mtu) {
log_warning_netdev(netdev, "MTU configured for %s, ignoring",
netdev_kind_to_string(netdev->kind));
}
if (netdev->mac) {
log_warning_netdev(netdev, "MAC configured for %s, ignoring",
netdev_kind_to_string(netdev->kind));
}
return 0;
}
const NetDevVTable tun_vtable = {
.object_size = sizeof(TunTap),
.sections = "Match\0NetDev\0Tun\0",
.config_verify = tuntap_verify,
.done = tuntap_done,
.create = netdev_create_tuntap,
.create_type = NETDEV_CREATE_INDEPENDENT,
@@ -183,6 +209,7 @@ const NetDevVTable tun_vtable = {
const NetDevVTable tap_vtable = {
.object_size = sizeof(TunTap),
.sections = "Match\0NetDev\0Tap\0",
.config_verify = tuntap_verify,
.done = tuntap_done,
.create = netdev_create_tuntap,
.create_type = NETDEV_CREATE_INDEPENDENT,