X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/42da2a58637902f3bba731a83538804e57e340bf..042d5c20a1c42002b35aa13c7a44dfb4a94d2e65:/tun-bsd.c

diff --git a/tun-bsd.c b/tun-bsd.c
index 5efe5ef8..4e8c0bd8 100644
--- a/tun-bsd.c
+++ b/tun-bsd.c
@@ -76,12 +76,12 @@ static void t_read(int fd, unsigned mode, void *v)
 
   n = read(fd, buf_i, sizeof(buf_i));
   if (n < 0) {
-    a_warn("TUN %s read-error -- %s", t_ifname(t), strerror(errno));
+    a_warn("TUN", "%s", t_ifname(t), "read-error", "?ERRNO", A_END);
     return;
   }
   IF_TRACING(T_TUNNEL, {
-    trace(T_TUNNEL, "tunnel: packet arrived");
-    trace_block(T_PACKET, "tunnel: packet contents", buf_i, n);
+    trace(T_TUNNEL, "tun-bsd: packet arrived");
+    trace_block(T_PACKET, "tun-bsd: packet contents", buf_i, n);
   })
   buf_init(&b, buf_i, n);
   p_tun(t->p, &b);
@@ -125,10 +125,10 @@ static tunnel *t_create(peer *p)
 	T( trace(T_TUNNEL, "tunnel device %u busy: skipping", n); )
 	break;
       case ENOENT:
-	a_warn("TUN - bsd no-tunnel-devices");
+	a_warn("TUN", "-", "bsd", "no-tunnel-devices", A_END);
 	return (0);
       default:
-	a_warn("TUN - open-error %s -- %s", buf, strerror(errno));
+	a_warn("TUN", "-", "open-error", "%s", buf, "?ERRNO", A_END);
 	break;
     }
     n++;
@@ -141,7 +141,7 @@ static tunnel *t_create(peer *p)
   t->n = n;
   sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
   sel_addfile(&t->f);
-  T( trace(T_TUNNEL, "tunnel: attached interface %s to peer `%s'",
+  T( trace(T_TUNNEL, "tun-bsd: attached interface %s to peer `%s'",
 	   t_ifname(t), p_name(p)); )
   return (t);
 }
@@ -159,8 +159,8 @@ static tunnel *t_create(peer *p)
 static void t_inject(tunnel *t, buf *b)
 {
   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-bsd: inject decrypted packet");
+    trace_block(T_PACKET, "tun-bsd: packet contents", BBASE(b), BLEN(b));
   })
   write(t->f.fd, BBASE(b), BLEN(b));
 }