chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/{keyexch.c,keyset.c}: Eliminate `ks_tregen'.
[tripe]
/
server
/
tun-linux.c
diff --git
a/server/tun-linux.c
b/server/tun-linux.c
index b870580263edc3576c1becaab815c6223d7c9cfc..10456e352c54c27050291b1ac898fa4c57c52b34 100644
(file)
--- a/
server/tun-linux.c
+++ b/
server/tun-linux.c
@@
-65,7
+65,8
@@
static void t_read(int fd, unsigned mode, void *v)
n = read(fd, buf_i, sizeof(buf_i));
if (n < 0) {
n = read(fd, buf_i, sizeof(buf_i));
if (n < 0) {
- a_warn("TUN", "%s", p_ifname(t->p), "read-error", "?ERRNO", A_END);
+ a_warn("TUN", "%s", p_ifname(t->p), "linux",
+ "read-error", "?ERRNO", A_END);
return;
}
IF_TRACING(T_TUNNEL, {
return;
}
IF_TRACING(T_TUNNEL, {
@@
-128,7
+129,7
@@
static void t_inject(tunnel *t, buf *b)
trace(T_TUNNEL, "tun-linux: inject decrypted packet");
trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
})
trace(T_TUNNEL, "tun-linux: inject decrypted packet");
trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
})
-
write(t->f.fd, BBASE(b), BLEN(b
));
+
IGNORE(write(t->f.fd, BBASE(b), BLEN(b)
));
}
/* --- @t_destroy@ --- *
}
/* --- @t_destroy@ --- *