#endif
errno == EAGAIN)
return;
- a_warn("TUN %s read-error -- %s", t->sl->name, strerror(errno));
+ a_warn("TUN", "%s", t->sl->name, "read-error", "?ERRNO", A_END);
return;
}
if (!n) {
- a_warn("TUN %s slip eof", t->sl->name);
+ a_warn("TUN", "%s", t->sl->name, "slip", "eof", A_END);
t->st = ST_EOF;
sel_rmfile(&t->f);
return;
}
IF_TRACING(T_TUNNEL, {
- trace_block(T_PACKET, "tunnel: SLIP-encapsulated data",
+ trace_block(T_PACKET, "tun-slip: SLIP-encapsulated data",
buf_t, n);
})
if (st & ST_BAD)
;
else if (st & ST_ESC)
- a_warn("TUN %s slip escape-end", t->sl->name);
+ a_warn("TUN", "%s", t->sl->name, "slip", "escape-end", A_END);
else if (q == t->buf) {
- T( trace(T_TUNNEL, "tunnel: empty packet"); )
+ T( trace(T_TUNNEL, "tun-slip: empty packet"); )
} else {
IF_TRACING(T_TUNNEL, {
- trace(T_TUNNEL, "tunnel: packet arrived");
- trace_block(T_PACKET, "tunnel: packet contents",
+ trace(T_TUNNEL, "tun-slip: packet arrived");
+ trace_block(T_PACKET, "tun-slip: packet contents",
t->buf, q - t->buf);
})
buf_init(&b, t->buf, q - t->buf);
break;
case SL_ESC:
if ((st & ST_ESC) && !(st & ST_BAD)) {
- a_warn("TUN %s slip bad-escape", t->sl->name);
+ a_warn("TUN", "%s", t->sl->name, "slip", "bad-escape", A_END);
st |= ST_BAD;
} else
st |= ST_ESC;
goto emit;
default:
if ((st & ST_ESC) && !(st & ST_BAD)) {
- a_warn("TUN %s slip bad-escape", t->sl->name);
+ a_warn("TUN", "%s", t->sl->name, "slip", "bad-escape", A_END);
st |= ST_BAD;
}
emit:
if (q < ll)
*q++ = o;
else {
- a_warn("TUN %s slip overflow", t->sl->name);
+ a_warn("TUN", "%s", t->sl->name, "slip", "overflow", A_END);
st |= ST_BAD;
}
}
for (;;) {
if (*p == '/' || *p == '.') {
slipcmd = p;
- T( trace(T_TUNNEL, "tunnel: declared slip command `%s'", slipcmd); )
+ T( trace(T_TUNNEL, "tun-slip: declared slip command `%s'", slipcmd); )
break;
}
uli = strtoul(p, &q, 0);
sl->name[n] = 0;
*tail = sl;
tail = &sl->next;
- T( trace(T_TUNNEL, "tunnel: declared slipif %d,%d=%s",
+ T( trace(T_TUNNEL, "tun-slip: declared slipif %d,%d=%s",
sl->ifd, sl->ofd, sl->name); )
p = q + n + 1;
if (!*p)
for (sl = slipifs; sl; sl = sl->next) {
if (!(sl->f & F_INUSE)) {
- T( trace(T_TUNNEL, "tunnel: %s using static slipif %s",
+ T( trace(T_TUNNEL, "tun-slip: %s using static slipif %s",
p_name(p), sl->name); )
goto found;
}
/* --- If no dynamic interfaces are available, give up --- */
if (!slipcmd) {
- a_warn("TUN - slip no-slip-interfaces");
+ a_warn("TUN", "-", "slip", "no-slip-interfaces", A_END);
goto fail;
}
/* --- Fork off a child process to create a dynamic SLIP interface --- */
if (pipe(pin) || pipe(pout)) {
- a_warn("TUN - slip pipe-error -- %s", strerror(errno));
+ a_warn("TUN", "-", "slip", "pipe-error", "?ERRNO", A_END);
goto fail;
}
if ((kid = fork()) < 0) {
- a_warn("TUN - slip fork-error -- %s", strerror(errno));
+ a_warn("TUN", "-", "slip", "fork-error", "?ERRNO", A_END);
goto fail;
}
if (!kid) {
for (;;) {
errno = EIO;
if (read(pout[0], &ch, 1) != 1 || ch == SL_END) {
- a_warn("TUN - slip read-ifname-failed -- %s", strerror(errno));
+ a_warn("TUN", "-", "slip", "read-ifname-failed", "?ERRNO", A_END);
goto fail;
}
if (ch == '\n')
sl->kid = kid;
sl->next = 0;
sl->f = F_DYNAMIC;
- T( trace(T_TUNNEL, "tunnel: %s using dynamic slipif %s",
+ T( trace(T_TUNNEL, "tun-slip: %s using dynamic slipif %s",
p_name(p), sl->name); )
fdflags(pout[0], O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
fdflags(pin[1], O_NONBLOCK, 0, FD_CLOEXEC, FD_CLOEXEC);
octet *q;
IF_TRACING(T_TUNNEL, {
- trace(T_TUNNEL, "tunnel: inject decrypted packet");
- trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
+ trace(T_TUNNEL, "tun-slip: inject decrypted packet");
+ trace_block(T_PACKET, "tun-slip: packet contents", BBASE(b), BLEN(b));
})
q = buf;
}
*q++ = SL_END;
IF_TRACING(T_TUNNEL, {
- trace_block(T_PACKET, "tunnel: SLIP-encapsulated contents",
+ trace_block(T_PACKET, "tun-slip: SLIP-encapsulated contents",
buf, q - buf);
})
write(t->sl->ofd, buf, q - buf);
sl->f &= ~F_INUSE;
}
if (sl && (sl->f & F_DYNAMIC)) {
- T( trace(T_TUNNEL, "tunnel: releasing dynamic slipif %s", sl->name); )
+ T( trace(T_TUNNEL, "tun-slip: releasing dynamic slipif %s", sl->name); )
close(sl->ofd);
close(sl->ifd);
kill(sl->kid, SIGTERM);