chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: strings in C are NUL-terminated anyway, no need to add a second NUL...
[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 eef8747210431c8318dd975f776cadee0e52235c..57cc77c55552bee1167a3e0a9ae343241d13792b 100644
(file)
--- a/
src/network/networkd-netdev-tuntap.c
+++ b/
src/network/networkd-netdev-tuntap.c
@@
-63,22
+63,20
@@
static int netdev_tuntap_add(NetDev *netdev, struct ifreq *ifr) {
const char *group;
uid_t uid;
gid_t gid;
const char *group;
uid_t uid;
gid_t gid;
- int r
= 0
;
+ int r;
assert(netdev);
assert(ifr);
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
assert(netdev);
assert(ifr);
fd = open(TUN_DEV, O_RDWR);
if (fd < 0) {
- log_error_netdev(netdev,
- "Failed to open tun dev: %s",
- strerror(-r));
- return r;
+ log_netdev_error(netdev, "Failed to open tun dev: %m");
+ return -errno;
}
r = ioctl(fd, TUNSETIFF, ifr);
if (r < 0) {
}
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;
@@
-97,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));
}
@@
-116,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;
@@
-133,13
+131,13
@@
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;
}
- return
r
;
+ return
0
;
}
static int netdev_create_tuntap(NetDev *netdev) {
}
static int netdev_create_tuntap(NetDev *netdev) {