chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
path-util: no need to check whether p is absolute twice
[elogind.git]
/
src
/
network
/
networkd-netdev-tuntap.c
diff --git
a/src/network/networkd-netdev-tuntap.c
b/src/network/networkd-netdev-tuntap.c
index eaf5df49718f14385372cf7b88f74ec73d72e390..4f449aea4820eeda113659a9714e2216d8dc1589 100644
(file)
--- a/
src/network/networkd-netdev-tuntap.c
+++ b/
src/network/networkd-netdev-tuntap.c
@@
-70,13
+70,13
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
- log_
error_netdev
(netdev, "Failed to open tun dev: %m");
+ log_
netdev_error
(netdev, "Failed to open tun dev: %m");
return -errno;
}
r = ioctl(fd, TUNSETIFF, ifr);
if (r < 0) {
return -errno;
}
r = ioctl(fd, TUNSETIFF, ifr);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"TUNSETIFF failed on tun dev: %s",
strerror(-r));
return r;
"TUNSETIFF failed on tun dev: %s",
strerror(-r));
return r;
@@
-95,14
+95,14
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
r = get_user_creds(&user, &uid, NULL, NULL, NULL);
if (r < 0) {
r = get_user_creds(&user, &uid, NULL, NULL, NULL);
if (r < 0) {
- log_error
("Cannot resolve user name %s: %s
",
-
t->user_name, strerror(-r)
);
+ log_error
_errno(r, "Cannot resolve user name %s: %m
",
+
t->user_name
);
return 0;
}
r = ioctl(fd, TUNSETOWNER, uid);
if ( r < 0) {
return 0;
}
r = ioctl(fd, TUNSETOWNER, uid);
if ( r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"TUNSETOWNER failed on tun dev: %s",
strerror(-r));
}
"TUNSETOWNER failed on tun dev: %s",
strerror(-r));
}
@@
-114,14
+114,14
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
r = get_group_creds(&group, &gid);
if (r < 0) {
r = get_group_creds(&group, &gid);
if (r < 0) {
- log_error
("Cannot resolve group name %s: %s
",
-
t->group_name, strerror(-r)
);
+ log_error
_errno(r, "Cannot resolve group name %s: %m
",
+
t->group_name
);
return 0;
}
r = ioctl(fd, TUNSETGROUP, gid);
if( r < 0) {
return 0;
}
r = ioctl(fd, TUNSETGROUP, gid);
if( r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"TUNSETGROUP failed on tun dev: %s",
strerror(-r));
return r;
"TUNSETGROUP failed on tun dev: %s",
strerror(-r));
return r;
@@
-131,7
+131,7
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
r = ioctl(fd, TUNSETPERSIST, 1);
if (r < 0) {
r = ioctl(fd, TUNSETPERSIST, 1);
if (r < 0) {
- log_
error_netdev
(netdev,
+ log_
netdev_error
(netdev,
"TUNSETPERSIST failed on tun dev: %s",
strerror(-r));
return r;
"TUNSETPERSIST failed on tun dev: %s",
strerror(-r));
return r;
@@
-171,17
+171,8
@@
static void tuntap_done(NetDev *netdev) {
}
static int tuntap_verify(NetDev *netdev, const char *filename) {
}
static int tuntap_verify(NetDev *netdev, const char *filename) {
- TunTap *t = NULL;
-
assert(netdev);
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->mtu) {
log_warning_netdev(netdev, "MTU configured for %s, ignoring",
netdev_kind_to_string(netdev->kind));