chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
network
/
networkd-netdev-tunnel.c
diff --git
a/src/network/networkd-netdev-tunnel.c
b/src/network/networkd-netdev-tunnel.c
index 174fe234fd40406afce30e69322c3f96a8e73ae2..31d34644edebdceac3bca3bc03689efc7e20aa4f 100644
(file)
--- a/
src/network/networkd-netdev-tunnel.c
+++ b/
src/network/networkd-netdev-tunnel.c
@@
-45,7
+45,7
@@
static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
if (r < 0) {
r = sd_rtnl_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
@@
-53,7
+53,7
@@
static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &t->local.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &t->local.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
@@
-61,7
+61,7
@@
static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_REMOTE, &t->remote.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_REMOTE, &t->remote.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
@@
-69,12
+69,20
@@
static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl);
if (r < 0) {
r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_TTL attribute: %s",
strerror(-r));
return r;
}
"Could not append IFLA_IPTUN_TTL attribute: %s",
strerror(-r));
return r;
}
+ r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_PMTUDISC, t->pmtudisc);
+ if (r < 0) {
+ log_netdev_error(netdev,
+ "Could not append IFLA_IPTUN_PMTUDISC attribute: %s",
+ strerror(-r));
+ return r;
+ }
+
return r;
}
return r;
}
@@
-90,7
+98,7
@@
static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
if (r < 0) {
r = sd_rtnl_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
@@
-98,7
+106,7
@@
static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &t->local.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &t->local.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
@@
-106,7
+114,7
@@
static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_REMOTE, &t->remote.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_REMOTE, &t->remote.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
@@
-114,12
+122,20
@@
static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl);
if (r < 0) {
r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TTL, t->ttl);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_TTL attribute: %s",
strerror(-r));
return r;
}
"Could not append IFLA_IPTUN_TTL attribute: %s",
strerror(-r));
return r;
}
+ r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_PMTUDISC, t->pmtudisc);
+ if (r < 0) {
+ log_netdev_error(netdev,
+ "Could not append IFLA_IPTUN_PMTUDISC attribute: %s",
+ strerror(-r));
+ return r;
+ }
+
return r;
}
return r;
}
@@
-135,7
+151,7
@@
static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u32(m, IFLA_GRE_LINK, link->ifindex);
if (r < 0) {
r = sd_rtnl_message_append_u32(m, IFLA_GRE_LINK, link->ifindex);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_GRE_LINK attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_GRE_LINK attribute: %s",
strerror(-r));
return r;
@@
-143,7
+159,7
@@
static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_GRE_LOCAL, &t->local.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_GRE_LOCAL, &t->local.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_GRE_LOCAL attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_GRE_LOCAL attribute: %s",
strerror(-r));
return r;
@@
-151,7
+167,7
@@
static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_GRE_REMOTE, &t->remote.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_GRE_REMOTE, &t->remote.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_GRE_REMOTE attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_GRE_REMOTE attribute: %s",
strerror(-r));
return r;
@@
-159,7
+175,7
@@
static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u8(m, IFLA_GRE_TTL, t->ttl);
if (r < 0) {
r = sd_rtnl_message_append_u8(m, IFLA_GRE_TTL, t->ttl);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_GRE_TTL attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_GRE_TTL attribute: %s",
strerror(-r));
return r;
@@
-167,12
+183,20
@@
static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u8(m, IFLA_GRE_TOS, t->tos);
if (r < 0) {
r = sd_rtnl_message_append_u8(m, IFLA_GRE_TOS, t->tos);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_GRE_TOS attribute: %s",
strerror(-r));
return r;
}
"Could not append IFLA_GRE_TOS attribute: %s",
strerror(-r));
return r;
}
+ r = sd_rtnl_message_append_u8(m, IFLA_GRE_PMTUDISC, t->pmtudisc);
+ if (r < 0) {
+ log_netdev_error(netdev,
+ "Could not append IFLA_GRE_PMTUDISC attribute: %s",
+ strerror(-r));
+ return r;
+ }
+
return r;
}
return r;
}
@@
-188,7
+212,7
@@
static int netdev_vti_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_u32(m, IFLA_VTI_LINK, link->ifindex);
if (r < 0) {
r = sd_rtnl_message_append_u32(m, IFLA_VTI_LINK, link->ifindex);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LINK attribute: %s",
strerror(-r));
return r;
@@
-196,7
+220,7
@@
static int netdev_vti_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_VTI_LOCAL, &t->local.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_VTI_LOCAL, &t->local.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_LOCAL attribute: %s",
strerror(-r));
return r;
@@
-204,7
+228,7
@@
static int netdev_vti_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_me
r = sd_rtnl_message_append_in_addr(m, IFLA_VTI_REMOTE, &t->remote.in);
if (r < 0) {
r = sd_rtnl_message_append_in_addr(m, IFLA_VTI_REMOTE, &t->remote.in);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
"Could not append IFLA_IPTUN_REMOTE attribute: %s",
strerror(-r));
return r;
@@
-238,11
+262,6
@@
static int netdev_tunnel_verify(NetDev *netdev, const char *filename) {
assert(t);
assert(t);
- if (t->local.in.s_addr == INADDR_ANY) {
- log_warning("Tunnel without local address configured in %s. Ignoring", filename);
- return -EINVAL;
- }
-
if (t->remote.in.s_addr == INADDR_ANY) {
log_warning("Tunnel without remote address configured in %s. Ignoring", filename);
return -EINVAL;
if (t->remote.in.s_addr == INADDR_ANY) {
log_warning("Tunnel without remote address configured in %s. Ignoring", filename);
return -EINVAL;