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);
})
else if (st & ST_ESC)
a_warn("TUN %s slip escape-end", t->sl->name);
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);
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;
}
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);